From 4e3e07f603de97d8c593d743a74f84325c87845c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 6 Nov 2023 16:38:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=AE=BD=E5=BA=A6=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/configManage/configParam.ts           |   2 +-
 src/views/configManage/configParam/index.vue  |  34 ++-
 .../components/array-children.vue             |  64 -----
 .../configManage/configParamTree/index.vue    | 243 ++++++------------
 4 files changed, 95 insertions(+), 248 deletions(-)
 delete mode 100644 src/views/configManage/configParamTree/components/array-children.vue

diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts
index bed1a69d..d885f021 100644
--- a/src/api/configManage/configParam.ts
+++ b/src/api/configManage/configParam.ts
@@ -18,7 +18,7 @@ export async function getParamConfigTopTab(neType: string) {
     url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/param_config`,
     method: 'get',
     params: {
-      SQL: `SELECT top_display,top_tag FROM param_config WHERE ne_type = '${neType}'`,
+      SQL: `SELECT top_display,top_tag,method FROM param_config WHERE ne_type = '${neType}'`,
     },
   });
   // 解析数据
diff --git a/src/views/configManage/configParam/index.vue b/src/views/configManage/configParam/index.vue
index f920e757..a4dab75c 100644
--- a/src/views/configManage/configParam/index.vue
+++ b/src/views/configManage/configParam/index.vue
@@ -1084,11 +1084,7 @@ onMounted(() => {
     <a-card :bordered="false" :body-style="{ paddingTop: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space
-          :size="8"
-          align="center"
-          v-if="false"
-        >
+        <a-space :size="8" align="center" v-if="false">
           <a-popconfirm
             placement="topLeft"
             title="网元配置重新载入"
@@ -1166,6 +1162,7 @@ onMounted(() => {
                           v-model:value="tableState.editRecord['value']"
                           :min="0"
                           :max="65535"
+                          style="min-width: 180px;"
                         ></a-input-number>
                         <a-switch
                           v-else-if="record['type'] === 'bool'"
@@ -1177,6 +1174,7 @@ onMounted(() => {
                           v-else-if="record['type'] === 'enum'"
                           v-model:value="tableState.editRecord['value']"
                           :allow-clear="true"
+                          style="min-width: 180px;"
                         >
                           <a-select-option
                             :value="+v"
@@ -1218,7 +1216,7 @@ onMounted(() => {
             v-show="tableState.type === 'array'"
             class="table"
             row-key="index"
-            :columns="tableState.arrayColumns"
+            :columns="tab.method === 'get' ? tableState.arrayColumns.filter((s:any)=>s.key !== 'index') : tableState.arrayColumns"
             :loading="tableState.loading"
             :data-source="tableState.arrayData"
             :size="tableState.size"
@@ -1229,7 +1227,12 @@ onMounted(() => {
             v-model:expanded-row-keys="tableState.arrayChildExpandKeys"
           >
             <template #title>
-              <a-button type="primary" @click.prevent="arrayAdd" size="small">
+              <a-button
+                type="primary"
+                @click.prevent="arrayAdd"
+                size="small"
+                v-if="tab.method !== 'get'"
+              >
                 <template #icon> <PlusOutlined /> </template>
                 {{ t('common.addText') }}
               </a-button>
@@ -1319,6 +1322,7 @@ onMounted(() => {
                           v-model:value="
                             tableState.editRecord[text.name]['value']
                           "
+                          style="width: 100%"
                         ></a-input>
                         <a-input-number
                           v-else-if="text['type'] === 'int'"
@@ -1327,6 +1331,7 @@ onMounted(() => {
                           "
                           :min="0"
                           :max="65535"
+                          style="width: 100%"
                         ></a-input-number>
                         <a-switch
                           v-else-if="text['type'] === 'bool'"
@@ -1340,12 +1345,12 @@ onMounted(() => {
                           v-else-if="text['type'] === 'enum'"
                           v-model:value="
                             tableState.editRecord[text.name]['value']
-                          "
-                          :allow-clear="true"
+                          " 
+                          style="min-width: 180px;"
                         >
                           <a-select-option
-                            :value="v"
-                            :key="v"
+                            :value="+v"
+                            :key="+v"
                             v-for="(k, v) in JSON.parse(text['filter'])"
                           >
                             {{ k }}
@@ -1490,6 +1495,7 @@ onMounted(() => {
                                   'value'
                                 ]
                               "
+                              style="width: 100%;"
                             ></a-input>
                             <a-input-number
                               v-else-if="text['type'] === 'int'"
@@ -1500,6 +1506,7 @@ onMounted(() => {
                               "
                               :min="0"
                               :max="65535"
+                              style="width: 100%;"
                             ></a-input-number>
                             <a-switch
                               v-else-if="text['type'] === 'bool'"
@@ -1519,10 +1526,11 @@ onMounted(() => {
                                 ]
                               "
                               :allow-clear="true"
+                              style="min-width: 180px;"
                             >
                               <a-select-option
-                                :value="v"
-                                :key="v"
+                                :value="+v"
+                                :key="+v"
                                 v-for="(k, v) in JSON.parse(text['filter'])"
                               >
                                 {{ k }}
diff --git a/src/views/configManage/configParamTree/components/array-children.vue b/src/views/configManage/configParamTree/components/array-children.vue
deleted file mode 100644
index 23812331..00000000
--- a/src/views/configManage/configParamTree/components/array-children.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<script setup lang="ts">
-import { reactive, toRaw, watch, ref } from 'vue';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { ColumnsType } from 'ant-design-vue/lib/table';
-import { listNeVersion } from '@/api/configManage/softwareManage';
-import { parseDateToStr } from '@/utils/date-utils';
-import useNeInfoStore from '@/store/modules/neinfo';
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import useI18n from '@/hooks/useI18n';
-const { t } = useI18n();
-const emit = defineEmits(['ok', 'cancel', 'update:visible']);
-const props = defineProps({
-  title: {
-    type: String,
-    default: '标题',
-  },
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-  data: {
-    type: Object,
-    required: true,
-  },
-});
-
-/**弹框取消按钮事件 */
-function fnModalCancel() {
-  emit('cancel');
-}
-
-/**显示弹框时初始数据 */
-function init() {
-  console.log(props.data);
-}
-
-/**监听是否显示，初始数据 */
-watch(
-  () => props.visible,
-  val => {
-    if (val) init();
-  }
-);
-</script>
-
-<template>
-  <a-modal
-    width="800px"
-    :title="props.title"
-    :visible="props.visible"
-    :keyboard="false"
-    :mask-closable="false"
-    @cancel="fnModalCancel"
-    :footer="null"
-  >
-    {{ props }}
-  </a-modal>
-</template>
-
-<style lang="less" scoped>
-.table :deep(.ant-pagination) {
-  padding: 0 24px;
-}
-</style>
diff --git a/src/views/configManage/configParamTree/index.vue b/src/views/configManage/configParamTree/index.vue
index ca295e5a..a4bf8b1c 100644
--- a/src/views/configManage/configParamTree/index.vue
+++ b/src/views/configManage/configParamTree/index.vue
@@ -20,7 +20,6 @@ import { toRaw } from 'vue';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import { DataNode, EventDataNode } from 'ant-design-vue/lib/tree';
 import { ColumnsType } from 'ant-design-vue/lib/table';
-import ArrayChildren from './components/array-children.vue';
 const { t } = useI18n();
 
 /**网元参数 */
@@ -990,34 +989,6 @@ function ruleVerification(row: Record<string, any>): (string | boolean)[] {
   return result;
 }
 
-/**网元重新加载状态 */
-let neReloadLoading = ref<boolean>(false);
-
-/**网元重新加载 */
-function fnNeReload() {
-  // 获取数据
-  const neType = neTypeSelect.value[0];
-  const neId = neTypeSelect.value[1];
-  neReloadLoading.value = true;
-  updateNeConfigReload(neType, neId)
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        message.success({
-          content: `网元重新加载完成`,
-          duration: 3,
-        });
-      } else {
-        message.error({
-          content: `网元重新加载失败`,
-          duration: 3,
-        });
-      }
-    })
-    .finally(() => {
-      neReloadLoading.value = false;
-    });
-}
-
 onMounted(() => {
   // 获取网元网元列表
   useNeInfoStore()
@@ -1307,32 +1278,7 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
         <!-- 网元类型 -->
         <a-card :bordered="false" title="网元类型" :loading="state.treeLoading">
           <!-- 插槽-卡片右侧 -->
-          <template #extra>
-            <a-space
-              :size="8"
-              align="center"
-              v-show="!['PCF', 'IMS'].includes(neTypeSelect[0])"
-            >
-              <a-popconfirm
-                placement="rightTop"
-                title="确认对该网元进行配置重新载入"
-                :ok-text="t('common.ok')"
-                :cancel-text="t('common.cancel')"
-                :disabled="neReloadLoading"
-                @confirm="fnNeReload"
-              >
-                <a-button
-                  type="dashed"
-                  danger
-                  :loading="neReloadLoading"
-                  size="small"
-                >
-                  <template #icon><SyncOutlined /></template>
-                  重新载入
-                </a-button>
-              </a-popconfirm>
-            </a-space>
-          </template>
+          <template #extra> </template>
 
           <a-form layout="vertical" autocomplete="off">
             <a-form-item name="neId ">
@@ -1367,7 +1313,7 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
               {{ state.title }}
             </a-typography-text>
             <a-typography-text type="danger" v-else>
-              左侧命令导航中选择要操作项！
+              左侧配置中选择要操作项！
             </a-typography-text>
           </template>
           <!-- 插槽-卡片右侧 -->
@@ -1439,14 +1385,14 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
                             )
                           "
                           v-model:value="state.editRecord['value']"
-                          :placeholder="record['filter']"
+                          style="min-width: 200px"
                         ></a-input>
                         <a-input-number
                           v-else-if="record['type'] === 'int'"
                           v-model:value="state.editRecord['value']"
                           :min="0"
                           :max="65535"
-                          :placeholder="record['filter']"
+                          style="min-width: 200px"
                         ></a-input-number>
                         <a-switch
                           v-else-if="record['type'] === 'bool'"
@@ -1457,8 +1403,8 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
                         <a-select
                           v-else-if="record['type'] === 'enum'"
                           v-model:value="state.editRecord['value']"
-                          :placeholder="record['filter']"
                           :allow-clear="true"
+                          style="min-width: 200px"
                         >
                           <a-select-option
                             :value="+v"
@@ -1520,109 +1466,86 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
           <a-form
             class="form"
             v-show="state.treeSelectNode.title.indexOf('Index-') === 0"
-            layout="vertical"
+            layout="horizontal"
             autocomplete="off"
             :validate-on-rule-change="false"
             :validateTrigger="[]"
           >
-            <a-row :gutter="16">
-              <a-col
-                :lg="6"
-                :md="12"
-                :xs="24"
-                v-for="item in state.treeSelectNode.record"
-              >
-                <a-form-item
-                  :label="item.display"
-                  :name="item.name"
-                  :required="item.optional === 'false'"
-                >
-                  <a-tooltip placement="topLeft">
-                    <template #title v-if="item.comment">
-                      {{ item.comment }}
-                    </template>
-                    <div class="editable-cell">
-                      {{ state.editRecord[item.name] }}
-                      <div
+            <a-form-item
+              v-for="item in state.treeSelectNode.record"
+              :label="item.display"
+              :name="item.name"
+              :required="item.optional === 'false'"
+            >
+              <a-tooltip placement="topLeft">
+                <template #title v-if="item.comment">
+                  {{ item.comment }}
+                </template>
+                <div class="editable-cell">
+                  {{ state.editRecord[item.name] }}
+                  <div
+                    v-if="
+                      !Array.isArray(item.array) &&
+                      state.editRecord[item.name] !== undefined
+                    "
+                    class="editable-cell__input-wrapper"
+                  >
+                    <a-space :size="16" align="center" direction="horizontal">
+                      <a-input
                         v-if="
-                          !Array.isArray(item.array) &&
-                          state.editRecord[item.name] !== undefined
+                          ['string', 'ipv6', 'ipv4', 'regex'].includes(
+                            item['type']
+                          )
                         "
-                        class="editable-cell__input-wrapper"
+                        v-model:value="state.editRecord[item.name]['value']"
+                      ></a-input>
+                      <a-input-number
+                        v-else-if="item['type'] === 'int'"
+                        v-model:value="state.editRecord[item.name]['value']"
+                        :min="0"
+                        :max="65535"
+                      ></a-input-number>
+                      <a-switch
+                        v-else-if="item['type'] === 'bool'"
+                        v-model:checked="state.editRecord[item.name]['value']"
+                        :checked-children="t('common.switch.open')"
+                        :un-checked-children="t('common.switch.shut')"
+                      ></a-switch>
+                      <a-select
+                        v-else-if="item['type'] === 'enum'"
+                        v-model:value="state.editRecord[item.name]['value']"
+                        :allow-clear="true"
+                        style="width: 100%"
                       >
-                        <a-space
-                          :size="16"
-                          align="center"
-                          direction="horizontal"
+                        <a-select-option
+                          :value="+v"
+                          :key="+v"
+                          v-for="(k, v) in JSON.parse(item['filter'])"
                         >
-                          <a-input
-                            v-if="
-                              ['string', 'ipv6', 'ipv4', 'regex'].includes(
-                                item['type']
-                              )
-                            "
-                            v-model:value="state.editRecord[item.name]['value']"
-                            :placeholder="item['filter']"
-                          ></a-input>
-                          <a-input-number
-                            v-else-if="item['type'] === 'int'"
-                            v-model:value="state.editRecord[item.name]['value']"
-                            :min="0"
-                            :max="65535"
-                            :placeholder="item['filter']"
-                          ></a-input-number>
-                          <a-switch
-                            v-else-if="item['type'] === 'bool'"
-                            v-model:checked="
-                              state.editRecord[item.name]['value']
-                            "
-                            :checked-children="t('common.switch.open')"
-                            :un-checked-children="t('common.switch.shut')"
-                          ></a-switch>
-                          <a-select
-                            v-else-if="item['type'] === 'enum'"
-                            v-model:value="state.editRecord[item.name]['value']"
-                            :placeholder="item['filter']"
-                            :allow-clear="true"
-                          >
-                            <a-select-option
-                              :value="v"
-                              :key="v"
-                              v-for="(k, v) in JSON.parse(item['filter'])"
-                            >
-                              {{ k }}
-                            </a-select-option>
-                          </a-select>
-                        </a-space>
-                      </div>
-                      <a-button
-                        type="link"
-                        size="small"
-                        @click.prevent=""
-                        v-else-if="Array.isArray(item.array)"
-                      >
-                        详情
-                      </a-button>
-                      <div v-else class="editable-cell__text-wrapper">
-                        {{ `${item.value}` }}
-                      </div>
-                    </div>
-                  </a-tooltip>
-                </a-form-item>
-              </a-col>
-            </a-row>
+                          {{ k }}
+                        </a-select-option>
+                      </a-select>
+                    </a-space>
+                  </div>
+                  <a-button
+                    type="link"
+                    size="small"
+                    @click.prevent=""
+                    v-else-if="Array.isArray(item.array)"
+                  >
+                    详情
+                  </a-button>
+                  <div v-else class="editable-cell__text-wrapper">
+                    {{ `${item.value}` }}
+                  </div>
+                </div>
+              </a-tooltip>
+            </a-form-item>
           </a-form>
         </a-card>
       </a-col>
     </a-row>
 
-    <!-- Array子列表 -->
-    <ArrayChildren
-      v-model:visible="modalArrayChildState.visible"
-      :title="modalArrayChildState.title"
-      v-model:data="modalArrayChildState.data"
-    ></ArrayChildren>
-
     <a-card
       :bordered="false"
       :body-style="{
@@ -1664,27 +1587,7 @@ let modalArrayChildState: ModalArrayChildStateType = reactive({
 
     <a-card :bordered="false" :body-style="{ paddingTop: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
-      <template #title>
-        <a-space
-          :size="8"
-          align="center"
-          v-show="!['PCF', 'IMS'].includes(neTypeSelect[0])"
-        >
-          <a-popconfirm
-            placement="topLeft"
-            title="网元配置重新载入"
-            :ok-text="t('common.ok')"
-            :cancel-text="t('common.cancel')"
-            :disabled="neReloadLoading"
-            @confirm="fnNeReload"
-          >
-            <a-button type="dashed" danger :loading="neReloadLoading">
-              <template #icon><SyncOutlined /></template>
-              重新载入
-            </a-button>
-          </a-popconfirm>
-        </a-space>
-      </template>
+      <template #title> </template>
       <a-tabs
         v-model:activeKey="tabState.tabActiveTopTag"
         :tab-position="tabState.tabPosition"