From 84e879f8f0639a0e4560a972ebe0d89c14b5d5a9 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 11 Apr 2024 10:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tableData;=E6=96=B0=E5=A2=9Ed?=
 =?UTF-8?q?ataGet=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/common/command/admin/VersionBase.php       |  4 ++--
 public/static/plugs/lay-module/tableData/tableData.css |  6 +++---
 public/static/plugs/lay-module/tableData/tableData.js  | 10 +++++-----
 .../static/plugs/lay-module/tableData/tableData.scss   |  8 ++++----
 public/static/plugs/ulthon-admin/ulthon-admin.js       |  6 ++++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index c23ac86..4d07d04 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.98';
+    public const VERSION = 'v2.0.99';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '修复表格选择字段渲染；',
+        '优化tableData;新增dataGet；',
         '发布新版本',
     ];
 
diff --git a/public/static/plugs/lay-module/tableData/tableData.css b/public/static/plugs/lay-module/tableData/tableData.css
index e79f5c7..17a9ecc 100644
--- a/public/static/plugs/lay-module/tableData/tableData.css
+++ b/public/static/plugs/lay-module/tableData/tableData.css
@@ -4,15 +4,15 @@
   justify-content: left;
   flex-wrap: wrap;
 }
-.table-data-container .layui-input .placeholder {
-  color: #808080;
-}
 .table-data-container .layui-input .layui-btn {
   pointer-events: none;
 }
 .table-data-container .layui-input .layui-btn i {
   pointer-events: all;
 }
+.table-data-container .placeholder {
+  color: #808080;
+}
 .table-data-container .layui-form-danger + .layui-input {
   border-color: #ff5722 !important;
 }
\ 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 2507b57..5d8e943 100644
--- a/public/static/plugs/lay-module/tableData/tableData.js
+++ b/public/static/plugs/lay-module/tableData/tableData.js
@@ -40,8 +40,8 @@
             height: clientHeight,
             placeholder: '请选择',
             selectConfirmCallback: 'onTableDataConfirm',
-            type:'input',
-            className:'layui-input',
+            type: 'input',
+            className: 'layui-input',
         };
 
         var options = $.extend(defaultOption, data);
@@ -56,7 +56,7 @@
 
         options.index += 'select_mode=' + options.selectType;
 
-        if(options.type == 'textarea'){
+        if (options.type == 'textarea') {
             options.className = 'layui-textarea';
         }
 
@@ -82,7 +82,7 @@
                     if (this.setting.fieldName.indexOf('|') < 0) {
                         return this.listSelected.map(
                             (item) => {
-                                item['_select_show'] = item[this.setting.fieldName];
+                                item['_select_show'] = ua.dataGet(item, this.setting.fieldName);
                                 return item;
                             }
                         );
@@ -92,7 +92,7 @@
                     return this.listSelected.map(item => {
                         var showText = '';
                         fieldNameList.forEach(fieldName => {
-                            showText += item[fieldName] + ' ';
+                            showText += ua.dataGet(item, fieldName) + ' ';
                         });
                         item['_select_show'] = showText;
 
diff --git a/public/static/plugs/lay-module/tableData/tableData.scss b/public/static/plugs/lay-module/tableData/tableData.scss
index 1449c11..3ba7a99 100644
--- a/public/static/plugs/lay-module/tableData/tableData.scss
+++ b/public/static/plugs/lay-module/tableData/tableData.scss
@@ -5,10 +5,6 @@
         justify-content: left;
         flex-wrap: wrap;
 
-        .placeholder {
-            color: #808080
-        }
-
         .layui-btn {
             pointer-events: none;
 
@@ -18,6 +14,10 @@
         }
     }
 
+    .placeholder {
+        color: #808080
+    }
+
     .layui-form-danger+.layui-input {
         border-color: #ff5722 !important;
     }
diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index 5584672..2b48727 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -2433,13 +2433,15 @@
                 defaultValue = undefined;
             }
 
+            return admin.dataGet(this.dataBrage, keys, defaultValue);
+        },
+        dataGet(data, keys, defaultValue) {
             return (
                 (!Array.isArray(keys)
                     ? keys.replace(/\[/g, '.').replace(/\]/g, '').split('.')
                     : keys
-                ).reduce((o, k) => (o || {})[k], this.dataBrage) || defaultValue
+                ).reduce((o, k) => (o || {})[k], data) || defaultValue
             );
-
         },
         getExtGroupName(ext) {
             var groupName = 'file';