@vtx/cs-map-layer 1.0.21 → 1.0.22

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/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", "popup"];
+var _excluded = ["code", "params", "styleOption", "showModal", "valueField", "customKeys", "customButton", "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; }
@@ -25,6 +25,7 @@ var FacilityLayer = function FacilityLayer(props) {
     valueField = props.valueField,
     _props$customKeys = props.customKeys,
     customKeys = _props$customKeys === void 0 ? [] : _props$customKeys,
+    customButton = props.customButton,
     _props$popup = props.popup,
     popup = _props$popup === void 0 ? {
       version: '1'
@@ -57,14 +58,16 @@ var FacilityLayer = function FacilityLayer(props) {
           feature: feature,
           showModal: showModal,
           valueField: valueField,
-          customKeys: customKeys
+          customKeys: customKeys,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal,
         valueField: valueField,
-        customKeys: customKeys
+        customKeys: customKeys,
+        customButton: customButton
       });
     }
   }, otherProps));

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.js

@@ -1,9 +1,9 @@
-/* type：类型  FacilityLayer-设施 DeviceLayer-设备 排水管点-WaterDrainPointLayer 排水管线-WaterDrainLineLayer 排水窨井-WaterSupplyPointLayer
- 视频-VideoLayer 行政区划-DivisionLayer 排水-雨水-管点-RainPointLayer 排水-雨水-管线-RainLineLayer 排水-雨水-窨井-RainManholeLayer
-排水-污水-管点-SewagePointLayer 排水-污水-管线-SewageLineLayer 排水-污水-窨井-SewageManholeLayer 排水-合流-管点-ConfluencePointLayer
-排水-合流-管线-ConfluenceLineLayer 排水-合流-窨井-ConfluenceManholeLayer  供水-管点-WaterSupplyPointLayer 供水-管线-WaterSupplyLineLayer
-原水-管点-RawWaterPointLayer 原水-管线-RawWaterLineLayer
-自定义图层-CustomLayer
+/* type：类型  FacilityLayer-设施 DeviceLayer-设备 排水管点-WaterDrainPointLayer 排水管线-WaterDrainLineLayer 排水窨井-WaterSupplyPointLayer
+ 视频-VideoLayer 行政区划-DivisionLayer 排水-雨水-管点-RainPointLayer 排水-雨水-管线-RainLineLayer 排水-雨水-窨井-RainManholeLayer
+排水-污水-管点-SewagePointLayer 排水-污水-管线-SewageLineLayer 排水-污水-窨井-SewageManholeLayer 排水-合流-管点-ConfluencePointLayer
+排水-合流-管线-ConfluenceLineLayer 排水-合流-窨井-ConfluenceManholeLayer  供水-管点-WaterSupplyPointLayer 供水-管线-WaterSupplyLineLayer
+原水-管点-RawWaterPointLayer 原水-管线-RawWaterLineLayer
+自定义图层-CustomLayer
 */
 
 var layerConfig = [{

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", "popup"];
+var _excluded = ["params", "showModal", "popup", "customButton"];
 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; }
@@ -21,6 +21,7 @@ var RainLineLayer = function RainLineLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -38,12 +39,14 @@ var RainLineLayer = function RainLineLayer(props) {
       if (popup.version == '2') {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
-          showModal: showModal
+          showModal: showModal,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customButton: customButton
       });
     }
   }, otherProps));

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", "popup"];
+var _excluded = ["params", "showModal", "popup", "customButton"];
 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; }
@@ -21,6 +21,7 @@ var RainManholeLayer = function RainManholeLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -38,12 +39,14 @@ var RainManholeLayer = function RainManholeLayer(props) {
       if (popup.version == '2') {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
-          showModal: showModal
+          showModal: showModal,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customButton: customButton
       });
     }
   }, otherProps));

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", "popup"];
+var _excluded = ["params", "showModal", "popup", "customButton"];
 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; }
