Merge pull request #1109 from dataease/pr@v1.4@refactor_theme_custom

backend/src/main/resources/db/migration/V27__de1.4.sql

@@ -158,32 +158,6 @@ INSERT INTO `sys_theme_item` VALUES (2, 'customSiderTextColor', '#ACBAC3');
 INSERT INTO `sys_theme_item` VALUES (2, 'customTableBG', '#21333B');
 INSERT INTO `sys_theme_item` VALUES (2, 'customTableColor', '#ACBAC3');
 INSERT INTO `sys_theme_item` VALUES (2, 'customTableBorderColor', '#495865');
-INSERT INTO `sys_theme_item` VALUES (7, 'primary', '#409EFF');
-INSERT INTO `sys_theme_item` VALUES (7, 'deSuccess', '#67C23A');
-INSERT INTO `sys_theme_item` VALUES (7, 'deWarning', '#E6A23C');
-INSERT INTO `sys_theme_item` VALUES (7, 'deDanger', '#F56C6C');
-INSERT INTO `sys_theme_item` VALUES (7, 'deInfo', '#909399');
-INSERT INTO `sys_theme_item` VALUES (7, 'deTextPrimary', '#303133');
-INSERT INTO `sys_theme_item` VALUES (7, 'deTextRegular', '#606266');
-INSERT INTO `sys_theme_item` VALUES (7, 'deTextSecondary', '#909399');
-INSERT INTO `sys_theme_item` VALUES (7, 'deTextPlaceholder', '#C0C4CC');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBorderBase', '#DCDFE6');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBorderLight', '#E4E7ED');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBorderLighter', '#EBEEF5');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBorderExtraLight', '#F2F6FC');
-INSERT INTO `sys_theme_item` VALUES (7, 'deWhite', '#FFFFFF');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBlack', '#000000');
-INSERT INTO `sys_theme_item` VALUES (7, 'deBackgroundBase', '#F5F7FA');
-INSERT INTO `sys_theme_item` VALUES (7, 'shade-1', 'rgb(58, 142, 230)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-1', 'rgb(83, 168, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-2', 'rgb(102, 177, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-3', 'rgb(121, 187, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-4', 'rgb(140, 197, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-5', 'rgb(160, 207, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-6', 'rgb(179, 216, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-7', 'rgb(198, 226, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-8', 'rgb(217, 236, 255)');
-INSERT INTO `sys_theme_item` VALUES (7, 'light-9', 'rgb(236, 245, 255)');
 INSERT INTO `sys_theme_item` VALUES (1, 'primary', '#409EFF');
 INSERT INTO `sys_theme_item` VALUES (1, 'deSuccess', '#67C23A');
 INSERT INTO `sys_theme_item` VALUES (1, 'deWarning', '#E6A23C');

frontend/src/lang/en.js

@@ -423,7 +423,14 @@ export default {
   theme: {
     change: 'Change Theme',
     documentation: 'Theme documentation',
-    tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.'
+    tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.',
+    base: 'Base color',
+    font: 'Font color',
+    border: 'Border color',
+    background: 'Background color',
+    custom: 'Custom color',
+    otherSave: 'Theme Save as',
+    info: 'Theme info'
   },
   tagsView: {
     refresh: 'Refresh',

frontend/src/lang/tw.js

@@ -423,7 +423,14 @@ export default {
   theme: {
     change: '換膚',
     documentation: '換膚文檔',
-    tips: 'Tips: 它區別于 navbar 上的 theme-pick, 是兩種不同的換膚方法，各自有不同的應用場景，具體請參考文檔。'
+    tips: 'Tips: 它區別于 navbar 上的 theme-pick, 是兩種不同的換膚方法，各自有不同的應用場景，具體請參考文檔。',
+    base: '基礎配色',
+    font: '字體顏色',
+    border: '邊框顏色',
+    background: '背景顏色',
+    custom: '自定義顏色',
+    otherSave: '主題另存為',
+    info: '主題信息'
   },
   tagsView: {
     refresh: '刷新',

frontend/src/lang/zh.js

@@ -425,7 +425,14 @@ export default {
   theme: {
     change: '换肤',
     documentation: '换肤文档',
-    tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。'
+    tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。',
+    base: '基础配色',
+    font: '字体颜色',
+    border: '边框颜色',
+    background: '背景颜色',
+    custom: '自定义颜色',
+    otherSave: '主题另存为',
+    info: '主题信息'
   },
   tagsView: {
     refresh: '刷新',

frontend/src/views/link/generate/index.vue

@@ -120,6 +120,10 @@ export default {
         this.form.uri = uri ? (this.origin + uri) : uri
         // 返回的密码是共钥加密后的 所以展示需要私钥解密一波
         pwd && (this.form.pwd = pwd)
+
+        if (pwd && pwd.length > 0 && pwd.length > this.pwdNums) {
+          this.resetPwd()
+        }
         /* pwd && (this.form.pwd = decrypt(pwd)) */
         /* overTime && (this.form.overTime = overTime) */
         overTime && (this.$set(this.form, 'overTime', overTime))

frontend/src/views/system/user/imp-ldap.vue

@@ -238,7 +238,7 @@ export default {
         ldapUsers().then(res => {
           if (res && res.data) {
             this.users = res.data.map(item => {
-              if (this.exitsUsers.some(existUser => existUser === item.userName)) {
+              if (this.exitsUsers.some(existUser => existUser.username === item.userName)) {
                 item.disabled = true
               }
               return item