From 776d17833be4f62408060fd89d265ffe879aff6f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 15 Sep 2020 10:32:44 +0800
Subject: [PATCH] =?UTF-8?q?style(XPack):=20=E4=BF=AE=E5=A4=8D=20=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V20__add_license.sql    |  6 ------
 .../business/components/settings/SettingMenu.vue   | 14 +++++++++++---
 .../track/case/components/TestCaseImport.vue       |  2 +-
 frontend/src/i18n/en-US.js                         |  6 +++++-
 frontend/src/i18n/zh-CN.js                         |  6 +++++-
 frontend/src/i18n/zh-TW.js                         |  4 +++-
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V20__add_license.sql b/backend/src/main/resources/db/migration/V20__add_license.sql
index ce2ba2daa5..56345d9064 100644
--- a/backend/src/main/resources/db/migration/V20__add_license.sql
+++ b/backend/src/main/resources/db/migration/V20__add_license.sql
@@ -2,12 +2,6 @@ CREATE TABLE `license` (
   `id` varchar(50) NOT NULL COMMENT 'ID',
   `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp',
   `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp',
-  `corporation` varchar(500) NOT NULL COMMENT 'corporation ',
-  `expired` varchar(255) NOT NULL COMMENT 'expired ',
-  `product` varchar(500) DEFAULT NULL COMMENT 'product name',
-  `edition` varchar(255) COMMENT 'edition ',
-  `license_version` varchar(255) NOT NULL COMMENT 'licenseVersion',
-  `license_count` INT COMMENT 'license_count',
   `license_code` longtext DEFAULT NULL COMMENT 'license_code',
   PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
\ No newline at end of file
diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index 3caee2bf3d..89ba6525f3 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -51,6 +51,7 @@
   export default {
     name: "MsSettingMenu",
     data() {
+      let valid = false;
       let getMenus = function (group) {
         let menus = [];
         Setting.children.forEach(child => {
@@ -58,7 +59,10 @@
             let menu = {index: Setting.path + "/" + child.path}
             menu.title = child.meta.title;
             menu.roles = child.meta.roles;
-            menu.valid = child.meta.valid;
+            if (child.meta.valid != undefined && child.meta.valid === true) {
+              menu.valid = child.meta.valid;
+              valid = true;
+            }
             menus.push(menu);
           }
         })
@@ -69,12 +73,15 @@
         organizations: getMenus('organization'),
         workspaces: getMenus('workspace'),
         persons: getMenus('person'),
+        isValid: valid,
         isCurrentOrganizationAdmin: false,
         isCurrentWorkspaceUser: false,
       }
     },
     mounted() {
-      //this.valid();
+      if (this.isValid === true) {
+        this.valid();
+      }
       this.isCurrentOrganizationAdmin = checkoutCurrentOrganization();
       this.isCurrentWorkspaceUser = checkoutCurrentWorkspace();
     },
@@ -83,7 +90,7 @@
         let _this = this;
         this.result = this.$get("/license/valid", response => {
           let data = response.data;
-          if (data === undefined || data != true) {
+          if (data === undefined || data === null || data.status != "valid") {
             this.systems.forEach(item => {
               if (item.valid != undefined && item.valid === true) {
                 _this.systems.splice(this.systems.indexOf(item), 1);
@@ -115,6 +122,7 @@
 </script>
 
 <style scoped>
+
   .setting {
     border-right: 0;
   }
diff --git a/frontend/src/business/components/track/case/components/TestCaseImport.vue b/frontend/src/business/components/track/case/components/TestCaseImport.vue
index 1508904db4..63d6dd3adc 100644
--- a/frontend/src/business/components/track/case/components/TestCaseImport.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseImport.vue
@@ -69,7 +69,7 @@
         },
         uploadValidate(file) {
           let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
-          if (suffix != 'xls' && suffix != 'xlsx') {
+          if (suffix != 'xls' && suffix != 'xlsx' && suffix != 'xmind') {
             this.$warning(this.$t('test_track.case.import.upload_limit_format'));
             return false;
           }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 56e8499545..be7fe4de3a 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -157,7 +157,7 @@ export default {
   license:{
     title: 'Authorization management',
     corporation: 'corporation',
-    expired: 'expired',
+    time: 'Authorization time',
     product: 'product',
     edition: 'edition',
     licenseVersion: 'licenseVersion',
@@ -165,6 +165,10 @@ export default {
     valid_license: 'valid license',
     show_license: 'show license',
     valid_license_error: 'validate license error',
+    status: 'valid state',
+    valid: 'valid',
+    invalid: 'invalid',
+    expired: 'expired',
   },
   workspace: {
     create: 'Create Workspace',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index fce2e3f59c..8239f196b4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -157,7 +157,7 @@ export default {
   license:{
     title: '授权管理',
     corporation: '客户名称',
-    expired: '授权时间',
+    time: '授权时间',
     product: '产品名称',
     edition: '产品版本',
     licenseVersion: '授权版本',
@@ -165,6 +165,10 @@ export default {
     valid_license: '授权验证',
     show_license: '查看授权',
     valid_license_error: '授权验证失败',
+    status: '授权状态',
+    valid: '有效',
+    invalid: '无效',
+    expired: '已过期',
   },
   workspace: {
     create: '创建工作空间',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 4629e053a4..b581509fba 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -155,7 +155,7 @@ export default {
   license:{
     title: '授權管理',
     corporation: '客戶名稱',
-    expired: '授權時間',
+    time: '授權時間',
     product: '產品名稱',
     edition: '產品版本',
     licenseVersion: '授權版本',
@@ -163,6 +163,8 @@ export default {
     valid_license: '授權验证',
     show_license: '查看授權',
     valid_license_error: '授權验证失败',
+    status: '授權状态',
+    expired: '已过期',
   },
 
   workspace: {