Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

src/initConfig.js

@@ -60,7 +60,8 @@ export const initGlobalConfig = () => {
         }
       });
       // eslint-disable-next-line react-hooks/rules-of-hooks
-    const client = params.getParams('client') || Cookies.get('city')
+    let client = params.getParams('client') || Cookies.get('city')
+    client = client && client !== 'undefined' ? client : 'city';
     appService
         .queryConfig({
           client: client || 'city',
@@ -72,7 +73,7 @@ export const initGlobalConfig = () => {
             store.dispatch(actionCreators.getConfig(Object.assign({})));
             const data = res;
             if (!data.client) {
-              data.client = params.getParams('client') || Cookies.get('city');
+              data.client = client;
             }
             // Cookies.set('city', data.client);
             store.dispatch(

src/layouts/BasicLayout1.js

@@ -360,7 +360,7 @@ const BasicLayout = props => {
   useEffect(() => {
     siteAction.setGlobalConfig(props.global);
     if (!Cookies.get('token')) {
-      let client = props.global && props.global.client;
+      let client = props.global && props.global.hasOwnProperty('client') ? props.global.get('client') : null;
       client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client: 'city';
       let generateType = props.global && props.global.hasOwnProperty('get') ? props.global.get('generateType') : null;
       generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';

src/micro.js

@@ -44,7 +44,7 @@ export const initMicroApps = () => {
 
 
     application && Array.isArray(application) && application.length > 0 && application.map(item => {
-        if(item.PackageName === 'report') {
+        if (item.PackageName === 'report') {
             products.push({
                 name: item.PackageName,
                 entry: item.RouteUrl,
@@ -83,8 +83,8 @@ export const initMicroApps = () => {
                 // eslint-
                 // disable-next-line no-undef
                 globalConfig: /civweb4/.test(item.name) ? Object.assign({}, config, {
-                    homepage: config.homepage ? config.homepage.replace(/civweb\//, ''): config.homepage
-                }): config,
+                    homepage: config.homepage ? config.homepage.replace(/civweb\//, '') : config.homepage
+                }) : config,
                 //createStoreage.get('globalConfig'),
                 XMLHttpRequest: window.XMLHttpRequest,
             };
@@ -115,7 +115,7 @@ export const initMicroApps = () => {
                 createStoreage.remove(`__PANDA_STORE__${location.hostname}`)
             },
         ],
-            afterUnmount: [app => {}],
+        afterUnmount: [app => { }],
     },
     );
     const globalStore = store.getState().toJS();
@@ -221,7 +221,7 @@ export const defaultApp = () => {
         //     createStoreage.set('init_web4', true)
         // }
         // let homepage = config.homepage.replace('civweb4/', '');
-        const url = !config.home ? `/civbase/civweb4/${config.homepage.replace(/^\//, '').replace(/^civweb4\//, '')}`: `/civbase/${config.homepage.replace(/^\//, '')}`;
+        const url = !config.home ? `/civbase/civweb4/${config.homepage.replace(/^\//, '').replace(/^civweb4\//, '')}` : `/civbase/${config.homepage.replace(/^\//, '')}`;
         setDefaultMountApp(url);
         // if(config.homepage.indexOf('civweb4') > -1) createStoreage.set('init_web4', true);
     }
@@ -238,17 +238,17 @@ export const defaultApp = () => {
 window.app = {
 
     modules: {},
-    require: function(request, method) {
-        if(request !== '.' && this.modules[request]) {
+    require: function (request, method) {
+        if (request !== '.' && this.modules[request]) {
             console.log('method', method);
-            return _.isFunction(this.modules[request]) ? this.modules[request](): _.isFunction(this.modules[request][method]) && this.modules[request][method]();
+            return _.isFunction(this.modules[request]) ? this.modules[request]() : _.isFunction(this.modules[request][method]) && this.modules[request][method]();
         }
-        if(request === '.') {
+        if (request === '.') {
             return
         }
         return _.isFunction(this.modules[request]) && this.modules[request]();
     },
-    define: function(name, context, index) {
+    define: function (name, context, index) {
         let keys = context.keys();
         for (let key of keys) {
             let parts = name.indexOf('@') > -1 ? [name, ...(key.slice(1).split('/'))] : (name + key.slice(1)).split('/');
@@ -267,7 +267,7 @@ window.app = {
             this.modules[name] = this.modules[name][index];
         }
     },
-    init: function(namespace, reducers) {
+    init: function (namespace, reducers) {
         [namespace] = reducers;
     }
 };
@@ -483,6 +483,7 @@ window.app.define('@wisdom-utils/components', require.context('../node_modules/@
 
 
 
+window.app.define('@ant-design/pro-form', require.context('../node_modules/@ant-design/pro-form/lib', true, /^.\/(lib\/)?[^\/]+\.js$/), 'index.js');
 
 window.app.define('classnames', require.context('classnames', true, /^.\/index\.js$/), 'index.js');
 window.app.define('@ant-design/icons', require.context('../node_modules/@ant-design/icons/lib', true, /^.\/(lib\/)?[^\/]+\.js$/), 'index.js');