diff --git a/src/views/ne/neConfig/hooks/useConfigArray.ts b/src/views/ne/neConfig/hooks/useConfigArray.ts index ea093048..b0823043 100644 --- a/src/views/ne/neConfig/hooks/useConfigArray.ts +++ b/src/views/ne/neConfig/hooks/useConfigArray.ts @@ -4,20 +4,19 @@ import { editNeConfigData, } from '@/api/ne/neConfig'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { Modal, message } from 'ant-design-vue/es'; +import { Modal,message } from 'ant-design-vue/es'; import { SizeType } from 'ant-design-vue/es/config-provider'; import { reactive, watch } from 'vue'; /** * 参数配置array类型 - * @param param 父级传入 { t, treeState, neTypeSelect, neIdSelect, fnActiveConfigNode, ruleVerification, modalState, fnModalCancel} + * @param param 父级传入 { t, treeState, neTypeSelect, fnActiveConfigNode, ruleVerification, modalState, fnModalCancel} * @returns */ export default function useConfigArray({ t, treeState, neTypeSelect, - neIdSelect, fnActiveConfigNode, ruleVerification, modalState, @@ -131,61 +130,29 @@ export default function useConfigArray({ data[key] = from[key]['value']; } - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - paramData: data, - loc: loc, - }) - ); - } - } else { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc: loc, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - + // 发送 const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.warning({ - content: t('views.ne.neConfig.updateItemErr'), - duration: 3, - }); - } else { + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc: loc, + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('views.ne.neConfig.updateItem', { num: modalState.title, }), duration: 3, }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { fnActiveConfigNode('#'); + } else { + message.warning({ + content: t('views.ne.neConfig.updateItemErr'), + duration: 3, + }); } }) .finally(() => { @@ -205,65 +172,28 @@ export default function useConfigArray({ num: title, }), onOk() { - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - loc: loc, - }) - ); - } - } else { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - loc: loc, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - - const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.error({ - content: `${rejected.reason}`, - duration: 2, - }); - } else { - message.success({ - content: t('views.ne.neConfig.delItemOk', { - num: title, - }), - duration: 2, - }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { - fnActiveConfigNode('#'); - } - }) - .finally(() => { - hide(); + delNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + loc: loc, + }).then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success({ + content: t('views.ne.neConfig.delItemOk', { + num: title, + }), + duration: 2, + }); arrayEditClose(); - }); + fnActiveConfigNode('#'); + } else { + message.error({ + content: `${res.msg}`, + duration: 2, + }); + } + }); }, }); } @@ -334,61 +264,29 @@ export default function useConfigArray({ data[key] = from[key]['value']; } - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - paramData: data, - loc: `${from['index']['value']}`, - }) - ); - } - } else { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc: `${from['index']['value']}`, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - + // 发送 const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.warning({ - content: t('views.ne.neConfig.addItemErr'), - duration: 3, - }); - } else { + addNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc: `${from['index']['value']}`, + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('views.ne.neConfig.addItemOk', { num: modalState.title, }), duration: 3, }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { fnActiveConfigNode('#'); + } else { + message.warning({ + content: t('views.ne.neConfig.addItemErr'), + duration: 3, + }); } }) .finally(() => { diff --git a/src/views/ne/neConfig/hooks/useConfigArrayChild.ts b/src/views/ne/neConfig/hooks/useConfigArrayChild.ts index 851e2df4..ee58b178 100644 --- a/src/views/ne/neConfig/hooks/useConfigArrayChild.ts +++ b/src/views/ne/neConfig/hooks/useConfigArrayChild.ts @@ -10,14 +10,13 @@ import { nextTick, reactive } from 'vue'; /** * 参数配置array类型的嵌套array - * @param param 父级传入 { t, treeState, neTypeSelect, neIdSelect, fnActiveConfigNode, ruleVerification, modalState, arrayState, arrayInitEdit, arrayInitAdd, arrayEditClose} + * @param param 父级传入 { t, treeState, neTypeSelect, fnActiveConfigNode, ruleVerification, modalState, arrayState, arrayInitEdit, arrayInitAdd, arrayEditClose} * @returns */ export default function useConfigArrayChild({ t, treeState, neTypeSelect, - neIdSelect, fnActiveConfigNode, ruleVerification, modalState, @@ -199,61 +198,29 @@ export default function useConfigArrayChild({ data[key] = from[key]['value']; } - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } - } else { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - + // 发送 const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.warning({ - content: t('views.ne.neConfig.updateItemErr'), - duration: 3, - }); - } else { + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc, + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('views.ne.neConfig.updateItem', { num: modalState.title, }), duration: 3, }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { fnActiveConfigNode('#'); + } else { + message.warning({ + content: t('views.ne.neConfig.updateItemErr'), + duration: 3, + }); } }) .finally(() => { @@ -274,65 +241,28 @@ export default function useConfigArrayChild({ num: title, }), onOk() { - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - loc, - }) - ); - } - } else { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - loc, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - - const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.error({ - content: `${rejected.reason}`, - duration: 2, - }); - } else { - message.success({ - content: t('views.ne.neConfig.delItemOk', { - num: title, - }), - duration: 2, - }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { - fnActiveConfigNode('#'); - } - }) - .finally(() => { - hide(); + delNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + loc, + }).then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success({ + content: t('views.ne.neConfig.delItemOk', { + num: title, + }), + duration: 2, + }); arrayEditClose(); - }); + fnActiveConfigNode('#'); + } else { + message.error({ + content: `${res.msg}`, + duration: 2, + }); + } + }); }, }); } @@ -379,61 +309,29 @@ export default function useConfigArrayChild({ data[key] = from[key]['value']; } - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } - } else { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - arrayEditClose(); - return; - } - + // 发送 const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.warning({ - content: t('views.ne.neConfig.addItemErr'), - duration: 3, - }); - } else { + addNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc, + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('views.ne.neConfig.addItemOk', { num: modalState.title, }), duration: 3, }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { fnActiveConfigNode('#'); + } else { + message.warning({ + content: t('views.ne.neConfig.addItemErr'), + duration: 3, + }); } }) .finally(() => { diff --git a/src/views/ne/neConfig/hooks/useConfigList.ts b/src/views/ne/neConfig/hooks/useConfigList.ts index 52a57627..37ed3aee 100644 --- a/src/views/ne/neConfig/hooks/useConfigList.ts +++ b/src/views/ne/neConfig/hooks/useConfigList.ts @@ -6,14 +6,13 @@ import { reactive, toRaw } from 'vue'; /** * list类型参数处理 - * @param param 父级传入 {t, treeState, neTypeSelect, neIdSelect, ruleVerification} + * @param param 父级传入 {t, treeState, neTypeSelect, ruleVerification} * @returns */ export default function useConfigList({ t, treeState, neTypeSelect, - neIdSelect, ruleVerification, }: any) { /**单列表状态类型 */ @@ -84,64 +83,25 @@ export default function useConfigList({ return; } - // 请求 - const reqArr = []; - if (neTypeSelect.value[1].startsWith('SYNC')) { - for (const neId of neIdSelect.value) { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neId, - paramName: treeState.selectNode.paramName, - paramData: { - [from['name']]: from['value'], - }, - }) - ); - } - } else { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: { - [from['name']]: from['value'], - }, - }) - ); - } - // 无请求提示 - if (reqArr.length === 0) { - message.warning({ - content: t('views.ne.neConfig.neIdSyncPleace'), - duration: 3, - }); - listState.confirmLoading = false; - listState.editRecord = {}; - return; - } - + // 发送 listState.confirmLoading = true; const hide = message.loading(t('common.loading'), 0); - Promise.allSettled(reqArr) - .then(resArr => { - const rejected = resArr.find(res => res.status === 'rejected'); - if (rejected) { - message.warning({ - content: t('views.ne.neConfig.updateValueErr'), - duration: 3, - }); - } else { + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: { + [from['name']]: from['value'], + }, + }) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('views.ne.neConfig.updateValue', { num: from['display'], }), duration: 3, }); - } - const fulfilled = resArr.find(res => res.status === 'fulfilled'); - if (fulfilled) { // 改变表格数据 const item = listState.data.find( (item: Record) => from['name'] === item['name'] @@ -149,6 +109,11 @@ export default function useConfigList({ if (item) { Object.assign(item, listState.editRecord); } + } else { + message.warning({ + content: t('views.ne.neConfig.updateValueErr'), + duration: 3, + }); } }) .finally(() => { diff --git a/src/views/ne/neConfig/index.vue b/src/views/ne/neConfig/index.vue index 05d15330..ad5754a4 100644 --- a/src/views/ne/neConfig/index.vue +++ b/src/views/ne/neConfig/index.vue @@ -1,8 +1,8 @@ + + + +