@vtx/cs-map-layer 1.0.14 → 1.0.15

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,40 +1,40 @@
-# @vtx/cs-map-layer
-
-[![NPM version](https://img.shields.io/npm/v/@vtx/cs-map-layer.svg?style=flat)](https://npmjs.org/package/@vtx/cs-map-layer)
-[![NPM downloads](http://img.shields.io/npm/dm/@vtx/cs-map-layer.svg?style=flat)](https://npmjs.org/package/@vtx/cs-map-layer)
-
-React components for Vortex
-
-## Usage
-
-TODO
-
-## Options
-
-TODO
-
-## Development
-
-```bash
-# install dependencies
-$ yarn install
-
-# develop library by docs demo
-$ yarn start
-
-# build library source code
-$ yarn run build
-
-# build library source code in watch mode
-$ yarn run build:watch
-
-# build docs
-$ yarn run docs:build
-
-# check your project for potential problems
-$ yarn run doctor
-```
-
-## LICENSE
-
-MIT
+# @vtx/cs-map-layer
+
+[![NPM version](https://img.shields.io/npm/v/@vtx/cs-map-layer.svg?style=flat)](https://npmjs.org/package/@vtx/cs-map-layer)
+[![NPM downloads](http://img.shields.io/npm/dm/@vtx/cs-map-layer.svg?style=flat)](https://npmjs.org/package/@vtx/cs-map-layer)
+
+React components for Vortex
+
+## Usage
+
+TODO
+
+## Options
+
+TODO
+
+## Development
+
+```bash
+# install dependencies
+$ yarn install
+
+# develop library by docs demo
+$ yarn start
+
+# build library source code
+$ yarn run build
+
+# build library source code in watch mode
+$ yarn run build:watch
+
+# build docs
+$ yarn run docs:build
+
+# check your project for potential problems
+$ yarn run doctor
+```
+
+## LICENSE
+
+MIT

package/lib/ConfluenceLineLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var ConfluenceLineLayer = function ConfluenceLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var ConfluenceLineLayer = function ConfluenceLineLayer(props) {
     zIndex: 40,
     id: 'ConfluencePointLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/ConfluenceManholeLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var ConfluenceManholeLayer = function ConfluenceManholeLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var ConfluenceManholeLayer = function ConfluenceManholeLayer(props) {
     zIndex: 30,
     id: 'ConfluenceManholeLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/ConfluencePointLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var ConfluencePointLayer = function ConfluencePointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var ConfluencePointLayer = function ConfluencePointLayer(props) {
     zIndex: 40,
     id: 'ConfluencePointLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/DeviceLayer/index.d.ts

@@ -3,7 +3,7 @@ import { CommonPropsI, DEVICE_CODE } from '../_util/interface';
 interface PropsI {
     code?: keyof typeof DEVICE_CODE;
     styleOption?: any;
-    dataField: string;
+    dataField?: string;
     name?: string;
     legend?: string | object;
 }

package/lib/DeviceLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["code", "params", "showModal", "styleOption", "name", "legend"];
+var _excluded = ["code", "params", "showModal", "styleOption", "name", "legend", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -14,6 +14,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { FeatureLayer, GroupLayer } from '@vtx/cs-map';
 import React, { useMemo } from 'react';
 import DeviceTemplate from "../_components/Template/DeviceTemplate";
+import DeviceTemplateV2 from "../_components/Template/DeviceTemplateV2";
 import { DEVICE_CODE } from "../_util/interface";
 import { deviceCodeMap, getDeviceStyle, deviceColorMap, deviceStatusNameMap } from "../_util/layerConfig";
 import http from "../_util/http";
@@ -29,6 +30,10 @@ var DeviceLayer = function DeviceLayer(props) {
     styleOption = _props$styleOption === void 0 ? {} : _props$styleOption,
     name = props.name,
     legend = props.legend,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _ref = deviceCodeMap[code] || {
       name: name
@@ -65,7 +70,9 @@ var DeviceLayer = function DeviceLayer(props) {
       var offlineData = [];
       var alarmData = [];
       var errorData = [];
-      data.forEach(function (item) {
+      data === null || data === void 0 || data.filter(function (v) {
+        return v[props.dataField || 'geometryInfo'];
+      }).forEach(function (item) {
         var newItem = cloneDeep(item);
         var status = item.status;
         newItem.geometryInfo = newItem[props.dataField || 'geometryInfo'];
@@ -119,6 +126,12 @@ var DeviceLayer = function DeviceLayer(props) {
       },
       legend: _legend,
       template: function template(feature) {
+        if (popup.version == '2') {
+          return /*#__PURE__*/React.createElement(DeviceTemplateV2, {
+            feature: feature,
+            showModal: showModal
+          });
+        }
         return /*#__PURE__*/React.createElement(DeviceTemplate, {
           feature: feature,
           showModal: showModal

package/lib/FacilityLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["code", "params", "styleOption", "showModal", "valueField", "customKeys"];
+var _excluded = ["code", "params", "styleOption", "showModal", "valueField", "customKeys", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,6 +11,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { FeatureLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
 var FacilityLayer = function FacilityLayer(props) {
@@ -24,6 +25,10 @@ var FacilityLayer = function FacilityLayer(props) {
     valueField = props.valueField,
     _props$customKeys = props.customKeys,
     customKeys = _props$customKeys === void 0 ? [] : _props$customKeys,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var newCode = code.toLocaleUpperCase();
   var _ref = facilityCodeMap[newCode] || {},
@@ -47,6 +52,14 @@ var FacilityLayer = function FacilityLayer(props) {
     zIndex: 4,
     id: newCode,
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal,
+          valueField: valueField,
+          customKeys: customKeys
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal,

package/lib/Layer/index.js

@@ -3,8 +3,8 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/*
- * @description: 排水-雨水管线图层
+/*
+ * @description: 排水-雨水管线图层
  */
 import { FeatureLayer, GroupLayer, ImageLayer } from '@vtx/cs-map';
 import React from 'react';

package/lib/Layer/layerConfig.d.ts

@@ -1,10 +1,17 @@
 declare const layerConfig: ({
     name: string;
     id: string;
-    children: {
+    children: ({
         type: string;
         id: string;
-    }[];
+        popup: {
+            version: string;
+        };
+    } | {
+        type: string;
+        id: string;
+        popup?: undefined;
+    })[];
     show?: undefined;
 } | {
     name: string;

package/lib/Layer/layerConfig.js

@@ -11,7 +11,10 @@ var layerConfig = [{
   "id": "GWLX",
   "children": [{
     "type": "SewageLineLayer",
-    "id": "WSGW"
+    "id": "WSGW",
+    "popup": {
+      "version": "2"
+    }
   }, {
     "type": "RainLineLayer",
     "id": "YSGW"

package/lib/RainLineLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var RainLineLayer = function RainLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var RainLineLayer = function RainLineLayer(props) {
     zIndex: 20,
     id: 'RainLineLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/RainManholeLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var RainManholeLayer = function RainManholeLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var RainManholeLayer = function RainManholeLayer(props) {
     zIndex: 30,
     id: 'RainManholeLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/RainPointLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,11 +11,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { getTenantId } from "../_util/util";
 var RainPointLayer = function RainPointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -30,6 +35,12 @@ var RainPointLayer = function RainPointLayer(props) {
     zIndex: 40,
     id: 'RainPointLayer',
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/RawWaterLineLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,12 +11,17 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
 var RawWaterLineLayer = function RawWaterLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.RAW_WATER_LINE;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -36,6 +41,12 @@ var RawWaterLineLayer = function RawWaterLineLayer(props) {
     },
     id: code,
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal

package/lib/RawWaterPointLayer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["params", "showModal"];
+var _excluded = ["params", "showModal", "popup"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,12 +11,17 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { ImageLayer } from '@vtx/cs-map';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
 var RawWaterPointLayer = function RawWaterPointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$popup = props.popup,
+    popup = _props$popup === void 0 ? {
+      version: '1'
+    } : _props$popup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.RAW_WATER_POINT;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -36,6 +41,12 @@ var RawWaterPointLayer = function RawWaterPointLayer(props) {
     },
     id: code,
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal