@vtx/modals2 4.0.7 → 5.0.1

package/lib/vm-info-collection/index.js

@@ -5,8 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _components = require("@vtx/components");
 require("./style");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function InfoCollection(props) {
   var _props$data = props.data,
     data = _props$data === void 0 ? [] : _props$data,
@@ -17,31 +24,126 @@ function InfoCollection(props) {
     _props$horizontal = props.horizontal,
     horizontal = _props$horizontal === void 0 ? false : _props$horizontal,
     _props$ellipsis = props.ellipsis,
-    ellipsis = _props$ellipsis === void 0 ? false : _props$ellipsis;
+    ellipsis = _props$ellipsis === void 0 ? false : _props$ellipsis,
+    padding = props.padding;
+  if (!data.length) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: horizontal ? 'info-collection-horizontal' : 'info-collection',
     style: {
-      height: '100%'
+      padding: padding !== null && padding !== void 0 ? padding : 'unset'
     }
   }, data.map(function (item) {
+    var _a;
     var style = {};
-    if (item.color) style.color = item.color;
+    if (item === null || item === void 0 ? void 0 : item.color) style.color = item.color;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "info-line",
       key: item.key,
       style: {
         marginRight: horizontal ? 0 : 12,
         marginBottom: gap,
-        width: width
+        width: item.label === '地址' || item.key === 'panoramaLinkAddress' || item.key.indexOf('hoto') > -1 ? '100%' : width
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "label"
-    }, item.label, "\uFF1A"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "info-label"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      title: item.label,
+      className: "ellipsis label"
+    }, item.label, " \uFF1A")), item.label === '地址' ? ( /*#__PURE__*/_react["default"].createElement("div", {
+      className: "value",
+      style: style
+    }, item.value || '-')) : item.key === 'panoramaLinkAddress' ? ( /*#__PURE__*/_react["default"].createElement("div", {
+      className: 'value'
+    }, ((_a = item === null || item === void 0 ? void 0 : item.value) === null || _a === void 0 ? void 0 : _a.indexOf('http')) > -1 ? ( /*#__PURE__*/_react["default"].createElement("a", {
+      onClick: function onClick() {
+        window.open(item.value);
+      }
+    }, item.value)) : item.value || '-')) : ( /*#__PURE__*/_react["default"].createElement("div", {
       className: "value ".concat(ellipsis ? 'ellipsis' : ''),
       style: style,
-      title: "".concat(item.value || '')
-    }, typeof item.render === 'function' ? item.render() : item.value || '--'));
+      title: ValueDom(item.componentType || '', item.value)
+    }, typeof item.render === 'function' ? item.render() : ValueDom(item.componentType || '', item.value))));
   }));
 }
 var _default = exports["default"] = InfoCollection;
+var QUARTER_MAP = {
+  '01': 'Q1',
+  '04': 'Q2',
+  '07': 'Q3',
+  '10': 'Q4'
+};
+/* eslint-disable no-case-declarations */
+var ValueDom = function ValueDom(componentType, value) {
+  var _a, _b;
+  var node;
+  switch (componentType) {
+    case 'MONTH_PERIOD':
+      node = (_a = value.join) === null || _a === void 0 ? void 0 : _a.call(value, '~');
+      break;
+    case 'QUARTER':
+      var _value$split = value.split('-'),
+        _value$split2 = _slicedToArray(_value$split, 2),
+        year = _value$split2[0],
+        quarter = _value$split2[1];
+      node = "".concat(year, "-").concat(QUARTER_MAP[quarter]);
+      break;
+    case 'ATTACHS':
+      var files = JSON.parse(value || '[]');
+      if (files.length) {
+        node = /*#__PURE__*/_react["default"].createElement(_components.VtxUpload, {
+          name: "file",
+          viewMode: true,
+          fileList: files,
+          downloadUrl: "".concat(process.env.PREFIX, "/cloudFile/common/downloadFile?id=")
+        });
+      } else {
+        node = '-';
+      }
+      break;
+    case 'MAP':
+      var lngLats = (value === null || value === void 0 ? void 0 : value.lngLats) || '';
+      node = lngLats;
+      break;
+    case 'SWITCH':
+      node = value ? '是' : '否';
+      break;
+    case 'GARBAGE_CAN':
+      var arr = [];
+      Array.isArray(node) && (node === null || node === void 0 ? void 0 : node.forEach(function (item) {
+        arr.push("".concat(item.garbageTypeName, "x").concat(item.throwDoorCount));
+      }));
+      node = arr;
+      break;
+    case 'TIME_PERIOD':
+      if (Array.isArray(value)) {
+        node = (_b = value === null || value === void 0 ? void 0 : value.map(function (item) {
+          return "".concat(item.startTime, "~").concat(item.endTime);
+        })) === null || _b === void 0 ? void 0 : _b.join('；');
+      }
+      break;
+    case 'image':
+      var photos = JSON.parse(value || '[]');
+      if (photos.length) {
+        node = /*#__PURE__*/_react["default"].createElement(_components.VtxUpload, {
+          name: "file",
+          viewMode: true,
+          fileList: files,
+          downloadUrl: "".concat(process.env.PREFIX, "/cloudFile/common/downloadFile?id=")
+        });
+      } else {
+        node = '-';
+      }
+      break;
+    case 'qrCode':
+      node = /*#__PURE__*/_react["default"].createElement(_components.VtxImage, {
+        aspectFit: true,
+        src: value
+      });
+      break;
+    default:
+      node = value;
+      break;
+  }
+  return node || '-';
+};
 //# sourceMappingURL=index.js.map

