@vtx/cs-map-layer 1.0.17 → 1.0.19

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

@@ -13,7 +13,7 @@ declare namespace CustomContent {
         deviceDetail: PropTypes.Requireable<object>;
         deviceData: PropTypes.Requireable<object>;
         valueField: PropTypes.Requireable<string>;
-        customButton: PropTypes.Requireable<NonNullable<((...args: any[]) => any) | PropTypes.ReactElementLike | null | undefined>>;
+        customButton: PropTypes.Requireable<NonNullable<PropTypes.ReactElementLike | ((...args: any[]) => any) | null | undefined>>;
         popup: PropTypes.Requireable<object>;
         detail: PropTypes.Requireable<object>;
     };

package/lib/_components/Template/DeviceCustomContent.js

@@ -1,7 +1,9 @@
+import { QuestionCircleOutlined } from '@ant-design/icons';
 import { getVtxToken } from '@vtx/utils';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { Tooltip } from "antd";
 function CustomContent(props) {
   var _ref = getVtxToken() || {},
     token = _ref.token,
@@ -64,8 +66,16 @@ function CustomContent(props) {
     }), /*#__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 : '')));
+      className: classnames(handleClassName('keyIndicators-item-left-value'), {
+        'is-alarm': v.onAlarm
+      })
+    }, v.value || v.value == 0 ? v.value : '', v.onAlarm ? /*#__PURE__*/React.createElement(React.Fragment, null, " (".concat(v.alarmLevel, "\u7EA7\u62A5\u8B66) "), /*#__PURE__*/React.createElement(Tooltip, {
+      title: v.alarmDescription
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
+      style: {
+        color: '#fff'
+      }
+    }))) : '')));
   })) : null));
 }
 CustomContent.propTypes = {

package/lib/_components/Template/DeviceTemplateV2.js

@@ -1,3 +1,9 @@
+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); }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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 _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); }
@@ -96,13 +102,12 @@ var DeviceTemplate = function DeviceTemplate(props) {
         res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 || _res$data2.map(function (item) {
           var _item$factorValues;
           item === null || item === void 0 || (_item$factorValues = item.factorValues) === null || _item$factorValues === void 0 || _item$factorValues.map(function (v) {
-            data.push({
-              // name: v?.factorName,
+            data.push(_objectSpread(_objectSpread({}, v), {}, {
               name: v === null || v === void 0 ? void 0 : v.monitorItemName,
               unit: v === null || v === void 0 ? void 0 : v.unit,
               value: v === null || v === void 0 ? void 0 : v.formatValue,
               updateTime: v === null || v === void 0 ? void 0 : v.timeDesc
-            });
+            }));
           });
         });
       }

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

@@ -12,7 +12,7 @@ declare namespace CustomContent {
         onClick: PropTypes.Requireable<(...args: any[]) => any>;
         facilityDetail: PropTypes.Requireable<object>;
         valueField: PropTypes.Requireable<string>;
-        customButton: PropTypes.Requireable<NonNullable<((...args: any[]) => any) | PropTypes.ReactElementLike | null | undefined>>;
+        customButton: PropTypes.Requireable<NonNullable<PropTypes.ReactElementLike | ((...args: any[]) => any) | null | undefined>>;
         popup: PropTypes.Requireable<object>;
         detail: PropTypes.Requireable<object>;
     };

package/lib/_components/Template/index.less

@@ -1,10 +1,10 @@
-.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;
 }

package/lib/_components/Template/indexV2.less

@@ -164,7 +164,7 @@
                 &-name {
                     white-space: nowrap;
                 }
-                
+
                 &-value {
                     margin-left: 8px;
                 }
@@ -546,6 +546,11 @@
 
                     &-value {
                         margin-left: 8px;
+
+                        &.is-alarm {
+                          color: #FF2F2F;
+                          flex: 1;
+                        }
                     }
                 }
 
@@ -559,4 +564,4 @@
             }
         }
     }
