@vtx/cs-map-layer 1.0.12 → 1.0.15

package/lib/SewageLineLayer/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 SewageLineLayer = function SewageLineLayer(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 SewageLineLayer = function SewageLineLayer(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/SewageManholeLayer/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 SewageManholeLayer = function SewageManholeLayer(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 SewageManholeLayer = function SewageManholeLayer(props) {
     zIndex: 30,
     id: 'SewageManholeLayer',
     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/SewagePointLayer/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 SewagePointLayer = function SewagePointLayer(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 SewagePointLayer = function SewagePointLayer(props) {
     zIndex: 40,
     id: 'SewagePointLayer',
     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/WaterDrainLineLayer/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 WaterDrainLineLayer = function WaterDrainLineLayer(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({
@@ -29,6 +34,12 @@ var WaterDrainLineLayer = function WaterDrainLineLayer(props) {
     zIndex: 20,
     id: 'WaterDrainLineLayer',
     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/WaterDrainManholeLayer/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 WaterDrainManholeLayer = function WaterDrainManholeLayer(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({
@@ -29,6 +34,12 @@ var WaterDrainManholeLayer = function WaterDrainManholeLayer(props) {
     zIndex: 30,
     id: 'WaterDrainLineLayer',
     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/WaterDrainPointLayer/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 WaterDrainPointLayer = function WaterDrainPointLayer(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({
@@ -29,6 +34,12 @@ var WaterDrainPointLayer = function WaterDrainPointLayer(props) {
     zIndex: 40,
     id: 'WaterDrainPointLayer',
     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/WaterSupplyLineLayer/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", "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,12 +11,19 @@ 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 WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _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 code = FACILITY_CODE.WATER_SUPPLY_LINE;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -33,9 +40,17 @@ var WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
     legend: "GD_GD",
     id: code,
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal,
+          customKeys: customKeys
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customKeys: customKeys
       });
     },
     group: [{

package/lib/WaterSupplyPointLayer/index.d.ts

@@ -2,6 +2,7 @@ import { type FC } from 'react';
 import { CommonPropsI, POINT_CHARACTERISTICS } from '../_util/interface';
 interface PropsI {
     groupKey?: POINT_CHARACTERISTICS[] | false;
+    customKeys?: any;
 }
 declare const WaterSupplyPointLayer: FC<CommonPropsI & PropsI>;
 export default WaterSupplyPointLayer;

package/lib/WaterSupplyPointLayer/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", "groupKey"];
+var _excluded = ["params", "showModal", "groupKey", "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; }
@@ -8,20 +8,27 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-/**
- *供水管点
+/**
+ *供水管点
  */
 import { ImageLayer } from '@vtx/cs-map';
+import { isArray, isEmpty } from 'lodash';
 import React from 'react';
 import FacilityTemplate from "../_components/Template/FacilityTemplate";
+import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE, POINT_CHARACTERISTICS, POINT_CHARACTERISTICS_STR } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
-import { isArray, isEmpty } from 'lodash';
 var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
     groupKey = props.groupKey,
+    _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 code = FACILITY_CODE.WATER_SUPPLY_POINT;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -53,9 +60,17 @@ var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
     legend: "GD_POINT",
     id: code,
     template: function template(feature) {
+      if (popup.version == '2') {
+        return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
+          feature: feature,
+          showModal: showModal,
+          customKeys: customKeys
+        });
+      }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customKeys: customKeys
       });
     },
     group: group

package/lib/_components/Template/CloseBtn.js

@@ -7,7 +7,6 @@ var CloseBtn = function CloseBtn(props) {
     type = props.type;
   var _useProps = useProps(),
     showModal = _useProps.showModal;
-  console.log(showModal);
   return /*#__PURE__*/React.createElement(ExclamationCircleOutlined, {
     onClick: function onClick() {
       if (props.showModal) {

package/lib/_components/Template/CloseBtnV2.d.ts

@@ -0,0 +1,8 @@
+import { type FC } from "react";
+declare const CloseBtn: FC<{
+    feature: any;
+    showModal: any;
+    type?: string;
+    facilityDetail?: any;
+}>;
+export default CloseBtn;

package/lib/_components/Template/CloseBtnV2.js

@@ -0,0 +1,21 @@
+import { ExclamationCircleOutlined } from "@ant-design/icons";
+import React from "react";
+import { useProps } from '@vtx/cs-map';
+var CloseBtn = function CloseBtn(props) {
+  var feature = props.feature,
+    type = props.type,
+    facilityDetail = props.facilityDetail;
+  var _useProps = useProps(),
+    showModal = _useProps.showModal;
+  return /*#__PURE__*/React.createElement(ExclamationCircleOutlined, {
+    onClick: function onClick() {
+      if (props.showModal) {
+        props.showModal(feature, type, facilityDetail);
+      } else if (showModal) {
+        showModal(feature, type, facilityDetail);
+      }
+    },
+    className: "close-btn"
+  });
+};
+export default CloseBtn;

package/lib/_components/Template/DeviceCustomContent.d.ts

@@ -0,0 +1,21 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+declare function CustomContent(props: any): React.JSX.Element;
+declare namespace CustomContent {
+    var propTypes: {
+        dark: PropTypes.Requireable<boolean>;
+        type: PropTypes.Requireable<string>;
+        code: PropTypes.Requireable<string>;
+        params: PropTypes.Requireable<object>;
+        styleOption: PropTypes.Requireable<object>;
+        showModal: PropTypes.Requireable<(...args: any[]) => any>;
+        onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        deviceDetail: PropTypes.Requireable<object>;
+        deviceData: PropTypes.Requireable<object>;
+        valueField: PropTypes.Requireable<string>;
+        customButton: PropTypes.Requireable<NonNullable<((...args: any[]) => any) | PropTypes.ReactElementLike | null | undefined>>;
+        popup: PropTypes.Requireable<object>;
+        detail: PropTypes.Requireable<object>;
+    };
+}
+export default CustomContent;

package/lib/_components/Template/DeviceCustomContent.js

@@ -0,0 +1,76 @@
+import { getVtxToken } from '@vtx/utils';
+import classnames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+var _ref = getVtxToken() || {},
+  token = _ref.token,
+  tenantId = _ref.tenantId,
+  userId = _ref.userId;
+function CustomContent(props) {
+  var _onClick = props.onClick,
+    deviceDetail = props.deviceDetail,
+    deviceData = props.deviceData,
+    dark = props.dark;
+  // console.log(showModal, valueField, customButton, popup, otherProps, 'CustomContent');
+  var handleClassName = function handleClassName(str) {
+    var commonClassnames = "device-layer-custom-content".concat(dark ? '-dark' : '');
+    return str ? "".concat(commonClassnames, "-").concat(str) : commonClassnames;
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName()),
+    onClick: function onClick() {
+      _onClick && _onClick();
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('title'))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('title-left')),
+    title: (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.name) || ''
+  }, (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.name) || ''), /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('title-right'))
+  }, (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.deviceTypeName) || '-')), /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('contentBox'))
+  }, (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.installAddress) && /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyParam'))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyParam-deviceDetail'))
+  }, /*#__PURE__*/React.createElement("img", {
+    src: require("../../assets/address".concat(dark ? '-dark' : '', ".png"))
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyParam-deviceDetail-address')),
+    title: (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.installAddress) || ''
+  }, (deviceDetail === null || deviceDetail === void 0 ? void 0 : deviceDetail.installAddress) || '')), /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyParam-line'))
+  })), deviceData !== null && deviceData !== void 0 && deviceData.length ? /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyIndicators'))
+  }, deviceData === null || deviceData === void 0 ? void 0 : deviceData.map(function (v) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: v === null || v === void 0 ? void 0 : v.name,
+      className: classnames(handleClassName('keyIndicators-item'))
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames(handleClassName('keyIndicators-item-left'))
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames(handleClassName('keyIndicators-item-round'))
+    }), /*#__PURE__*/React.createElement("span", null, v.name || ''), /*#__PURE__*/React.createElement("span", null, v.unit ? "\uFF08".concat(v.unit, "\uFF09") : '', ":"), /*#__PURE__*/React.createElement("span", {
+      className: classnames(handleClassName('keyIndicators-item-left-value'))
+    }, v.value || v.value == 0 ? v.value : '')), /*#__PURE__*/React.createElement("div", {
+      className: classnames(handleClassName('keyIndicators-item-updateTime'))
+    }, v.updateTime));
+  })) : null));
+}
+CustomContent.propTypes = {
+  dark: PropTypes.bool,
+  type: PropTypes.string,
+  code: PropTypes.string,
+  params: PropTypes.object,
+  styleOption: PropTypes.object,
+  showModal: PropTypes.func,
+  onClick: PropTypes.func,
+  deviceDetail: PropTypes.object,
+  deviceData: PropTypes.object,
+  valueField: PropTypes.string,
+  customButton: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  popup: PropTypes.object,
+  detail: PropTypes.object
+};
+export default CustomContent;

