fix(全局): bug 修复

2024-05-29 15:52:42 +08:00 · 2024-05-29 15:52:42 +08:00 · 1d91d6adc7
parent 0531f2af0a
commit 1d91d6adc7
12 changed files with 55 additions and 21 deletions
--- a/frontend/src/api/requrls/api-test/management.ts
+++ b/frontend/src/api/requrls/api-test/management.ts
@ -57,7 +57,7 @@ export const GetMockUrlUrl = '/api/definition/mock/get-url'; // 获取mock url
 * api回收站
 */
 export const RecoverDefinitionUrl = '/api/definition/recover'; // 回收站-接口定义-恢复
-export const DeleteRecycleApiUrl = '/api/definition/delete/'; // 回收站-接口定义-彻底删除
+export const DeleteRecycleApiUrl = '/api/definition/delete'; // 回收站-接口定义-彻底删除
 export const BatchRecoverApiUrl = '/api/definition/batch-recover'; // 回收站-接口定义-批量恢复
 export const BatchCleanOutApiUrl = '/api/definition/batch/delete'; // 回收站-接口定义-批量彻底删除
 export const GetTrashModuleTreeUrl = '/api/definition/module/trash/tree'; // 回收站查找模块
--- a/frontend/src/components/business/ms-user-group-comp/authTable.vue
+++ b/frontend/src/components/business/ms-user-group-comp/authTable.vue
@ -33,13 +33,15 @@
                  :model-value="record.perChecked"
                  @change="(v, e) => handleCellAuthChange(v, rowIndex, record, e)"
                >
-                  <a-checkbox
-                    v-for="item in record.permissions"
-                    :key="item.id"
-                    :disabled="item.license || systemAdminDisabled || disabled"
-                    :value="item.id"
-                    >{{ t(item.name) }}</a-checkbox
-                  >
+                  <template v-for="item in record.permissions" :key="item.id">
+                    <a-checkbox
+                      v-if="(item.license && licenseStore.hasLicense()) || !item.license"
+                      :disabled="item.license || systemAdminDisabled || disabled"
+                      :value="item.id"
+                    >
+                      {{ t(item.name) }}
+                    </a-checkbox>
+                  </template>
                </a-checkbox-group>
                <a-checkbox
                  class="mr-[7px]"
@ -77,6 +79,7 @@
    saveOrgUSetting,
  } from '@/api/modules/setting/usergroup';
  import { useI18n } from '@/hooks/useI18n';
+  import useLicenseStore from '@/store/modules/setting/license';

  import {
    type AuthScopeType,
@ -121,6 +124,9 @@
      },
    }
  );
+
+  const licenseStore = useLicenseStore();
+
  const systemType = inject<AuthScopeEnum>('systemType');

  const loading = ref(false);
--- a/frontend/src/components/pure/ms-detail-card/index.vue
+++ b/frontend/src/components/pure/ms-detail-card/index.vue
@ -3,7 +3,7 @@
    <div class="ms-detail-card-title">
      <div class="flex flex-1 items-center gap-[8px]">
        <a-tooltip :content="t(props.title)">
-          <div class="one-line-text max-w-[300px] flex-1 font-medium text-[var(--color-text-1)]">
+          <div class="one-line-text max-w-[300px] font-medium text-[var(--color-text-1)]">
            {{ t(props.title) }}
          </div>
        </a-tooltip>
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@ -1450,6 +1450,7 @@
          if (requestVModel.value.isNew) {
            // 未保存过的接口保存为用例，先保存接口定义，再保存为用例
            await realSave(definitionParams, true);
+            done(true);
          }
          if (!requestVModel.value.isNew) {
            const params: AddApiCaseParams = {
@ -1463,7 +1464,6 @@
            };
            await addCase(params);
            emit('addDone');
-            done(true);
            Message.success(t('common.saveSuccess'));
            handleSaveCaseCancel();
            saveCaseLoading.value = false;
--- a/frontend/src/views/api-test/management/index.vue
+++ b/frontend/src/views/api-test/management/index.vue
@ -38,7 +38,7 @@
        <div class="relative flex h-full flex-col">
          <div
            id="managementContainer"
-            :class="['absolute z-[101] h-full w-full', importDrawerVisible ? '' : 'invisible']"
+            :class="['absolute z-[102] h-full w-full', importDrawerVisible ? '' : 'invisible']"
            style="transition: all 0.3s"
          >
            <importApi
@ -105,6 +105,7 @@
  }

  function newApi() {
+    importDrawerVisible.value = false;
    managementRef.value?.newTab();
  }

