chore: 升级kit_global_config

config/micor.js

@@ -21,6 +21,15 @@ export default {
       container: '#micro-container',
       activeRule: '/civbase/civ_pandawork',
     },
+    {
+      name: 'report',
+      entry: `//${window.location.hostname}:8345/report/workplatform`,
+      container: '#micro-container',
+      activeRule: '/civbase/report',
+      props: {
+        origin: `//${window.location.hostname}:8345`
+      }
+    },
     // {
     //   name: 'civ_webgis',
     //   entry: `//${window.location.hostname}:8080/civ_webgis`,

package-lock.json

@@ -16748,9 +16748,9 @@
             }
         },
         "kit_global_config": {
-            "version": "1.0.39",
-            "resolved": "https://g.civnet.cn:4873/kit_global_config/-/kit_global_config-1.0.39.tgz",
-            "integrity": "sha512-15WzXI81DED8cCjK62v2KLkofeI5brZW6CtCrD1m6a8oAYw3UKCp+W8O3lBJV0RrokKWQPE6cE6dC9eNNl14QQ==",
+            "version": "1.0.40",
+            "resolved": "https://g.civnet.cn:4873/kit_global_config/-/kit_global_config-1.0.40.tgz",
+            "integrity": "sha512-c6+jhOi/A/hmYDcaixjZROaS/r5catJFgpp2E9fWDsU/BAZ0Geyy5STbr7k4llWJkzOTz01rmYX5NLHNuAZnnA==",
             "requires": {
                 "@babel/runtime": "^7.10.5",
                 "js-base64": "^3.5.2",

package.json

@@ -116,7 +116,7 @@
         "immutable": "^4.0.0-rc.12",
         "js-base64": "^3.5.2",
         "js-cookie": "^2.2.1",
-        "kit_global_config": "^1.0.39",
+        "kit_global_config": "^1.0.40",
         "kit_logger": "^1.0.2",
         "kit_utils": "^1.3.11",
         "lodash": "4.17.11",

src/micro.js

@@ -53,7 +53,7 @@ export const initMicroApps = (loader, store) => {
         process.env.NODE_ENV !== 'production' ?
         micorConfig.dev :
         products;
-    console.log("reateStoreage.get('globalConfig')", createStoreage.get('globalConfig'))
+
     registerMicroApps(
         entrys.map(item => {
             item.loader = loader;
@@ -181,12 +181,12 @@ export const defaultApp = () => {
     // eslint-disable-next-line no-undef
     const config = createStoreage.get('globalConfig');
     if (config && config.token) {
-        debugger
+        
         const basePath =config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?'civweb4' :'civweb4';
         if(config && config.home) {
             setDefaultMountApp(`/civbase/${config.home.path.replace(/^\//, '')}`);
         } else {
-            debugger
+            
             const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
             setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/${basePath}${homepage}`);
             createStoreage.set('init_web4', true)

src/pages/user/login/login.js

@@ -601,6 +601,7 @@ class Login {
         generateType: params.getParams('generateType') || ''
       })
       .then(response => {
+        debugger
         
         self.globalConfig.layout = 'blank';
         if (response && response.token) {
@@ -625,7 +626,6 @@ class Login {
                   self.globalConfig.userInfo = Object.assign(
                     {},
                     response,
-                
                   );
                   if(response.hasOwnProperty('data')) {
                     self.globalConfig.userInfo = {
@@ -645,6 +645,7 @@ class Login {
                     expires: date,
                     path: '/',
                   })
+                  debugger
                   // self.globalConfig.Industry = industry;
                   self.updateConfig && self.updateConfig(self.globalConfig);
                   const loginSite = {};