From 97f21abbf141088ea6d25f30cfba17cc7a01e921 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 2 Mar 2022 15:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=88=87=E6=8D=A2=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dict/JDictSelectTag.vue    |   2 +-
 jero-web/src/components/tableDate/index.vue   |   3 +-
 jero-web/src/components/tools/UserMenu.vue    | 194 ++++++++++--------
 3 files changed, 106 insertions(+), 93 deletions(-)

diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue
index 0c991d188..a7917a1b6 100644
--- a/jero-web/src/components/dict/JDictSelectTag.vue
+++ b/jero-web/src/components/dict/JDictSelectTag.vue
@@ -8,7 +8,7 @@
   </a-radio-group>
 
   <a-select v-else-if="tagType=='select'" :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
-    <a-select-option :value="undefined">请选择</a-select-option>
+    <a-select-option :value="undefined">{{$t('pleaseSelect')}}</a-select-option>
     <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
       <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
         {{ item.text || item.label }}
diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue
index 2dbc052af..0345280ac 100644
--- a/jero-web/src/components/tableDate/index.vue
+++ b/jero-web/src/components/tableDate/index.vue
@@ -31,7 +31,7 @@
         </span>
         <span slot="detailText" slot-scope="text,record">
               <span class="text" :title="text">
-               {{text.length > 18?text.slice(0,17)+'...':text}}
+               {{text && text.length > 18?text.slice(0,17)+'...':text}}
               </span>
         </span>
 
