From ae6feb15a2254f6da5c768912a7202c7d8da0607 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 Nov 2023 10:02:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97=E5=B1=95=E5=BC=80=E5=8A=A0=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configManage/configParamTree/index.vue    | 46 +++++++++++--------
 .../configParamTreeTable/index.vue            | 46 +++++--------------
 2 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/src/views/configManage/configParamTree/index.vue b/src/views/configManage/configParamTree/index.vue
index 0d03c25c..ff41d081 100644
--- a/src/views/configManage/configParamTree/index.vue
+++ b/src/views/configManage/configParamTree/index.vue
@@ -1383,18 +1383,17 @@ onMounted(() => {
                           </a-select>
                         </div>
 
-                        <template v-if="item.array">
+                        <template v-else-if="item.array">
+                          <span v-if="arrayState.newIndex === -1">-</span>
                           <a-button
-                            type="link"
+                            type="default"
                             size="small"
                             @click.prevent="arrayChildExpand(data.key, item)"
+                            v-else
                           >
+                            <template #icon><BarsOutlined /></template>
                             {{
-                              arrayState.newIndex === -1
-                                ? '-'
-                                : t(
-                                    'views.configManage.configParamForm.arrayMore'
-                                  )
+                              t('views.configManage.configParamForm.arrayMore')
                             }}
                           </a-button>
                           <!--特殊字段拓展显示-->
@@ -1414,6 +1413,7 @@ onMounted(() => {
                       #extra
                       v-if="
                         Array.isArray(item.array) &&
+                        arrayChildState.loc.startsWith(data.key) &&
                         item.display === arrayChildState.title
                       "
                     >
@@ -1613,19 +1613,25 @@ onMounted(() => {
                                     </a-select>
                                   </div>
 
-                                  <a-button
-                                    type="link"
-                                    size="small"
-                                    v-else-if="item.array"
-                                  >
-                                    {{
-                                      arrayChildState.newIndex === -1
-                                        ? '-'
-                                        : t(
-                                            'views.configManage.configParamForm.arrayMore'
-                                          )
-                                    }}
-                                  </a-button>
+                                  <template v-else-if="item.array">
+                                    <span v-if="arrayChildState.newIndex === -1">
+                                      -
+                                      </span>
+                                    <a-button
+                                      type="default"
+                                      size="small"
+                                      v-else
+                                    >
+                                      <template #icon>
+                                        <BarsOutlined />
+                                    </template>
+                                      {{
+                                        t(
+                                          'views.configManage.configParamForm.arrayMore'
+                                        )
+                                      }}
+                                    </a-button>
+                                  </template>
 
                                   <div v-else>
                                     {{ `${item.value || '&nbsp;'}` }}
diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue
index 0147b50f..d1be67f4 100644
--- a/src/views/configManage/configParamTreeTable/index.vue
+++ b/src/views/configManage/configParamTreeTable/index.vue
@@ -119,7 +119,6 @@ function fnActiveConfigNode(key: string | number) {
         });
         arrayState.columns = columns;
 
-        arrayState.collapseActiveKey = [];
         arrayEditClose();
       }
     } else {
@@ -273,8 +272,6 @@ function listEditOk() {
 
 /**多列列表状态类型 */
 type ArrayStateType = {
-  /**面板激活项 */
-  collapseActiveKey: string[];
   /**紧凑型 */
   size: SizeType;
   /**多列嵌套记录字段 */
@@ -288,26 +285,16 @@ type ArrayStateType = {
   data: Record<string, any>[];
   /**多列记录规则 */
   dataRule: Record<string, any>;
-  /**新增行记录Index 编辑-1/新增>=0 */
-  newIndex: number;
-  /**编辑行Key值 */
-  editKey: number | string;
-  /**编辑行记录 */
-  editRecord: Record<string, any>;
 };
 
 /**多列列表状态 */
 let arrayState: ArrayStateType = reactive({
-  collapseActiveKey: [],
   size: 'middle',
   columns: [],
   columnsData: [],
   arrayChildExpandKeys: [],
   data: [],
   dataRule: {},
-  newIndex: -2,
-  editKey: -1,
-  editRecord: {},
 });
 
 /**多列表编辑 */
@@ -504,8 +491,6 @@ type ArrayChildStateType = {
   title: string;
   /**层级index */
   loc: string;
-  /**面板激活项 */
-  collapseActiveKey: string[];
   /**紧凑型 */
   size: SizeType;
   /**多列嵌套记录字段 */
@@ -517,27 +502,17 @@ type ArrayChildStateType = {
   data: Record<string, any>[];
   /**多列嵌套记录规则 */
   dataRule: Record<string, any>;
-  /**新增嵌套行记录Index  编辑-1/新增>=0 */
-  newIndex: number;
-  /**编辑嵌套行Key值 */
-  editKey: number | string;
-  /**编辑嵌套行记录 */
-  editRecord: Record<string, any>;
 };
 
 /**表格状态 */
 let arrayChildState: ArrayChildStateType = reactive({
   title: '',
   loc: '',
-  collapseActiveKey: [],
   size: 'middle',
   columns: [],
   columnsData: [],
   data: [],
   dataRule: {},
-  newIndex: -2,
-  editKey: -1,
-  editRecord: {},
 });
 
 /**多列表展开嵌套行 */
@@ -625,11 +600,8 @@ function arrayChildExpand(
   arrayState.arrayChildExpandKeys = [indexRow];
 
   arrayChildState.loc = `${loc}/${from['name']}`;
-  arrayChildState.newIndex = -3;
   // 设置展开列表标题
   arrayChildState.title = `${from['display']}`;
-  // 关闭默认展开
-  arrayChildState.collapseActiveKey = [];
 }
 
 /**多列表展开嵌套行 */
@@ -1357,12 +1329,13 @@ onMounted(() => {
                     <div class="editable-cell">
                       <template v-if="text.array">
                         <a-button
-                          type="link"
+                          type="default"
                           size="small"
                           @click.prevent="
                             arrayChildExpand(record['index'], text)
                           "
                         >
+                          <template #icon><BarsOutlined /></template>
                           {{
                             t('views.configManage.configParamForm.arrayMore')
                           }}
@@ -1437,11 +1410,16 @@ onMounted(() => {
                           {{ text.comment }}
                         </template>
                         <div class="editable-cell">
-                          <a-button type="link" size="small" v-if="text.array">
-                            {{
-                              t('views.configManage.configParamForm.arrayMore')
-                            }}
-                          </a-button>
+                          <template v-if="text.array">
+                            <a-button type="default" size="small">
+                              <template #icon><BarsOutlined /></template>
+                              {{
+                                t(
+                                  'views.configManage.configParamForm.arrayMore'
+                                )
+                              }}
+                            </a-button>
+                          </template>
 
                           <div v-else>
                             {{ `${text.value || '&nbsp;'}` }}