Skip to content

C
CivWeb
Commit 48ef09be authored by 邓晓峰's avatar 邓晓峰
Browse files
Options

fix: 修复arcgismap/core初始化

parent 5ff91f02
Show whitespace changes
Inline Side-by-side
Showing with 317 additions and 82 deletions
config/config.js
View file @ 48ef09be
......@@ -35,8 +35,8 @@ module.exports = {
nodeModulesTransform: {
type: 'none',
exclude: [
'@wisdom-map/arcgismap',
'@wisdom-map/arcgismap/lib/arcgisapi',
// '@wisdom-map/arcgismap',
// '@wisdom-map/arcgismap/lib/arcgisapi',
'swagger-ui-react',
'Cesium'
],
......
internals/webpack/babel-preset/index.js
View file @ 48ef09be
......@@ -20,25 +20,18 @@ module.exports = opts => {
const preset = {
presets: [
opts.env && [
'@babel/preset-env',
require('@umijs/deps/compiled/babel/preset-env'),
{
...mergeConfig(defaultEnvConfig,{}),
modules: false,
...opts.env
},
],
// opts.react && ['@babel/preset-react'],
// opts.typescript && [
// '@babel/preset-typescript',
// {
// allowNamespaces: true,
// },
// ],
].filter(Boolean),
plugins: [
['@babel/plugin-proposal-optional-chaining', { loose: false }],
['@babel/plugin-proposal-nullish-coalescing-operator', { loose: false }],
'@babel/plugin-syntax-top-level-await',
require('@umijs/deps/compiled/babel/plugin-syntax-top-level-await').default,
['@babel/plugin-transform-destructuring', { loose: false }],
// opts.typescript && ['babel-plugin-transform-typescript-metadata'],
['@babel/plugin-proposal-decorators', { legacy: true }],
......@@ -58,7 +51,7 @@ module.exports = opts => {
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-transform-react-jsx',
opts.transformRuntime && [
'@babel/plugin-transform-runtime',
require('@umijs/deps/compiled/babel/plugin-transform-runtime').default,
{
version: require('@babel/runtime/package.json').version,
absoluteRuntime: dirname(
......@@ -98,11 +91,23 @@ module.exports = opts => {
'@umijs/babel-plugin-import-to-await-require',
opts.importToAwaitRequire,
],
'react-activation/babel'
// opts.lockCoreJS3 && [
// '@umijs/babel-plugin-lock-core-js-3',
// opts.lockCoreJS3,
// ],
'react-activation/babel',
opts.lockCoreJS3 && [
'@umijs/babel-plugin-lock-core-js-3',
opts.lockCoreJS3,
],
opts.noAnonymousDefaultExport && [
require.resolve('@umijs/babel-plugin-no-anonymous-default-export'),
],
[
require('@umijs/deps/compiled/babel/plugin-proposal-record-and-tuple')
.default,
{
syntaxType: 'hash',
polyfillModuleName: '@umijs/deps/reexported/record-tuple-polyfill',
importPolyfill: true,
},
],
].filter(Boolean),
env: {
production: {
......
internals/webpack/nodeModulesTransform.js
View file @ 48ef09be
......@@ -18,7 +18,7 @@ const TYPE_ALL_EXCLUDE = [
'lodash',
'react',
'react-dom',
'@wisdom-map/arcgismap'
// '@wisdom-map/arcgismap'
];
......
internals/webpack/webpack.base.babel.js
View file @ 48ef09be
......@@ -215,7 +215,7 @@ module.exports = options => {
chainConfig.module
.rule('js')
.test(/\.(js|mjs|jsx|ts|tsx)$/)
.include.add([cwd, ...(process.env.APP_ROOT ? [process.cwd()] : [])])
.include.add([/node_modules\/@esri/, cwd, ...(process.env.APP_ROOT ? [process.cwd()] : [])])
.end()
.exclude.add(/node_modules/)
.add(/\.mfsu/)
......
package-lock.json
View file @ 48ef09be
......@@ -4,6 +4,11 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@a11y/focus-trap": {
"version": "1.0.5",
"resolved": "https://g.civnet.cn:4873/@a11y%2ffocus-trap/-/focus-trap-1.0.5.tgz",
"integrity": "sha1-B0gYnDfKISVccCql3j7gDtSCHSI="
},
"@ahooksjs/use-request": {
"version": "2.8.13",
"resolved": "https://g.civnet.cn:4873/@ahooksjs%2fuse-request/-/use-request-2.8.13.tgz",
......@@ -181,6 +186,21 @@
}
}
},
"@arcgis/core": {
"version": "4.22.2",
"resolved": "https://g.civnet.cn:4873/@arcgis%2fcore/-/core-4.22.2.tgz",
"integrity": "sha512-twx50yjKsMoeotgQfnYHmm4EIS57fC9rWNNrvGc2xERVUOY7p2fFPs2qemdyFnCmvrRNflZcnZkxrTZXeDCtow==",
"requires": {
"@esri/arcgis-html-sanitizer": "~2.9.0-next.1",
"@esri/calcite-colors": "~6.0.1",
"@esri/calcite-components": "1.0.0-beta.69",
"@popperjs/core": "~2.10.2",
"focus-trap": "~6.7.1",
"luxon": "~2.1.1",
"moment": "~2.29.1",
"sortablejs": "~1.14.0"
}
},
"@babel/cli": {
"version": "7.4.3",
"resolved": "https://g.civnet.cn:4873/@babel%2fcli/-/cli-7.4.3.tgz",
......@@ -2114,6 +2134,79 @@
}
}
},
"@esri/arcgis-html-sanitizer": {
"version": "2.9.1",
"resolved": "https://g.civnet.cn:4873/@esri%2farcgis-html-sanitizer/-/arcgis-html-sanitizer-2.9.1.tgz",
"integrity": "sha512-VZIdOSO1KjrssUaxyncc+gJbrtSk9N+K7QNNSs0f1HWckn9urUoyMrwC5fF1EGW64jpSDOC9SP9Wk/csjF9oxA==",
"requires": {
"lodash.isplainobject": "^4.0.6",
"xss": "^1.0.10"
}
},
"@esri/calcite-colors": {
"version": "6.0.3",
"resolved": "https://g.civnet.cn:4873/@esri%2fcalcite-colors/-/calcite-colors-6.0.3.tgz",
"integrity": "sha512-zGWjeOipQ5MajzWYCWt6PI216iBrdnwsedSZQTT1W0XxgJvd0WDfL2IIPYbZ3ltYoI3aiaeZXfx6h62kAJ9cpg==",
"requires": {
"cross-env": "^7.0.3"
},
"dependencies": {
"cross-env": {
"version": "7.0.3",
"resolved": "https://g.civnet.cn:4873/cross-env/-/cross-env-7.0.3.tgz",
"integrity": "sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8=",
"requires": {
"cross-spawn": "^7.0.1"
}
}
}
},
"@esri/calcite-components": {
"version": "1.0.0-beta.69",
"resolved": "https://g.civnet.cn:4873/@esri%2fcalcite-components/-/calcite-components-1.0.0-beta.69.tgz",
"integrity": "sha1-SjGX1Thxp5byK0UUKO+o0kBGoVI=",
"requires": {
"@a11y/focus-trap": "1.0.5",
"@popperjs/core": "2.10.2",
"@stencil/core": "2.10.0",
"@types/color": "3.0.2",
"color": "4.0.1",
"lodash-es": "4.17.21",
"sortablejs": "1.14.0"
},
"dependencies": {
"@types/color": {
"version": "3.0.2",
"resolved": "https://g.civnet.cn:4873/@types%2fcolor/-/color-3.0.2.tgz",
"integrity": "sha1-N3kEPngvViqpFXtfxr0H4U/Y5/M=",
"requires": {
"@types/color-convert": "*"
}
},
"color": {
"version": "4.0.1",
"resolved": "https://g.civnet.cn:4873/color/-/color-4.0.1.tgz",
"integrity": "sha1-Id9EzRAkWpGxzPW6AxYJsOEOfWc=",
"requires": {
"color-convert": "^2.0.1",
"color-string": "^1.6.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://g.civnet.cn:4873/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://g.civnet.cn:4873/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
}
}
},
"@exodus/schemasafe": {
"version": "1.0.0-rc.6",
"resolved": "https://g.civnet.cn:4873/@exodus%2fschemasafe/-/schemasafe-1.0.0-rc.6.tgz",
......@@ -2509,6 +2602,11 @@
}
}
},
"@popperjs/core": {
"version": "2.10.2",
"resolved": "https://g.civnet.cn:4873/@popperjs%2fcore/-/core-2.10.2.tgz",
"integrity": "sha1-B5jAM1Hw3qGlpMq93yalWny+5ZA="
},
"@qixian.cs/path-to-regexp": {
"version": "6.1.0",
"resolved": "https://g.civnet.cn:4873/@qixian.cs%2fpath-to-regexp/-/path-to-regexp-6.1.0.tgz",
......@@ -2592,6 +2690,11 @@
"integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
"dev": true
},
"@stencil/core": {
"version": "2.10.0",
"resolved": "https://g.civnet.cn:4873/@stencil%2fcore/-/core-2.10.0.tgz",
"integrity": "sha1-rPRLmuZXiiDw0Jv5QpboM76tyIU="
},
"@stylelint/postcss-css-in-js": {
"version": "0.37.2",
"resolved": "https://g.civnet.cn:4873/@stylelint%2fpostcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
......@@ -4515,7 +4618,6 @@
"version": "2.0.0",
"resolved": "https://g.civnet.cn:4873/@types%2fcolor-convert/-/color-convert-2.0.0.tgz",
"integrity": "sha1-j17muehj3L7lcD9aUX/7E9PqTiI=",
"dev": true,
"requires": {
"@types/color-name": "*"
}
......@@ -4523,8 +4625,7 @@
"@types/color-name": {
"version": "1.1.1",
"resolved": "https://g.civnet.cn:4873/@types%2fcolor-name/-/color-name-1.1.1.tgz",
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
"dev": true
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
},
"@types/compression": {
"version": "1.7.0",
......@@ -4576,9 +4677,9 @@
}
},
"@types/eslint-scope": {
"version": "3.7.2",
"resolved": "https://g.civnet.cn:4873/@types%2feslint-scope/-/eslint-scope-3.7.2.tgz",
"integrity": "sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ==",
"version": "3.7.3",
"resolved": "https://g.civnet.cn:4873/@types%2feslint-scope/-/eslint-scope-3.7.3.tgz",
"integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"dev": true,
"requires": {
"@types/eslint": "*",
......@@ -7529,10 +7630,11 @@
}
},
"@wisdom-map/arcgismap": {
"version": "1.0.60-0",
"resolved": "https://g.civnet.cn:4873/@wisdom-map%2farcgismap/-/arcgismap-1.0.60-0.tgz",
"integrity": "sha512-My2JGb2y/xUwW0xMd/IL4xpdjK1BdN8X8GOSAMtR1yVLGXXXQhyyoY0okqALCxSGoxLa+VRYodKhtomPrCKMLQ==",
"version": "1.0.75-0",
"resolved": "https://g.civnet.cn:4873/@wisdom-map%2farcgismap/-/arcgismap-1.0.75-0.tgz",
"integrity": "sha512-er5AxKI6zbaHTkvoDDs5I4uwtBElCkdeybdO7ZqkQnHNuKVvl250QYZy54wBNwPE1c2jQbbW/xEDZIKeuIRPgQ==",
"requires": {
"@arcgis/core": "^4.22.2",
"@babel/polyfill": "7.4.3",
"@babel/runtime": "^7.12.0",
"@wisdom-map/util": "^1.0.28-0",
......@@ -10067,14 +10169,12 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://g.civnet.cn:4873/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"color-string": {
"version": "1.6.0",
"resolved": "https://g.civnet.cn:4873/color-string/-/color-string-1.6.0.tgz",
"integrity": "sha1-w5FfYf4mdnLLfh4GTJ1pIhn2wxI=",
"dev": true,
"requires": {
"color-name": "^1.0.0",
"simple-swizzle": "^0.2.2"
......@@ -11040,7 +11140,6 @@
"version": "7.0.3",
"resolved": "https://g.civnet.cn:4873/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
......@@ -11317,6 +11416,11 @@
"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
"dev": true
},
"cssfilter": {
"version": "0.0.10",
"resolved": "https://g.civnet.cn:4873/cssfilter/-/cssfilter-0.0.10.tgz",
"integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
},
"cssnano": {
"version": "4.1.11",
"resolved": "https://g.civnet.cn:4873/cssnano/-/cssnano-4.1.11.tgz",
......@@ -12194,6 +12298,16 @@
"once": "^1.4.0"
}
},
"enhanced-resolve": {
"version": "5.9.2",
"resolved": "https://g.civnet.cn:4873/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
"integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
"dev": true,
"requires": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
}
},
"enquirer": {
"version": "2.3.6",
"resolved": "https://g.civnet.cn:4873/enquirer/-/enquirer-2.3.6.tgz",
......@@ -13193,7 +13307,7 @@
"esquery": {
"version": "1.4.0",
"resolved": "https://g.civnet.cn:4873/esquery/-/esquery-1.4.0.tgz",
"integrity": "sha1-IUj/w4uC6McFff7UhCWz5h8PJKU=",
"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
"dev": true,
"requires": {
"estraverse": "^5.1.0"
......@@ -14033,6 +14147,14 @@
"integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
"dev": true
},
"focus-trap": {
"version": "6.7.3",
"resolved": "https://g.civnet.cn:4873/focus-trap/-/focus-trap-6.7.3.tgz",
"integrity": "sha512-8xCEKndV4KrseGhFKKKmczVA14yx1/hnmFICPOjcFjToxCJYj/NHH43tPc3YE/PLnLRNZoFug0EcWkGQde/miQ==",
"requires": {
"tabbable": "^5.2.1"
}
},
"follow-redirects": {
"version": "1.14.4",
"resolved": "https://g.civnet.cn:4873/follow-redirects/-/follow-redirects-1.14.4.tgz",
......@@ -14409,7 +14531,7 @@
"get-intrinsic": {
"version": "1.1.1",
"resolved": "https://g.civnet.cn:4873/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
"integrity": "sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y=",
"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
"requires": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
......@@ -14938,7 +15060,7 @@
"has-tostringtag": {
"version": "1.0.0",
"resolved": "https://g.civnet.cn:4873/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
"integrity": "sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU=",
"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
"requires": {
"has-symbols": "^1.0.2"
}
......@@ -16470,7 +16592,7 @@
"is-directory": {
"version": "0.3.1",
"resolved": "https://g.civnet.cn:4873/is-directory/-/is-directory-0.3.1.tgz",
"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
"integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
"dev": true
},
"is-docker": {
......@@ -16837,8 +16959,7 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://g.civnet.cn:4873/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isobject": {
"version": "3.0.1",
......@@ -18890,8 +19011,7 @@
"lodash.isplainobject": {
"version": "4.0.6",
"resolved": "https://g.civnet.cn:4873/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
"dev": true
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
},
"lodash.memoize": {
"version": "4.1.2",
......@@ -19143,6 +19263,11 @@
"es5-ext": "~0.10.2"
}
},
"luxon": {
"version": "2.1.1",
"resolved": "https://g.civnet.cn:4873/luxon/-/luxon-2.1.1.tgz",
"integrity": "sha1-NAUvejOnmJdnY3vnz4C0fbJk/4g="
},
"make-dir": {
"version": "2.1.0",
"resolved": "https://g.civnet.cn:4873/make-dir/-/make-dir-2.1.0.tgz",
......@@ -22174,8 +22299,7 @@
"path-key": {
"version": "3.1.1",
"resolved": "https://g.civnet.cn:4873/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
},
"path-parse": {
"version": "1.0.7",
......@@ -22225,7 +22349,7 @@
"performance-now": {
"version": "2.1.0",
"resolved": "https://g.civnet.cn:4873/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
"dev": true
},
"picocolors": {
......@@ -26972,7 +27096,6 @@
"version": "2.0.0",
"resolved": "https://g.civnet.cn:4873/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"requires": {
"shebang-regex": "^3.0.0"
}
......@@ -26980,8 +27103,7 @@
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://g.civnet.cn:4873/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
},
"shelljs": {
"version": "0.8.3",
......@@ -27094,7 +27216,6 @@
"version": "0.2.2",
"resolved": "https://g.civnet.cn:4873/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
"integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
"dev": true,
"requires": {
"is-arrayish": "^0.3.1"
},
......@@ -27102,8 +27223,7 @@
"is-arrayish": {
"version": "0.3.2",
"resolved": "https://g.civnet.cn:4873/is-arrayish/-/is-arrayish-0.3.2.tgz",
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
"dev": true
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
}
}
},
......@@ -27307,6 +27427,11 @@
}
}
},
"sortablejs": {
"version": "1.14.0",
"resolved": "https://g.civnet.cn:4873/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha1-bS4XzL2yX0ZHNN9iHU811Ks1s9g="
},
"source-list-map": {
"version": "2.0.1",
"resolved": "https://g.civnet.cn:4873/source-list-map/-/source-list-map-2.0.1.tgz",
......@@ -29048,6 +29173,11 @@
"@babel/runtime": "^7.10.2"
}
},
"tabbable": {
"version": "5.2.1",
"resolved": "https://g.civnet.cn:4873/tabbable/-/tabbable-5.2.1.tgz",
"integrity": "sha1-4/2nNn3bsXLc2p+HHA/bNtHEzZw="
},
"table": {
"version": "5.4.6",
"resolved": "https://g.civnet.cn:4873/table/-/table-5.4.6.tgz",
......@@ -31063,13 +31193,13 @@
"dev": true
},
"webpack": {
"version": "5.65.0",
"resolved": "https://g.civnet.cn:4873/webpack/-/webpack-5.65.0.tgz",
"integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
"version": "5.70.0",
"resolved": "https://g.civnet.cn:4873/webpack/-/webpack-5.70.0.tgz",
"integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
"@types/estree": "^0.0.50",
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
"@webassemblyjs/ast": "1.11.1",
"@webassemblyjs/wasm-edit": "1.11.1",
"@webassemblyjs/wasm-parser": "1.11.1",
......@@ -31077,12 +31207,12 @@
"acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.8.3",
"enhanced-resolve": "^5.9.2",
"es-module-lexer": "^0.9.0",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
"glob-to-regexp": "^0.4.1",
"graceful-fs": "^4.2.4",
"graceful-fs": "^4.2.9",
"json-parse-better-errors": "^1.0.2",
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
......@@ -31091,31 +31221,33 @@
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
"watchpack": "^2.3.1",
"webpack-sources": "^3.2.2"
"webpack-sources": "^3.2.3"
},
"dependencies": {
"@types/estree": {
"version": "0.0.51",
"resolved": "https://g.civnet.cn:4873/@types%2festree/-/estree-0.0.51.tgz",
"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
"dev": true
},
"acorn": {
"version": "8.7.0",
"resolved": "https://g.civnet.cn:4873/acorn/-/acorn-8.7.0.tgz",
"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
"dev": true
},
"enhanced-resolve": {
"version": "5.8.3",
"resolved": "https://g.civnet.cn:4873/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
"integrity": "sha1-bVUtRlzOBCP1s9cYUR6lOCansvA=",
"dev": true,
"requires": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
}
},
"glob-to-regexp": {
"version": "0.4.1",
"resolved": "https://g.civnet.cn:4873/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
"dev": true
},
"graceful-fs": {
"version": "4.2.9",
"resolved": "https://g.civnet.cn:4873/graceful-fs/-/graceful-fs-4.2.9.tgz",
"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://g.civnet.cn:4873/has-flag/-/has-flag-4.0.0.tgz",
......@@ -31123,9 +31255,9 @@
"dev": true
},
"jest-worker": {
"version": "27.4.5",
"resolved": "https://g.civnet.cn:4873/jest-worker/-/jest-worker-27.4.5.tgz",
"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
"version": "27.5.1",
"resolved": "https://g.civnet.cn:4873/jest-worker/-/jest-worker-27.5.1.tgz",
"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
"dev": true,
"requires": {
"@types/node": "*",
......@@ -31169,12 +31301,12 @@
}
},
"terser-webpack-plugin": {
"version": "5.3.0",
"resolved": "https://g.civnet.cn:4873/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz",
"integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==",
"version": "5.3.1",
"resolved": "https://g.civnet.cn:4873/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
"integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
"dev": true,
"requires": {
"jest-worker": "^27.4.1",
"jest-worker": "^27.4.5",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
"source-map": "^0.6.1",
......@@ -31182,9 +31314,9 @@
}
},
"webpack-sources": {
"version": "3.2.2",
"resolved": "https://g.civnet.cn:4873/webpack-sources/-/webpack-sources-3.2.2.tgz",
"integrity": "sha1-2I43QYM+/sV8THibYBDbmXdUUmA=",
"version": "3.2.3",
"resolved": "https://g.civnet.cn:4873/webpack-sources/-/webpack-sources-3.2.3.tgz",
"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"dev": true
}
}
......@@ -31601,7 +31733,6 @@
"version": "2.0.2",
"resolved": "https://g.civnet.cn:4873/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
......@@ -31769,6 +31900,15 @@
"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
"dev": true
},
"xss": {
"version": "1.0.11",
"resolved": "https://g.civnet.cn:4873/xss/-/xss-1.0.11.tgz",
"integrity": "sha512-EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==",
"requires": {
"commander": "^2.20.3",
"cssfilter": "0.0.10"
}
},
"xtend": {
"version": "4.0.2",
"resolved": "https://g.civnet.cn:4873/xtend/-/xtend-4.0.2.tgz",
package.json
View file @ 48ef09be
......@@ -90,6 +90,8 @@
"babel-core": "7.0.0-bridge.0"
},
"dependencies": {
"@esri/calcite-colors": "6.0.3",
"@esri/arcgis-html-sanitizer": "2.9.1",
"@amap/amap-jsapi-loader": "^1.0.1",
"@ant-design/colors": "^5.0.1",
"@ant-design/icons": "^4.0.0",
......@@ -102,7 +104,7 @@
"@wisdom-cesium/cesium": "^1.0.64",
"@wisdom-components/basictable": "^1.5.16",
"@wisdom-components/empty": "^1.4.1",
"@wisdom-map/arcgismap": "^1.0.60-0",
"@wisdom-map/arcgismap": "^1.0.75-0",
"@wisdom-map/util": "^1.0.27-0",
"@wisdom-utils/components": "0.0.14",
"@wisdom-utils/runtime": "0.0.15",
......@@ -289,7 +291,7 @@
"traverse": "^0.6.6",
"umi-webpack-bundle-analyzer": "3.6.0",
"url-loader": "1.1.2",
"webpack": "^5.65.0",
"webpack": "^5.70.0",
"webpack-chain": "6.5.1",
"webpack-cli": "4.2.0",
"webpack-dev-middleware": "5.3.0",
......
src/components/mapView/index.js 0 → 100644
View file @ 48ef09be
// eslint-disable-next-line import/extensions
// import arcgisConfig from '@wisdom-map/arcgismap/lib/arcgisapi/4.20/@arcgis/core/config';
import React from 'react';
// eslint-disable-next-line import/extensions
import { ArcGISMap as MapComponent } from '@wisdom-map/arcgismap';
// import MapComponent from './lib/index.js';
// eslint-disable-next-line react/prefer-stateless-function
export default class ArcGISMap extends React.Component {
render() {
// arcgisConfig.assetsPath = `${window.location.origin
// }/${pkg.name.toLocaleLowerCase()}/assets`;
return <MapComponent {...this.props} />;
}
}
src/components/mapView/index.less 0 → 100644
View file @ 48ef09be
@import '~antd/es/style/themes/default.less';
.view {
position: absolute;
top:0;
right: 0;
bottom: 0;
left: 0;
.loadingBox{
position: absolute;
left: calc(50% - 40px);
top: calc(50% - 23px);
color: @text-color;
}
.mapBox {
width: 100%;
height: 100%;
}
}
src/layouts/BasicLayout1.js
View file @ 48ef09be
......@@ -42,7 +42,7 @@ import CesiumMap from '../pages/cesiumMap';
import { actionCreators } from '@/containers/App/store';
import KeepAlive from 'react-activation'
// import CreateBaseMap from '@/pages/map';
import CreateBaseMap from '@/pages/baseMapPage/baseMapPage';
// import Authorized from '@/utils/Authorized';
import { findPathByLeafId, getBaseName } from '@/utils/utils';
// import { renderRoutes } from 'react-router-config';
......@@ -687,9 +687,12 @@ const BasicLayout = props => {
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : null
}
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <CreateBaseMap /> : null
}
<div id="micro-container" className="subapp-container">
{/*<CreateBaseMap/>*/}
{props.children}
</div>
{props.children}
......@@ -707,6 +710,10 @@ const BasicLayout = props => {
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : null
}
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <CreateBaseMap /> : null
}
<div id="micro-container" className="subapp-container">
{/*<CreateBaseMap/>*/}
{props.children}
......
src/pages/baseMapPage/baseMapPage.js 0 → 100644
View file @ 48ef09be
import React from 'react';
import { Spin } from 'antd';
import { connect } from 'react-redux';
import { actionCreators } from '@/containers/App/store';
import MapComponent from '@/components/mapView';
import style from './baseMapPage.less';
class CreateMap extends React.Component {
constructor(props) {
super(props);
this.mapManganerRef = React.createRef();
}
state = {
loading: true,
config: window.globalConfig.mapsettings,
widgets: window.globalConfig.uiwidgets,
};
getView = view => {
this.props.updageMapView(view);
};
render() {
return (
<>
<MapComponent {...this.state} getMapInfo={this.getView} />
</>
);
}
}
const mapStateToProps = state => ({});
const mapDispatchToProps = dispatch => ({
updageMapView(mapView) {
dispatch(actionCreators.updageMapView(mapView));
},
});
export default connect(
mapStateToProps,
mapDispatchToProps,
)(CreateMap);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment