From 5b2831bb64d0fa34d4792dd52968b37c71fa4c42 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 14 Aug 2023 13:06:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8B=BC=E5=86=99=E5=92=8C=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?styles=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/authorizedManagement/index.vue     |   1 +
 .../authorizedManagement/locale/en-US.ts      |   2 +-
 .../pluginManager/components/pluginTable.vue  | 241 +++++++++---------
 .../setting/system/pluginManager/index.vue    |   5 +-
 .../system/pluginManager/locale/en-US.ts      |  34 +--
 .../system/pluginManager/locale/zh-CN.ts      |  34 ++-
 6 files changed, 155 insertions(+), 162 deletions(-)

diff --git a/frontend/src/views/setting/system/authorizedManagement/index.vue b/frontend/src/views/setting/system/authorizedManagement/index.vue
index 85dfd419c1..a919b23e47 100644
--- a/frontend/src/views/setting/system/authorizedManagement/index.vue
+++ b/frontend/src/views/setting/system/authorizedManagement/index.vue
@@ -149,6 +149,7 @@
           await addLicense(authorizedForm.licenseCode);
           authDrawer.value = false;
           Message.success(t('system.authorized.licenseSuccessTip'));
+          getLicenseDetail();
         } catch (error) {
           console.log(error);
         } finally {
diff --git a/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts b/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
index e68f3c8889..71f895414c 100644
--- a/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
+++ b/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
@@ -6,7 +6,7 @@ export default {
   'system.authorized.authorizedVersion': 'The authorized version',
   'system.authorized.authorizationsCount': 'Number of authorizations',
   'system.authorized.authorizationStatus': 'Authorization status',
-  'system.authorized.authorityChecking': 'Authority Checking',
+  'system.authorized.authorityChecking': 'Valid License',
   'system.authorized.valid': 'valid',
   'system.authorized.invalid': 'invalid',
   'system.authorized.failure': 'failure',
diff --git a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue
index 493eb63305..a2f984f4f2 100644
--- a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue
+++ b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue
@@ -20,119 +20,117 @@
         ></a-input-search>
       </a-col>
     </a-row>
-    <div class="ms-table-wrapper flex flex-col justify-between">
-      <div>
-        <a-table
-          :data="filterData"
-          :pagination="false"
-          :scroll="{ y: 480, x: 2400 }"
-          :expandable="expandable"
-          :loading="loading"
-          row-key="id"
-          :expanded-row-keys="expandedRowKeys"
-          @expand="handleExpand"
-        >
-          <template #columns>
-            <a-table-column :width="300" fixed="left" :title="t('system.plugin.tableColunmName')" :ellipsis="true">
-              <template #cell="{ record }">
-                {{ record.name }} <span class="text-[--color-text-4]">({{ (record.pluginForms || []).length }})</span>
-              </template>
-            </a-table-column>
-            <a-table-column :title="t('system.plugin.tableColunmDescription')" data-index="description" />
-            <a-table-column :title="t('system.plugin.tableColunmStatus')">
-              <template #cell="{ record }">
-                <div v-if="record.enable" class="flex items-center">
-                  <icon-check-circle-fill class="mr-[2px] text-[rgb(var(--success-6))]" />
-                  {{ t('system.user.tableEnable') }}
-                </div>
-                <div v-else class="flex items-center text-[var(--color-text-4)]">
-                  <icon-stop class="mr-[2px]" />
-                  {{ t('system.user.tableDisable') }}
-                </div>
-              </template>
-            </a-table-column>
-            <a-table-column :title="t('system.plugin.tableColunmApplicationScene')" data-index="scenario">
-              <template #cell="{ record }">{{
-                record.scenario === 'API' ? t('system.plugin.sceneApi') : t('system.plugin.sceneManagement')
-              }}</template>
-            </a-table-column>
-            <a-table-column :title="t('system.user.tableColunmOrg')" :width="300">
-              <template #cell="{ record }">
-                <a-tooltip :content="(record.organizations||[]).map((e: any) => e.name).join(',')">
-                  <span>
-                    <a-tag
-                      v-for="org of (record.organizations || []).slice(0, 3)"
-                      :key="org.id"
-                      class="mr-[4px] border-[rgb(var(--primary-5))] bg-transparent !text-[rgb(var(--primary-5))]"
-                      bordered
-                    >
-                      {{ org.name }}
-                    </a-tag>
-                    <a-tag
-                      v-if="(record.organizations || []).length > 3"
-                      class="mr-[4px] border-[rgb(var(--primary-5))] bg-transparent !text-[rgb(var(--primary-5))]"
-                      bordered
-                    >
-                      +{{ (record.organizations || []).length - 3 }}
-                    </a-tag>
-                  </span>
-                </a-tooltip>
-              </template>
-            </a-table-column>
-            <a-table-column
-              :title="t('system.plugin.tableColunmDescription')"
-              data-index="fileName"
-              :width="300"
-              :ellipsis="true"
-            />
-            <a-table-column
-              :title="t('system.plugin.tableColunmVersion')"
-              data-index="pluginId"
-              :width="300"
-              :ellipsis="true"
-            />
-            <a-table-column :title="t('system.plugin.tableColunmAuthorization')">
-              <template #cell="{ record }">
-                <span>{{
-                  record.xpack ? t('system.plugin.uploadOpenSource') : t('system.plugin.uploadCompSource')
-                }}</span>
-              </template>
-            </a-table-column>
-            <a-table-column :title="t('system.plugin.tableColunmCreatedBy')" data-index="createUser" />
-            <a-table-column :title="t('system.plugin.tableColunmUpdateTime')" :width="200">
-              <template #cell="{ record }">
-                <span>{{ getTime(record.updateTime) }}</span>
-              </template>
-            </a-table-column>
-            <a-table-column :width="200" fixed="right" align="center" :bordered="false">
-              <template #title>
-                {{ t('system.plugin.tableColunmActions') }}
-              </template>
-              <template #cell="{ record }">
-                <MsButton @click="update(record)">{{ t('system.plugin.edit') }}</MsButton>
-                <MsButton v-if="record.enable" @click="disableHandler(record)">{{
-                  t('system.plugin.tableDisable')
-                }}</MsButton>
-                <MsButton v-else @click="enableHandler(record)">{{ t('system.plugin.tableEnable') }}</MsButton>
-                <MsTableMoreAction :list="tableActions" @select="handleSelect($event, record)"></MsTableMoreAction>
-              </template>
-            </a-table-column>
-          </template>
-          <template #expand-icon="{ record, expanded }">
-            <span v-if="(record.pluginForms || []).length && !expanded" class="collapsebtn"
-              ><icon-plus :style="{ 'font-size': '12px' }"
-            /></span>
-            <span v-else-if="(record.pluginForms || []).length && expanded" class="expand"
-              ><icon-minus class="text-[rgb(var(--primary-6))]" :style="{ 'font-size': '12px' }"
-            /></span>
-          </template>
-        </a-table>
-      </div>
-      <div class="ms-footerNum"
-        >{{ t('system.plugin.totalNum') }}<span class="mx-2">{{ totalNum }}</span
-        >{{ t('system.plugin.dataList') }}</div
+    <div class="pr-2">
+      <a-table
+        :data="filterData"
+        :pagination="false"
+        :scroll="{ y: 360, x: 2400, maxHeight: 200 }"
+        :expandable="expandable"
+        :loading="loading"
+        row-key="id"
+        :expanded-row-keys="expandedRowKeys"
+        @expand="handleExpand"
       >