@@ -21,6 +21,7 @@ var RainPointLayer = function RainPointLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
@@ -38,12 +39,14 @@ var RainPointLayer = function RainPointLayer(props) {
       if (popup.version == '2') {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
-          showModal: showModal
+          showModal: showModal,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customButton: customButton
       });
     }
   }, otherProps));

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", "popup"];
+var _excluded = ["params", "showModal", "popup", "customButton"];
 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; }
@@ -14,6 +14,7 @@ import FacilityTemplate from "../_components/Template/FacilityTemplate";
 import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
+import { getTenantId } from "../_util/util";
 var RawWaterLineLayer = function RawWaterLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
@@ -22,14 +23,17 @@ var RawWaterLineLayer = function RawWaterLineLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.RAW_WATER_LINE;
   var _facilityCodeMap$code = facilityCodeMap[code],
     name = _facilityCodeMap$code.name,
     labelField = _facilityCodeMap$code.labelField;
+  var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
     url: "/geoserver/zhsw/wms",
     params: _objectSpread({
+      viewparams: "tenantId:".concat(tenantId),
       typeName: 'zhsw:zhsw_raw_water_line'
     }, params),
     name: name,
@@ -44,12 +48,14 @@ var RawWaterLineLayer = function RawWaterLineLayer(props) {
       if (popup.version == '2') {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
-          showModal: showModal
+          showModal: showModal,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customButton: customButton
       });
     }
   }, otherProps));

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", "popup"];
+var _excluded = ["params", "showModal", "popup", "customButton"];
 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; }
@@ -14,6 +14,7 @@ import FacilityTemplate from "../_components/Template/FacilityTemplate";
 import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
+import { getTenantId } from "../_util/util";
 var RawWaterPointLayer = function RawWaterPointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
@@ -22,15 +23,18 @@ var RawWaterPointLayer = function RawWaterPointLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.RAW_WATER_POINT;
   var _facilityCodeMap$code = facilityCodeMap[code],
     name = _facilityCodeMap$code.name,
     labelField = _facilityCodeMap$code.labelField;
+  var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
     url: "/geoserver/zhsw/wms",
     params: _objectSpread({
-      typeName: 'zhsw:zhsw_raw_water_point'
+      typeName: 'zhsw:zhsw_raw_water_point',
+      viewparams: "tenantId:".concat(tenantId)
     }, params),
     name: name,
     labelField: labelField,
@@ -44,12 +48,14 @@ var RawWaterPointLayer = function RawWaterPointLayer(props) {
       if (popup.version == '2') {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
-          showModal: showModal
+          showModal: showModal,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
-        showModal: showModal
+        showModal: showModal,
+        customButton: customButton
       });
     }
   }, otherProps));

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", "customKeys", "popup"];
+var _excluded = ["params", "showModal", "customKeys", "popup", "customButton"];
 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; }
@@ -14,6 +14,7 @@ import FacilityTemplate from "../_components/Template/FacilityTemplate";
 import FacilityTemplateV2 from "../_components/Template/FacilityTemplateV2";
 import { FACILITY_CODE } from "../_util/interface";
 import { facilityCodeMap } from "../_util/layerConfig";
+import { getTenantId } from "../_util/util";
 var WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
@@ -24,14 +25,17 @@ var WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.WATER_SUPPLY_LINE;
   var _facilityCodeMap$code = facilityCodeMap[code],
     name = _facilityCodeMap$code.name,
     labelField = _facilityCodeMap$code.labelField;
+  var tenantId = getTenantId();
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
     url: "/geoserver/zhsw/wms",
     params: _objectSpread({
+      viewparams: "tenantId:".concat(tenantId),
       typeName: 'zhsw:zhsw_water_supply_line'
     }, params),
     name: name,
@@ -44,13 +48,15 @@ var WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
           showModal: showModal,
