Merge branch 'devNew' into 'master'

config/config.js

 const slash = require('slash2');
 const proxy = require('./proxy');
 const defaultSetting = require('./defaultSetting');
-const cesiumBuild = "../node_modules/@wisdom-cesium/panda_cesium_source/lib";
-const cesiumSource = '../node_modules/@wisdom-cesium/panda_cesium_source/lib';
 const pkgName = require('../package.json').name;
 // eslint-disable-next-line import/order
 const { NODE_ENV } = process.env;
@@ -100,30 +98,7 @@ module.exports = {
     },
     javascriptEnabled: true,
   },
-  copy: [
-    {
-      from: path.join(pkgName, cesiumBuild, './Workers'),
-      to: 'Workers',
-    },
-    {
-      from: path.join(pkgName, cesiumSource, 'Assets'),
-      to: 'Assets',
-    },
-    {
-      from: path.join(pkgName, cesiumSource, 'Widgets'),
-      to: 'Widgets',
-    },
-    {
-      from: path.join(pkgName, cesiumSource, 'ThirdParty'),
-      to: 'ThirdParty',
-    },
-  ],
-  define: {
-    // eslint-disable-next-line no-useless-escape
-    CESIUM_BASE_URL: JSON.stringify(CESIUM_BASE_URL).replace(/\"/g, ''),
-  },
   alias: {
-    cesium: path.resolve(__dirname, cesiumSource),
     '@esri/arcgis-html-sanitizer': path.resolve(
       __dirname,
       '../node_modules/@esri/arcgis-html-sanitizer/dist/esm/index.js',

internals/webpack/config/cssRules.js

@@ -80,26 +80,26 @@ export async function addCSSRules(opts) {
           ...userConfig.cssLoader,
         });
 
-      rule
-        .use('postcss-loader')
-        .loader(require.resolve('@umijs/bundler-webpack/compiled/postcss-loader'))
-        .options({
-          postcssOptions: {
-            ident: 'postcss',
-            plugins: [
-              require('../compiled/postcss-flexbugs-fixes'),
-              require('postcss-preset-env')({
-                browsers: opts.browsers,
-                autoprefixer: {
-                  flexbox: 'no-2009',
-                  ...userConfig.autoprefixer,
-                },
-                stage: 3,
-              }),
-            ].concat(userConfig.extraPostCSSPlugins || []),
-            ...userConfig.postcssLoader,
-          },
-        });
+      // rule
+      //   .use('postcss-loader')
+      //   .loader(require.resolve('@umijs/bundler-webpack/compiled/postcss-loader'))
+      //   .options({
+      //     postcssOptions: {
+      //       ident: 'postcss',
+      //       plugins: [
+      //         require('../compiled/postcss-flexbugs-fixes'),
+      //         require('postcss-preset-env')({
+      //           browsers: opts.browsers,
+      //           autoprefixer: {
+      //             flexbox: 'no-2009',
+      //             ...userConfig.autoprefixer,
+      //           },
+      //           stage: 3,
+      //         }),
+      //       ].concat(userConfig.extraPostCSSPlugins || []),
+      //       ...userConfig.postcssLoader,
+      //     },
+      //   });
 
       if (loader) {
         rule

internals/webpack/css.js

@@ -70,30 +70,30 @@ function createCSSRule({
                   ),
               );
           
-          rule
-              .use('postcss-loader')
-              .loader(require.resolve('postcss-loader'))
-              .options(
-                deepmerge(
-                  {
-                    ident: 'postcss',
-                    plugins: () => [
-                      require('postcss-flexbugs-fixes'),
-                      require('postcss-preset-env')({
-                        // TODO: set browsers
-                        autoprefixer: {
-                          ...config.autoprefixer,
-                          overrideBrowserslist: browserslist,
-                        },
-                        // https://cssdb.org/
-                        stage: 3,
-                      }),
-                      ...(config.extraPostCSSPlugins ? config.extraPostCSSPlugins : []),
-                    ],
-                  },
-                  config.postcssLoader || {},
-                ),
-              );
+          // rule
+          //     .use('postcss-loader')
+          //     .loader(require.resolve('postcss-loader'))
+          //     .options(
+          //       deepmerge(
+          //         {
+          //           ident: 'postcss',
+          //           plugins: () => [
+          //             require('postcss-flexbugs-fixes'),
+          //             require('postcss-preset-env')({
+          //               // TODO: set browsers
+          //               autoprefixer: {
+          //                 ...config.autoprefixer,
+          //                 overrideBrowserslist: browserslist,
+          //               },
+          //               // https://cssdb.org/
+          //               stage: 3,
+          //             }),
+          //             ...(config.extraPostCSSPlugins ? config.extraPostCSSPlugins : []),
+          //           ],
+          //         },
+          //         config.postcssLoader || {},
+          //       ),
+          //     );
       
           if (loader) {
             rule

internals/webpack/webpack.prod.babel.js

@@ -59,7 +59,10 @@ module.exports = require('./webpack.base.babel')({
           test: /[\\/]node_modules[\\/]/,
           name(module) {
             const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
+            // @ts-ignore
+            if (['@wisdom-components', 'swiper'].indexOf(packageName) === -1) {
               return `npm.${packageName.replace('@', '')}`;
+            }
           },
         },
         bizComponent: {
@@ -69,6 +72,13 @@ module.exports = require('./webpack.base.babel')({
           test: /[\\/]src[\\/]components[\\/]/,
           name: 'biz-component',
         },
+        layouts: {
+          chunks: 'all',
+          minSize: 0,
+          maxInitialRequests: 10,
+          test: /[\\/]src[\\/]layouts[\\/]/,
+          name: 'layouts',
+        },
         arcgis_views: {
           chunks: 'all',
           minSize: 0,

package.json

@@ -99,16 +99,16 @@
         "@ant-design/colors": "^5.0.1",
         "@ant-design/icons": "^4.0.0",
         "@ant-design/pro-form": "1.70.1",
-        "@ant-design/pro-layout": "^6.24.1",
+        "@ant-design/pro-layout": "6.38.11",
         "@ant-design/pro-list": "1.21.71",
         "@ant-design/pro-skeleton": "^1.0.0-beta.2",
-        "@ant-design/pro-table": "2.76.4",
-        "@ant-design/pro-utils": "^1.10.4",
+        "@ant-design/pro-table": "2.77.1",
+        "@ant-design/pro-utils": "1.42.4",
+        "@ant-design/pro-provider": "1.8.1",
         "@babel/polyfill": "7.4.3",
         "@babel/runtime": "^7.10.5",
         "@congcongcai/jieba.js": "0.0.3",
         "@esri/calcite-colors": "6.0.3",
-        "@wisdom-cesium/cesium": "^1.1.49",
         "@wisdom-cesium/krpano": "1.0.29-60",
         "@wisdom-components/basictable": "^1.5.16",
         "@wisdom-components/empty": "^1.4.1",
@@ -117,7 +117,7 @@
         "@wisdom-map/arcgismap":"^2.0.49",
         "@wisdom-map/basemap":"^2.0.2",
         "@wisdom-map/util":"1.2.9",
-        "@wisdom-utils/components": "0.1.364",  
+        "@wisdom-utils/components": "0.1.370",
         "@wisdom-utils/runtime": "0.0.51",
         "@wisdom-utils/utils": "0.1.408",
         "animate.css": "^4.1.1",
@@ -132,7 +132,7 @@
         "history": "4.9.0",
         "hoist-non-react-statics": "3.3.0",
         "immer": "3.0.0",
-        "immutable": "^4.0.0-rc.12",
+        "immutable": "^4.0.0",
         "jquery": "^3.7.0",
         "js-base64": "^3.5.2",
         "js-cookie": "^2.2.1",
@@ -152,6 +152,7 @@
         "rc-cascader": "^2.3.2",
         "rc-queue-anim": "^2.0.0",
         "react": "17.0.2",
+        "react-file-viewer": "^1.2.1",
         "react-activation": "^0.9.9",
         "react-dom": "17.0.2",
         "react-draggable": "^4.4.3",
@@ -174,7 +175,8 @@
         "sha1": "^1.1.1",
         "sm4js": "^0.0.6",
         "styled-components": "4.2.0",
-        "swiper": "6.8.4"
+        "swiper": "6.8.4",
+        "xlsx": "^0.17.3"
     },
     "devDependencies": {
         "@babel/cli": "7.4.3",
@@ -271,11 +273,6 @@
         "ora": "^5.1.0",
         "path-to-regexp": "^2.4.0",
         "plop": "2.3.0",
-        "postcss": "7.0.32",
-        "postcss-flexbugs-fixes": "4.2.1",
-        "postcss-loader": "3.0.0",
-        "postcss-preset-env": "6.7.0",
-        "postcss-safe-parser": "^4.0.2",
         "pre-commit": "1.2.2",
         "prettier": "1.17.0",
         "querystring-browser": "^1.0.4",