Merge remote-tracking branch 'origin/master'

src/views/main-navbar-update-language.vue

@@ -62,7 +62,7 @@
     methods: {
       // 获取多语言列表
       getLanguageList() {
-        searchSysLanguage({}).then(({data}) => {
+        searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
           this.languageList = data.rows
         })
       },

src/views/main-navbar.vue

@@ -189,7 +189,7 @@
     methods: {
       // 获取多语言列表
       getLanguageList() {
-        searchSysLanguage({}).then(({data}) => {
+        searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
           this.languageList = data.rows
         })
       },

src/views/modules/sys/language/common-language-base.vue

@@ -13,7 +13,8 @@
 
       </el-col>
       <el-col :span="4">
-        {{ item.languageCode }}
+
+        {{ languageList[index].languageCode==item.languageCode?languageList[index].languageName:item.languageCode }}
       </el-col>
       <el-col :span="20">
         <el-input v-model="item.languageValue" controls-position="right" style="display:inline"></el-input>
@@ -28,13 +29,14 @@
 </template>
 
 <script>
-import {searchBaseLanguageList, saveBaseObjectLanguageList} from '@/api/sysLanguage.js'
+import {searchBaseLanguageList, saveBaseObjectLanguageList,searchSysLanguage} from '@/api/sysLanguage.js'
 
 export default {
   data() {
     return {
       visible: false,
       dataList: [],
+      languageList: [],
       buttons: {
         add: '确认',
         close: '关闭',
@@ -42,8 +44,9 @@ export default {
     }
   },
   methods: {
-    init(val) {
+    async  init(val) {
       this.visible = true
+      await this.getLanguageList()
       searchBaseLanguageList(val).then(({data}) => {
         this.dataList = data.rows
       })
@@ -62,7 +65,13 @@ export default {
           this.$message.error(data.msg)
         }
       })
-    }
+    },
+    // 获取多语言列表
+    async  getLanguageList() {
+      await searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
+        this.languageList = data.rows
+      })
+    },
   }
 }
 </script>

src/views/modules/sys/language/common-language-list.vue

@@ -56,16 +56,16 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            fixed="right"
-            header-align="center"
-            align="center"
-            width="150"
-            :label="buttons.operate">
-            <template slot-scope="scope">
-              <a type="text" size="small" @click="saveLanguageList(scope.row)">添加</a>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            fixed="right"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="150"-->
+<!--            :label="buttons.operate">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" @click="saveLanguageList(scope.row)">添加</a>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </el-col>
     </el-row>
