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" 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", 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`, }, }); // 解析数据 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) { url: `/ne/info/oamFile`, method: 'put', data: data, + timeout: 60_000, }); } @@ -173,5 +174,6 @@ export function serviceNeAction(data: Record) { url: `/ne/action/service`, method: 'put', data: data, + timeout: 60_000, }); } diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index ce41bd78..e0da724f 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 b42ec08c..da4aad00 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: "文件名", 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 = {}; 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); 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(); 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(() => {});