From 77bcee07c5e7c1b14b474a2df3f8878f88afda4b Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Wed, 10 Apr 2024 16:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=EF=BC=8C=E6=94=AF=E6=8C=81textarea=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/common/command/admin/VersionBase.php |  4 +--
 .../plugs/lay-module/tableData/tableData.css  |  1 +
 .../plugs/lay-module/tableData/tableData.html | 11 ++++---
 .../plugs/lay-module/tableData/tableData.js   | 31 ++++++++++++++-----
 .../plugs/lay-module/tableData/tableData.scss |  6 ++--
 5 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index 18ae354..5e08d61 100644
--- a/extend/base/common/command/admin/VersionBase.php
+++ b/extend/base/common/command/admin/VersionBase.php
@@ -12,12 +12,12 @@ use think\console\Output;
 
 class VersionBase extends Command
 {
-    public const VERSION = 'v2.0.96';
+    public const VERSION = 'v2.0.97';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '优化PHP配置进程数',
+        '优化表格选择器，支持textarea，支持多字段显示；',
         '发布新版本',
     ];
 
diff --git a/public/static/plugs/lay-module/tableData/tableData.css b/public/static/plugs/lay-module/tableData/tableData.css
index 11d9a57..e79f5c7 100644
--- a/public/static/plugs/lay-module/tableData/tableData.css
+++ b/public/static/plugs/lay-module/tableData/tableData.css
@@ -2,6 +2,7 @@
   display: flex;
   align-items: center;
   justify-content: left;
+  flex-wrap: wrap;
 }
 .table-data-container .layui-input .placeholder {
   color: #808080;
diff --git a/public/static/plugs/lay-module/tableData/tableData.html b/public/static/plugs/lay-module/tableData/tableData.html
index 2a59265..00cca6a 100644
--- a/public/static/plugs/lay-module/tableData/tableData.html
+++ b/public/static/plugs/lay-module/tableData/tableData.html
@@ -1,11 +1,12 @@
 <div class="table-data-container" ref="tableData">
     <input type="hidden" :name="setting.name" :value="value" :lay-verify="setting.required == 1?'required':''">
-    <div class="layui-input" @click="openSelectPage">
+    <div :class="setting.className" @click="openSelectPage">
         <div class="placeholder" v-if="listSelected.length == 0">{{setting.placeholder}}</div>
-        <div class="layui-btn layui-btn-xs layui-btn-normal" v-for="(itemSelect,indexSelect) in listSelected">
-            <span>{{itemSelect[setting.fieldName]}}</span>
-            <i class="layui-icon layui-icon-close" @click.stop="removeItem(itemSelect,indexSelect)" v-if="setting.readonly != 1"></i>
+        <div class="layui-btn-container">
+            <div class="layui-btn layui-btn-xs layui-btn-normal" v-for="(itemSelect,indexSelect) in listSelectedShow">
+                <span>{{itemSelect['_select_show']}}</span>
+                <i class="layui-icon layui-icon-close" @click.stop="removeItem(itemSelect,indexSelect)" v-if="setting.readonly != 1"></i>
+            </div>
         </div>
-
     </div>
 </div>
\ No newline at end of file
diff --git a/public/static/plugs/lay-module/tableData/tableData.js b/public/static/plugs/lay-module/tableData/tableData.js
index d532cbb..ad13028 100644
--- a/public/static/plugs/lay-module/tableData/tableData.js
+++ b/public/static/plugs/lay-module/tableData/tableData.js
@@ -20,7 +20,6 @@
         success: function (template) {
             tableDataTemplate = template;
         }
-
     });
 
     tableData.prototype.render = function (elem, data) {
@@ -41,6 +40,8 @@
             height: clientHeight,
             placeholder: '请选择',
             selectConfirmCallback: 'onTableDataConfirm',
+            type:'input',
+            className:'layui-input',
         };
 
         var options = $.extend(defaultOption, data);
@@ -55,6 +56,10 @@
 
         options.index += 'select_mode=' + options.selectType;
 
+        if(options.type == 'textarea'){
+            options.className = 'layui-textarea';
+        }
+
         app = new Vue({
             el: elem,
             data() {
@@ -72,6 +77,24 @@
                     this.value = valueList.join(',');
                 }
             },
+            computed: {
+                listSelectedShow() {
+                    if (this.setting.fieldName.indexOf('|') < 0) {
+                        return this.listSelected.map(item => item['_select_show'] = item[this.setting.fieldName]);
+                    }
+
+                    var fieldNameList = this.setting.fieldName.split('|');
+                    return this.listSelected.map(item => {
+                        var showText = '';
+                        fieldNameList.forEach(fieldName => {
+                            showText += item[fieldName] + ' ';
+                        });
+                        item['_select_show'] = showText;
+
+                        return item;
+                    });
+                },
+            },
             created() {
                 this.value = options.selectValue;
                 if (typeof this.value != 'string') {
@@ -106,7 +129,6 @@
                     }
 
                     var selectedIds = this.listSelected.map(item => item.id);
-
                     var index = layer.open({
                         title: '选择数据',
                         type: 2,
@@ -122,19 +144,14 @@
                                     if (options.selectType == 'radio') {
                                         this.listSelected = [];
                                     }
-
                                     var itemFind = this.listSelected.find(itemSelect => itemSelect[valueField] == dataItem[valueField]);
-
                                     if (itemFind == undefined) {
                                         this.listSelected.push(dataItem);
                                     }
-
-
                                 });
                                 this.$forceUpdate();
                                 layer.close(index);
                             };
-
                         },
                         end: function () {
                             index = null;
diff --git a/public/static/plugs/lay-module/tableData/tableData.scss b/public/static/plugs/lay-module/tableData/tableData.scss
index 3ed8758..1449c11 100644
--- a/public/static/plugs/lay-module/tableData/tableData.scss
+++ b/public/static/plugs/lay-module/tableData/tableData.scss
@@ -1,8 +1,9 @@
 .table-data-container {
     .layui-input {
-        display        : flex;
-        align-items    : center;
+        display: flex;
+        align-items: center;
         justify-content: left;
+        flex-wrap: wrap;
 
         .placeholder {
             color: #808080
@@ -17,7 +18,6 @@
         }
     }
 
-
     .layui-form-danger+.layui-input {
         border-color: #ff5722 !important;
     }