package/lib/_components/Template/DeviceTemplate.d.ts

@@ -1,4 +1,5 @@
 import { FC } from 'react';
+import './index.less';
 declare const DeviceTemplate: FC<{
     feature: any;
     showModal: any;

package/lib/_components/Template/DeviceTemplate.js

@@ -1,3 +1,7 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -8,6 +12,7 @@ import { Col, Empty, Row, Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
 import http from "../../_util/http";
 import CloseBtn from "./CloseBtn";
+import "./index.less";
 var DeviceTemplate = function DeviceTemplate(props) {
   var feature = props.feature,
     showModal = props.showModal;
@@ -28,6 +33,7 @@ var DeviceTemplate = function DeviceTemplate(props) {
         deviceId: id
       }
     }).then(function (res) {
+      var _res$data;
       setLoading(false);
       var data = [];
       if (String(res === null || res === void 0 ? void 0 : res.result) === '0') {
@@ -43,7 +49,12 @@ var DeviceTemplate = function DeviceTemplate(props) {
       // if (data?.length > 4) {
       //     data = data.slice(0, 4);
       // }
-      setDeviceData(data);
+      // 固定加入
+      setDeviceData([].concat(_toConsumableArray(data), [{
+        label: '数据采集时间',
+        key: 'monitorTime',
+        value: (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data[0]) === null || _res$data === void 0 ? void 0 : _res$data.monitorTime
+      }]));
     });
   };
   useEffect(function () {
@@ -51,7 +62,9 @@ var DeviceTemplate = function DeviceTemplate(props) {
       getDeviceData(id);
     }
   }, [id]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spin, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "cesium-popup-v1"
+  }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     size: "small"
   }, /*#__PURE__*/React.createElement(Row, null, deviceData === null || deviceData === void 0 ? void 0 : deviceData.map(function (item, index) {

package/lib/_components/Template/DeviceTemplateV2.d.ts

@@ -0,0 +1,7 @@
+import { FC } from 'react';
+import './indexV2.less';
+declare const DeviceTemplate: FC<{
+    feature: any;
+    showModal: any;
+}>;
+export default DeviceTemplate;