@@ -132,6 +132,7 @@
           if (res.success) {
             var jsonHead = res.result
             this.columns = []
+            // res.db_field_txt
             jsonHead.forEach((res, index) => {
               this.columns.push({
                 title: res.db_field_txt,
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index b16d30205..0ba785367 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -2,44 +2,44 @@
   <div class="user-wrapper" :class="theme">
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-<!--    <span class="action" @click="showClick">-->
-<!--      <a-icon type="search"></a-icon>-->
-<!--    </span>-->
+    <!--    <span class="action" @click="showClick">-->
+    <!--      <a-icon type="search"></a-icon>-->
+    <!--    </span>-->
     <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-<!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
-<!--      <a-select-->
-<!--        class="search-input"-->
-<!--        showSearch-->
-<!--        :showArrow="false"-->
-<!--        placeholder="搜索菜单"-->
-<!--        optionFilterProp="children"-->
-<!--        :filterOption="filterOption"-->
-<!--        :open="isMobile()?true:null"-->
-<!--        :getPopupContainer="(node) => node.parentNode"-->
-<!--        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"-->
-<!--        @change="searchMethods"-->
-<!--        @blur="hiddenClick"-->
-<!--      >-->
-<!--        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>-->
-<!--      </a-select>-->
-<!--    </component>-->
+    <!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
+    <!--      <a-select-->
+    <!--        class="search-input"-->
+    <!--        showSearch-->
+    <!--        :showArrow="false"-->
+    <!--        placeholder="搜索菜单"-->
+    <!--        optionFilterProp="children"-->
+    <!--        :filterOption="filterOption"-->
+    <!--        :open="isMobile()?true:null"-->
+    <!--        :getPopupContainer="(node) => node.parentNode"-->
+    <!--        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"-->
+    <!--        @change="searchMethods"-->
+    <!--        @blur="hiddenClick"-->
+    <!--      >-->
+    <!--        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>-->
+    <!--      </a-select>-->
+    <!--    </component>-->
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-<!--    <span class="action">-->
-<!--      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">-->
-<!--        <a-icon type="question-circle-o"></a-icon>-->
-<!--      </a>-->
-<!--    </span>-->
+    <!--    <span class="action">-->
+    <!--      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">-->
+    <!--        <a-icon type="question-circle-o"></a-icon>-->
+    <!--      </a>-->
+    <!--    </span>-->
     <header-notice class="action"/>
     <div class="action">
-      <span @click="changeLocale('en-us')" v-show="localeval=='zh-cn'">English</span >
-      <span @click="changeLocale('zh-cn')" v-show="localeval=='en-us'">中文</span >
+      <span @click="changeLocale('en-us')" v-show="localeval=='zh-cn'">English</span>
+      <span @click="changeLocale('zh-cn')" v-show="localeval=='en-us'">中文</span>
     </div>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
-<!--        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>-->
+        <!--        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>-->
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <a-menu-item key="0">
@@ -54,9 +54,9 @@
             <span>账户设置</span>
           </router-link>
         </a-menu-item>
-        <a-menu-item key="3"  @click="systemSetting">
-           <a-icon type="tool"/>
-           <span>系统设置</span>
+        <a-menu-item key="3" @click="systemSetting">
+          <a-icon type="tool"/>
+          <span>系统设置</span>
         </a-menu-item>
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
@@ -74,25 +74,25 @@
           <a-icon type="logout"/>
           <span>退出登录</span>
         </a-menu-item>
-       <!-- <a-menu-item key="2" disabled>
-          <a-icon type="setting"/>
-          <span>测试</span>
-        </a-menu-item>
-        <a-menu-divider/>
-        <a-menu-item key="3">
-          <a href="javascript:;" @click="handleLogout">
-            <a-icon type="logout"/>
-            <span>退出登录</span>
-          </a>
-        </a-menu-item>-->
+        <!-- <a-menu-item key="2" disabled>
+           <a-icon type="setting"/>
+           <span>测试</span>
+         </a-menu-item>
+         <a-menu-divider/>
+         <a-menu-item key="3">
+           <a href="javascript:;" @click="handleLogout">
+             <a-icon type="logout"/>
+             <span>退出登录</span>
+           </a>
+         </a-menu-item>-->
       </a-menu>
     </a-dropdown>
-<!--    <span class="action">-->
-<!--      <a class="logout_title" href="javascript:;" @click="handleLogout">-->
-<!--        <a-icon type="logout"/>-->
-<!--        <span v-if="isDesktop()">&nbsp;退出登录</span>-->
-<!--      </a>-->
-<!--    </span>-->
+    <!--    <span class="action">-->
+    <!--      <a class="logout_title" href="javascript:;" @click="handleLogout">-->
+    <!--        <a-icon type="logout"/>-->
+    <!--        <span v-if="isDesktop()">&nbsp;退出登录</span>-->
+    <!--      </a>-->
+    <!--    </span>-->
     <user-password ref="userPassword"></user-password>
     <depart-select ref="departSelect" :closable="true" title="部门切换"></depart-select>
     <setting-drawer ref="settingDrawer" :closable="true" title="系统设置"></setting-drawer>
@@ -102,28 +102,29 @@
 <script>
   import HeaderNotice from './HeaderNotice'
   import UserPassword from './UserPassword'
-  import SettingDrawer from "@/components/setting/SettingDrawer";
+  import SettingDrawer from '@/components/setting/SettingDrawer'
   import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters,mapState } from 'vuex'
+  import { mapActions, mapGetters, mapState } from 'vuex'
   import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl,getAction } from "@/api/manage"
+  import { getFileAccessHttpUrl, getAction } from '@/api/manage'
   import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+  import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
   import moment from 'moment'
   import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
-  import enUS from 'ant-design-vue/es/locale/en_US';
+  import enUS from 'ant-design-vue/es/locale/en_US'
   import 'moment/locale/zh-cn'
+
   moment.locale('zh-cn')
   const EN = 'en-us'
   const ZH = 'zh-cn'
 
   export default {
-    name: "UserMenu",
+    name: 'UserMenu',
     mixins: [mixinDevice],
-    data(){
-      return{
+    data() {
+      return {
         // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-        searchMenuOptions:[],
+        searchMenuOptions: [],
         searchMenuComp: 'span',
         searchMenuVisible: false,
         locale: zhCN,
@@ -147,8 +148,8 @@
     /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
     created() {
       let lists = []
-      this.searchMenus(lists,this.permissionMenuList)
-      this.searchMenuOptions=[...lists]
+      this.searchMenus(lists, this.permissionMenuList)
+      this.searchMenuOptions = [...lists]
     },
     mounted() {
       //如果是单点登录模式
@@ -158,7 +159,7 @@
           this.updateCurrentDepart()
         }
       }
-      this.localeval=localStorage.getItem('language')
+      this.localeval = localStorage.getItem('language')
     },
     computed: {
       ...mapState({
@@ -175,8 +176,8 @@
         handler() {
           this.searchMenuVisible = false
           this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
-        },
-      },
+        }
+      }
       // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
     },
     methods: {
@@ -184,13 +185,13 @@
       showClick() {
         this.searchMenuVisible = true
       },
-      hiddenClick(){
+      hiddenClick() {
         this.shows = false
       },
       /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(["Logout"]),
-      ...mapGetters(["nickname", "avatar","userInfo"]),
-      getAvatar(){
+      ...mapActions(['Logout']),
+      ...mapGetters(['nickname', 'avatar', 'userInfo']),
+      getAvatar() {
         return getFileAccessHttpUrl(this.avatar())
       },
       handleLogout() {
@@ -202,7 +203,7 @@
           onOk() {
             return that.Logout({}).then(() => {
               // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              that.$router.push({ path: '/user/login' });
+              that.$router.push({ path: '/user/login' })
               localStorage.removeItem('language')
               // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
               //window.location.reload()
@@ -214,27 +215,27 @@
             })
           },
           onCancel() {
-          },
-        });
+          }
+        })
       },
-      updatePassword(){
+      updatePassword() {
         let username = this.userInfo().username
         this.$refs.userPassword.show(username)
       },
-      updateCurrentDepart(){
+      updateCurrentDepart() {
         this.$refs.departSelect.show()
       },
-      systemSetting(){
+      systemSetting() {
         this.$refs.settingDrawer.showDrawer()
       },
       /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      searchMenus(arr,menus){
-        for(let i of menus){
-          if(!i.hidden && "layouts/RouteView"!==i.component){
-           arr.push(i)
+      searchMenus(arr, menus) {
+        for (let i of menus) {
+          if (!i.hidden && 'layouts/RouteView' !== i.component) {
+            arr.push(i)
           }
-          if(i.children&& i.children.length>0){
-            this.searchMenus(arr,i.children)
+          if (i.children && i.children.length > 0) {
+            this.searchMenus(arr, i.children)
           }
         }
       },
@@ -254,43 +255,50 @@
       // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
       /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
-      clearCache(){
-        getAction("sys/dict/refleshCache").then((res) => {
+      clearCache() {
+        getAction('sys/dict/refleshCache').then((res) => {
           if (res.success) {
             //重新加载缓存
-            getAction("sys/dict/queryAllDictItems").then((res) => {
+            getAction('sys/dict/queryAllDictItems').then((res) => {
               if (res.success) {
                 Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
                 Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
               }
             })
-            this.$message.success("刷新缓存完成！");
+            this.$message.success('刷新缓存完成！')
+          }
+        }).catch(e => {
+          this.$message.warn('刷新缓存失败！')
+          console.log('刷新失败', e)
+        })
+      },
+      queryAllDictItemsByCut() {
+        getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
+          if (res.success) {
+            Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
           }
-        }).catch(e=>{
-          this.$message.warn("刷新缓存失败！");
-          console.log("刷新失败",e)
         })
       },
       /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
       moment,
-      changeLocale (localeval) {
-        console.log('loacal',localeval)
-        this.$root.Bus.$emit('switchLanguage',localeval)
+      changeLocale(localeval) {
+        this.$root.Bus.$emit('switchLanguage', localeval)
         this.localeval = localeval
         if (localeval === EN) {
           moment.locale(EN)
           this.$i18n.locale = EN
           this.locale = enUS
+          this.queryAllDictItemsByCut()
           // localStorage.setItem('language', EN)
           // location.reload();
         } else {
           moment.locale(ZH)
           this.$i18n.locale = ZH
           this.locale = zhCN
+          this.queryAllDictItemsByCut()
           // localStorage.setItem('language', ZH)
           // location.reload();
         }
-        console.log('this.locale',this.locale)
       }
     }
   }
@@ -307,11 +315,13 @@
       background-color: inherit;
       border: 0;
       border-bottom: 1px solid white;
+
       &__placeholder, &__field__placeholder {
         color: inherit;
       }
     }
   }
+
   /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
   /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
@@ -321,10 +331,12 @@
     color: inherit;
     text-decoration: none;
   }
+
   .action {
     color: rgba(0, 0, 0, 0.65) !important;
   }
-  .action .avatar{
-     background: #ccc !important;
+
+  .action .avatar {
+    background: #ccc !important;
   }
 </style>
\ No newline at end of file