Commit 3666f193 authored by 涂伟's avatar 涂伟
parents 5b8b85d6 ae52d285
Pipeline #71588 failed with stages
......@@ -27,21 +27,21 @@ module.exports = require('./webpack.base.babel')({
minimize: true,
minimizer: [
new TerserPlugin({
terserOptions: {
warnings: false,
compress: {
comparisons: false,
drop_console: true,
drop_debugger: true,
pure_funcs: ['console.log'], // 移除console
},
parse: {},
mangle: true,
output: {
comments: false,
ascii_only: true,
},
},
// terserOptions: {
// warnings: false,
// compress: {
// comparisons: false,
// drop_console: true,
// drop_debugger: true,
// pure_funcs: ['console.log'], // 移除console
// },
// parse: {},
// mangle: true,
// output: {
// comments: false,
// ascii_only: true,
// },
// },
parallel: threads, // 开启多进程
cache: true,
sourceMap: true,
......
......@@ -95,7 +95,7 @@
"@wisdom-cesium/cesium": "1.1.12",
"@wisdom-cesium/krpano": "^1.0.29-52",
"@wisdom-map/amap": "1.1.0-beta.45",
"@wisdom-map/arcgismap": "1.4.0-147",
"@wisdom-map/arcgismap": "1.4.0-150",
"@wisdom-map/basemap": "1.1.0-24",
"ace-builds": "^1.4.12",
"antd-img-crop": "^3.13.2",
......@@ -122,7 +122,7 @@
"js-calendar-converter": "0.0.4",
"lodash": "4.17.11",
"minimist": "1.2.0",
"panda-xform": "4.0.5",
"panda-xform": "^4.1.0",
"prop-types": "15.7.2",
"quill": "^1.3.7",
"rc-tween-one": "^3.0.6",
......
......@@ -185,7 +185,7 @@ const TileData = props => {
useEffect(() => {
QueryBaseMapItems().then(res => {
if (res.code === 0) {
if (res.code === '0') {
setJson(res.data);
}
});
......
......@@ -126,7 +126,7 @@
},
{
"title": "Geo0暖色",
"type": "streetwarm",
"type": "streetWarm",
"url": "//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer",
"key": "",
"maxleve": 18
......
......@@ -570,9 +570,10 @@ const AddModal = props => {
ss.push(regCn.test(cc[0]));
if (!url.test(aa)) {
return Promise.reject('url格式不正确');
} else if (ss.indexOf(true) == -1) {
return Promise.reject('局域网IP不正确');
}
// else if (ss.indexOf(true) == -1) {
// return Promise.reject('局域网IP不正确');
// }
}
return Promise.resolve();
},
......
......@@ -18,6 +18,14 @@ const AddForm = props => {
const submit = () => {
if (addType === 1) {
let obj = form.getFieldsValue();
let arr = obj.pageUrl.split('/'); // 用const声明常量
const product = productList.find(item => item.PackageName.includes(arr[0]));
if (product) {
arr.shift();
obj.pageUrl = arr.join('/');
}
console.log(product, 'product');
obj.product = product?.PackageName || 'civweb4';
submitCallback(obj, nodeObj);
}
if (addType === 2) {
......@@ -54,7 +62,7 @@ const AddForm = props => {
<Item label="菜单别名" name="shortName">
<Input placeholder="请输入菜单别名" />
</Item>
<Item label="产品类型:" name="product">
{/* <Item label="产品类型:" name="product">
<Select placeholder="请选择产品类型" allowClear>
{productList &&
productList.length > 0 &&
......@@ -64,7 +72,7 @@ const AddForm = props => {
</Option>
))}
</Select>
</Item>
</Item> */}
<Item
label="菜单图标"
name="imageUrl"
......
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