feat: change hooks

package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@jianyu/easy-fix-sub-app": "^0.0.1",
-    "@jianyu/easy-inject-qiankun": "^0.1.9",
+    "@jianyu/easy-inject-qiankun": "^0.1.10",
     "@jianyu/icon": "^0.1.7",
     "@jianyu/reset.css": "^0.0.2",
     "axios": "^0.21.1",

src/store/workspace/common-use.js

@@ -1,4 +1,5 @@
 import { getWorkspaceMenu, workspaceCommonUse } from '@/api/modules'
+import { tryCallHooks } from '@jianyu/easy-inject-qiankun'
 
 // 把菜单接口数据转化成一维数组
 function flatMenuList (list = [], index) {
@@ -50,20 +51,24 @@ export default {
       /**
        * 调用基座钩子，获取信息
        */
-      if (!vm?.$BRACE?.$promise) {
-        return dispatch('getWorkspaceMenu')
-      }
-      vm.$BRACE.$promise({
-        fKey: 'getStore',
-        all: false
-      }).then(({ type = '', data: store }) => {
-        if (type === 'success') {
-          console.log(store.getters.getMenus, store)
-        } else {
+      tryCallHooks({
+        fn: () => {
+          vm.$BRACE.$promise({
+            fKey: 'getStore',
+            all: false
+          }).then(({ type = '', data: store }) => {
+            if (type === 'success') {
+              console.log('base store', store)
+            } else {
+              dispatch('getWorkspaceMenu')
+            }
+          }).catch(() => {
+            dispatch('getWorkspaceMenu')
+          })
+        },
+        spareFn: () => {
           dispatch('getWorkspaceMenu')
         }
-      }).catch(() => {
-        dispatch('getWorkspaceMenu')
       })
     },
     // 获取工作桌面菜单

src/views/SubPush.vue

@@ -84,6 +84,7 @@ import Dialog from '@/components/dialog/Dialog.vue'
 import FollowOfficialAccountDialog from '@/components/dialog/FollowOfficialAccountDialog.vue'
 import { getFreeUserPushInfo } from '@/api/modules/'
 import { mapState, mapGetters, mapActions } from 'vuex'
+import { tryCallHooks } from '@jianyu/easy-inject-qiankun'
 
 export default {
   name: 'SubPush',
@@ -316,16 +317,19 @@ export default {
       } else if (this.vt === 's') {
         // 商机管理跳转老页面(框架内打开)
         const url = '/entpc/newBus/set_subscribe'
-        if (this?.$BRACE?.methods?.open) {
-          this.$BRACE.methods.open({
-            route: {
-              link: url,
-              appType: 'qiankun'
-            }
-          })
-        } else {
-          window.open(url)
-        }
+        tryCallHooks({
+          fn: (url) => {
+            this.$BRACE.methods.open({
+              route: {
+                link: url,
+                appType: 'qiankun'
+              }
+            })
+          },
+          spareFn: (url) => {
+            window.open(url)
+          }
+        }, url)
       }
     },
     toBuySvip () {

src/views/workspace/components/CommonUse.vue

@@ -45,6 +45,7 @@ import { Dialog, Image } from 'element-ui'
 import WorkspaceCard from '../ui/WorkspaceCard'
 import SelectorCard from '@/components/selector/SelectorCard'
 import Transfer from '@/components/work-desktop/Transfer'
+import { tryCallHooks } from '@jianyu/easy-inject-qiankun'
 
 export default {
   name: 'CommonUse',
@@ -83,11 +84,18 @@ export default {
       this.transferSave(data)
     },
     openLink (url) {
-      this.$BRACE.methods.open({
-        route: {
-          link: url
+      tryCallHooks({
+        fn: (url) => {
+          this.$BRACE.methods.open({
+            route: {
+              link: url
+            }
+          })
+        },
+        spareFn: (url) => {
+          window.open(url)
         }
-      })
+      }, url)
     },
     confirmSaveFn () {
       try {

yarn.lock

@@ -927,10 +927,10 @@
   resolved "http://192.168.3.207:4873/@jianyu%2feasy-fix-sub-app/-/easy-fix-sub-app-0.0.1.tgz#e67307eff24e1a8243b0ddde7069143573bab532"
   integrity sha512-fLLdXxWjocygUEtV0wIMY1Sj1RdTVN5SmsipEcIeB0B/k1lM0jqBjN7d9BRL0KF7C4G+Q+KaXvYT8A1ZTDu5SQ==
 
-"@jianyu/easy-inject-qiankun@^0.1.7":
-  version "0.1.7"
-  resolved "http://192.168.3.207:4873/@jianyu%2feasy-inject-qiankun/-/easy-inject-qiankun-0.1.7.tgz#f01910cd84cd386c73b841cbb7a6a578353ea3ed"
-  integrity sha512-fZH2KA0YfLkI6CBTvQ2Dn9RFnzA2gfzUl1VrPvf1HqCJrBBDaJx6TXwEFfOMLTXnzKh20AGBZiEDMJlvPUpMLA==
+"@jianyu/easy-inject-qiankun@^0.1.10":
+  version "0.1.10"
+  resolved "http://192.168.3.207:4873/@jianyu%2feasy-inject-qiankun/-/easy-inject-qiankun-0.1.10.tgz#41ef4e78b51317e4e7ab4230f61304551c96482d"
+  integrity sha512-KUt4s0oxew/xjtisYaUbBymPcXoXJabX7yVPYglpD3A00/rLQ3JKPvYfrHTCfn+4I1CFWdudHPg7tpnSj7wZNQ==
 
 "@jianyu/icon@^0.1.7":
   version "0.1.7"