+        <template #columns>
+          <a-table-column :width="300" fixed="left" :title="t('system.plugin.tableColumnsName')" :ellipsis="true">
+            <template #cell="{ record }">
+              {{ record.name }} <span class="text-[--color-text-4]">({{ (record.pluginForms || []).length }})</span>
+            </template>
+          </a-table-column>
+          <a-table-column :title="t('system.plugin.tableColumnsDescription')" data-index="description" />
+          <a-table-column :title="t('system.plugin.tableColumnsStatus')">
+            <template #cell="{ record }">
+              <div v-if="record.enable" class="flex items-center">
+                <icon-check-circle-fill class="mr-[2px] text-[rgb(var(--success-6))]" />
+                {{ t('system.user.tableEnable') }}
+              </div>
+              <div v-else class="flex items-center text-[var(--color-text-4)]">
+                <icon-stop class="mr-[2px]" />
+                {{ t('system.user.tableDisable') }}
+              </div>
+            </template>
+          </a-table-column>
+          <a-table-column :title="t('system.plugin.tableColumnsApplicationScene')" data-index="scenario">
+            <template #cell="{ record }">{{
+              record.scenario === 'API' ? t('system.plugin.interfaceTest') : t('system.plugin.projectManagement')
+            }}</template>
+          </a-table-column>
+          <a-table-column :title="t('system.plugin.tableColumnsOrg')" :width="300">
+            <template #cell="{ record }">
+              <a-tooltip :content="(record.organizations||[]).map((e: any) => e.name).join(',')">
+                <span>
+                  <a-tag
+                    v-for="org of (record.organizations || []).slice(0, 3)"
+                    :key="org.id"
+                    class="mr-[4px] border-[rgb(var(--primary-5))] bg-transparent !text-[rgb(var(--primary-5))]"
+                    bordered
+                  >
+                    {{ org.name }}
+                  </a-tag>
+                  <a-tag
+                    v-if="(record.organizations || []).length > 3"
+                    class="mr-[4px] border-[rgb(var(--primary-5))] bg-transparent !text-[rgb(var(--primary-5))]"
+                    bordered
+                  >
+                    +{{ (record.organizations || []).length - 3 }}
+                  </a-tag>
+                </span>
+              </a-tooltip>
+            </template>
+          </a-table-column>
+          <a-table-column
+            :title="t('system.plugin.tableColumnsDescription')"
+            data-index="fileName"
+            :width="300"
+            :ellipsis="true"
+          />
+          <a-table-column
+            :title="t('system.plugin.tableColumnsVersion')"
+            data-index="pluginId"
+            :width="300"
+            :ellipsis="true"
+          />
+          <a-table-column :title="t('system.plugin.tableColumnsAuthorization')">
+            <template #cell="{ record }">
+              <span>{{
+                record.xpack ? t('system.plugin.uploadOpenSource') : t('system.plugin.uploadCompSource')
+              }}</span>
+            </template>
+          </a-table-column>
+          <a-table-column :title="t('system.plugin.tableColumnsCreatedBy')" data-index="createUser" />
+          <a-table-column :title="t('system.plugin.tableColumnsUpdateTime')" :width="200">
+            <template #cell="{ record }">
+              <span>{{ getTime(record.updateTime) }}</span>
+            </template>
+          </a-table-column>
+          <a-table-column :width="200" fixed="right" align="center" :bordered="false">
+            <template #title>
+              {{ t('system.plugin.tableColumnsActions') }}
+            </template>
+            <template #cell="{ record }">
+              <MsButton @click="update(record)">{{ t('system.plugin.edit') }}</MsButton>
+              <MsButton v-if="record.enable" @click="disableHandler(record)">{{
+                t('system.plugin.tableDisable')
+              }}</MsButton>
+              <MsButton v-else @click="enableHandler(record)">{{ t('system.plugin.tableEnable') }}</MsButton>
+              <MsTableMoreAction :list="tableActions" @select="handleSelect($event, record)"></MsTableMoreAction>
+            </template>
+          </a-table-column>
+        </template>
+        <template #expand-icon="{ record, expanded }">
+          <span v-if="(record.pluginForms || []).length && !expanded" class="collapsebtn"
+            ><icon-plus :style="{ 'font-size': '12px' }"
+          /></span>
+          <span v-else-if="(record.pluginForms || []).length && expanded" class="expand"
+            ><icon-minus class="text-[rgb(var(--primary-6))]" :style="{ 'font-size': '12px' }"
+          /></span>
+        </template>
+      </a-table>
     </div>
