From 9198d94738c996d68ba5e1f52b75d0e842612919 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 30 Nov 2021 17:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/plugs/easy-admin/easy-admin.js | 22 +++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 10fa49d..267916a 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -1441,6 +1441,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                 }
             },
             select: function () {
+                
                 var selectList = document.querySelectorAll("[data-select]");
                 $.each(selectList, function (i, v) {
                     var url = $(this).attr('data-select'),
@@ -1448,8 +1449,17 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                         value = $(this).attr('data-value'),
                         that = this,
                         html = '<option value=""></option>';
+
+                    var template = $(that).data('template');
+
+                    if(typeof template != 'function'){
+                        template = function(data,fields){
+                            return data[fields[1]];
+                        }
+                    }
+
                     var fields = selectFields.replace(/\s/g, "").split(',');
-                    if (fields.length !== 2) {
+                    if (fields.length < 2) {
                         return admin.msg.error('下拉选择字段有误');
                     }
                     admin.request.get(
@@ -1460,12 +1470,18 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                             },
                         }, function (res) {
                             var list = res.data;
+
+
+
                             list.forEach(val => {
                                 var key = val[fields[0]];
+
+                                var valueTitle = template(val, fields);
+
                                 if (value !== undefined && key.toString() === value) {
-                                    html += '<option value="' + key + '" selected="">' + val[fields[1]] + '</option>';
+                                    html += '<option value="' + key + '" selected="">' + valueTitle + '</option>';
                                 } else {
-                                    html += '<option value="' + key + '">' + val[fields[1]] + '</option>';
+                                    html += '<option value="' + key + '">' + valueTitle + '</option>';
                                 }
                             });
                             $(that).html(html);