doway-coms 2.0.1 → 2.0.2

package/package.json

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

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

@@ -225,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.data
+                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){