doway-coms 2.0.0 → 2.0.2

package/package.json

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

package/packages/utils/api.js

@@ -1,5 +1,6 @@
 import request from './request'
 import store from './store'
+import axios from 'axios'
 export function loadViewInfo(moduleCode) {
   return request({
     url: store.getters.umsUrl + '/v1/module/loadViewInfo',
@@ -10,10 +11,7 @@ export function loadViewInfo(moduleCode) {
   })
 }
 export function loadLangInfo(moduleCode,moduleLangCacheHash) {
-  return request({
-    url: store.getters.moduleLangUrl + '/'+ moduleCode+'_zh_cn.json?cacheHash='+moduleLangCacheHash,
-    method: 'get'
-  })
+  return axios.get(store.getters.moduleLangUrl + '/'+ moduleCode+'_zh_cn.json?cacheHash='+moduleLangCacheHash)
 }
 
 export function saveUserModuleDataFieldApi(data) {

package/packages/utils/common.js

@@ -248,16 +248,16 @@ export function replaceParamString(
           alert('防呆，子应用没有路由缓存键:'+JSON.stringify(to))
       }
       if (to.meta.moduleCode && !store.getters.moduleViewInfo[to.meta.moduleCode]) {
-        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()
-        //   })
+        // 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

@@ -24,6 +24,7 @@ export default new Vuex.Store({
         isGenerateMatCode:'false',//是否生成物料编码
         webAppCode: '',
         moduleViewInfo: {},
+        moduleLangInfo:{},
         controlSize: 'small',
         newId: 0,//明细新增id
         userId: '',
@@ -52,6 +53,9 @@ export default new Vuex.Store({
         SET_WEB_APP_CODE: (state, webAppCode) => {
           state.webAppCode = webAppCode
         },
+        SET_MODULE_LANG_INFO:(state,data)=>{
+          state.moduleLangInfo[data.moduleCode] = data.info
+        },
         SET_MODULE_VIEW_INFO: (state, data) => {
           let tempDataInfo = {}
           XEUtils.arrayEach(data.info.datas,loopData=>{
@@ -221,30 +225,39 @@ export default new Vuex.Store({
                   moduleCode: dataInfo.moduleCode,
                   info: reponseData.content
                 })
-                resolve()
-              })
-              .catch(error => {
-                reject(error)
-              })
-          })
-        },
-        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
+                loadLangInfo(dataInfo.moduleCode,reponseData.content.moduleLangCacheHash)
+                .then(langData=>{
+                  commit('SET_MODULE_LANG_INFO', {
+                    moduleCode: dataInfo.moduleCode,
+                    info: langData.data
+                  })
+                  resolve()
+                }).catch(()=>{
+                   resolve()
                 })
-                resolve()
               })
               .catch(error => {
-                console.debug(error)
-                resolve()
+                reject(error)
               })
           })
         },
+        // 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.data
+        //         })
+        //         resolve()
+        //       })
+        //       .catch(error => {
+        //         console.debug(error)
+        //         resolve()
+        //       })
+        //   })
+        // },
         // 固定返回工作台，并根据条件决定是否关闭其余标签
         goWorkbench({ commit }, tabsAllClose) {
           if(window.$wujie){
@@ -277,6 +290,7 @@ export default new Vuex.Store({
         token: state => state.token,
         webAppCode: state => state.webAppCode,
         moduleViewInfo: state => state.moduleViewInfo,
+        moduleLangInfo: state => state.moduleLangInfo,
         controlSize: state => state.controlSize,
         newId: state => () => {
           state.newId = state.newId + 1