-          customKeys: customKeys
+          customKeys: customKeys,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal,
-        customKeys: customKeys
+        customKeys: customKeys,
+        customButton: customButton
       });
     },
     group: [{

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", "customKeys", "popup"];
+var _excluded = ["params", "showModal", "groupKey", "customKeys", "popup", "customButton"];
 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,8 +8,8 @@ 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';
@@ -18,6 +18,7 @@ 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 { getTenantId } from "../_util/util";
 var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
   var _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
@@ -29,11 +30,13 @@ var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
     popup = _props$popup === void 0 ? {
       version: '1'
     } : _props$popup,
+    customButton = props.customButton,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.WATER_SUPPLY_POINT;
   var _facilityCodeMap$code = facilityCodeMap[code],
     name = _facilityCodeMap$code.name,
     labelField = _facilityCodeMap$code.labelField;
+  var tenantId = getTenantId();
   var newGroupKey = [POINT_CHARACTERISTICS.GD_BZ, POINT_CHARACTERISTICS.GD_CSK, POINT_CHARACTERISTICS.GD_BJG, POINT_CHARACTERISTICS.GD_FM, POINT_CHARACTERISTICS.GD_JCJ, POINT_CHARACTERISTICS.GD_PQF, POINT_CHARACTERISTICS.GD_PSF, POINT_CHARACTERISTICS.GD_SB, POINT_CHARACTERISTICS.GD_XFS, POINT_CHARACTERISTICS.GD_YLD, POINT_CHARACTERISTICS.GD_PNJ, POINT_CHARACTERISTICS.GD_PXJ, POINT_CHARACTERISTICS.GD_XSJ, POINT_CHARACTERISTICS.GD_DTFB];
   if (groupKey === false) {
     newGroupKey = [];
@@ -52,6 +55,7 @@ var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
   return /*#__PURE__*/React.createElement(ImageLayer, _extends({
     url: "/geoserver/zhsw/wms",
     params: _objectSpread({
+      viewparams: "tenantId:".concat(tenantId),
       typeName: 'zhsw:zhsw_water_supply_point'
     }, params),
     name: name,
@@ -64,13 +68,15 @@ var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
         return /*#__PURE__*/React.createElement(FacilityTemplateV2, {
           feature: feature,
           showModal: showModal,
-          customKeys: customKeys
+          customKeys: customKeys,
+          customButton: customButton
         });
       }
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal,
-        customKeys: customKeys
+        customKeys: customKeys,
+        customButton: customButton
       });
     },
     group: group

package/lib/_components/Template/CloseBtn.js

@@ -1,7 +1,7 @@
 import { ExclamationCircleOutlined } from "@ant-design/icons";
-import React from "react";
 import "./index.less";
 import { useProps } from '@vtx/cs-map';
+import React from 'react';
 var CloseBtn = function CloseBtn(props) {
   var feature = props.feature,
     type = props.type;

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

@@ -4,6 +4,7 @@ declare const FacilityTemplate: FC<{
     feature: any;
     valueField?: string;
     showModal?: any;
+    customButton?: any;
     /**
      * 接收自定义字段显示
      */

package/lib/_components/Template/FacilityTemplate.js

@@ -18,7 +18,8 @@ var FacilityTemplate = function FacilityTemplate(props) {
   var feature = props.feature,
     showModal = props.showModal,
     valueField = props.valueField,
-    customKeys = props.customKeys;
+    customKeys = props.customKeys,
+    customButton = props.customButton;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     list = _useState2[0],
@@ -27,6 +28,10 @@ var FacilityTemplate = function FacilityTemplate(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    facilityDetail = _useState6[0],
+    setFacilityDetail = _useState6[1];
   var properties = (feature === null || feature === void 0 ? void 0 : feature.values_) || {};
 
   // valueField-传入的设施id取值字段  facility_id：默认图层中设施id字段  facilityId：默认设施列表接口中设施id字段
@@ -70,6 +75,7 @@ var FacilityTemplate = function FacilityTemplate(props) {
       if (!res.result && res.data) {
         var _data;
         data = res.data;
+        setFacilityDetail(data);
         getFacilityField((_data = data) === null || _data === void 0 ? void 0 : _data.typeCode, data);
       }
     }).catch(function () {
@@ -91,7 +97,16 @@ var FacilityTemplate = function FacilityTemplate(props) {
       span: 24,
       key: index
     }, item.label, "\uFF1A", item.value || String(item.value) === '0' ? item.value : '--');
-  })) : null), /*#__PURE__*/React.createElement(CloseBtn, {
+  })) : null), customButton ? /*#__PURE__*/React.createElement("div", {
+    className: "facility-layer-custom-button",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, typeof customButton === 'function' ? customButton({
+    feature: feature,
+    facilityDetail: facilityDetail,
+    list: list
+  }) : customButton) : null, /*#__PURE__*/React.createElement(CloseBtn, {
     showModal: showModal,
     feature: feature,
     type: "1"

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

@@ -4,6 +4,7 @@ declare const FacilityTemplate: FC<{
     feature: any;
     valueField?: string;
     showModal?: any;
+    customButton?: any;
     /**
      * 接收自定义字段显示
      */

package/lib/_components/Template/FacilityTemplateV2.js

@@ -15,6 +15,7 @@ var FacilityTemplate = function FacilityTemplate(props) {
     showModal = props.showModal,
     valueField = props.valueField,
     customKeys = props.customKeys,
+    customButton = props.customButton,
     _props$extraKeyParamL = props.extraKeyParamList,
     extraKeyParamList = _props$extraKeyParamL === void 0 ? [] : _props$extraKeyParamL;
   var _useState = useState([]),
@@ -86,6 +87,8 @@ var FacilityTemplate = function FacilityTemplate(props) {
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     size: "small"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: customButton ? 'facility-layer-custom-panel facility-layer-custom-panel-has-button' : 'facility-layer-custom-panel'
   }, /*#__PURE__*/React.createElement(CustomContent, {
     extraKeyParamList: extraKeyParamList,
     dark: true,
@@ -97,7 +100,16 @@ var FacilityTemplate = function FacilityTemplate(props) {
       //     showModal && showModal(feature, map, '1');
       // }
     }
-  })), /*#__PURE__*/React.createElement(CloseBtn, {
+  }), customButton ? /*#__PURE__*/React.createElement("div", {
+    className: "facility-layer-custom-button",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, typeof customButton === 'function' ? customButton({
+    feature: feature,
+    facilityDetail: facilityDetail,
+    list: list
+  }) : customButton) : null)), /*#__PURE__*/React.createElement(CloseBtn, {
     showModal: showModal,
     feature: feature,
     facilityDetail: facilityDetail,

package/lib/_components/Template/index.less

@@ -1,10 +1,15 @@
-.close-btn {
-    position: absolute;
-    top: 12px;
-    right: 30px;
-    cursor: pointer;
-}
-
-.cesium-popup-v1{
-    width: 300px;
-}
+.close-btn {
+    position: absolute;
+    top: 12px;
+    right: 30px;
+    cursor: pointer;
+}
+
+.cesium-popup-v1{
+    width: 300px;
+}
+
+.facility-layer-custom-button {
+    padding: 8px 10px 0;
+    text-align: right;
+}

package/lib/_components/Template/indexV2.less

@@ -42,6 +42,28 @@
     cursor: pointer;
 }
 
+.facility-layer-custom-button {
+    padding: 8px 10px 10px;
+    text-align: right;
+}
+
+.facility-layer-custom-panel-has-button {
+    overflow: hidden;
+    background: #162d56;
+    box-shadow: inset 0 4px 16px 0 #1d7ad0;
+    border-radius: 8px;
+
+    .facility-layer-custom-content-dark {
+        background: transparent;
+        box-shadow: none;
+        border-radius: 8px 8px 0 0;
+    }
+
+    .facility-layer-custom-button {
+        padding: 2px 10px 10px;
+    }
+}
+
 .map-empty {
     display: flex;
     flex-direction: column;
@@ -549,7 +571,7 @@
 
                         &.is-alarm {
                           color: #FF2F2F;
-                          flex: 1;
+                            flex: 1;
                         }
                     }
                 }

package/lib/_util/http.js

@@ -19,10 +19,10 @@ import { getVtxToken } from "@vtx/utils";
 // 默认30秒超时
 var SECOND = 30;
 var MILL_SECOND = 1000;
-/**
- * 基于 axios 封装的请求封装
- * axios文档 http://www.axios-js.com/zh-cn/docs/
- * 支持 Get 和 Post 请求
+/**
+ * 基于 axios 封装的请求封装
+ * axios文档 http://www.axios-js.com/zh-cn/docs/
+ * 支持 Get 和 Post 请求
  */
 var Http = /*#__PURE__*/function () {
   function Http(options) {
@@ -57,10 +57,10 @@ var Http = /*#__PURE__*/function () {
       return instance;
     }
 
-    /**
-     * get 请求
-     * @param {*} url
-     * @param {*} options {body}
+    /**
+     * get 请求
+     * @param {*} url
+     * @param {*} options {body}
      */
   }, {
     key: "get",
@@ -78,10 +78,10 @@ var Http = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * post 请求
-     * @param {*} url
-     * @param {*} options
+    /**
+     * post 请求
+     * @param {*} url
+     * @param {*} options
      */
   }, {
     key: "post",
@@ -99,9 +99,9 @@ var Http = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * 响应数据的处理
-     * @param {*} response
+    /**
+     * 响应数据的处理
+     * @param {*} response
      */
   }, {
     key: "_responseHandler",
@@ -122,9 +122,9 @@ var Http = /*#__PURE__*/function () {
       throw error;
     }
 
-    /**
-     * 请求错误处理
-     * @param {*} error
+    /**
+     * 请求错误处理
+     * @param {*} error
      */
   }, {
     key: "_errorHandler",

package/lib/_util/interface.d.ts

@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 export declare enum TYPE {
     FACILITY = "1",
     DEVICE = "2"
@@ -373,6 +374,11 @@ export interface CommonPropsI {
     params?: object;
     showModal?: (feature: any) => any;
     customKeys?: any;
+    customButton?: ReactNode | ((args: {
+        feature: any;
+        facilityDetail?: any;
+        list?: any[];
+    }) => any);
     popup?: {
         version: string;
         fields?: {

package/lib/_util/interface.js

@@ -71,8 +71,8 @@ export var DEVICE_CODE = /*#__PURE__*/function (DEVICE_CODE) {
   return DEVICE_CODE;
 }({});
 
-/**
- * 管点特征枚举
+/**
+ * 管点特征枚举
  */
 export var POINT_CHARACTERISTICS = /*#__PURE__*/function (POINT_CHARACTERISTICS) {
   POINT_CHARACTERISTICS[POINT_CHARACTERISTICS["GD_BZ"] = 1] = "GD_BZ";

package/lib/typings.d.ts

@@ -1,4 +1,4 @@
-declare module '@vtx/cs-map'
-declare module '@vtx/utils'
-declare module '@vtx/map-icon'
-declare module '@ant-design/icons'
+declare module '@vtx/cs-map'
+declare module '@vtx/utils'
+declare module '@vtx/map-icon'
+declare module '@ant-design/icons'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/cs-map-layer",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "React components for Vortex",
   "license": "MIT",
   "module": "lib/index.js",
@@ -18,6 +18,7 @@
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepublishOnly": "npm run build",
     "start": "npm run dev"
   },
   "husky": {