@@ -103,7 +103,7 @@ export default {
       buttons: {
         settingLanguageList: '设置语言列表',
         search: '查询',
-        addList: '批量添加',
+        addList: '批量保存',
         add: '确认',
         close: '关闭',
         operate: '操作',
@@ -111,7 +111,7 @@ export default {
     }
   },
   methods: {
-    init(val) {
+   async init(functionId) {
       this.visible = true
       let query = {
         functionId: 9001,
@@ -121,21 +121,23 @@ export default {
       getTableDefaultListLanguage(query).then(({data}) => {
         if (data.rows.length > 0) {
           this.languageColumnList = data.rows
-          this.getDataList()
         }
       })
-      this.getLanguageList()
+     this.addQuery.functionId = functionId
+     await  this.getLanguageList()
+     await  this.getDataList()
     },
     // 获取多语言列表
-    getLanguageList() {
-      searchSysLanguage({}).then(({data}) => {
+    async  getLanguageList() {
+      await searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
         this.languageList = data.rows
+        this.addQuery.languageCode = this.languageList[0].languageCode
       })
     },
     // 获取数据列表
-    getDataList() {
+    async  getDataList() {
       this.dataListLoading = true
-      searchLanguageListByLanguageCode(this.addQuery).then(({data}) => {
+      await searchLanguageListByLanguageCode(this.addQuery).then(({data}) => {
         this.languageDataList = data.rows
         this.dataListLoading = false
       }).catch(()=>{

src/views/modules/sys/language/common.vue

@@ -35,10 +35,7 @@
               {{ buttons.download }}
             </download-excel>
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="addOrUpdateLanguageList()">{{ buttons.settingLanguageList }}
-            </el-button>
-          </el-form-item>
+
         </el-form>
       </el-col>
       <el-col :span="24">
@@ -73,6 +70,9 @@
             width="150"
             :label="buttons.cz">
             <template slot-scope="scope">
+              <a type="text" size="small" @click="addOrUpdateLanguageList(scope.row.functionId)">{{ buttons.settingLanguageList }}
+              </a>
+              |
               <a type="text" size="small" @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
             </template>
           </el-table-column>
@@ -150,13 +150,13 @@
     </el-dialog>
 
     <!--  语言组件   -->
-    <commonLanguageBase  ref="commonLanguageAdd" v-drag></commonLanguageBase>
-    <commonLanguageList  ref="commonLanguageList" v-drag></commonLanguageList>
+    <commonLanguageBase ref="commonLanguageAdd" v-drag></commonLanguageBase>
+    <commonLanguageList ref="commonLanguageList" v-drag></commonLanguageList>
   </div>
 </template>
 
 <script>
-import  column from "../../common/column";
+import column from "../../common/column";
 import commonLanguageBase from "./common-language-base";
 import commonLanguageList from "./common-language-list";
 import {
@@ -180,6 +180,7 @@ import {
   removerUser
 } from "@/api/table.js"
 import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+
 export default {
   components: {
     column,
@@ -452,7 +453,7 @@ export default {
         objectType: 'button'
       },
       buttons: {
-        settingLanguageList: '设置语言列表',
+        settingLanguageList: '按语言设置',
         edit: '编辑',
         delete: '删除',
         deleteList: '批量删除',
@@ -463,7 +464,7 @@ export default {
         defaultTable: '设置默认配置',
         list: "列表",
         addList: '批量添加',
-        settingLanguage: "设置语言"
+        settingLanguage: "按控件设置"
       },
       // 导出 start
       exportData: [],
@@ -475,7 +476,7 @@ export default {
       buttonList: [
         {
           functionId: "9001",
-          languageValue: '设置语言列表',
+          languageValue: '按语言设置',
           objectId: 'settingLanguageList',
           objectType: "button",
           tableId: "common1001"
@@ -545,7 +546,7 @@ export default {
         },
         {
           functionId: "9001",
-          languageValue: '设置语言',
+          languageValue: '按控件设置',
           objectId: 'settingLanguage',
           objectType: "button",
           tableId: "common1001"
@@ -580,7 +581,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 175;
+      this.height = window.innerHeight - 180;
     })
   },
   activated() {
@@ -631,16 +632,16 @@ export default {
 
     },
     // 单个语言编辑
-    addOrUpdateLanguage (val) {
+    addOrUpdateLanguage(val) {
       this.commonLanguageVisible = true
       this.$nextTick(() => {
         this.$refs.commonLanguageAdd.init(val)
       })
     },
     // 语言列表编辑
-    addOrUpdateLanguageList () {
+    addOrUpdateLanguageList(functionId) {
       this.$nextTick(() => {
-        this.$refs.commonLanguageList.init()
+        this.$refs.commonLanguageList.init(functionId)
       })
     },
     // 保存语言编辑
@@ -756,23 +757,19 @@ export default {
       })
     },
     // 保存 默认配置 列
-    saveColumnList() {
+    async saveColumnList() {
       // 删除所有的该页面下保存的数据
       if (this.userColumnList) {
         //删除 user自定义的数据
-        removerUser(this.queryTable)
+       await removerUser(this.queryTable)
       }
       // 删除默认配置
-      removerDefault(this.queryTable)
-      // 删除语言
-      // removerLanguage(this.queryTable)
+      await removerDefault(this.queryTable)
       // 保存页面 table属性
       let sumColumnList = this.columnList.concat(this.columnList1);
-      saveTableDefaultList(sumColumnList).then(({data}) => {
-      })
+      saveTableDefaultList(sumColumnList)
       // 保存页面 button label title 属性
-      saveButtonList(this.buttonList).then(({data}) => {
-      })
+      saveButtonList(this.buttonList)
       this.getFunctionButtonList()
       this.getColumnList()
     },
@@ -855,10 +852,6 @@ export default {
   height: calc(100% - 40px);
 }
 
-
-
-
-
 .sl-svg {
   overflow: hidden;
   float: right;

src/views/modules/sys/menu-language.vue

@@ -10,7 +10,7 @@
                 :label="item.columnLabel"
                 :prop="item.columnProp">
           <el-col :span="24">
-            {{item.languageCode }}
+            {{ languageList[index].languageCode==item.languageCode?languageList[index].languageName:item.languageCode }}
             <el-input v-model="item.languageValue" controls-position="right" style="display:inline"></el-input>
           </el-col>
         </el-row>
@@ -23,13 +23,14 @@
 </template>
 
 <script>
-import {searchMenuLanguageById,saveMenuLanguage} from '@/api/sysLanguageMenu.js'
-
+import {searchMenuLanguageById,saveMenuLanguage,} from '@/api/sysLanguageMenu.js'
+import {searchSysLanguage} from '@/api/sysLanguage.js'
 export default {
   data() {
     return {
       visible:false,
       dataList: [],
+      languageList: [],
       buttons: {
         add: '确认',
         close: '关闭'
@@ -37,8 +38,9 @@ export default {
     }
   },
   methods: {
-    init(id) {
+   async init(id) {
       this.visible = true
+      await this.getLanguageList()
       let menu = {
         menuId: id
       }
@@ -62,7 +64,13 @@ export default {
           this.$message.error(data.msg)
         }
       })
-    }
+    },
+    // 获取多语言列表
+    async  getLanguageList() {
+      await searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
+        this.languageList = data.rows
+      })
+    },
   }
 }
 </script>

src/views/modules/sys/user-add-or-update.vue

@@ -106,7 +106,7 @@ export default {
 
     // 获取多语言列表
     getLanguageList() {
-      let queryLanguage = {}
+      let queryLanguage = { languageCode: this.$i18n.locale}
       searchSysLanguage(queryLanguage).then(({data}) => {
         this.languageList = data.rows
       })