cloud-web-corejs 1.0.54-dev.613 → 1.0.54-dev.614

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.613",
+  "version": "1.0.54-dev.614",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/layout/components/Sidebar/default.vue

@@ -173,7 +173,7 @@
       v-if="showMenuModal"
     ></div>
     <el-dialog
-      title="切换组织"
+      :title="$t1('切换组织')"
       width="355px"
       custom-class="dialog-style list-dialog"
       v-if="showCompanyDialog"
@@ -186,7 +186,11 @@
       @close="changeCompanyClose"
     >
       <div class="cont">
-        <el-input placeholder="搜索" class="search-btn" v-model="filterText"></el-input>
+        <el-input
+          :placeholder="$t1('搜索')"
+          class="search-btn"
+          v-model="filterText"
+        ></el-input>
         <el-tree
           :props="defaultProps"
           :load="loadNode"
@@ -414,9 +418,9 @@ export default {
               window.open(path);
             },
           });
-        } else{
-          if (path.indexOf('token={token}') >= 0) {
-            path = path.replace('token={token}', 'token=' + getToken())
+        } else {
+          if (path.indexOf("token={token}") >= 0) {
+            path = path.replace("token={token}", "token=" + getToken());
           }
           window.open(path);
         }
@@ -610,7 +614,7 @@ export default {
           let parentLabel = companyCode ? node.label : null;
           datas.forEach((item) => {
             item.leaf = !item.hasChild;
-            let label = item.companyName;
+            let label = this.$t1(item.companyName);
             /*if(companyCode){
               label = label + '('+companyTypeMap[item.companyType]+')'
             }*/

package/src/layout/components/langTool.vue

@@ -1,14 +1,18 @@
 <template>
-  <div class="item" v-if="i18nEnabled && languageSettings.length>1">
-    <el-dropdown class='lang-box' trigger="click">
-    <span class="el-dropdown-link">
-      <i class="iconfont icon-duoyuyan"></i><i
-      class="el-icon-arrow-down el-icon--right"></i>
-    </span>
+  <div class="item" v-if="i18nEnabled && languageSettings.length > 1">
+    <el-dropdown class="lang-box" trigger="click">
+      <span class="el-dropdown-link">
+        <i class="iconfont icon-duoyuyan"></i
+        ><i class="el-icon-arrow-down el-icon--right"></i>
+      </span>
       <el-dropdown-menu slot="dropdown" class="lang-box-pup">
-        <el-dropdown-item v-for="(item,index) in languageSettings" :key="index" :command="item.languageCode"
-                          @click.native="changeLanguage(item.languageCode)"
-                          :class="{'cur':currentName == item.languageName}">{{ item.languageName }}
+        <el-dropdown-item
+          v-for="(item, index) in languageSettings"
+          :key="index"
+          :command="item.languageCode"
+          @click.native="changeLanguage(item.languageCode)"
+          :class="{ cur: currentName == item.languageName }"
+          >{{ $t1(item.languageName) }}
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -24,13 +28,13 @@ export default {
     return {
       languageSettings: [],
       languageSettingMap: {},
-      i18nEnabled: settingConfig.i18nEnabled
-    }
+      i18nEnabled: settingConfig.i18nEnabled,
+    };
   },
   computed: {
     currentName() {
-      return this.languageSettingMap[this.$i18n.locale]
-    }
+      return this.languageSettingMap[this.$i18n.locale];
+    },
   },
   mounted() {
     this.initLanguageSetting();
@@ -42,33 +46,33 @@ export default {
           url: USER_PREFIX + `/auth/switchLanguage`,
           method: `post`,
           data: {
-            "stringOne": command
+            stringOne: command,
           },
           isLoading: true,
           modalStrictly: true,
           loadingTarget: document.body,
-          success: res => {
-            this.$i18n.locale = command // 设置给本地的i18n插件
+          success: (res) => {
+            this.$i18n.locale = command; // 设置给本地的i18n插件
             localStorage.setItem("i18n-lang", command);
-            this.$message.success('切换多语言成功')
-            location.reload()
-          }
-        })
+            this.$message.success("切换多语言成功");
+            location.reload();
+          },
+        });
       }
     },
     initLanguageSetting() {
       if (settingConfig.i18nEnabled !== true) return;
-      let languageSettings = []
-      languageSettings.push(...(this.$store.state.user.languageSettings));
+      let languageSettings = [];
+      languageSettings.push(...this.$store.state.user.languageSettings);
       let map = {};
-      languageSettings.forEach(item => {
+      languageSettings.forEach((item) => {
         map[item.languageCode] = item.languageName;
       });
       this.languageSettingMap = map;
       this.languageSettings = languageSettings;
     },
-  }
-}
+  },
+};
 </script>
 <style scoped lang="scss">
 /*多语言*/
@@ -78,7 +82,7 @@ export default {
   height: 18px;
   line-height: 18px;
   vertical-align: middle;
-  color: #FFF;
+  color: #fff;
   font-size: 12px;
 
   .el-icon--right {
@@ -86,7 +90,7 @@ export default {
   }
 
   .el-dropdown-link {
-    color: #FFF;
+    color: #fff;
 
     .name {
       display: inline-block;
@@ -95,7 +99,7 @@ export default {
       overflow: hidden;
       vertical-align: middle;
       font-size: 12px;
-      line-height: 19px
+      line-height: 19px;
     }
 
     i {
@@ -110,7 +114,6 @@ export default {
       }
     }
   }
-
 }
 
 .lang-box-pup .el-dropdown-menu__item.cur {