@vtx/cs-map-layer 1.0.10 → 1.0.12

package/lib/DeviceLayer/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", "showModal"];
+var _excluded = ["code", "params", "showModal", "styleOption"];
 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; }
@@ -10,31 +10,33 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 DeviceTemplate from "../_components/Template/DeviceTemplate";
 import { DEVICE_CODE } from "../_util/interface";
 import { deviceCodeMap, getDeviceStyle } from "../_util/layerConfig";
-import DeviceTemplate from "../_components/Template/DeviceTemplate";
 var DeviceLayer = function DeviceLayer(props) {
   var _props$code = props.code,
     code = _props$code === void 0 ? DEVICE_CODE.DEFAULT : _props$code,
     _props$params = props.params,
     params = _props$params === void 0 ? {} : _props$params,
     showModal = props.showModal,
+    _props$styleOption = props.styleOption,
+    styleOption = _props$styleOption === void 0 ? {} : _props$styleOption,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _deviceCodeMap$code = deviceCodeMap[code],
-    name = _deviceCodeMap$code.name,
-    labelField = _deviceCodeMap$code.labelField,
-    icon = _deviceCodeMap$code.icon;
+  var _ref = deviceCodeMap[code] || {},
+    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 || '');
+      return getDeviceStyle(f, icon || '', styleOption);
     },
     name: name,
     labelField: labelField,
-    legend: icon,
+    legend: icon || (styleOption === null || styleOption === void 0 ? void 0 : styleOption.icon),
     zIndex: 4,
     id: code,
     template: function template(feature) {

package/lib/_util/http.js

@@ -9,21 +9,20 @@ 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); }
 import axios from 'axios';
 // 安装axios的同时会同步安装qs包 https://www.npmjs.com/package/qs
-import { getUrlParam, trim } from '@vtx/utils';
+import { trim } from '@vtx/utils';
 import { message } from 'antd';
 import isObject from 'lodash/isObject';
 import pickBy from 'lodash/pickBy';
 import qs from 'qs';
+import { getVtxToken } from "@vtx/utils";
 
 // 默认30秒超时
 var SECOND = 30;
 var MILL_SECOND = 1000;
-var _getUrlParam = getUrlParam(),
-  token = _getUrlParam.token;
-/**
- * 基于 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) {
@@ -37,6 +36,11 @@ var Http = /*#__PURE__*/function () {
   _createClass(Http, [{
     key: "_createAxios",
     value: function _createAxios(options) {
+      var _ref = getVtxToken() || {},
+        token = _ref.token,
+        tenantId = _ref.tenantId,
+        userId = _ref.userId;
+
       // 创建实例
       var instance = axios.create(_objectSpread({
         // `timeout` 指定请求超时的毫秒数(0 表示无超时时间)
@@ -44,17 +48,19 @@ var Http = /*#__PURE__*/function () {
         timeout: MILL_SECOND * SECOND,
         headers: {
           Authorization: token ? "Bearer ".concat(token) : '',
-          'Cache-Control': 'no-cache'
+          'Cache-Control': 'no-cache',
+          tenantId: tenantId,
+          userId: userId
         }
       }, options));
       instance.interceptors.response.use(this._responseHandler, this._errorHandler);
       return instance;
     }
 
-    /**
-     * get 请求
-     * @param {*} url
-     * @param {*} options {body}
+    /**
+     * get 请求
+     * @param {*} url
+     * @param {*} options {body}
      */
   }, {
     key: "get",
@@ -72,10 +78,10 @@ var Http = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * post 请求
-     * @param {*} url
-     * @param {*} options
+    /**
+     * post 请求
+     * @param {*} url
+     * @param {*} options
      */
   }, {
     key: "post",
@@ -93,9 +99,9 @@ var Http = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * 响应数据的处理
-     * @param {*} response
+    /**
+     * 响应数据的处理
+     * @param {*} response
      */
   }, {
     key: "_responseHandler",
@@ -116,9 +122,9 @@ var Http = /*#__PURE__*/function () {
       throw error;
     }
 
-    /**
-     * 请求错误处理
-     * @param {*} error
+    /**
+     * 请求错误处理
+     * @param {*} error
      */
   }, {
     key: "_errorHandler",

package/lib/_util/layerConfig.d.ts

@@ -15,7 +15,7 @@ type DeviceI = {
 };
 declare const facilityCodeMap: FacilityI;
 declare const deviceCodeMap: DeviceI;
-export declare const getDeviceStyle: (f: any, icon: string) => {
+export declare const getDeviceStyle: (f: any, icon: string, styleOption?: {}) => {
     type: string;
     style: {
         icon: string;

package/lib/_util/layerConfig.js

@@ -1,5 +1,7 @@
 var _facilityCodeMap;
 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); }
@@ -250,6 +252,7 @@ var deviceCodeMap = {
   }
 };
 export var getDeviceStyle = function getDeviceStyle(f, icon) {
+  var styleOption = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var value = f._properties.properties._value;
   var statusMap = {
     1: '',
@@ -262,11 +265,11 @@ export var getDeviceStyle = function getDeviceStyle(f, icon) {
   };
   return {
     type: 'Marker',
-    style: {
+    style: _objectSpread({
       icon: icon,
       scale: 0.65,
       status: statusMap[value.status]
-    }
+    }, styleOption)
   };
 };
 export { deviceCodeMap, facilityCodeMap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/cs-map-layer",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "React components for Vortex",
   "license": "MIT",
   "module": "lib/index.js",
@@ -11,10 +11,10 @@
   "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",
-    "cesium:fix": "node ./scripts/cesium-fix.js",
     "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}\"",
@@ -57,14 +57,21 @@
     "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/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",
+    "ahooks": "^3.1.5",
+    "antd": "4.20.5",
+    "axios": "^0.21.1",
     "babel-plugin-import": "^1.13.8",
     "dumi": "^2.2.13",
     "eslint": "^8.23.0",
@@ -76,21 +83,14 @@
     "prettier-plugin-packagejson": "^2.2.18",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@ant-design/icons": "4.7.0",
-    "@vtx/cs-map": "^1.0.53",
-    "@turf/turf": "^6.5.0",
-    "@vtx/map-icon": "^2.0.16",
-    "ahooks": "^3.1.5",
-    "axios": "^0.21.1",
-    "antd": "4.20.5",
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": ">4.0.0",
-    "@vtx/map-icon": ">=2.0.0",
+    "@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",
-    "@ant-design/icons": ">=4.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },