fix: UDM用户隐藏csv文件导入导出/保持回显

This commit is contained in:
TsMask
2023-11-09 12:04:28 +08:00
parent b983d77aeb
commit c3b46d0f0c
2 changed files with 39 additions and 46 deletions

View File

@@ -800,6 +800,7 @@ onMounted(() => {
ok-text="TXT" ok-text="TXT"
ok-type="default" ok-type="default"
@confirm="fnExportList('txt')" @confirm="fnExportList('txt')"
:show-cancel="false"
cancel-text="CSV" cancel-text="CSV"
@cancel="fnExportList('csv')" @cancel="fnExportList('csv')"
> >
@@ -844,15 +845,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]" :selected-keys="[tableState.size as string]"
@click="fnTableSize" @click="fnTableSize"
> >
<a-menu-item key="default">{{ <a-menu-item key="default">
t('common.size.default') {{ t('common.size.default') }}
}}</a-menu-item> </a-menu-item>
<a-menu-item key="middle">{{ <a-menu-item key="middle">
t('common.size.middle') {{ t('common.size.middle') }}
}}</a-menu-item> </a-menu-item>
<a-menu-item key="small">{{ <a-menu-item key="small">
t('common.size.small') {{ t('common.size.small') }}
}}</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
</a-dropdown> </a-dropdown>
@@ -1064,9 +1065,7 @@ onMounted(() => {
@cancel="fnBatchModalCancel" @cancel="fnBatchModalCancel"
> >
<a-form name="modalStateBatchFrom" layout="horizontal"> <a-form name="modalStateBatchFrom" layout="horizontal">
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label="t('views.neUser.auth.num')" :label="t('views.neUser.auth.num')"
@@ -1081,7 +1080,6 @@ onMounted(() => {
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
@@ -1144,19 +1142,17 @@ onMounted(() => {
</a-col> </a-col>
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
label="OPC" label="OPC"
name="opc" name="opc"
v-bind="modalStateBatchFrom.validateInfos.opc" v-bind="modalStateBatchFrom.validateInfos.opc"
> >
<a-input <a-input
v-model:value="modalState.BatchForm.opc" v-model:value="modalState.BatchForm.opc"
allow-clear allow-clear
></a-input> ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</a-modal> </a-modal>
@@ -1219,7 +1215,7 @@ onMounted(() => {
@upload="fnModalUploadImportUpload" @upload="fnModalUploadImportUpload"
@close="fnModalUploadImportClose" @close="fnModalUploadImportClose"
v-model:visible="uploadImportState.visible" v-model:visible="uploadImportState.visible"
:ext="['.csv', '.txt']" :ext="['.txt']"
> >
<template #default> <template #default>
<a-textarea <a-textarea

View File

@@ -438,19 +438,20 @@ const modalStateFrom = Form.useForm(
* 进行表达规则校验 * 进行表达规则校验
*/ */
function fnModalOk() { function fnModalOk() {
const from = Object.assign({}, toRaw(modalState.from));
let validateNames = ['imsi', 'staticIp']; let validateNames = ['imsi', 'staticIp'];
if (modalState.from.id === '') { if (from.id === '') {
validateNames.push('smData'); validateNames.push('smData');
} }
modalStateFrom modalStateFrom
.validate(validateNames) .validate(validateNames)
.then(e => { .then(e => {
modalState.confirmLoading = true; modalState.confirmLoading = true;
const from = toRaw(modalState.from);
let ardArr = [0, 0, 0, 0, 0, 0, 0, 0]; let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0]; let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
let odbArr = [0, 0, 0, 0, 0, 0, 0, 0,0]; let odbArr = [0, 0, 0, 0, 0, 0, 0, 0, 0];
from.ard.forEach((item: any) => { from.ard.forEach((item: any) => {
ardArr[item] = 1; ardArr[item] = 1;
@@ -478,8 +479,6 @@ function fnModalOk() {
content: t('common.msgSuccess', { msg: modalState.title }), content: t('common.msgSuccess', { msg: modalState.title }),
duration: 3, duration: 3,
}); });
modalState.visibleByEdit = false;
modalStateFrom.resetFields();
fnGetList(); fnGetList();
} else { } else {
message.error({ message.error({
@@ -490,6 +489,7 @@ function fnModalOk() {
}) })
.finally(() => { .finally(() => {
hide(); hide();
fnModalCancel();
modalState.confirmLoading = false; modalState.confirmLoading = false;
}); });
}) })
@@ -527,11 +527,12 @@ const modalStateBatchFrom = Form.useForm(
* 进行表达规则校验 * 进行表达规则校验
*/ */
function fnBatchModalOk() { function fnBatchModalOk() {
const from = Object.assign({}, toRaw(modalState.BatchForm));
modalStateBatchFrom modalStateBatchFrom
.validate() .validate()
.then(e => { .then(e => {
modalState.confirmLoading = true; modalState.confirmLoading = true;
const from = toRaw(modalState.BatchForm);
let ardArr = [0, 0, 0, 0, 0, 0, 0, 0]; let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0]; let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
let odbArr = [0, 0, 0, 0, 0, 0, 0, 0]; let odbArr = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -564,8 +565,6 @@ function fnBatchModalOk() {
content: t('common.msgSuccess', { msg: modalState.title }), content: t('common.msgSuccess', { msg: modalState.title }),
duration: 3, duration: 3,
}); });
modalState.visibleByBatch = false;
modalStateBatchFrom.resetFields();
fnGetList(); fnGetList();
} else { } else {
message.error({ message.error({
@@ -575,11 +574,8 @@ function fnBatchModalOk() {
} }
}) })
.finally(() => { .finally(() => {
1;
hide(); hide();
from.epsOdb = []; fnBatchModalCancel();
from.hplmnOdb = [];
from.ard = [];
modalState.confirmLoading = false; modalState.confirmLoading = false;
}); });
}) })
@@ -981,6 +977,7 @@ onMounted(() => {
ok-text="TXT" ok-text="TXT"
ok-type="default" ok-type="default"
@confirm="fnExportList('txt')" @confirm="fnExportList('txt')"
:show-cancel="false"
cancel-text="CSV" cancel-text="CSV"
@cancel="fnExportList('csv')" @cancel="fnExportList('csv')"
> >
@@ -1027,15 +1024,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]" :selected-keys="[tableState.size as string]"
@click="fnTableSize" @click="fnTableSize"
> >
<a-menu-item key="default">{{ <a-menu-item key="default">
t('common.size.default') {{ t('common.size.default') }}
}}</a-menu-item> </a-menu-item>
<a-menu-item key="middle">{{ <a-menu-item key="middle">
t('common.size.middle') {{ t('common.size.middle') }}
}}</a-menu-item> </a-menu-item>
<a-menu-item key="small">{{ <a-menu-item key="small">
t('common.size.small') {{ t('common.size.small') }}
}}</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
</a-dropdown> </a-dropdown>
@@ -1751,7 +1748,7 @@ onMounted(() => {
@upload="fnModalUploadImportUpload" @upload="fnModalUploadImportUpload"
@close="fnModalUploadImportClose" @close="fnModalUploadImportClose"
v-model:visible="uploadImportState.visible" v-model:visible="uploadImportState.visible"
:ext="['.csv', '.txt']" :ext="['.txt']"
> >
<template #default> <template #default>
<a-textarea <a-textarea