From abcc2152b0f390282712fb42587c248ee9d90662 Mon Sep 17 00:00:00 2001
From: Dean <1602264241@qq.com>
Date: Wed, 28 Oct 2020 09:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/admin/js/mall/goods.js         |  6 ++--
 public/static/plugs/easy-admin/easy-admin.js | 29 ++++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/public/static/admin/js/mall/goods.js b/public/static/admin/js/mall/goods.js
index 1a689fcf..ff0270ec 100644
--- a/public/static/admin/js/mall/goods.js
+++ b/public/static/admin/js/mall/goods.js
@@ -27,14 +27,14 @@ define(["jquery", "easy-admin"], function ($, ea) {
                         icon: 'fa fa-plus ',
                         extend: 'data-full="true"',
                     }],
-                    'delete', 'export'],
+                    'delete'],
                 cols: [[
                     {type: "checkbox"},
                     {field: 'id', width: 80, title: 'ID'},
                     {field: 'sort', width: 80, title: '排序', edit: 'text'},
-                    {field: 'cate.title', minWidth: 80, title: '商品分类'},
+                    {field: 'cate.title', minWidth: 80, title: '商品分类',search: 'select',selectList: '/'+CONFIG.ADMIN+'/mall.cate/index|title,title'},
                     {field: 'title', minWidth: 80, title: '商品名称'},
-                    {field: 'logo', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image},
+                    {field: 'cate.image', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image},
                     {field: 'market_price', width: 100, title: '市场价', templet: ea.table.price},
                     {field: 'discount_price', width: 100, title: '折扣价', templet: ea.table.price},
                     {field: 'total_stock', width: 100, title: '库存统计'},
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index bc4a572b..280585a3 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -297,17 +297,28 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                             case  'select':
                                 d.searchOp = '=';
                                 var selectHtml = '';
-                                $.each(d.selectList, function (sI, sV) {
-                                    var selected = '';
-                                    if (sI === d.searchValue) {
-                                        selected = 'selected=""';
+                                var data_select = '';
+                                var data_fields = '';
+                                if(typeof d.selectList === 'string'){
+                                    var url = d.selectList.split('|');
+                                    if(url.length === 2){
+                                        data_select=url[0];
+                                        data_fields=url[1];
                                     }
-                                    selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
-                                });
+                                }else{
+                                    $.each(d.selectList, function (sI, sV) {
+                                        var selected = '';
+                                        if (sI === d.searchValue) {
+                                            selected = 'selected=""';
+                                        }
+                                        selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
+                                    });
+                                }
+
                                 formHtml += '\t<div class="layui-form-item layui-inline">\n' +
                                     '<label class="layui-form-label">' + d.title + '</label>\n' +
                                     '<div class="layui-input-inline">\n' +
-                                    '<select class="layui-select" id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '" >\n' +
+                                    '<select class="layui-select" id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp +'"'+ (data_select ? ' data-select="'+data_select+'"':'""') + (data_fields?' data-fields="'+data_fields+'"':'""') + ' data-value="'+d.searchValue+ '" >\n' +
                                     '<option value="">- 全部 -</option> \n' +
                                     selectHtml +
                                     '</select>\n' +
@@ -1190,7 +1201,9 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                             if (typeof preposeCallback === 'function') {
                                 dataField = preposeCallback(dataField);
                             }
-                            admin.api.form(url, dataField, ok, no, ex, refresh);
+                            if(dataField!==false){
+                                admin.api.form(url, dataField, ok, no, ex, refresh);
+                            }
 
                             return false;
                         });