@vtx/cs-map-layer 1.0.22 → 1.0.24

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/DeviceLayer/index.js

@@ -102,6 +102,9 @@ var DeviceLayer = function DeviceLayer(props) {
   var _icon = icon || styleOption.icon;
   var getProps = function getProps(status) {
     var color = deviceColorMap[status];
+    if (status == 1) {
+      color = styleOption.color || deviceColorMap[status];
+    }
     var _legend = {
       color: color,
       icon: _icon

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/WaterSupplyPointLayer/index.js

@@ -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';

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/FacilityCustomContent.d.ts

@@ -16,6 +16,7 @@ declare namespace CustomContent {
         popup: PropTypes.Requireable<object>;
         detail: PropTypes.Requireable<object>;
         extraKeyParamList: PropTypes.Requireable<any[]>;
+        customFactorValuesList: PropTypes.Requireable<any[]>;
     };
 }
 export default CustomContent;

package/lib/_components/Template/FacilityCustomContent.js

@@ -23,7 +23,9 @@ function CustomContent(props) {
     facilityDetail = props.facilityDetail,
     dark = props.dark,
     _props$extraKeyParamL = props.extraKeyParamList,
-    extraKeyParamList = _props$extraKeyParamL === void 0 ? [] : _props$extraKeyParamL;
+    extraKeyParamList = _props$extraKeyParamL === void 0 ? [] : _props$extraKeyParamL,
+    _props$customFactorVa = props.customFactorValuesList,
+    customFactorValuesList = _props$customFactorVa === void 0 ? [] : _props$customFactorVa;
   // !-解决因子不能及时更新问题
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -127,7 +129,22 @@ function CustomContent(props) {
     }, v.label || '', "\xA0: \xA0", v.label == '所属河道' ? (facilityDetail === null || facilityDetail === void 0 || (_facilityDetail$dataJ = facilityDetail.dataJson) === null || _facilityDetail$dataJ === void 0 ? void 0 : _facilityDetail$dataJ.regionTypeValue) == '河道' ? (facilityDetail === null || facilityDetail === void 0 || (_facilityDetail$dataJ2 = facilityDetail.dataJson) === null || _facilityDetail$dataJ2 === void 0 ? void 0 : _facilityDetail$dataJ2.regionObjectName) || '' : '' : (facilityDetail === null || facilityDetail === void 0 || (_facilityDetail$dataJ3 = facilityDetail.dataJson) === null || _facilityDetail$dataJ3 === void 0 ? void 0 : _facilityDetail$dataJ3[v.value]) || '');
   }), item !== null && item !== void 0 && (_item$keyParamList2 = item.keyParamList) !== null && _item$keyParamList2 !== void 0 && _item$keyParamList2.length ? /*#__PURE__*/React.createElement("div", {
     className: classnames(handleClassName('keyParam-line'))
-  }) : null), item !== null && item !== void 0 && (_item$factorValuesLis = item.factorValuesList) !== null && _item$factorValuesLis !== void 0 && _item$factorValuesLis.length ? /*#__PURE__*/React.createElement("div", {
+  }) : null), customFactorValuesList !== null && customFactorValuesList !== void 0 && customFactorValuesList.length ? /*#__PURE__*/React.createElement("div", {
+    className: classnames(handleClassName('keyIndicators'))
+  }, customFactorValuesList === null || customFactorValuesList === void 0 ? void 0 : customFactorValuesList.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", {
+      className: classnames(handleClassName('keyIndicators-item-left-name'))
+    }, 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 : '')));
+  })) : item !== null && item !== void 0 && (_item$factorValuesLis = item.factorValuesList) !== null && _item$factorValuesLis !== void 0 && _item$factorValuesLis.length ? /*#__PURE__*/React.createElement("div", {
     className: classnames(handleClassName('keyIndicators'))
   }, /*#__PURE__*/React.createElement("div", {
     className: classnames(handleClassName('keyIndicators-item'))
@@ -166,6 +183,7 @@ CustomContent.propTypes = {
   customButton: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
   popup: PropTypes.object,
   detail: PropTypes.object,
-  extraKeyParamList: PropTypes.array
+  extraKeyParamList: PropTypes.array,
+  customFactorValuesList: PropTypes.array
 };
 export default CustomContent;

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

@@ -10,5 +10,6 @@ declare const FacilityTemplate: FC<{
      */
     customKeys?: any;
     extraKeyParamList?: any[];
+    customFactorValuesList?: any[];
 }>;
 export default FacilityTemplate;

package/lib/_components/Template/FacilityTemplateV2.js

@@ -17,7 +17,9 @@ var FacilityTemplate = function FacilityTemplate(props) {
     customKeys = props.customKeys,
     customButton = props.customButton,
     _props$extraKeyParamL = props.extraKeyParamList,
-    extraKeyParamList = _props$extraKeyParamL === void 0 ? [] : _props$extraKeyParamL;
+    extraKeyParamList = _props$extraKeyParamL === void 0 ? [] : _props$extraKeyParamL,
+    _props$customFactorVa = props.customFactorValuesList,
+    customFactorValuesList = _props$customFactorVa === void 0 ? [] : _props$customFactorVa;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     list = _useState2[0],
@@ -91,6 +93,7 @@ var FacilityTemplate = function FacilityTemplate(props) {
     className: customButton ? 'facility-layer-custom-panel facility-layer-custom-panel-has-button' : 'facility-layer-custom-panel'
   }, /*#__PURE__*/React.createElement(CustomContent, {
     extraKeyParamList: extraKeyParamList,
+    customFactorValuesList: customFactorValuesList,
     dark: true,
     facilityDetail: facilityDetail,
     onClick: function onClick() {

package/lib/_components/Template/index.less

@@ -1,15 +1,15 @@
-.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;
-}
+.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/_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.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.22",
+  "version": "1.0.24",
   "description": "React components for Vortex",
   "license": "MIT",
   "module": "lib/index.js",