-}
+}

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/_util/layerConfig.js

@@ -355,10 +355,17 @@ var facilityPopup = {
     // 基础信息：设施类型、设施名称、地址
     // 设施类型
     facilityClassStr: '泵站',
+    //   // 关键参数： 额定流量（m³/s）
+    //   keyParamList: [
+    //       {
+    //           label: '额定流量（m³/s）',
+    //           value: 'totalRatedFlow',
+    //       },
+    //   ],
     // 关键参数： 额定流量（m³/s）
     keyParamList: [{
-      label: '额定流量（m³/s）',
-      value: 'totalRatedFlow'
+      label: '设计规模（吨/天）',
+      value: 'designScale'
     }],
     // 展示所有配置因子
     showKeyIndicatorsListAll: false,

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,102 +1,105 @@
-{
-  "name": "@vtx/cs-map-layer",
-  "version": "1.0.17",
-  "description": "React components for Vortex",
-  "license": "MIT",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "cesium:fix": "node ./scripts/cesium-fix.js",
-    "dev": "npm run cesium:fix && dumi dev",
-    "docs:build": "npm run cesium:fix && dumi build",
-    "doctor": "father doctor",
-    "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": "father doctor && npm run build",
-    "start": "npm run dev"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "*.{md,json}": [
-      "prettier --write --no-error-on-unmatched-pattern"
-    ],
-    "*.{css,less}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@vtx/utils": "latest",
-    "cesium": "1.90.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.1",
-    "qs": "^6.0.0",
-    "ahooks": "^3.1.5"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "4.7.0",
-    "@babel/runtime": "^7.6.3",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@turf/turf": "^6.5.0",
-    "@types/lodash": "^4.14.202",
-    "@types/qs": "^6.9.11",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "@vtx/cs-map": "latest",
-    "@vtx/map-icon": "^2.0.16",
-    "antd": "4.20.5",
-    "axios": "^0.21.1",
-    "babel-plugin-import": "^1.13.8",
-    "dumi": "^2.2.13",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.0.0",
-    "@vtx/cs-map": ">=1.0.40",
-    "@vtx/map-icon": ">=2.0.0",
-    "antd": ">4.0.0",
-    "axios": ">=0.21.1",
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": [],
-  "slideEffects": false
-}
+{
+  "name": "@vtx/cs-map-layer",
+  "version": "1.0.19",
+  "description": "React components for Vortex",
+  "license": "MIT",
+  "module": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "cesium:fix": "node ./scripts/cesium-fix.js",
+    "dev": "npm run cesium:fix && dumi dev",
+    "docs:build": "npm run cesium:fix && dumi build",
+    "doctor": "father doctor",
+    "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}\"",
+    "start": "npm run dev"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{md,json}": [
+      "prettier --write --no-error-on-unmatched-pattern"
+    ],
+    "*.{css,less}": [
+      "stylelint --fix",
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/icons-svg": "^4.4.2",
+    "@vtx/utils": "latest",
+    "ahooks": "^3.1.5",
+    "cesium": "1.90.0",
+    "classnames": "^2.5.1",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.1",
+    "prop-types": "^15.8.1",
+    "qs": "^6.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "4.7.0",
+    "@babel/runtime": "^7.6.3",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@turf/turf": "^6.5.0",
+    "@types/lodash": "^4.14.202",
+    "@types/prop-types": "^15.7.15",
+    "@types/qs": "^6.9.11",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "@vtx/cs-map": "latest",
+    "@vtx/map-icon": "^2.0.16",
+    "antd": "4.20.5",
+    "axios": "^0.21.1",
+    "babel-plugin-import": "^1.13.8",
+    "dumi": "^2.2.13",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.0.0",
+    "@vtx/cs-map": ">=1.0.40",
+    "@vtx/map-icon": ">=2.0.0",
+    "antd": ">4.0.0",
+    "axios": ">=0.21.1",
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [],
+  "slideEffects": false
+}