doway-coms 1.9.8 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.9.8",
+  "version": "2.0.0",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseTreeSelect/src/index.vue

@@ -34,6 +34,7 @@
           :replaceFields="replaceFields"
           :dropdownMatchSelectWidth="dropdownMatchSelectWidth"
           :treeDefaultExpandAll="treeDefaultExpandAll"
+          :treeDefaultExpandedKeys="treeDefaultExpandedKeys"
           @change="changeData"
           :size="size"
           :allowClear="allowClear"
@@ -255,10 +256,11 @@ export default {
     return {
       treeData: [],
       currentValue: '',
+      treeDefaultExpandedKeys: [],
     }
   },
   mounted() {
-    // this.searchData()
+    this.searchData()
     if (this.treeData.length) {
       this.currentValue = this.row[this.linkedField]
     } else {
@@ -269,11 +271,14 @@ export default {
     treeData(val) {
       if (this.treeData.length) {
         this.currentValue = this.row[this.linkedField]
+        this.treeDefaultExpandedKeys = []
+        this.treeDefaultExpandedKeys.push(this.currentValue)
       } else {
         this.currentValue = this.value
       }
     },
     edit(value) {
+      // debugger
       if (value) {
         if (this.treeData.length) {
           this.currentValue = this.row[this.linkedField]

package/packages/utils/api.js

@@ -9,6 +9,12 @@ export function loadViewInfo(moduleCode) {
     }
   })
 }
+export function loadLangInfo(moduleCode,moduleLangCacheHash) {
+  return request({
+    url: store.getters.moduleLangUrl + '/'+ moduleCode+'_zh_cn.json?cacheHash='+moduleLangCacheHash,
+    method: 'get'
+  })
+}
 
 export function saveUserModuleDataFieldApi(data) {
   return request({

package/packages/utils/common.js

@@ -1,6 +1,7 @@
 import {notification } from 'ant-design-vue'
 import store from './store'
 import XEUtils from 'xe-utils'
+import axios from 'axios'
 /**
  * 替换掩码参数字符串
  * @param {参数字符串} paramString
@@ -247,11 +248,16 @@ export function replaceParamString(
           alert('防呆，子应用没有路由缓存键:'+JSON.stringify(to))
       }
       if (to.meta.moduleCode && !store.getters.moduleViewInfo[to.meta.moduleCode]) {
-        store
-          .dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode })
-          .then(() => {
-            next()
-          })
+        axios.all([store.dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode }),
+        store.dispatch('moduleLoadLangInfo', { moduleCode: to.meta.moduleCode,moduleLangCacheHash:to.meta.moduleLangCacheHash })])
+        .then(axios.spread(function() {
+           next()
+        }))
+        // store
+        //   .dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode })
+        //   .then(() => {
+        //     next()
+        //   })
           .catch((err) => {
             console.debug(err)
           })

package/packages/utils/store.js

@@ -1,5 +1,5 @@
 
-import {loadViewInfo} from './api'
+import {loadViewInfo,loadLangInfo} from './api'
 import XEUtils from 'xe-utils'
 import Vue from 'vue'
 import Vuex from 'vuex'
@@ -9,6 +9,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
     state: {
+        moduleLangUrl:'',
         umsUrl:'',
         baseUrl:'',
         msgUrl:'',
@@ -143,6 +144,9 @@ export default new Vuex.Store({
         SET_UMS_URL:(state,url) => {
           state.umsUrl = url
         },
+        SET_MODULE_LANG_URL:(state,url) => {
+          state.moduleLangUrl = url
+        },
         SET_BASE_URL:(state,url) => {
           state.baseUrl = url
         },
@@ -224,6 +228,23 @@ export default new Vuex.Store({
               })
           })
         },
+        moduleLoadLangInfo({ commit, state }, dataInfo) {
+          let vm = this
+          return new Promise((resolve, reject) => {
+            loadLangInfo(dataInfo.moduleCode)
+              .then(reponseData => {
+                commit('SET_MODULE_LANG_INFO', {
+                  moduleCode: dataInfo.moduleCode,
+                  info: reponseData.content
+                })
+                resolve()
+              })
+              .catch(error => {
+                console.debug(error)
+                resolve()
+              })
+          })
+        },
         // 固定返回工作台，并根据条件决定是否关闭其余标签
         goWorkbench({ commit }, tabsAllClose) {
           if(window.$wujie){
@@ -249,6 +270,7 @@ export default new Vuex.Store({
         industryVersion:state=>state.industryVersion,
         isGenerateMatCode:state=>state.isGenerateMatCode,
         umsUrl:state=>state.umsUrl,
+        moduleLangUrl:state=>state.moduleLangUrl,
         baseUrl:state=>state.baseUrl,
         msgUrl:state=>state.msgUrl,
         identityUrl:state=>state.identityUrl,