+    <div class="ms-footerNum"
+      >{{ t('system.plugin.totalNum') }}<span class="mx-2">{{ totalNum }}</span
+      >{{ t('system.plugin.dataList') }}</div
+    >
     <UploadModel
       v-model:visible="uploadVisible"
       :originize-list="originizeList"
@@ -211,7 +209,7 @@
       value: '',
     },
     {
-      label: 'system.plugin.apiTest',
+      label: 'system.plugin.interfaceTest',
       value: 'API',
     },
     {
@@ -248,7 +246,7 @@
     openModal({
       type: 'warning',
       title: t('system.plugin.deletePluginTip', { name: characterLimit(record.name) }),
-      content: '',
+      content: t('system.plugin.deleteContentTip'),
       okText: t('system.plugin.deletePluginConfirm'),
       cancelText: t('system.plugin.pluginCancel'),
       okButtonProps: {
@@ -389,11 +387,6 @@
   :deep(.arco-table-tr-expand .arco-table-cell) {
     padding: 0 !important;
   }
-  :deep(.arco-table) {
-    margin-right: -10px;
-    padding-right: 10px;
-    max-width: 100%;
-  }
   :deep(.collapsebtn) {
     padding: 0 1px;
     border: 1px solid var(--color-text-4);
@@ -414,13 +407,8 @@
     @apply bg-white;
   }
   .ms-footerNum {
-    height: 22px;
-    line-height: 22px;
-    @apply mt-4 text-sm text-slate-500;
-  }
-  .ms-table-wrapper {
-    height: calc(100vh - 236px);
-    min-height: 400px;
+    width: 100%;
+    @apply absolute bottom-0 z-20 mt-4 bg-white pt-4 text-sm text-slate-500;
   }
   :deep(.arco-table-tr .arco-table-td) {
     height: 54px !important;
@@ -428,4 +416,7 @@
   .ms-table-expand :deep(.arco-scrollbar-container + .arco-scrollbar-track-direction-vertical) {
     left: 0 !important;
   }
+  :deep(.arco-table-content + .arco-scrollbar-track-direction-vertical .arco-scrollbar-thumb-direction-vertical) {
+    height: 0 !important;
+  }
 </style>
diff --git a/frontend/src/views/setting/system/pluginManager/index.vue b/frontend/src/views/setting/system/pluginManager/index.vue
index 702fc95476..5d09b0748a 100644
--- a/frontend/src/views/setting/system/pluginManager/index.vue
+++ b/frontend/src/views/setting/system/pluginManager/index.vue
@@ -1,7 +1,7 @@
 /* stylelint-disable order/properties-order */
 <template>
   <MsCard simple>
-    <div class="wrapper flex flex-col justify-between">
+    <div class="wrapper">
       <a-alert :closable="true" class="mb-4">
         <div>
           {{ t('system.plugin.alertDescribe') }}
@@ -28,6 +28,9 @@
     color: rgb(var(--primary-5));
   }
   .wrapper {
+    /* position: relative; */
     width: 100%;
+    height: calc(100vh - 138px);
+    min-height: 500px;
   }
 </style>
diff --git a/frontend/src/views/setting/system/pluginManager/locale/en-US.ts b/frontend/src/views/setting/system/pluginManager/locale/en-US.ts
index 8ba5605486..b4aa12769d 100644
--- a/frontend/src/views/setting/system/pluginManager/locale/en-US.ts
+++ b/frontend/src/views/setting/system/pluginManager/locale/en-US.ts
@@ -5,20 +5,20 @@ export default {
   'system.plugin.tableEnable': 'Enable',
   'system.plugin.tableDisable': 'Disable',
   'system.plugin.edit': 'Edit',
-  'system.plugin.tableColunmName': 'Name',
-  'system.plugin.tableColunmJarPackage': 'Jar Package',
-  'system.plugin.tableColunmDescription': 'Description',
-  'system.plugin.tableColunmVersion': 'Type',
-  'system.plugin.tableColunmCreateTime': 'CreateTime',
-  'system.plugin.tableColunmUpdateTime': 'UpdateTime',
-  'system.plugin.tableColunmApplicationScene': 'ApplicationScene',
+  'system.plugin.tableColumnsName': 'Name',
+  'system.plugin.tableColumnsJarPackage': 'Jar Package',
+  'system.plugin.tableColumnsDescription': 'Description',
+  'system.plugin.tableColumnsVersion': 'Type',
+  'system.plugin.tableColumnsCreateTime': 'CreateTime',
+  'system.plugin.tableColumnsUpdateTime': 'UpdateTime',
+  'system.plugin.tableColumnsApplicationScene': 'ApplicationScene',
   'system.plugin.ChangeSceneName': 'Change Scene({name})',
-  'system.plugin.tableColunmOrg': 'Application Organization',
-  'system.plugin.tableColunmAuthorization': 'Authorization Type',
-  'system.plugin.tableColunmCreatedBy': 'Created By',
-  'system.plugin.tableColunmExpirationDate': 'Expiration Date',
-  'system.plugin.tableColunmActions': 'Actions',
-  'system.plugin.tableColunmStatus': 'Status',
+  'system.plugin.tableColumnsOrg': 'Application Organization',
+  'system.plugin.tableColumnsAuthorization': 'AuthorizationType',
+  'system.plugin.tableColumnsCreatedBy': 'CreatedBy',
+  'system.plugin.tableColumnsExpirationDate': 'Expiration Date',
+  'system.plugin.tableColumnsActions': 'Actions',
+  'system.plugin.tableColumnsStatus': 'Status',
   'system.plugin.ChangeScene': 'Change Scene',
   'system.plugin.SelectApplicationScene': 'Select Application Scene',
   'system.plugin.interfaceTest': 'Interface Test',
@@ -42,8 +42,8 @@ export default {
   'system.plugin.viewTable': 'View the form',
   'system.plugin.downAddress': 'More open source plug-ins can be downloaded here',
   'system.plugin.goDownload': 'downloads',
-  'system.plugin.deletePluginTip': 'Are you sure to delete the `{name}` plugin?',
-  'system.plugin.disablePluginTip': 'Are you sure to disable the `{name}` plugin?',
+  'system.plugin.deletePluginTip': 'Are you sure to delete the {name} plugin?',
+  'system.plugin.disablePluginTip': 'Are you sure to disable the {name} plugin?',
   'system.resourcePool.deletePoolContentUsed':
     'This resource pool has been used, and related tests will stop immediately after deletion, please operate with caution!',
   'system.resourcePool.deletePoolContentUnuse': 'This resource pool is not in use. Are you sure to delete it?',
@@ -83,7 +83,6 @@ export default {
   'system.plugin.uploadFileTip': 'Please upload the file and submit it!',
   'system.plugin.uploadOpenSource': 'Open Source',
   'system.plugin.uploadCompSource': 'Enterprise Edition',
-  'system.plugin.sceneApi': 'Interface Testing',
   'system.plugin.sceneManagement': 'Project Management',
   'system.resourcePool.deletePoolSuccess': 'Deleted successfully',
   'system.plugin.sizeExceedTip': 'The file size exceeds the limit！',
@@ -100,6 +99,7 @@ export default {
   'system.resourcePool.useAPI': 'API test',
   'system.resourcePool.useUI': ' UI test',
   'system.plugin.all': 'All',
-  'system.plugin.apiTest': 'API Test',
   'system.plugin.projectManagement': 'Project Management',
+  'system.plugin.deleteContentTip':
+    'After deletion, the defects/requirements of the platform cannot be synchronized, and the historical data is automatically switched to other templates. Please exercise caution!',
 };
diff --git a/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts b/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts
index b3cf9090bf..5311d6bd26 100644
--- a/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts
@@ -5,19 +5,19 @@ export default {
   'system.plugin.tableEnable': '启用',
   'system.plugin.tableDisable': '禁用',
   'system.plugin.edit': '编辑',
-  'system.plugin.tableColunmName': '名称',
-  'system.plugin.tableColunmJarPackage': 'jar包',
-  'system.plugin.tableColunmDescription': '描述',
-  'system.plugin.tableColunmVersion': '版本',
-  'system.plugin.tableColunmCreateTime': '创建时间',
-  'system.plugin.tableColunmUpdateTime': '更新时间',
-  'system.plugin.tableColunmApplicationScene': '应用场景',
-  'system.plugin.tableColunmOrg': '应用组织',
-  'system.plugin.tableColunmAuthorization': '授权类型',
-  'system.plugin.tableColunmCreatedBy': '创建人',
-  'system.plugin.tableColunmExpirationDate': '到期时间',
-  'system.plugin.tableColunmActions': '操作',
-  'system.plugin.tableColunmStatus': '状态',
+  'system.plugin.tableColumnsName': '名称',
+  'system.plugin.tableColumnsJarPackage': 'jar包',
+  'system.plugin.tableColumnsDescription': '描述',
+  'system.plugin.tableColumnsVersion': '版本',
+  'system.plugin.tableColumnsCreateTime': '创建时间',
+  'system.plugin.tableColumnsUpdateTime': '更新时间',
+  'system.plugin.tableColumnsApplicationScene': '应用场景',
+  'system.plugin.tableColumnsOrg': '应用组织',
+  'system.plugin.tableColumnsAuthorization': '授权类型',
+  'system.plugin.tableColumnsCreatedBy': '创建人',
+  'system.plugin.tableColumnsExpirationDate': '到期时间',
+  'system.plugin.tableColumnsActions': '操作',
+  'system.plugin.tableColumnsStatus': '状态',
   'system.plugin.ChangeScene': '场景变更',
   'system.plugin.ChangeSceneName': '场景变更({name})',
   'system.plugin.SelectApplicationScene': '选择应用场景',
@@ -31,8 +31,8 @@ export default {
   'system.plugin.supportFormat': '只支持JAR格式文件，文件大小不超过50M',
   'system.plugin.interfaceTestDescribe': '协议类的插件建议选择接口测试',
   'system.plugin.projectMangerDescribe': '项目管理平台类建议选择项目管理',
-  'system.plugin.deletePluginTip': '确认删除 `{name}` 这个插件吗？',
-  'system.plugin.disablePluginTip': '确认禁用 `{name}` 这个插件吗？',
+  'system.plugin.deletePluginTip': '确认删除 {name} 这个插件吗？',
+  'system.plugin.disablePluginTip': '确认禁用 {name} 这个插件吗？',
   'system.resourcePool.deletePoolContentUsed': '该资源池已被使用，删除后相关测试会立即停止，请谨慎操作！',
   'system.resourcePool.deletePoolContentUnuse': '该资源池未被使用，是否确认删除？',
   'system.plugin.deletePluginConfirm': '确认删除',
@@ -76,11 +76,9 @@ export default {
   'system.plugin.uploadFileTip': '请上传文件再提交！',
   'system.plugin.uploadOpenSource': '开源版',
   'system.plugin.uploadCompSource': '企业版',
-  'system.plugin.sceneApi': '接口测试',
-  'system.plugin.sceneManagement': '项目管理',
   'system.plugin.sizeExceedTip': '文件大小超出限制！',
   'system.plugin.showScriptTitle': '查看脚本({name})',
   'system.plugin.all': '全部',
-  'system.plugin.apiTest': '接口测试',
   'system.plugin.projectManagement': '项目管理',
+  'system.plugin.deleteContentTip': '删除后，将无法同步该平台的缺陷/需求，历史数据自动切换为其它模板展示，请谨慎操作！',
 };