feat(系统设置): 统一开关启用关闭文案修改优化

2024-09-09 11:45:54 +08:00 · 2024-09-09 11:45:54 +08:00 · c6c47cff95
parent 426609042b
commit c6c47cff95
9 changed files with 34 additions and 26 deletions
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@ -973,12 +973,13 @@
    }
  );

-  const batchParams = ref<BatchActionQueryParams>({
+  const initBatchParams: BatchActionQueryParams = {
    selectedIds: [],
    selectAll: false,
    excludeIds: [],
    currentSelectCount: 0,
-  });
+  };
+  const batchParams = ref<BatchActionQueryParams>(cloneDeep(initBatchParams));

  const conditionParams = computed(() => {
    return {
@ -1362,6 +1363,7 @@
        Message.success(t('caseManagement.featureCase.batchMoveSuccess'));
      } else {
        await batchCopyToModules(params);
+        batchParams.value = cloneDeep(initBatchParams);
        Message.success(t('caseManagement.featureCase.batchCopySuccess'));
      }
      isMove.value = false;
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
@ -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() {
+    detailForm.value = { ...props.form };
+    const { steps } = detailForm.value;
+    setStepData(steps);
    isEditPreposition.value = false;
  }

@ -568,19 +587,7 @@
  // 获取详情
  async function getDetails() {
    const { steps, attachments } = detailForm.value;
-    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 = [];
-    }
+    setStepData(steps);
    const fileIds = (attachments || []).map((item: any) => item.id);
    if (fileIds.length) {
      await getCheckFileIds(fileIds);
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/falseAlermRule.vue
@ -336,7 +336,7 @@
  const handleEnableOrDisableProject = async (v: string | BatchActionQueryParams, isEnable = true) => {
    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 okText = isEnable ? t('common.confirmEnable') : t('common.confirmClose');
+    const okText = isEnable ? t('common.confirmEnable') : t('common.confirmDisable');
    openModal({
      type: 'info',
      cancelText: t('common.cancel'),
@ -364,7 +364,7 @@
              enable: isEnable,
            });
          }
-          Message.success(isEnable ? t('common.enableSuccess') : t('common.closeSuccess'));
+          Message.success(isEnable ? t('common.enableSuccess') : t('common.disableSuccess'));
          fetchData();
        } catch (error) {
          // eslint-disable-next-line no-console
--- a/frontend/src/views/setting/organization/project/locale/zh-CN.ts
+++ b/frontend/src/views/setting/organization/project/locale/zh-CN.ts
@ -43,7 +43,7 @@ export default {
  'system.organization.revokeDeleteToolTip': '该组织将与 30 天后自动删除',
  'system.organization.createOrganizationSuccess': '创建组织成功',
  'system.organization.enableTitle': '开启组织',
-  'system.organization.endTitle': '结束组织',
+  'system.organization.endTitle': '关闭组织',
  'system.organization.enableContent': '开启后的组织展示在组织切换列表',
  'system.organization.endContent': '结束后的组织不展示在组织切换列表',
  'system.organization.updateOrganization': '更新组织',
--- a/frontend/src/views/setting/organization/project/orgProject.vue
+++ b/frontend/src/views/setting/organization/project/orgProject.vue
@ -274,7 +274,7 @@
  const handleEnableOrDisableProject = async (record: any, isEnable = true) => {
    const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
    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({
      type: 'error',
      cancelText: t('common.cancel'),
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@ -271,7 +271,7 @@
  const handleEnableOrDisableOrg = async (record: OrgProjectTableItem, isEnable = true) => {
    const title = isEnable ? t('system.organization.enableTitle') : t('system.organization.endTitle');
    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({
      type: 'info',
      cancelText: t('common.cancel'),
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@ -244,7 +244,7 @@
  const handleEnableOrDisableProject = async (record: OrgProjectTableItem, isEnable = true) => {
    const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
    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({
      type: 'info',
      cancelText: t('common.cancel'),
--- a/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
@ -43,7 +43,7 @@ export default {
  'system.organization.revokeDeleteToolTip': '该组织将与 {count} 天后自动删除',
  'system.organization.createOrganizationSuccess': '创建组织成功',
  'system.organization.enableTitle': '启用组织',
-  'system.organization.endTitle': '结束组织',
+  'system.organization.endTitle': '关闭组织',
  'system.organization.enableContent': '开启后的组织展示在组织切换列表',
  'system.organization.endContent': '结束后的组织不展示在组织切换列表',
  'system.organization.updateOrganization': '更新组织',
@ -54,9 +54,9 @@ export default {
  'system.organization.searchUserPlaceholder': '通过名称/邮箱/手机搜索',
  'system.organization.organizationAdminRequired': '组织管理员不能为空',
  'system.project.enableTitle': '启用项目',
-  'system.project.endTitle': '结束项目',
+  'system.project.endTitle': '关闭项目',
  'system.project.enableContent': '开启后的项目展示在项目切换列表',
-  'system.project.endContent': '结束后的项目不展示在项目切换列表',
+  'system.project.endContent': '关闭后的项目不展示在项目切换列表',
  'system.project.projectNamePlaceholder': '请输入项目名称，不可与其他项目名称重复',
  'system.project.updateProject': '更新项目',
  'system.project.createProject': '创建项目',
--- a/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
@ -108,7 +108,7 @@
      title: 'testPlan.executeHistory.executionStartAndEndTime',
      dataIndex: 'startTime',
      slotName: 'executionStartAndEndTime',
-      width: 300,
+      width: 350,
    },
    {
      title: 'common.operation',
@ -124,7 +124,6 @@
      columns,
      scroll: { x: '100%' },
      selectable: false,
-      heightUsed: 298,
    },
    (record) => {
      return {