From 594c84752324c258bcbebbd3c9f77724b702f276 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 21:58:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6=E5=B9=B6=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E3=80=90=E4=BF=9D=E5=AD=98=E3=80=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...enerator-table-config-form-query-field.vue | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
index 52576bcc..ecbbf79a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
@@ -75,11 +75,9 @@
 </template>
 
 <script setup>
-  import _ from 'lodash';
   import Sortable from 'sortablejs';
   import { inject, nextTick, ref } from 'vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
   import { CODE_QUERY_FIELD_QUERY_TYPE_ENUM } from '/@/constants/support/code-generator-const';
   import { convertLowerCamel } from '/@/utils/str-util';
 
@@ -130,12 +128,13 @@
 
   const tableColumns = ref([]);
 
+  let rowKeyCounter = 1;
   //初始化设置数据
   function setData(tableColumnInfos, config) {
     rowKeyCounter = 1;
     let data = config && config.queryFields ? config.queryFields : [];
     for (let index = 0; index < data.length; index++) {
-      data[index].rowKey = 'rowKey' + (index + 1);
+      data[index].rowKey = 'rowKey' + rowKeyCounter;
       rowKeyCounter++;
     }
     tableData.value = data;
@@ -147,7 +146,6 @@
   }
 
   // -------------------  增加、删除 -------------------
-  let rowKeyCounter = 1;
   function addQuery() {
     tableData.value.push({
       rowKey: 'rowKey' + rowKeyCounter,
@@ -155,13 +153,19 @@
       fieldName: '',
       queryTypeEnum: '',
       columnNameList: null,
-      width: '',
+      width: '200px',
     });
     rowKeyCounter++;
   }
 
   function onDelete(index) {
-    _.pullAt(tableData.value, index);
+    // 以这种方式删除 列表才会重新渲染
+    const tempList = [...tableData.value];
+    tempList.splice(index, 1);
+    tableData.value = [];
+    nextTick(() => {
+      tableData.value = tempList;
+    });
   }
 
   //初始化拖拽
@@ -173,6 +177,10 @@
       ghostClass: 'smart-ghost-class', //设置拖拽停靠样式类名
       chosenClass: 'smart-ghost-class', //设置选中样式类名
       handle: '.handle',
+      onEnd: ({ oldIndex, newIndex }) => {
+        const oldRow = tableData.value.splice(oldIndex, 1)[0];
+        tableData.value.splice(newIndex, 0, oldRow);
+      },
     });
   }
 
@@ -211,36 +219,16 @@
 
   // 获取表单数据
   function getFieldsForm() {
-    let result = [];
-    let trList = document.querySelectorAll('#smartCodeQueryFieldsTable tbody .column-row');
-    if (trList && trList.length === 0) {
-      return result;
-    }
-
-    for (let tr of trList) {
-      let rowKey = tr.getAttribute('data-row-key');
-      if (!rowKey) {
-        continue;
-      }
-      if (rowKey && rowKey.indexOf('rowKey') === -1) {
-        continue;
-      }
-
-      let index = parseInt(rowKey.substring(6));
-      let tableItem = tableData.value[index - 1];
-      let obj = {
-        queryTypeEnum: tableItem.queryTypeEnum,
-        label: tableItem.label,
-        fieldName: tableItem.fieldName,
-        columnNameList: tableItem.columnNameList,
-        width: tableItem.width,
+    let result = tableData.value.map((item) => {
+      return {
+        label: item.label,
+        width: item.width,
+        fieldName: item.fieldName,
+        queryTypeEnum: item.queryTypeEnum,
+        // 字符串转为数组
+        columnNameList: item.columnNameList && typeof item.columnNameList === 'string' ? [item.columnNameList] : item.columnNameList,
       };
-      // 字符串转为数组
-      if (obj.columnNameList && typeof obj.columnNameList === 'string') {
-        obj.columnNameList = [obj.columnNameList];
-      }
-      result.push(obj);
-    }
+    });
     return result;
   }