From 726c1a4769d96763012502914e0abfd81b151dfc Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 2 Nov 2023 20:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8B=96=E5=8A=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lay-module/propertyInput/propertyInput.html  | 16 +++++++++-------
 .../lay-module/propertyInput/propertyInput.js    | 16 +++++++++++-----
 public/static/plugs/ulthon-admin/ulthon-admin.js | 10 ++++++++++
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/public/static/plugs/lay-module/propertyInput/propertyInput.html b/public/static/plugs/lay-module/propertyInput/propertyInput.html
index c5c4f7d..830fa03 100644
--- a/public/static/plugs/lay-module/propertyInput/propertyInput.html
+++ b/public/static/plugs/lay-module/propertyInput/propertyInput.html
@@ -1,14 +1,12 @@
 <div class="property-input-container" ref="propertyInput">
     <input type="hidden" :name="setting.name" :value="value" :lay-verify="setting.required == 1?'required':''">
 
-    <draggable tag="table" :list="listItem" class="input-list" handle=".drag-item">
+    <draggable tag="table" v-model="listItem" class="input-list" handle=".drag-item" draggable=".input-item">
 
-        <tr class="input-item" slot="header">
-            <td class="input-item-name" :class="'input-item-name-'+item.key" v-for="(item,index) in field">{{item.title}}</td>
-            <td class="input-item-name input-item-name-options">操作</td>
-        </tr>
-        <tr class="input-item" :key="index" v-for="(item,index) in listItem">
-            <td class="input-value" :class="'input-item-value-'+itemField.key" v-for="(itemField,indexField) in field">
+
+
+        <tr class="input-item" :key="item.uid" v-for="(item,index) in listItem">
+            <td class="input-value" :class="item.uid+itemField.key" :key="'drag-item-'+indexField" v-for="(itemField,indexField) in field">
                 <input type="text" class="layui-input" :placeholder="'请输入'+itemField.title" :value="item[itemField.key]" @change="onItemChange(item,index,itemField,$event)">
             </td>
             <td class="input-option">
@@ -19,6 +17,10 @@
                 </div>
             </td>
         </tr>
+        <tr class="input-item" slot="header">
+            <td class="input-item-name" :class="'input-item-name-'+item.key" v-for="(item,index) in field">{{item.title}}</td>
+            <td class="input-item-name input-item-name-options">操作</td>
+        </tr>
         <tr class="input-item" slot="footer">
             <td>
                 <div class="layui-btn layui-btn-primary" @click="onAddItem" title="增加"><i class="layui-icon layui-icon-add-1"></i></div>
diff --git a/public/static/plugs/lay-module/propertyInput/propertyInput.js b/public/static/plugs/lay-module/propertyInput/propertyInput.js
index 279c8b2..fcd976d 100644
--- a/public/static/plugs/lay-module/propertyInput/propertyInput.js
+++ b/public/static/plugs/lay-module/propertyInput/propertyInput.js
@@ -109,6 +109,13 @@
             }
         }
 
+        // 如果value缺少uid，则生成
+        for (var i = 0; i < options.value.length; i++) {
+            if (!options.value[i].uid) {
+                options.value[i].uid = ua.randdomString();
+            }
+        }
+
         app = new Vue({
             el: elem,
             data() {
@@ -126,8 +133,8 @@
             created() {
                 if (this.setting.value) {
                     this.originalValue = $.extend(true, [], this.setting.value);
-                    this.listItem = this.setting.value;
-                    this.value = this.setting.value;
+                    this.listItem = $.extend(true, [], this.setting.value);
+                    this.updateValue(this.listItem);
                 }
 
             },
@@ -142,9 +149,6 @@
                 onResetItem() {
                     this.listItem = $.extend(true, [], this.originalValue);
                 },
-                removeItem(item, index) {
-                    this.listItem.splice(index, 1);
-                },
                 onAddItem() {
 
                     var emptyItem = {};
@@ -153,6 +157,8 @@
                         emptyItem[this.field[i].key] = '';
                     }
 
+                    emptyItem.uid = ua.randdomString();
+
                     this.listItem.push(emptyItem);
                 },
                 onItemChange(item, index, itemField, event) {
diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index dd521eb..1fc3bb6 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -2425,6 +2425,16 @@
             } else {
                 replaceCallback(code);
             }
+        },
+        randdomString(len) {
+            len = len || 32;
+            var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+            var maxPos = $chars.length;
+            var pwd = '';
+            for (var i = 0; i < len; i++) {
+                pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+            }
+            return pwd;
         }
     };