feat(系统设置): 统一开关启用关闭文案修改优化
This commit is contained in:
parent
426609042b
commit
c6c47cff95
|
@ -973,12 +973,13 @@
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const batchParams = ref<BatchActionQueryParams>({
|
const initBatchParams: BatchActionQueryParams = {
|
||||||
selectedIds: [],
|
selectedIds: [],
|
||||||
selectAll: false,
|
selectAll: false,
|
||||||
excludeIds: [],
|
excludeIds: [],
|
||||||
currentSelectCount: 0,
|
currentSelectCount: 0,
|
||||||
});
|
};
|
||||||
|
const batchParams = ref<BatchActionQueryParams>(cloneDeep(initBatchParams));
|
||||||
|
|
||||||
const conditionParams = computed(() => {
|
const conditionParams = computed(() => {
|
||||||
return {
|
return {
|
||||||
|
@ -1362,6 +1363,7 @@
|
||||||
Message.success(t('caseManagement.featureCase.batchMoveSuccess'));
|
Message.success(t('caseManagement.featureCase.batchMoveSuccess'));
|
||||||
} else {
|
} else {
|
||||||
await batchCopyToModules(params);
|
await batchCopyToModules(params);
|
||||||
|
batchParams.value = cloneDeep(initBatchParams);
|
||||||
Message.success(t('caseManagement.featureCase.batchCopySuccess'));
|
Message.success(t('caseManagement.featureCase.batchCopySuccess'));
|
||||||
}
|
}
|
||||||
isMove.value = false;
|
isMove.value = false;
|
||||||
|
|
|
@ -480,7 +480,26 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setStepData(steps: string) {
|
||||||
|
if (steps) {
|
||||||
|
stepData.value = JSON.parse(steps).map((item: any) => {
|
||||||
|
return {
|
||||||
|
id: item.id,
|
||||||
|
step: item.desc,
|
||||||
|
expected: item.result,
|
||||||
|
actualResult: item.actualResult,
|
||||||
|
executeResult: item.executeResult,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
stepData.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function handleCancel() {
|
function handleCancel() {
|
||||||
|
detailForm.value = { ...props.form };
|
||||||
|
const { steps } = detailForm.value;
|
||||||
|
setStepData(steps);
|
||||||
isEditPreposition.value = false;
|
isEditPreposition.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -568,19 +587,7 @@
|
||||||
// 获取详情
|
// 获取详情
|
||||||
async function getDetails() {
|
async function getDetails() {
|
||||||
const { steps, attachments } = detailForm.value;
|
const { steps, attachments } = detailForm.value;
|
||||||
if (steps) {
|
setStepData(steps);
|
||||||
stepData.value = JSON.parse(steps).map((item: any) => {
|
|
||||||
return {
|
|
||||||
id: item.id,
|
|
||||||
step: item.desc,
|
|
||||||
expected: item.result,
|
|
||||||
actualResult: item.actualResult,
|
|
||||||
executeResult: item.executeResult,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
stepData.value = [];
|
|
||||||
}
|
|
||||||
const fileIds = (attachments || []).map((item: any) => item.id);
|
const fileIds = (attachments || []).map((item: any) => item.id);
|
||||||
if (fileIds.length) {
|
if (fileIds.length) {
|
||||||
await getCheckFileIds(fileIds);
|
await getCheckFileIds(fileIds);
|
||||||
|
|
|
@ -336,7 +336,7 @@
|
||||||
const handleEnableOrDisableProject = async (v: string | BatchActionQueryParams, isEnable = true) => {
|
const handleEnableOrDisableProject = async (v: string | BatchActionQueryParams, isEnable = true) => {
|
||||||
const title = isEnable ? t('project.menu.rule.enableRule') : t('project.menu.rule.disableRule');
|
const title = isEnable ? t('project.menu.rule.enableRule') : t('project.menu.rule.disableRule');
|
||||||
const content = isEnable ? t('project.menu.rule.enableRuleTip') : t('project.menu.rule.disableRuleTip');
|
const content = isEnable ? t('project.menu.rule.enableRuleTip') : t('project.menu.rule.disableRuleTip');
|
||||||
const okText = isEnable ? t('common.confirmEnable') : t('common.confirmClose');
|
const okText = isEnable ? t('common.confirmEnable') : t('common.confirmDisable');
|
||||||
openModal({
|
openModal({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
cancelText: t('common.cancel'),
|
cancelText: t('common.cancel'),
|
||||||
|
@ -364,7 +364,7 @@
|
||||||
enable: isEnable,
|
enable: isEnable,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Message.success(isEnable ? t('common.enableSuccess') : t('common.closeSuccess'));
|
Message.success(isEnable ? t('common.enableSuccess') : t('common.disableSuccess'));
|
||||||
fetchData();
|
fetchData();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line no-console
|
// eslint-disable-next-line no-console
|
||||||
|
|
|
@ -43,7 +43,7 @@ export default {
|
||||||
'system.organization.revokeDeleteToolTip': '该组织将与 30 天后自动删除',
|
'system.organization.revokeDeleteToolTip': '该组织将与 30 天后自动删除',
|
||||||
'system.organization.createOrganizationSuccess': '创建组织成功',
|
'system.organization.createOrganizationSuccess': '创建组织成功',
|
||||||
'system.organization.enableTitle': '开启组织',
|
'system.organization.enableTitle': '开启组织',
|
||||||
'system.organization.endTitle': '结束组织',
|
'system.organization.endTitle': '关闭组织',
|
||||||
'system.organization.enableContent': '开启后的组织展示在组织切换列表',
|
'system.organization.enableContent': '开启后的组织展示在组织切换列表',
|
||||||
'system.organization.endContent': '结束后的组织不展示在组织切换列表',
|
'system.organization.endContent': '结束后的组织不展示在组织切换列表',
|
||||||
'system.organization.updateOrganization': '更新组织',
|
'system.organization.updateOrganization': '更新组织',
|
||||||
|
|
|
@ -274,7 +274,7 @@
|
||||||
const handleEnableOrDisableProject = async (record: any, isEnable = true) => {
|
const handleEnableOrDisableProject = async (record: any, isEnable = true) => {
|
||||||
const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
|
const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
|
||||||
const content = isEnable ? t('system.project.enableContent') : t('system.project.endContent');
|
const content = isEnable ? t('system.project.enableContent') : t('system.project.endContent');
|
||||||
const okText = isEnable ? t('common.confirmStart') : t('common.confirmEnd');
|
const okText = isEnable ? t('common.confirmStart') : t('common.confirmClose');
|
||||||
openModal({
|
openModal({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
cancelText: t('common.cancel'),
|
cancelText: t('common.cancel'),
|
||||||
|
|
|
@ -271,7 +271,7 @@
|
||||||
const handleEnableOrDisableOrg = async (record: OrgProjectTableItem, isEnable = true) => {
|
const handleEnableOrDisableOrg = async (record: OrgProjectTableItem, isEnable = true) => {
|
||||||
const title = isEnable ? t('system.organization.enableTitle') : t('system.organization.endTitle');
|
const title = isEnable ? t('system.organization.enableTitle') : t('system.organization.endTitle');
|
||||||
const content = isEnable ? t('system.organization.enableContent') : t('system.organization.endContent');
|
const content = isEnable ? t('system.organization.enableContent') : t('system.organization.endContent');
|
||||||
const okText = isEnable ? t('common.confirmStart') : t('common.confirmEnd');
|
const okText = isEnable ? t('common.confirmStart') : t('common.confirmClose');
|
||||||
openModal({
|
openModal({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
cancelText: t('common.cancel'),
|
cancelText: t('common.cancel'),
|
||||||
|
|
|
@ -244,7 +244,7 @@
|
||||||
const handleEnableOrDisableProject = async (record: OrgProjectTableItem, isEnable = true) => {
|
const handleEnableOrDisableProject = async (record: OrgProjectTableItem, isEnable = true) => {
|
||||||
const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
|
const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
|
||||||
const content = isEnable ? t('system.project.enableContent') : t('system.project.endContent');
|
const content = isEnable ? t('system.project.enableContent') : t('system.project.endContent');
|
||||||
const okText = isEnable ? t('common.confirmStart') : t('common.confirmEnd');
|
const okText = isEnable ? t('common.confirmStart') : t('common.confirmClose');
|
||||||
openModal({
|
openModal({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
cancelText: t('common.cancel'),
|
cancelText: t('common.cancel'),
|
||||||
|
|
|
@ -43,7 +43,7 @@ export default {
|
||||||
'system.organization.revokeDeleteToolTip': '该组织将与 {count} 天后自动删除',
|
'system.organization.revokeDeleteToolTip': '该组织将与 {count} 天后自动删除',
|
||||||
'system.organization.createOrganizationSuccess': '创建组织成功',
|
'system.organization.createOrganizationSuccess': '创建组织成功',
|
||||||
'system.organization.enableTitle': '启用组织',
|
'system.organization.enableTitle': '启用组织',
|
||||||
'system.organization.endTitle': '结束组织',
|
'system.organization.endTitle': '关闭组织',
|
||||||
'system.organization.enableContent': '开启后的组织展示在组织切换列表',
|
'system.organization.enableContent': '开启后的组织展示在组织切换列表',
|
||||||
'system.organization.endContent': '结束后的组织不展示在组织切换列表',
|
'system.organization.endContent': '结束后的组织不展示在组织切换列表',
|
||||||
'system.organization.updateOrganization': '更新组织',
|
'system.organization.updateOrganization': '更新组织',
|
||||||
|
@ -54,9 +54,9 @@ export default {
|
||||||
'system.organization.searchUserPlaceholder': '通过名称/邮箱/手机搜索',
|
'system.organization.searchUserPlaceholder': '通过名称/邮箱/手机搜索',
|
||||||
'system.organization.organizationAdminRequired': '组织管理员不能为空',
|
'system.organization.organizationAdminRequired': '组织管理员不能为空',
|
||||||
'system.project.enableTitle': '启用项目',
|
'system.project.enableTitle': '启用项目',
|
||||||
'system.project.endTitle': '结束项目',
|
'system.project.endTitle': '关闭项目',
|
||||||
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
||||||
'system.project.endContent': '结束后的项目不展示在项目切换列表',
|
'system.project.endContent': '关闭后的项目不展示在项目切换列表',
|
||||||
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
||||||
'system.project.updateProject': '更新项目',
|
'system.project.updateProject': '更新项目',
|
||||||
'system.project.createProject': '创建项目',
|
'system.project.createProject': '创建项目',
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
title: 'testPlan.executeHistory.executionStartAndEndTime',
|
title: 'testPlan.executeHistory.executionStartAndEndTime',
|
||||||
dataIndex: 'startTime',
|
dataIndex: 'startTime',
|
||||||
slotName: 'executionStartAndEndTime',
|
slotName: 'executionStartAndEndTime',
|
||||||
width: 300,
|
width: 350,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'common.operation',
|
title: 'common.operation',
|
||||||
|
@ -124,7 +124,6 @@
|
||||||
columns,
|
columns,
|
||||||
scroll: { x: '100%' },
|
scroll: { x: '100%' },
|
||||||
selectable: false,
|
selectable: false,
|
||||||
heightUsed: 298,
|
|
||||||
},
|
},
|
||||||
(record) => {
|
(record) => {
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Reference in New Issue