From 0f988f65e4000babd33f12bb847ee89ff621b9dd Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 22 Nov 2023 15:38:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=94=A8=E6=96=87=E6=9C=AC=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configManage/configParam/index.vue  | 59 ++++++---------
 .../configManage/configParamForm/index.vue    | 75 +++++++------------
 .../configManage/configParamTree/index.vue    | 75 +++++++------------
 .../configParamTreeTable/index.vue            | 28 +++----
 4 files changed, 92 insertions(+), 145 deletions(-)

diff --git a/src/views/configManage/configParam/index.vue b/src/views/configManage/configParam/index.vue
index e82ba419..b3d63ea7 100644
--- a/src/views/configManage/configParam/index.vue
+++ b/src/views/configManage/configParam/index.vue
@@ -1199,16 +1199,8 @@ onMounted(() => {
                       "
                       class="editable-cell__input-wrapper"
                     >
-                      <a-input
-                        v-if="
-                          ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                            record['type']
-                          )
-                        "
-                        v-model:value="tableState.editRecord['value']"
-                      ></a-input>
                       <a-input-number
-                        v-else-if="record['type'] === 'int'"
+                        v-if="record['type'] === 'int'"
                         v-model:value="tableState.editRecord['value']"
                         style="width: 100%"
                       ></a-input-number>
@@ -1232,7 +1224,10 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
-
+                      <a-input
+                        v-else
+                        v-model:value="tableState.editRecord['value']"
+                      ></a-input>
                       <a-space :size="16" align="center">
                         <a-popconfirm
                           :title="t('views.configManage.configParam.editSure')"
@@ -1378,19 +1373,8 @@ onMounted(() => {
                       "
                       class="editable-cell__input-wrapper"
                     >
-                      <a-input
-                        v-if="
-                          ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                            text['type']
-                          )
-                        "
-                        v-model:value="
-                          tableState.editRecord[text.name]['value']
-                        "
-                        style="width: 100%"
-                      ></a-input>
                       <a-input-number
-                        v-else-if="text['type'] === 'int'"
+                        v-if="text['type'] === 'int'"
                         v-model:value="
                           tableState.editRecord[text.name]['value']
                         "
@@ -1419,6 +1403,13 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input
+                        v-else
+                        v-model:value="
+                          tableState.editRecord[text.name]['value']
+                        "
+                        style="width: 100%"
+                      ></a-input>
                     </div>
                     <template v-else-if="text.array">
                       <a-button
@@ -1565,21 +1556,8 @@ onMounted(() => {
                           "
                           class="editable-cell__input-wrapper"
                         >
-                          <a-input
-                            v-if="
-                              ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                                text['type']
-                              )
-                            "
-                            v-model:value="
-                              tableState.arrayChildEditRecord[text.name][
-                                'value'
-                              ]
-                            "
-                            style="width: 100%"
-                          ></a-input>
                           <a-input-number
-                            v-else-if="text['type'] === 'int'"
+                            v-if="text['type'] === 'int'"
                             v-model:value="
                               tableState.arrayChildEditRecord[text.name][
                                 'value'
@@ -1615,6 +1593,15 @@ onMounted(() => {
                               {{ k }}
                             </a-select-option>
                           </a-select>
+                          <a-input
+                            v-else
+                            v-model:value="
+                              tableState.arrayChildEditRecord[text.name][
+                                'value'
+                              ]
+                            "
+                            style="width: 100%"
+                          ></a-input>
                         </div>
                         <a-button
                           type="link"
diff --git a/src/views/configManage/configParamForm/index.vue b/src/views/configManage/configParamForm/index.vue
index 16361e6c..debb4140 100644
--- a/src/views/configManage/configParamForm/index.vue
+++ b/src/views/configManage/configParamForm/index.vue
@@ -1096,16 +1096,8 @@ onMounted(() => {
                         "
                         class="editable-cell__input-wrapper"
                       >
-                        <a-input
-                          v-if="
-                            ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                              record['type']
-                            )
-                          "
-                          v-model:value="listState.editRecord['value']"
-                        ></a-input>
                         <a-input-number
-                          v-else-if="record['type'] === 'int'"
+                          v-if="record['type'] === 'int'"
                           v-model:value="listState.editRecord['value']"
                           style="width: 100%"
                         ></a-input-number>
@@ -1129,6 +1121,10 @@ onMounted(() => {
                             {{ k }}
                           </a-select-option>
                         </a-select>
+                        <a-input
+                          v-else
+                          v-model:value="listState.editRecord['value']"
+                        ></a-input>
                         <a-space
                           :size="16"
                           align="center"
@@ -1300,19 +1296,8 @@ onMounted(() => {
                               arrayState.editRecord[item.name] !== undefined
                             "
                           >
-                            <a-input
-                              v-if="
-                                ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                                  item['type']
-                                )
-                              "
-                              v-model:value="
-                                arrayState.editRecord[item.name]['value']
-                              "
-                              :disabled="item.name === 'index'"
-                            ></a-input>
                             <a-input-number
-                              v-else-if="item['type'] === 'int'"
+                              v-if="item['type'] === 'int'"
                               v-model:value="
                                 arrayState.editRecord[item.name]['value']
                               "
@@ -1343,6 +1328,13 @@ onMounted(() => {
                                 {{ k }}
                               </a-select-option>
                             </a-select>
+                            <a-input
+                              v-else
+                              v-model:value="
+                                arrayState.editRecord[item.name]['value']
+                              "
+                              :disabled="item.name === 'index'"
+                            ></a-input>
                           </div>
 
                           <a-button
@@ -1513,24 +1505,8 @@ onMounted(() => {
                                         ] !== undefined
                                       "
                                     >
-                                      <a-input
-                                        v-if="
-                                          [
-                                            'string',
-                                            'ipv6',
-                                            'ipv4',
-                                            'regex',
-                                          ].includes(item['type'])
-                                        "
-                                        v-model:value="
-                                          arrayChildState.editRecord[item.name][
-                                            'value'
-                                          ]
-                                        "
-                                        :disabled="item.name === 'index'"
-                                      ></a-input>
                                       <a-input-number
-                                        v-else-if="item['type'] === 'int'"
+                                        v-if="item['type'] === 'int'"
                                         v-model:value="
                                           arrayChildState.editRecord[item.name][
                                             'value'
@@ -1573,6 +1549,15 @@ onMounted(() => {
                                           {{ k }}
                                         </a-select-option>
                                       </a-select>
+                                      <a-input
+                                        v-else
+                                        v-model:value="
+                                          arrayChildState.editRecord[item.name][
+                                            'value'
+                                          ]
+                                        "
+                                        :disabled="item.name === 'index'"
+                                      ></a-input>
                                     </div>
 
                                     <a-button
@@ -1653,15 +1638,8 @@ onMounted(() => {
                   modalState.from[item.name] !== undefined
                 "
               >
-                <a-input
-                  v-if="
-                    ['string', 'ipv6', 'ipv4', 'regex'].includes(item['type'])
-                  "
-                  v-model:value="modalState.from[item.name]['value']"
-                  :disabled="item.name === 'index'"
-                ></a-input>
                 <a-input-number
-                  v-else-if="item['type'] === 'int'"
+                  v-if="item['type'] === 'int'"
                   v-model:value="modalState.from[item.name]['value']"
                   :disabled="item.name === 'index'"
                   style="width: 100%"
@@ -1686,6 +1664,11 @@ onMounted(() => {
                     {{ k }}
                   </a-select-option>
                 </a-select>
+                <a-input
+                  v-else
+                  v-model:value="modalState.from[item.name]['value']"
+                  :disabled="item.name === 'index'"
+                ></a-input>
               </div>
               <div v-else>
                 {{ `${item.value || '&nbsp;'}` }}
diff --git a/src/views/configManage/configParamTree/index.vue b/src/views/configManage/configParamTree/index.vue
index f49fcb40..0aebd793 100644
--- a/src/views/configManage/configParamTree/index.vue
+++ b/src/views/configManage/configParamTree/index.vue
@@ -1130,16 +1130,8 @@ onMounted(() => {
                       "
                       class="editable-cell__input-wrapper"
                     >
-                      <a-input
-                        v-if="
-                          ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                            record['type']
-                          )
-                        "
-                        v-model:value="listState.editRecord['value']"
-                      ></a-input>
                       <a-input-number
-                        v-else-if="record['type'] === 'int'"
+                        v-if="record['type'] === 'int'"
                         v-model:value="listState.editRecord['value']"
                         style="width: 100%"
                       ></a-input-number>
@@ -1163,6 +1155,10 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input
+                        v-else
+                        v-model:value="listState.editRecord['value']"
+                      ></a-input>
                       <a-space :size="16" align="center" direction="horizontal">
                         <a-tooltip placement="bottomRight">
                           <template #title> {{ t('common.ok') }} </template>
@@ -1334,19 +1330,8 @@ onMounted(() => {
                             arrayState.editRecord[item.name] !== undefined
                           "
                         >
-                          <a-input
-                            v-if="
-                              ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                                item['type']
-                              )
-                            "
-                            v-model:value="
-                              arrayState.editRecord[item.name]['value']
-                            "
-                            :disabled="item.name === 'index'"
-                          ></a-input>
                           <a-input-number
-                            v-else-if="item['type'] === 'int'"
+                            v-if="item['type'] === 'int'"
                             v-model:value="
                               arrayState.editRecord[item.name]['value']
                             "
@@ -1377,6 +1362,13 @@ onMounted(() => {
                               {{ k }}
                             </a-select-option>
                           </a-select>
+                          <a-input
+                            v-else
+                            v-model:value="
+                              arrayState.editRecord[item.name]['value']
+                            "
+                            :disabled="item.name === 'index'"
+                          ></a-input>
                         </div>
 
                         <template v-else-if="item.array">
@@ -1550,24 +1542,8 @@ onMounted(() => {
                                         undefined
                                     "
                                   >
-                                    <a-input
-                                      v-if="
-                                        [
-                                          'string',
-                                          'ipv6',
-                                          'ipv4',
-                                          'regex',
-                                        ].includes(item['type'])
-                                      "
-                                      v-model:value="
-                                        arrayChildState.editRecord[item.name][
-                                          'value'
-                                        ]
-                                      "
-                                      :disabled="item.name === 'index'"
-                                    ></a-input>
                                     <a-input-number
-                                      v-else-if="item['type'] === 'int'"
+                                      v-if="item['type'] === 'int'"
                                       v-model:value="
                                         arrayChildState.editRecord[item.name][
                                           'value'
@@ -1610,6 +1586,15 @@ onMounted(() => {
                                         {{ k }}
                                       </a-select-option>
                                     </a-select>
+                                    <a-input
+                                      v-else
+                                      v-model:value="
+                                        arrayChildState.editRecord[item.name][
+                                          'value'
+                                        ]
+                                      "
+                                      :disabled="item.name === 'index'"
+                                    ></a-input>
                                   </div>
 
                                   <template v-else-if="item.array">
@@ -1697,15 +1682,8 @@ onMounted(() => {
                   modalState.from[item.name] !== undefined
                 "
               >
-                <a-input
-                  v-if="
-                    ['string', 'ipv6', 'ipv4', 'regex'].includes(item['type'])
-                  "
-                  v-model:value="modalState.from[item.name]['value']"
-                  :disabled="item.name === 'index'"
-                ></a-input>
                 <a-input-number
-                  v-else-if="item['type'] === 'int'"
+                  v-if="item['type'] === 'int'"
                   v-model:value="modalState.from[item.name]['value']"
                   :disabled="item.name === 'index'"
                   style="width: 100%"
@@ -1730,6 +1708,11 @@ onMounted(() => {
                     {{ k }}
                   </a-select-option>
                 </a-select>
+                <a-input
+                  v-else
+                  v-model:value="modalState.from[item.name]['value']"
+                  :disabled="item.name === 'index'"
+                ></a-input>
               </div>
               <div v-else>
                 {{ `${item.value || '&nbsp;'}` }}
diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue
index 1ce80312..31529140 100644
--- a/src/views/configManage/configParamTreeTable/index.vue
+++ b/src/views/configManage/configParamTreeTable/index.vue
@@ -1190,16 +1190,8 @@ onMounted(() => {
                       "
                       class="editable-cell__input-wrapper"
                     >
-                      <a-input
-                        v-if="
-                          ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                            record['type']
-                          )
-                        "
-                        v-model:value="listState.editRecord['value']"
-                      ></a-input>
                       <a-input-number
-                        v-else-if="record['type'] === 'int'"
+                        v-if="record['type'] === 'int'"
                         v-model:value="listState.editRecord['value']"
                         style="width: 100%"
                       ></a-input-number>
@@ -1223,6 +1215,10 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input
+                        v-else
+                        v-model:value="listState.editRecord['value']"
+                      ></a-input>
                       <a-space :size="16" align="center" direction="horizontal">
                         <a-tooltip placement="bottomRight">
                           <template #title> {{ t('common.ok') }} </template>
@@ -1481,15 +1477,8 @@ onMounted(() => {
                   modalState.from[item.name] !== undefined
                 "
               >
-                <a-input
-                  v-if="
-                    ['string', 'ipv6', 'ipv4', 'regex'].includes(item['type'])
-                  "
-                  v-model:value="modalState.from[item.name]['value']"
-                  :disabled="item.name === 'index'"
-                ></a-input>
                 <a-input-number
-                  v-else-if="item['type'] === 'int'"
+                  v-if="item['type'] === 'int'"
                   v-model:value="modalState.from[item.name]['value']"
                   :disabled="item.name === 'index'"
                   style="width: 100%"
@@ -1514,6 +1503,11 @@ onMounted(() => {
                     {{ k }}
                   </a-select-option>
                 </a-select>
+                <a-input
+                  v-else
+                  v-model:value="modalState.from[item.name]['value']"
+                  :disabled="item.name === 'index'"
+                ></a-input>
               </div>
               <div v-else>
                 {{ `${item.value || '&nbsp;'}` }}