package/lib/vm-info-collection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","e","__esModule","InfoCollection","props","_props$data","data","_props$width","width","_props$gap","gap","_props$horizontal","horizontal","_props$ellipsis","ellipsis","React","createElement","className","style","height","map","item","color","key","marginRight","marginBottom","label","concat","title","value","render","_default","exports"],"sources":["vm-info-collection/index.js"],"sourcesContent":["import React from 'react';\nimport './style';\nfunction InfoCollection(props) {\n    const { data = [], \n    // infoData = {},\n    width = '100%', gap = 8, horizontal = false, ellipsis = false, } = props;\n    return (React.createElement(\"div\", { className: horizontal ? 'info-collection-horizontal' : 'info-collection', style: { height: '100%' } }, data.map(item => {\n        const style = {};\n        if (item.color)\n            style.color = item.color;\n        return (React.createElement(\"div\", { className: \"info-line\", key: item.key, style: { marginRight: horizontal ? 0 : 12, marginBottom: gap, width } },\n            React.createElement(\"div\", { className: \"label\" },\n                item.label,\n                \"\\uFF1A\"),\n            React.createElement(\"div\", { className: `value ${ellipsis ? 'ellipsis' : ''}`, style: style, title: `${item.value || ''}` }, typeof item.render === 'function' ? item.render() : item.value || '--')));\n    })));\n}\nexport default InfoCollection;\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACAA,OAAA;AAAiB,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,gBAAAA,CAAA;AACjB,SAASE,cAAcA,CAACC,KAAK,EAAE;EAC3B,IAAAC,WAAA,GAEmED,KAAK,CAFhEE,IAAI;IAAJA,IAAI,GAAAD,WAAA,cAAG,EAAE,GAAAA,WAAA;IAAAE,YAAA,GAEkDH,KAAK,CAAxEI,KAAK;IAALA,KAAK,GAAAD,YAAA,cAAG,MAAM,GAAAA,YAAA;IAAAE,UAAA,GAAqDL,KAAK,CAAxDM,GAAG;IAAHA,GAAG,GAAAD,UAAA,cAAG,CAAC,GAAAA,UAAA;IAAAE,iBAAA,GAA4CP,KAAK,CAA/CQ,UAAU;IAAVA,UAAU,GAAAD,iBAAA,cAAG,KAAK,GAAAA,iBAAA;IAAAE,eAAA,GAAwBT,KAAK,CAA3BU,QAAQ;IAARA,QAAQ,GAAAD,eAAA,cAAG,KAAK,GAAAA,eAAA;EAC7D,oBAAQE,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;IAAEC,SAAS,EAAEL,UAAU,GAAG,4BAA4B,GAAG,iBAAiB;IAAEM,KAAK,EAAE;MAAEC,MAAM,EAAE;IAAO;EAAE,CAAC,EAAEb,IAAI,CAACc,GAAG,CAAC,UAAAC,IAAI,EAAI;IACzJ,IAAMH,KAAK,GAAG,CAAC,CAAC;IAChB,IAAIG,IAAI,CAACC,KAAK,EACVJ,KAAK,CAACI,KAAK,GAAGD,IAAI,CAACC,KAAK;IAC5B,oBAAQP,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;MAAEC,SAAS,EAAE,WAAW;MAAEM,GAAG,EAAEF,IAAI,CAACE,GAAG;MAAEL,KAAK,EAAE;QAAEM,WAAW,EAAEZ,UAAU,GAAG,CAAC,GAAG,EAAE;QAAEa,YAAY,EAAEf,GAAG;QAAEF,KAAK,EAALA;MAAM;IAAE,CAAC,eAC/IO,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;MAAEC,SAAS,EAAE;IAAQ,CAAC,EAC7CI,IAAI,CAACK,KAAK,EACV,QAAQ,CAAC,eACbX,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;MAAEC,SAAS,WAAAU,MAAA,CAAWb,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAE;MAAEI,KAAK,EAAEA,KAAK;MAAEU,KAAK,KAAAD,MAAA,CAAKN,IAAI,CAACQ,KAAK,IAAI,EAAE;IAAG,CAAC,EAAE,OAAOR,IAAI,CAACS,MAAM,KAAK,UAAU,GAAGT,IAAI,CAACS,MAAM,CAAC,CAAC,GAAGT,IAAI,CAACQ,KAAK,IAAI,IAAI,CAAC,CAAC;EAC7M,CAAC,CAAC,CAAC;AACP;AAAC,IAAAE,QAAA,GAAAC,OAAA,cACc7B,cAAc","ignoreList":[]}
+{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_components","e","__esModule","_slicedToArray","r","_arrayWithHoles","_iterableToArrayLimit","_unsupportedIterableToArray","_nonIterableRest","TypeError","a","_arrayLikeToArray","t","toString","call","slice","constructor","name","Array","from","test","length","n","l","Symbol","iterator","i","u","f","o","next","Object","done","push","value","isArray","InfoCollection","props","_props$data","data","_props$width","width","_props$gap","gap","_props$horizontal","horizontal","_props$ellipsis","ellipsis","padding","React","createElement","Fragment","className","style","map","item","_a","color","key","marginRight","marginBottom","label","indexOf","title","onClick","window","open","concat","ValueDom","componentType","render","_default","exports","QUARTER_MAP","_b","node","join","_value$split","split","_value$split2","year","quarter","files","JSON","parse","VtxUpload","viewMode","fileList","downloadUrl","process","env","PREFIX","lngLats","arr","forEach","garbageTypeName","throwDoorCount","startTime","endTime","photos","VtxImage","aspectFit","src"],"sources":["vm-info-collection/index.js"],"sourcesContent":["import React from 'react';\nimport { VtxUpload, VtxImage } from '@vtx/components';\nimport './style';\nfunction InfoCollection(props) {\n    const { data = [], width = '100%', gap = 8, horizontal = false, ellipsis = false, padding, } = props;\n    if (!data.length)\n        return React.createElement(React.Fragment, null);\n    return (React.createElement(\"div\", { className: horizontal ? 'info-collection-horizontal' : 'info-collection', style: { padding: padding !== null && padding !== void 0 ? padding : 'unset' } }, data.map(item => {\n        var _a;\n        const style = {};\n        if (item === null || item === void 0 ? void 0 : item.color)\n            style.color = item.color;\n        return (React.createElement(\"div\", { className: \"info-line\", key: item.key, style: {\n                marginRight: horizontal ? 0 : 12,\n                marginBottom: gap,\n                width: item.label === '地址' ||\n                    item.key === 'panoramaLinkAddress' ||\n                    item.key.indexOf('hoto') > -1\n                    ? '100%'\n                    : width,\n            } },\n            React.createElement(\"div\", { className: \"info-label\" },\n                React.createElement(\"div\", { title: item.label, className: `ellipsis label` },\n                    item.label,\n                    \" \\uFF1A\")),\n            item.label === '地址' ? (React.createElement(\"div\", { className: \"value\", style: style }, item.value || '-')) : item.key === 'panoramaLinkAddress' ? (React.createElement(\"div\", { className: 'value' }, ((_a = item === null || item === void 0 ? void 0 : item.value) === null || _a === void 0 ? void 0 : _a.indexOf('http')) > -1 ? (React.createElement(\"a\", { onClick: () => {\n                    window.open(item.value);\n                } }, item.value)) : (item.value || '-'))) : (React.createElement(\"div\", { className: `value ${ellipsis ? 'ellipsis' : ''}`, style: style, title: ValueDom(item.componentType || '', item.value) }, typeof item.render === 'function'\n                ? item.render()\n                : ValueDom(item.componentType || '', item.value)))));\n    })));\n}\nexport default InfoCollection;\nconst QUARTER_MAP = {\n    '01': 'Q1',\n    '04': 'Q2',\n    '07': 'Q3',\n    '10': 'Q4',\n};\n/* eslint-disable no-case-declarations */\nconst ValueDom = (componentType, value) => {\n    var _a, _b;\n    let node;\n    switch (componentType) {\n        case 'MONTH_PERIOD':\n            node = (_a = value.join) === null || _a === void 0 ? void 0 : _a.call(value, '~');\n            break;\n        case 'QUARTER':\n            const [year, quarter] = value.split('-');\n            node = `${year}-${QUARTER_MAP[quarter]}`;\n            break;\n        case 'ATTACHS':\n            const files = JSON.parse(value || '[]');\n            if (files.length) {\n                node = (React.createElement(VtxUpload, { name: \"file\", viewMode: true, fileList: files, downloadUrl: `${process.env.PREFIX}/cloudFile/common/downloadFile?id=` }));\n            }\n            else {\n                node = '-';\n            }\n            break;\n        case 'MAP':\n            const lngLats = (value === null || value === void 0 ? void 0 : value.lngLats) || '';\n            node = lngLats;\n            break;\n        case 'SWITCH':\n            node = value ? '是' : '否';\n            break;\n        case 'GARBAGE_CAN':\n            const arr = [];\n            Array.isArray(node) &&\n                (node === null || node === void 0 ? void 0 : node.forEach(item => {\n                    arr.push(`${item.garbageTypeName}x${item.throwDoorCount}`);\n                }));\n            node = arr;\n            break;\n        case 'TIME_PERIOD':\n            if (Array.isArray(value)) {\n                node = (_b = value === null || value === void 0 ? void 0 : value.map((item) => `${item.startTime}~${item.endTime}`)) === null || _b === void 0 ? void 0 : _b.join('；');\n            }\n            break;\n        case 'image':\n            const photos = JSON.parse(value || '[]');\n            if (photos.length) {\n                node = (React.createElement(VtxUpload, { name: \"file\", viewMode: true, fileList: files, downloadUrl: `${process.env.PREFIX}/cloudFile/common/downloadFile?id=` }));\n            }\n            else {\n                node = '-';\n            }\n            break;\n        case 'qrCode':\n            node = React.createElement(VtxImage, { aspectFit: true, src: value });\n            break;\n        default:\n            node = value;\n            break;\n    }\n    return node || '-';\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/vm-info-collection/style/index.css

@@ -22,17 +22,15 @@
   -webkit-box-pack: start;
       -ms-flex-pack: start;
           justify-content: start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-right: 12px;
 }
 .info-collection,
 .info-collection-horizontal {
   font-size: 14px;
 }
-.info-collection .label,
-.info-collection-horizontal .label {
-  color: var(--label-color);
-  white-space: nowrap;
-}
 .info-collection .value,
 .info-collection-horizontal .value {
   color: var(--info-color);
@@ -48,24 +46,22 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.info-collection .default-base,
-.info-collection-horizontal .default-base {
-  width: 430px;
-  height: 60%;
-  margin-right: 10px;
-  background-color: var(--bg-color2);
+.info-collection .ellipsis.label,
+.info-collection-horizontal .ellipsis.label {
+  min-width: 78px;
 }
-.info-collection .default-base img,
-.info-collection-horizontal .default-base img {
-  height: 160px;
-  width: 100%;
-}
-.info-collection .default-base-img,
-.info-collection-horizontal .default-base-img {
-  margin-bottom: 24px;
+.info-collection .info-label,
+.info-collection-horizontal .info-label {
+  min-width: 98px;
+  max-width: 350px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  min-width: 80px;
+  color: var(--label-color);
+  white-space: nowrap;
+  margin-right: 4px;
 }
-.info-collection .default-base-img img,
-.info-collection-horizontal .default-base-img img {
-  height: 160px;
-  width: 100%;
+.info-collection .info-label.label,
+.info-collection-horizontal .info-label.label {
+  min-width: 78px;
 }

package/lib/vm-info-collection/style/index.less

@@ -7,9 +7,13 @@
 .info-collection-horizontal {
     display: flex;
     flex-flow: wrap;
+    // max-height: 340px;
+    // overflow-y: auto;
+    // overflow-x: hidden;
     .info-line {
         display: flex;
         justify-content: start;
+        align-items: center;
         margin-right: 12px;
     }
 }
@@ -17,11 +21,6 @@
 .info-collection-horizontal {
     font-size: 14px;
 
-    .label {
-        color: var(--label-color);
-        white-space: nowrap;
-    }
-
     .value {
         color: var(--info-color);
         font-weight: 400;
@@ -34,24 +33,15 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-    }
-    .default-base {
-        width: 430px;
-        height: 60%;
-        // padding: 24px;
-        margin-right: 10px;
-        background-color: var(--bg-color2);
-        img {
-            height:160px;
-            width: 100%;
-        }
-        &-img {
-            margin-bottom: 24px;
-            img {
-                height:160px;
-                width: 100%;
-            }
+        &.label {
+            min-width: 78px;
         }
     }
-
+    .info-label {
+        .ellipsis;
+        min-width: 80px;
+        color: var(--label-color);
+        white-space: nowrap;
+        margin-right: 4px;
+    }
 }

package/lib/vm-map/index.js

@@ -11,9 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 var _map = require("@vtx/map");
 var _useSettings2 = _interopRequireDefault(require("../vm-hooks/useSettings"));
 var _mapStyle = require("./mapStyle");
+require("./style");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -22,17 +27,20 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /* eslint-disable no-undef */
 var defaultCenter = [116.421516, 39.898331];
 function VmMap(_a) {
-  var _a$mapType = _a.mapType,
+  var _b, _c;
+  var _a$key = _a.key,
+    key = _a$key === void 0 ? 1 : _a$key,
+    _a$mapType = _a.mapType,
     mapType = _a$mapType === void 0 ? 'bmap' : _a$mapType,
-    mapCenter = _a.mapCenter,
     _a$mapPoints = _a.mapPoints,
     mapPoints = _a$mapPoints === void 0 ? [] : _a$mapPoints,
+    mapCenter = _a.mapCenter,
     _a$mapPolygons = _a.mapPolygons,
     mapPolygons = _a$mapPolygons === void 0 ? [] : _a$mapPolygons,
     currentLayer = _a.currentLayer,
     geometryType = _a.geometryType,
     clickGraphic = _a.clickGraphic,
-    rest = (0, _tslib.__rest)(_a, ["mapType", "mapCenter", "mapPoints", "mapPolygons", "currentLayer", "geometryType", "clickGraphic"]);
+    rest = (0, _tslib.__rest)(_a, ["key", "mapType", "mapPoints", "mapCenter", "mapPolygons", "currentLayer", "geometryType", "clickGraphic"]);
   var mapRef = (0, _react.useRef)();
   var markers = (0, _react.useRef)([]);
   var mappolygons = (0, _react.useRef)([]);
@@ -44,14 +52,18 @@ function VmMap(_a) {
     _useState2 = _slicedToArray(_useState, 2),
     points = _useState2[0],
     setPoints = _useState2[1];
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    polygons = _useState4[0],
-    setPolygons = _useState4[1];
+    center = _useState4[0],
+    setCenter = _useState4[1];
   var _useState5 = (0, _react.useState)([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    lines = _useState6[0],
-    setLines = _useState6[1];
+    polygons = _useState6[0],
+    setPolygons = _useState6[1];
+  var _useState7 = (0, _react.useState)([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    lines = _useState8[0],
+    setLines = _useState8[1];
   (0, _react.useEffect)(function () {
     var wrapScroll = document.querySelector('.ant-modal-body');
     wrapScroll && wrapScroll.addEventListener('scroll', function () {
@@ -65,13 +77,13 @@ function VmMap(_a) {
   }, [theme]);
   (0, _react.useEffect)(function () {
     if ((mapPoints === null || mapPoints === void 0 ? void 0 : mapPoints.length) > 0) {
-      var list = mapPoints.map(function (ele) {
+      var _list = mapPoints.map(function (ele) {
         return Object.assign(Object.assign({}, ele), {
           longitude: ele.lng,
           latitude: ele.lat
         });
       }) || [];
-      setPoints(list);
+      setPoints(_list);
     }
   }, [mapPoints]);
   (0, _react.useEffect)(function () {
@@ -82,13 +94,15 @@ function VmMap(_a) {
     if ((filterMapPolygons === null || filterMapPolygons === void 0 ? void 0 : filterMapPolygons.length) > 0) {
       if (geometryType === 'polyline') {
         setLines(filterMapPolygons.map(function (item) {
-          return Object.assign(Object.assign({}, item), {
+          return {
+            id: item.id,
+            config: item.config,
             paths: item.rings.split(';').map(function (v) {
               return v.split(',').map(function (v) {
                 return Number(v);
               });
             })
-          });
+          };
         }));
       } else {
         setPolygons(filterMapPolygons.map(function (item) {
@@ -128,7 +142,7 @@ function VmMap(_a) {
     var center = mapCenter || defaultCenter;
     mapRef.current = new window.BMapGL.Map('modalMap', {
       style: {
-        styleJson: isDark ? _mapStyle.customStyle : _mapStyle.customLight
+        styleJson: isDark || theme == 'blue' ? _mapStyle.customStyle : _mapStyle.customLight
       }
     });
     var point = new window.BMapGL.Point(center[0], center[1]);
@@ -151,8 +165,8 @@ function VmMap(_a) {
     var points = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     removePoints();
     if (!(points === null || points === void 0 ? void 0 : points.length)) {
-      var center = mapCenter || defaultCenter;
-      var point = new window.BMapGL.Point(center[0], center[1]);
+      var _center = mapCenter || defaultCenter;
+      var point = new window.BMapGL.Point(_center[0], _center[1]);
       mapRef.current.addOverlay(new window.BMapGL.Marker(point));
       return;
     }
@@ -162,10 +176,10 @@ function VmMap(_a) {
       var _a, _b;
       var position = new window.BMapGL.Point(item.lng, item.lat);
       positions.push(position);
-      var icon = new window.BMapGL.Icon(item.url, new window.BMapGL.Size(item.width || 32, item.height || 45));
+      var icon = new window.BMapGL.Icon(item.url || require('./imgs/defaultMarker.png'), new window.BMapGL.Size(item.width || 32, item.height || 45));
       var marker = new window.BMapGL.Marker(position, {
         icon: icon,
-        offset: new window.BMapGL.Size(((_a = item.offset) === null || _a === void 0 ? void 0 : _a.width) || -10, ((_b = item.offset) === null || _b === void 0 ? void 0 : _b.height) || -16),
+        offset: new window.BMapGL.Size(((_a = item === null || item === void 0 ? void 0 : item.offset) === null || _a === void 0 ? void 0 : _a.width) || -10, ((_b = item === null || item === void 0 ? void 0 : item.offset) === null || _b === void 0 ? void 0 : _b.height) || -16),
         title: item.name || ''
       });
       markers.current.push(marker);
@@ -175,7 +189,8 @@ function VmMap(_a) {
   };
   // 清除地图点位
   var removePoints = function removePoints() {
-    markers.current.forEach(function (marker) {
+    var _a;
+    ((_a = markers.current) === null || _a === void 0 ? void 0 : _a.length) && markers.current.forEach(function (marker) {
       mapRef.current.addOverlay(marker);
     });
     markers.current = [];
@@ -195,11 +210,13 @@ function VmMap(_a) {
     var polygons = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var type = arguments.length > 1 ? arguments[1] : undefined;
     removePolygons();
-    if (!(polygons === null || polygons === void 0 ? void 0 : polygons.length)) return;
+    var list = polygons === null || polygons === void 0 ? void 0 : polygons.filter(function (ele) {
+      return !!ele.rings;
+    });
+    if (!(list === null || list === void 0 ? void 0 : list.length)) return;
     var points = [];
     //遍历添加图层(图元)
     polygons.map(function (item) {
-      var _a;
       //初始化参数
       var cg = {
         lineType: 'solid',
@@ -222,7 +239,7 @@ function VmMap(_a) {
           fillColor: cg.color,
           fillOpacity: cg.pellucidity
         },
-        polygonPath = (_a = item.rings) === null || _a === void 0 ? void 0 : _a.split(';').map(function (item) {
+        polygonPath = item.rings.split(';').map(function (item) {
           var _ref2 = item === null || item === void 0 ? void 0 : item.split(','),
             _ref3 = _slicedToArray(_ref2, 2),
             lng = _ref3[0],
@@ -238,8 +255,7 @@ function VmMap(_a) {
         clickPolygon(item, e);
         // 居中显示
         setTimeout(function () {
-          var _a;
-          mapRef.current.setViewport((_a = item.rings) === null || _a === void 0 ? void 0 : _a.split(';').map(function (item) {
+          mapRef.current.setViewport(item.rings.split(';').map(function (item) {
             var _ref4 = item === null || item === void 0 ? void 0 : item.split(','),
               _ref5 = _slicedToArray(_ref4, 2),
               lng = _ref5[0],
@@ -262,7 +278,8 @@ function VmMap(_a) {
   };
   // 清除地图图元
   var removePolygons = function removePolygons() {
-    mappolygons.current.forEach(function (polygon) {
+    var _a;
+    ((_a = mappolygons.current) === null || _a === void 0 ? void 0 : _a.length) && mappolygons.current.forEach(function (polygon) {
       mapRef.current.removeOverlay(polygon);
     });
     mappolygons.current = [];
@@ -274,15 +291,42 @@ function VmMap(_a) {
     });
     highlightLayer.current = [];
   };
+  var list = mapType !== 'olmap' ? [].concat(_toConsumableArray(polygons), _toConsumableArray(lines)) : [];
+  var pointCneter;
+  if ((points === null || points === void 0 ? void 0 : points.length) > 0) {
+    pointCneter = [(_b = points === null || points === void 0 ? void 0 : points[0]) === null || _b === void 0 ? void 0 : _b.lng, (_c = points === null || points === void 0 ? void 0 : points[0]) === null || _c === void 0 ? void 0 : _c.lat];
+  }
   var mapProps = Object.assign({
+    key: key,
     mapId: Date.now(),
-    mapCenter: mapCenter || defaultCenter,
+    mapCenter: pointCneter || mapCenter || defaultCenter,
     mapType: mapType,
     mapPoints: points || [],
     mapPolygons: polygons || [],
-    mapLines: lines || []
+    mapLines: lines || [],
+    setCenter: center
   }, rest);
-  return theme === 'light' ? ( /*#__PURE__*/_react["default"].createElement(_map.VtxMap, Object.assign({}, mapProps))) : ( /*#__PURE__*/_react["default"].createElement("div", {
+  // 点位层级固定显示16，可在customMapInfo传参修改
+  if (list.length) {
+    mapProps = Object.assign(Object.assign({}, mapProps), {
+      mapVisiblePoints: {
+        fitView: list.length ? list === null || list === void 0 ? void 0 : list.map(function (ele) {
+          return ele.id;
+        }) : [],
+        type: 'all'
+      },
+      setVisiblePoints: Math.random() * 1000
+    });
+  }
+  (0, _react.useEffect)(function () {
+    if (mapCenter && (mapCenter === null || mapCenter === void 0 ? void 0 : mapCenter.length) > 0) {
+      setCenter(true);
+      setTimeout(function () {
+        return setCenter(false);
+      }, 2500);
+    }
+  }, [JSON.stringify(mapCenter)]);
+  return theme == 'light' ? ( /*#__PURE__*/_react["default"].createElement(_map.VtxMap, Object.assign({}, mapProps))) : ( /*#__PURE__*/_react["default"].createElement("div", {
     id: "modalMap",
     style: {
       width: '100%',