@vtx/cs-map-layer 1.0.12 → 1.0.14

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

@@ -3,6 +3,9 @@ import { CommonPropsI, DEVICE_CODE } from '../_util/interface';
 interface PropsI {
     code?: keyof typeof DEVICE_CODE;
     styleOption?: any;
+    dataField: string;
+    name?: string;
+    legend?: string | object;
 }
 declare const DeviceLayer: FC<CommonPropsI & PropsI>;
 export default DeviceLayer;

package/lib/DeviceLayer/index.js

@@ -1,18 +1,24 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["code", "params", "showModal", "styleOption"];
+var _excluded = ["code", "params", "showModal", "styleOption", "name", "legend"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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 { FeatureLayer } from '@vtx/cs-map';
-import React from 'react';
+import { FeatureLayer, GroupLayer } from '@vtx/cs-map';
+import React, { useMemo } from 'react';
 import DeviceTemplate from "../_components/Template/DeviceTemplate";
 import { DEVICE_CODE } from "../_util/interface";
-import { deviceCodeMap, getDeviceStyle } from "../_util/layerConfig";
+import { deviceCodeMap, getDeviceStyle, deviceColorMap, deviceStatusNameMap } from "../_util/layerConfig";
+import http from "../_util/http";
+import { useRequest } from 'ahooks';
+import { cloneDeep, isEmpty, isObject } from 'lodash';
 var DeviceLayer = function DeviceLayer(props) {
   var _props$code = props.code,
     code = _props$code === void 0 ? DEVICE_CODE.DEFAULT : _props$code,
@@ -21,30 +27,116 @@ var DeviceLayer = function DeviceLayer(props) {
     showModal = props.showModal,
     _props$styleOption = props.styleOption,
     styleOption = _props$styleOption === void 0 ? {} : _props$styleOption,
+    name = props.name,
+    legend = props.legend,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _ref = deviceCodeMap[code] || {},
-    name = _ref.name,
+  var _ref = deviceCodeMap[code] || {
+      name: name
+    },
+    _name = _ref.name,
     labelField = _ref.labelField,
     icon = _ref.icon;
-  return /*#__PURE__*/React.createElement(FeatureLayer, _extends({
-    url: "/cloud/zhsw-jcyj/api/basicDevice/list",
-    params: _objectSpread({
-      deviceTypeId: code
-    }, params),
-    style: function style(f) {
-      return getDeviceStyle(f, icon || '', styleOption);
-    },
-    name: name,
-    labelField: labelField,
-    legend: icon || (styleOption === null || styleOption === void 0 ? void 0 : styleOption.icon),
-    zIndex: 4,
-    id: code,
-    template: function template(feature) {
-      return /*#__PURE__*/React.createElement(DeviceTemplate, {
-        feature: feature,
-        showModal: showModal
+  var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return http.post('/cloud/device/deviceMap/list', {
+              body: JSON.stringify(_objectSpread({
+                deviceTypeId: code
+              }, params))
+            });
+          case 2:
+            res = _context.sent;
+            return _context.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      refreshDeps: [code, JSON.stringify(params)]
+    }),
+    _useRequest$data = _useRequest.data,
+    data = _useRequest$data === void 0 ? [] : _useRequest$data;
+  var _useMemo = useMemo(function () {
+      var onlineData = [];
+      var offlineData = [];
+      var alarmData = [];
+      var errorData = [];
+      data.forEach(function (item) {
+        var newItem = cloneDeep(item);
+        var status = item.status;
+        newItem.geometryInfo = newItem[props.dataField || 'geometryInfo'];
+        newItem.geometryInfo.coordType = newItem.geometryInfo.coordinateType || newItem.geometryInfo.coordType;
+        newItem.geometryInfo.type = newItem.geometryInfo.shapeType || newItem.geometryInfo.type;
+        if (status === 1) {
+          onlineData.push(newItem);
+        } else if (status === 2) {
+          alarmData.push(newItem);
+        } else if (status === 3) {
+          offlineData.push(newItem);
+        } else if (status === 4) {
+          errorData.push(newItem);
+        }
       });
+      return {
+        onlineData: onlineData,
+        offlineData: offlineData,
+        alarmData: alarmData,
+        errorData: errorData
+      };
+    }, [data]),
+    offlineData = _useMemo.offlineData,
+    onlineData = _useMemo.onlineData,
+    alarmData = _useMemo.alarmData,
+    errorData = _useMemo.errorData;
+  var _icon = icon || styleOption.icon;
+  var getProps = function getProps(status) {
+    var color = deviceColorMap[status];
+    var _legend = {
+      color: color,
+      icon: _icon
+    };
+    if (legend) {
+      _legend = isObject(legend) ? _objectSpread(_objectSpread({}, _legend), legend) : legend;
     }
-  }, otherProps));
+    return _objectSpread({
+      style: function style(f) {
+        return getDeviceStyle(f, icon || '', styleOption);
+      },
+      name: "".concat(_name, "-").concat(deviceStatusNameMap[status]),
+      labelField: labelField,
+      valueField: 'id',
+      zIndex: 60,
+      id: "".concat(code, "_").concat(status),
+      cluster: {
+        style: {
+          color: color,
+          icon: _icon
+        }
+      },
+      legend: _legend,
+      template: function template(feature) {
+        return /*#__PURE__*/React.createElement(DeviceTemplate, {
+          feature: feature,
+          showModal: showModal
+        });
+      }
+    }, otherProps);
+  };
+  return /*#__PURE__*/React.createElement(GroupLayer, {
+    name: _name,
+    id: code
+  }, !isEmpty(onlineData) && /*#__PURE__*/React.createElement(FeatureLayer, _extends({
+    data: onlineData
+  }, getProps(1))), !isEmpty(offlineData) && /*#__PURE__*/React.createElement(FeatureLayer, _extends({
+    data: offlineData
+  }, getProps(3))), !isEmpty(alarmData) && /*#__PURE__*/React.createElement(FeatureLayer, _extends({
+    data: alarmData
+  }, getProps(2))), !isEmpty(errorData) && /*#__PURE__*/React.createElement(FeatureLayer, _extends({
+    data: errorData
+  }, getProps(4))));
 };
 export default DeviceLayer;

package/lib/FacilityLayer/index.d.ts

@@ -4,6 +4,10 @@ interface PropsI {
     code?: keyof typeof FACILITY_CODE;
     styleOption?: any;
     valueField?: string;
+    /**
+     * 接收自定义字段显示
+     */
+    customKeys?: any;
 }
 declare const FacilityLayer: FC<CommonPropsI & PropsI>;
 export default FacilityLayer;

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"];
+var _excluded = ["code", "params", "styleOption", "showModal", "valueField", "customKeys"];
 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; }
@@ -22,6 +22,8 @@ var FacilityLayer = function FacilityLayer(props) {
     styleOption = _props$styleOption === void 0 ? {} : _props$styleOption,
     showModal = props.showModal,
     valueField = props.valueField,
+    _props$customKeys = props.customKeys,
+    customKeys = _props$customKeys === void 0 ? [] : _props$customKeys,
     otherProps = _objectWithoutProperties(props, _excluded);
   var newCode = code.toLocaleUpperCase();
   var _ref = facilityCodeMap[newCode] || {},
@@ -48,7 +50,8 @@ var FacilityLayer = function FacilityLayer(props) {
       return /*#__PURE__*/React.createElement(FacilityTemplate, {
         feature: feature,
         showModal: showModal,
-        valueField: valueField
+        valueField: valueField,
+        customKeys: customKeys
       });
     }
   }, 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/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"];
 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; }
@@ -17,6 +17,8 @@ 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,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.WATER_SUPPLY_LINE;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -35,7 +37,8 @@ var WaterSupplyLineLayer = function WaterSupplyLineLayer(props) {
     template: function template(feature) {
       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"];
 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,22 @@ 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 { 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,
     otherProps = _objectWithoutProperties(props, _excluded);
   var code = FACILITY_CODE.WATER_SUPPLY_POINT;
   var _facilityCodeMap$code = facilityCodeMap[code],
@@ -55,7 +57,8 @@ var WaterSupplyPointLayer = function WaterSupplyPointLayer(props) {
     template: function template(feature) {
       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/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); }
@@ -28,6 +32,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 +48,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 () {

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

@@ -3,5 +3,9 @@ declare const FacilityTemplate: FC<{
     feature: any;
     valueField?: string;
     showModal?: any;
+    /**
+     * 接收自定义字段显示
+     */
+    customKeys?: any;
 }>;
 export default FacilityTemplate;

package/lib/_components/Template/FacilityTemplate.js

@@ -16,7 +16,8 @@ import CloseBtn from "./CloseBtn";
 var FacilityTemplate = function FacilityTemplate(props) {
   var feature = props.feature,
     showModal = props.showModal,
-    valueField = props.valueField;
+    valueField = props.valueField,
+    customKeys = props.customKeys;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     list = _useState2[0],
@@ -38,13 +39,17 @@ var FacilityTemplate = function FacilityTemplate(props) {
     }).then(function (res) {
       var _list = [];
       if (String(res === null || res === void 0 ? void 0 : res.result) === '0' && res.data) {
-        var _res$data$baseFields = res.data.baseFields,
-          baseFields = _res$data$baseFields === void 0 ? [] : _res$data$baseFields;
-        baseFields = baseFields.filter(function (r) {
-          return r.tableShow;
+        var _res$data = res.data,
+          _res$data$baseFields = _res$data.baseFields,
+          baseFields = _res$data$baseFields === void 0 ? [] : _res$data$baseFields,
+          _res$data$customField = _res$data.customFields,
+          customFields = _res$data$customField === void 0 ? [] : _res$data$customField;
+        var _list2 = [].concat(_toConsumableArray(baseFields), _toConsumableArray(customFields)).filter(function (r) {
+          return (customKeys === null || customKeys === void 0 ? void 0 : customKeys.includes(r.showKey)) || r.tableShow;
         }) || [];
-        if (baseFields.length) {
-          _list = transform(_toConsumableArray(baseFields), facilityDetail);
+        console.log(_list2);
+        if (_list2.length) {
+          _list = transform(_toConsumableArray(_list2), facilityDetail);
         }
       }
       setList(_list);

package/lib/_components/Template/index.less

@@ -1,6 +1,6 @@
-.close-btn {
-    position: absolute;
-    top: 12px;
-    right: 30px;
-    cursor: pointer;
-}
+.close-btn {
+    position: absolute;
+    top: 12px;
+    right: 30px;
+    cursor: pointer;
+}

package/lib/_util/http.d.ts

@@ -1,6 +1,6 @@
 import { AxiosInstance } from 'axios';
 interface OptionI {
-    body?: object;
+    body?: object | string;
     extraHeader?: {
         msg?: string;
     };

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

@@ -229,6 +229,10 @@ export declare enum DEVICE_CODE {
      * 水质检测仪
      */
     WATER_QUALITY_DETECTOR = "WATER_QUALITY_DETECTOR",
+    /**
+     * 泵房设备
+     */
+    BF_STATION = "BF_STATION",
     /**
      * 甲烷气体传感器
      */
@@ -368,4 +372,5 @@ export declare enum POINT_CHARACTERISTICS_STR {
 export interface CommonPropsI {
     params?: object;
     showModal?: (feature: any) => any;
+    customKeys?: any;
 }

package/lib/_util/interface.js

@@ -63,6 +63,7 @@ export var DEVICE_CODE = /*#__PURE__*/function (DEVICE_CODE) {
   DEVICE_CODE["LEVEL_SENSOR"] = "LEVEL_SENSOR";
   DEVICE_CODE["MANOMETER"] = "MANOMETER";
   DEVICE_CODE["WATER_QUALITY_DETECTOR"] = "WATER_QUALITY_DETECTOR";
+  DEVICE_CODE["BF_STATION"] = "BF_STATION";
   DEVICE_CODE["WATER_JWQTCGQ"] = "WATER_JWQTCGQ";
   DEVICE_CODE["INCLINOMETER"] = "INCLINOMETER";
   DEVICE_CODE["INTEGRATED_LEVEL_SENSOR"] = "INTEGRATED_LEVEL_SENSOR";
@@ -70,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.d.ts

@@ -15,6 +15,18 @@ type DeviceI = {
 };
 declare const facilityCodeMap: FacilityI;
 declare const deviceCodeMap: DeviceI;
+export declare const deviceColorMap: {
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+};
+export declare const deviceStatusNameMap: {
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+};
 export declare const getDeviceStyle: (f: any, icon: string, styleOption?: {}) => {
     type: string;
     style: {

package/lib/_util/layerConfig.js

@@ -249,8 +249,31 @@ var deviceCodeMap = {
     icon: 'SZZ',
     name: '噪声传感器',
     labelField: 'name'
+  },
+  BF_STATION: {
+    icon: 'BF',
+    name: '泵房设备',
+    labelField: 'name'
   }
 };
+export var deviceColorMap = {
+  1: '#119FFB',
+  // 正常/在线
+  2: '#CE3739',
+  // 报警/异常
+  3: '#AAAAAD',
+  // 离线
+  4: '#CE3739' // 故障/堵塞
+};
+export var deviceStatusNameMap = {
+  1: '在线',
+  // 正常/在线
+  2: '报警',
+  // 报警/异常
+  3: '离线',
+  // 离线
+  4: '故障' // 故障/堵塞
+};
 export var getDeviceStyle = function getDeviceStyle(f, icon) {
   var styleOption = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var value = f._properties.properties._value;

package/lib/typings.d.ts

@@ -1,3 +1,4 @@
-declare module '@vtx/cs-map'
-declare module '@vtx/utils'
-declare module '@vtx/map-icon'
+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.12",
+  "version": "1.0.14",
   "description": "React components for Vortex",
   "license": "MIT",
   "module": "lib/index.js",
@@ -54,7 +54,8 @@
     "cesium": "1.90.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
-    "qs": "^6.0.0"
+    "qs": "^6.0.0",
+    "ahooks": "^3.1.5"
   },
   "devDependencies": {
     "@ant-design/icons": "4.7.0",
@@ -69,7 +70,6 @@
     "@umijs/lint": "^4.0.0",
     "@vtx/cs-map": "latest",
     "@vtx/map-icon": "^2.0.16",
-    "ahooks": "^3.1.5",
     "antd": "4.20.5",
     "axios": "^0.21.1",
     "babel-plugin-import": "^1.13.8",