--- a/frontend/src/views/login/locale/en-US.ts
+++ b/frontend/src/views/login/locale/en-US.ts
@ -4,7 +4,7 @@ export default {
  'login.form.password.errMsg': 'Password cannot be empty',
  'login.form.login.errMsg': 'Login error, refresh and try again',
  'login.form.login.success': 'welcome to use',
-  'login.form.userName.placeholder': 'Please enter your email',
+  'login.form.userName.placeholder': 'Please enter your username',
  'login.form.userName.placeholderOther': 'Please enter your account',
  'login.form.password.placeholder': 'Please enter your password',
  'login.form.rememberPassword': 'Remember password',
--- a/frontend/src/views/login/locale/zh-CN.ts
+++ b/frontend/src/views/login/locale/zh-CN.ts
@ -1,10 +1,10 @@
 export default {
  'login.form.title': '现代化、开源的测试管理和接口测试工具',
-  'login.form.userName.errMsg': '邮箱不能为空',
+  'login.form.userName.errMsg': '用户名不能为空',
  'login.form.password.errMsg': '密码不能为空',
  'login.form.login.errMsg': '登录出错，请刷新重试',
  'login.form.login.success': '欢迎使用',
-  'login.form.userName.placeholder': '请输入邮箱',
+  'login.form.userName.placeholder': '请输入用户名',
  'login.form.userName.placeholderOther': '请输入账号',
  'login.form.password.placeholder': '请输入密码',
  'login.form.rememberPassword': '记住密码',
--- a/frontend/src/views/project-management/projectAndPermission/member/components/memberTable.vue
+++ b/frontend/src/views/project-management/projectAndPermission/member/components/memberTable.vue
@ -134,6 +134,13 @@
  const lastProjectId = computed(() => appStore.currentProjectId);
  const hasOperationPermission = computed(() => hasAnyPermission(['PROJECT_USER:READ+DELETE']));
  const columns: MsTableColumn = [
+    {
+      title: 'system.user.userName',
+      dataIndex: 'email',
+      showTooltip: true,
+      sortIndex: 0,
+      showDrag: false,
+    },
    {
      title: 'project.member.tableColumnName',
      slotName: 'name',
@ -146,7 +153,7 @@
      slotName: 'email',
      dataIndex: 'email',
      showTooltip: true,
-      showDrag: true,
+      showDrag: false,
    },
    {
      title: 'project.member.tableColumnPhone',
@ -166,6 +173,7 @@
      title: 'project.member.tableColumnStatus',
      slotName: 'enable',
      dataIndex: 'enable',
+      showDrag: true,
      width: 150,
    },
    {
--- a/frontend/src/views/setting/organization/member/index.vue
+++ b/frontend/src/views/setting/organization/member/index.vue
@ -162,14 +162,10 @@
  );
  const columns: MsTableColumn = [
    {
-      title: 'organization.member.tableColunmEmail',
+      title: 'system.user.userName',
      dataIndex: 'email',
-      width: 200,
-      showInTable: true,
      showTooltip: true,
-      ellipsis: true,
      sortIndex: 0,
-      showDrag: false,
    },
    {
      title: 'organization.member.tableColunmName',
@ -178,6 +174,17 @@
      showTooltip: true,
      ellipsis: true,
      showDrag: false,
+      sortIndex: 1,
+    },
+    {
+      title: 'organization.member.tableColunmEmail',
+      dataIndex: 'email',
+      width: 200,
+      showInTable: true,
+      showTooltip: true,
+      ellipsis: true,
+      sortIndex: 2,
+      showDrag: false,
    },
    {
      title: 'organization.member.tableColunmPhone',
--- a/frontend/src/views/setting/system/user/index.vue
+++ b/frontend/src/views/setting/system/user/index.vue
@ -346,7 +346,7 @@

  const columns: MsTableColumn = [
    {
-      title: 'system.user.tableColumnEmail',
+      title: 'system.user.userName',
      dataIndex: 'email',
      showTooltip: true,
      sortIndex: 0,
@ -357,26 +357,36 @@
      showTooltip: true,
      sortIndex: 1,
    },
+    {
+      title: 'system.user.tableColumnEmail',
+      dataIndex: 'email',
+      showTooltip: true,
+      sortIndex: 2,
+    },
    {
      title: 'system.user.tableColumnPhone',
      dataIndex: 'phone',
+      showDrag: true,
    },
    {
      title: 'system.user.tableColumnOrg',
      dataIndex: 'organizationList',
      isTag: true,
+      showDrag: true,
      width: 300,
    },
    {
      title: 'system.user.tableColumnUserGroup',
      dataIndex: 'userRoleList',
      slotName: 'userGroup',
+      showDrag: true,
      width: 300,
    },
    {
      title: 'system.user.tableColumnStatus',
      slotName: 'enable',
      dataIndex: 'enable',
+      showDrag: true,
    },
    {
      title: hasOperationSysUserPermission.value ? 'system.user.tableColumnActions' : '',
--- a/frontend/src/views/setting/system/user/locale/en-US.ts
+++ b/frontend/src/views/setting/system/user/locale/en-US.ts
@ -117,4 +117,5 @@ export default {
  'system.user.num': 'Line',
  'system.user.line': '', // 英文没有后面的单位
  'system.user.closeTip': 'Your changes have not been saved. Do you want to continue closing the window?',
+  'system.user.userName': 'Username',
 };
--- a/frontend/src/views/setting/system/user/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/user/locale/zh-CN.ts
@ -116,4 +116,5 @@ export default {
  'system.user.num': '第',
  'system.user.line': '行',
  'system.user.closeTip': '您的更改尚未保存，是否要继续关闭窗口？',
+  'system.user.userName': '用户名',
 };