@deepinnet-components/pc 0.0.52 → 0.0.54

package/dist/Map2D/Map/index.js

@@ -15,7 +15,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // @ts-nocheck
 import { useEffect, useRef, useState } from 'react';
+import arrowImg from "../demo/imgs/\u7BAD\u5934\u65B9\u5411.png";
 import "../index.less";
+import { getBase64FromLocalImage } from "../utils";
 var Map = function Map(props) {
   var id = props.id,
     _props$opts = props.opts,
@@ -96,6 +98,26 @@ var Map = function Map(props) {
       if (props.onRightClick) {
         map === null || map === void 0 || map.on('contextmenu', mapRightClick);
       }
+      _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var base64, image;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return getBase64FromLocalImage(arrowImg);
+            case 2:
+              base64 = _context2.sent;
+              _context2.next = 5;
+              return map.loadImage(base64);
+            case 5:
+              image = _context2.sent;
+              map.addImage('custom-arrow', image.data);
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
     }
   }, [map]);
   return /*#__PURE__*/React.createElement("div", {

package/dist/Map2D/MapPolyline/index.js

@@ -50,6 +50,12 @@ var MapPolyline = function MapPolyline(props) {
     zIndex = _props$zIndex === void 0 ? 12 : _props$zIndex,
     _props$isArrow = props.isArrow,
     isArrow = _props$isArrow === void 0 ? false : _props$isArrow,
+    _props$arrowConfig = props.arrowConfig,
+    arrowConfig = _props$arrowConfig === void 0 ? {
+      img: 'custom-arrow',
+      spacing: 25,
+      size: 1
+    } : _props$arrowConfig,
     _props$multi = props.multi,
     multi = _props$multi === void 0 ? false : _props$multi,
     _props$isGetColor = props.isGetColor,
@@ -158,23 +164,25 @@ var MapPolyline = function MapPolyline(props) {
         obj[item.id] = (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.zIndex;
       });
       var fKey = findKeyWithMinValueGreaterThan(obj, zIndex, [id]);
-      if (fKey) {
-        map.moveLayer(id, fKey);
-        if (getOutline()) {
-          map.moveLayer(outlineId, fKey);
-        }
-        if (getArrowLine()) {
-          map.moveLayer(allowLayerId, fKey);
-        }
-      } else {
-        map.moveLayer(id);
-        if (getOutline()) {
-          map.moveLayer(outlineId);
-        }
-        if (getArrowLine()) {
-          map.moveLayer(allowLayerId);
+      try {
+        if (fKey) {
+          map.moveLayer(id, fKey);
+          if (getOutline()) {
+            map.moveLayer(outlineId, fKey);
+          }
+          if (getArrowLine()) {
+            map.moveLayer(allowLayerId, fKey);
+          }
+        } else {
+          map.moveLayer(id);
+          if (getOutline()) {
+            map.moveLayer(outlineId);
+          }
+          if (getArrowLine()) {
+            map.moveLayer(allowLayerId);
+          }
         }
-      }
+      } catch (error) {}
     }
   }, [zIndex, map, line]);
   useEffect(function () {
@@ -203,7 +211,8 @@ var MapPolyline = function MapPolyline(props) {
       },
       zIndex: zIndex,
       metadata: {
-        zIndex: zIndex
+        zIndex: zIndex,
+        isArrow: isArrow
       }
     };
     if (multi && isGetColor) {
@@ -223,21 +232,20 @@ var MapPolyline = function MapPolyline(props) {
       map.setPaintProperty(id, 'line-color', lineColor);
       map.setPaintProperty(id, 'line-width', width);
       map.setPaintProperty(id, 'line-opacity', opacity);
-    } else {
-      // console.log('添加layer')
-      map.addLayer(lineObj);
       if (isArrow) {
+        var arrowLayer = map.getLayer(allowLayerId);
+        if (arrowLayer) return;
         var arrowLineObj = {
           id: allowLayerId,
           type: 'symbol',
           source: id,
           layout: {
-            'icon-image': 'custom-arrow',
+            'icon-image': arrowConfig.img || 'custom-arrow',
             // 箭头图标
             'symbol-placement': 'line',
-            'symbol-spacing': 25,
+            'symbol-spacing': arrowConfig.spacing || 25,
             // 图标间隔，默认为250
-            'icon-size': 1
+            'icon-size': arrowConfig.size || 1
           },
           metadata: {
             zIndex: zIndex
@@ -245,6 +253,34 @@ var MapPolyline = function MapPolyline(props) {
         };
         map.addLayer(arrowLineObj);
         setArrowLine(arrowLineObj);
+      } else {
+        var _arrowLayer = map.getLayer(allowLayerId);
+        if (_arrowLayer) {
+          map === null || map === void 0 || map.removeLayer(allowLayerId);
+        }
+      }
+    } else {
+      // console.log('添加layer')
+      map.addLayer(lineObj);
+      if (isArrow) {
+        var _arrowLineObj = {
+          id: allowLayerId,
+          type: 'symbol',
+          source: id,
+          layout: {
+            'icon-image': arrowConfig.img || 'custom-arrow',
+            // 箭头图标
+            'symbol-placement': 'line',
+            'symbol-spacing': arrowConfig.spacing || 25,
+            // 图标间隔，默认为250
+            'icon-size': arrowConfig.size || 1
+          },
+          metadata: {
+            zIndex: zIndex
+          }
+        };
+        map.addLayer(_arrowLineObj);
+        setArrowLine(_arrowLineObj);
       }
     }
     setLine(deepClone(lineObj));
@@ -296,7 +332,7 @@ var MapPolyline = function MapPolyline(props) {
     if (!map || !sourceData) return;
     drawLine();
     drawOutLine();
-  }, [map, sourceData, color, width, opacity, isOutline]);
+  }, [map, sourceData, color, width, opacity, isOutline, isArrow]);
   var flagRef = useRef(false);
   function onMouseenter(e) {
     if (flagRef.current) return;
@@ -322,7 +358,7 @@ var MapPolyline = function MapPolyline(props) {
     var _e$originalEvent, _e$originalEvent$stop;
     (_e$originalEvent = e.originalEvent) === null || _e$originalEvent === void 0 || (_e$originalEvent$stop = _e$originalEvent.stopPropagation) === null || _e$originalEvent$stop === void 0 || _e$originalEvent$stop.call(_e$originalEvent);
     var features = map.queryRenderedFeatures(e.point);
-    console.log(features);
+    // console.log(features);
     if (!features.length) return;
     var item = features.find(function (item) {
       return item.source.includes('customPolyline::');

package/dist/Map2D/demo/utilsDemo/getPolygonCenter.js

@@ -5,10 +5,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Map2D } from "../../..";
-import { Button, Space, message } from 'antd';
+import { Button, message } from 'antd';
 import React, { useEffect, useState } from 'react';
-// @ts-ignore
-
 var Map = Map2D.Map,
   MapMarker = Map2D.MapMarker,
   MapPolygon = Map2D.MapPolygon,
@@ -165,9 +163,6 @@ var App = function App() {
     onClick: function onClick() {
       message.info('centerOfMass中心');
     }
-  })))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    onClick: function onClick() {}
-  }, "btn")));
+  })))));
 };
 export default App;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",