From 06b6175a76a90c4f49c303ad3bc97df8542081dc Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 24 Jun 2024 17:11:49 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=B7=E6=96=B0=E4=B8=8D=E5=BA=94=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 55a13b0e..9fad1acb 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -944,7 +944,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList(1)">
+            <a-button type="text" @click.prevent="fnGetList()">
               <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>

From 84bdb4428654115bb07dcdd870539bb4abb1c481 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 25 Jun 2024 15:37:58 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?60s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ne/neInfo.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/api/ne/neInfo.ts b/src/api/ne/neInfo.ts
index eaf01ba8..49156044 100644
--- a/src/api/ne/neInfo.ts
+++ b/src/api/ne/neInfo.ts
@@ -134,6 +134,7 @@ export function saveOAMFile(data: Record<string, any>) {
     url: `/ne/info/oamFile`,
     method: 'put',
     data: data,
+    timeout: 60_000,
   });
 }
 
@@ -173,5 +174,6 @@ export function serviceNeAction(data: Record<string, any>) {
     url: `/ne/action/service`,
     method: 'put',
     data: data,
+    timeout: 60_000,
   });
 }

From 2a2b441e09eb3b04b9a7855dbade0fd564f0ff24 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 25 Jun 2024 17:53:45 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A1=86=E5=80=92=E8=AE=A1=E6=97=B6=E6=97=A0=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/setting/components/system-reset.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/system/setting/components/system-reset.vue b/src/views/system/setting/components/system-reset.vue
index 265a8370..8a142c56 100644
--- a/src/views/system/setting/components/system-reset.vue
+++ b/src/views/system/setting/components/system-reset.vue
@@ -66,10 +66,9 @@ function fnModalCancel() {
         {{ t('common.reset') }}
       </a-button>
     </a-col>
-    <ProModal
+    <a-modal
       :drag="true"
-      :width="400"
-      :minHeight="200"
+      :width="416"
       :destroyOnClose="true"
       :mask-closable="false"
       v-model:visible="state.visible"
@@ -84,7 +83,7 @@ function fnModalCancel() {
       <div style="color: #f5222d">
         {{ t('views.system.setting.resetTipContent') }}
       </div>
-    </ProModal>
+    </a-modal>
 
     <a-col :lg="12" :md="12" :xs="24">
       <a-typography>

From a213be0d6497604dfaa496302af055946ac3dbb9 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 25 Jun 2024 17:54:50 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=9A=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=89=AF=E6=9C=AC=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neSoftware/components/UploadMoreFile.vue  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/ne/neSoftware/components/UploadMoreFile.vue b/src/views/ne/neSoftware/components/UploadMoreFile.vue
index eaebda82..a1f79102 100644
--- a/src/views/ne/neSoftware/components/UploadMoreFile.vue
+++ b/src/views/ne/neSoftware/components/UploadMoreFile.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { reactive, onMounted, toRaw, watch } from 'vue';
 import { message, Upload, notification } from 'ant-design-vue/lib';
+import type { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
+import type { FileType, UploadFile } from 'ant-design-vue/lib/upload/interface';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { NE_TYPE_LIST, NE_EXPAND_LIST } from '@/constants/ne-constants';
-import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { addNeSoftware } from '@/api/ne/neSoftware';
-import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { uploadFileChunk } from '@/api/tool/file';
 const { t } = useI18n();
 const emit = defineEmits(['ok', 'cancel', 'update:visible']);
@@ -230,6 +230,20 @@ function fnBeforeUploadFile(file: FileType) {
   return true;
 }
 
+/**表单上传前删除 */
+function fnBeforeRemoveFile(file: UploadFile) {
+  const fileName = file.name;
+  // 取网元类型判断是否支持
+  let neType = '';
+  const neTypeIndex = fileName.indexOf('-');
+  if (neTypeIndex !== -1) {
+    neType = fileName.substring(0, neTypeIndex).toUpperCase();
+  }
+  const idx = modalState.from.findIndex(item => item.neType === neType);
+  modalState.from.splice(idx, 1);
+  return true;
+}
+
 /**表单上传文件 */
 function fnUploadFile(up: UploadRequestOption) {
   const uploadFile = modalState.uploadFiles.find(
@@ -465,6 +479,7 @@ onMounted(() => {});
               showRemoveIcon: true,
               showDownloadIcon: false,
             }"
+            :remove="fnBeforeRemoveFile"
             :before-upload="fnBeforeUploadFile"
             :custom-request="fnUploadFile"
             :disabled="modalState.confirmLoading"

From b42d8cb37050ffe137968522e9053358f09a1aca Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 10:43:12 +0800
Subject: [PATCH 05/12] =?UTF-8?q?style:=20=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=BD=91=E5=85=83=E7=89=88=E6=9C=ACUpdate=20?=
 =?UTF-8?q?Softwares=E6=94=B9=E6=88=90Batch=20Upload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts | 2 +-
 src/i18n/locales/zh-CN.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 5d26b63b..1dbb6f43 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -713,7 +713,7 @@ export default {
         uploadTitle: "Update Software",
         upload: "Upload",
         uploadNotFile: "No software files uploaded",
-        uploadBatch: "Update Softwares",
+        uploadBatch: "Batch Upload",
         uploadBatchMax: "Multiple packages can be uploaded, with up to {txt} selected at the same time.",
         uploadFileName: "Parses file names in the format of: amf-r2.240x.xx-xxx",
         name: "File Name",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index e7483006..38441a2c 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -713,7 +713,7 @@ export default {
         uploadTitle: "上传软件",
         upload: "上传",
         uploadNotFile: "未上传软件文件",
-        uploadBatch: "上传软件包",
+        uploadBatch: "批量上传",
         uploadBatchMax: "可上传多个软件包，最多同时选择{txt}个。",
         uploadFileName: "解析文件名称格式如: amf-r2.240x.xx-xxx",
         name: "文件名",

From 650b02dc3003fe8269a26b4863381722f2aca009 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 10:43:50 +0800
Subject: [PATCH 06/12] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E7=BD=91?=
 =?UTF-8?q?=E5=85=83=E8=BD=AF=E4=BB=B6=E5=8D=95=E4=B8=8A=E4=BC=A0=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6650?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neSoftware/components/EditModal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/ne/neSoftware/components/EditModal.vue b/src/views/ne/neSoftware/components/EditModal.vue
index f38b4165..e00e2b70 100644
--- a/src/views/ne/neSoftware/components/EditModal.vue
+++ b/src/views/ne/neSoftware/components/EditModal.vue
@@ -346,6 +346,7 @@ onMounted(() => {});
 <template>
   <ProModal
     :drag="true"
+    :width="650"
     :destroyOnClose="true"
     :keyboard="false"
     :mask-closable="false"

From 8a2d0ccfa1ad28fdf9f28d5ef0fd437fce0b2e71 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 10:44:32 +0800
Subject: [PATCH 07/12] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E7=BD=91?=
 =?UTF-8?q?=E5=85=83=E8=BD=AF=E4=BB=B6=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=A1=86=E6=A0=87=E9=A2=98=E7=BB=9F=E4=B8=80=E4=B8=BA=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=BD=AF=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neSoftware/components/UploadMoreFile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ne/neSoftware/components/UploadMoreFile.vue b/src/views/ne/neSoftware/components/UploadMoreFile.vue
index a1f79102..50a6bf10 100644
--- a/src/views/ne/neSoftware/components/UploadMoreFile.vue
+++ b/src/views/ne/neSoftware/components/UploadMoreFile.vue
@@ -352,7 +352,7 @@ watch(
   () => props.visible,
   val => {
     if (val) {
-      modalState.title = t('views.ne.neSoftware.uploadBatch');
+      modalState.title = t('views.ne.neSoftware.uploadTitle');
       modalState.visibleByMoreFile = true;
     }
   }

From a5b5269b91a3f98cf1057237e41669431fb49311 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 10:45:06 +0800
Subject: [PATCH 08/12] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0c7dc32e..42b62bbf 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
     "@antv/g6": "~4.8.24",
-    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-yaml": "^6.1.1",
     "@codemirror/merge": "^6.6.3",
     "@codemirror/theme-one-dark": "^6.1.2",
@@ -24,12 +24,12 @@
     "@xterm/xterm": "^5.5.0",
     "ant-design-vue": "^3.2.20",
     "antdv-pro-layout": "~3.3.5",
-    "antdv-pro-modal": "^3.0.9",
+    "antdv-pro-modal": "^3.1.0",
     "codemirror": "^6.0.1",
     "dayjs": "^1.11.11",
     "echarts": "~5.5.0",
     "file-saver": "^2.0.5",
-    "intl-tel-input": "~23.0.11",
+    "intl-tel-input": "~23.0.12",
     "js-base64": "^3.7.7",
     "js-cookie": "^3.0.5",
     "localforage": "^1.10.0",

From de79760a0e17238c12e9114367071e901187197d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 10:50:19 +0800
Subject: [PATCH 09/12] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7240626?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 .env.production  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 1e7ed646..91541e4d 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240619.1"
+VITE_APP_VERSION = "2.240626"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/.env.production b/.env.production
index 3b1b6622..58441d82 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240619.1"
+VITE_APP_VERSION = "2.240626"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

From 2b680d6d204373b18cb9d6d88f78fa639a1cc7d2 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 11:59:00 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=AF=E9=80=89=E9=A1=B9=E6=8C=89id=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/configManage/configParam.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts
index 54101596..fd29a4b1 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,method FROM param_config WHERE ne_type = '${neType}'`,
+      SQL: `SELECT id,top_display,top_tag,method FROM param_config WHERE ne_type = '${neType}' ORDER BY id ASC`,
     },
   });
   // 解析数据

From d42a8701dafa7b3044361dc5330cfc1a8470168c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 16:47:45 +0800
Subject: [PATCH 11/12] =?UTF-8?q?style:=20=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A7=84=E5=88=99=E6=A0=A1=E9=AA=8C=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configManage/configParamTreeTable/hooks/useOptions.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/configManage/configParamTreeTable/hooks/useOptions.ts b/src/views/configManage/configParamTreeTable/hooks/useOptions.ts
index 5b2f00dc..3c5fce98 100644
--- a/src/views/configManage/configParamTreeTable/hooks/useOptions.ts
+++ b/src/views/configManage/configParamTreeTable/hooks/useOptions.ts
@@ -23,6 +23,8 @@ export default function useOptions() {
     }
     switch (type) {
       case 'int':
+        // filter: "0~128"
+
         if (filter && filter.indexOf('~') !== -1) {
           const filterArr = filter.split('~');
           const minInt = parseInt(filterArr[0]);
@@ -73,6 +75,8 @@ export default function useOptions() {
         }
         break;
       case 'bool':
+        // filter: '{"0":"false", "1":"true"}'
+        
         if (filter && filter.indexOf('{') === 1) {
           let filterJson: Record<string, any> = {};
           try {
@@ -90,6 +94,8 @@ export default function useOptions() {
         }
         break;
       case 'string':
+        // filter: "0~128"
+
         // 字符串长度判断
         if (filter && filter.indexOf('~') !== -1) {
           try {
@@ -127,6 +133,8 @@ export default function useOptions() {
 
         break;
       case 'regex':
+        // filter: "^[0-9]{3}$"
+
         if (filter) {
           try {
             let regex = new RegExp(filter);

From 525854604f0450a891f09ca500cfc7a8fd71da5e Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Jun 2024 16:48:46 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9EOMC=E9=85=8D=E7=BD=AE=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E6=B2=A1=E6=9C=89telnet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neInfo/components/EditModal.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue
index ce7104d1..a3f8620f 100644
--- a/src/views/ne/neInfo/components/EditModal.vue
+++ b/src/views/ne/neInfo/components/EditModal.vue
@@ -223,6 +223,12 @@ function fnModalVisibleByEdit(editId: string) {
       modalState.confirmLoading = false;
       hide();
       if (res.code === RESULT_CODE_SUCCESS) {
+        // OMC没有telnet
+        if (res.data.neType === 'OMC') {
+          res.data.hosts = res.data.hosts.filter(
+            (s: any) => s.hostType === 'ssh'
+          );
+        }
         Object.assign(modalState.from, res.data);
         modalState.title = t('views.ne.neInfo.editTitle');
         modalState.visibleByEdit = true;
@@ -286,6 +292,10 @@ function fnModalCancel() {
  */
 function fnNeTypeChange(v: any) {
   const hostsLen = modalState.from.hosts.length;
+  // OMC没有telnet
+  if (hostsLen >= 2 && v === 'OMC') {
+    modalState.from.hosts.splice(1, hostsLen);
+  }
   // 网元默认只含22和4100
   if (hostsLen === 3 && v !== 'UPF') {
     modalState.from.hosts.pop();