ym-giswidget-2d 1.0.82 → 1.0.84

package/components/draw/Draw.vue.d.ts

@@ -1,13 +1,23 @@
 import { default as OLMap } from 'ym-gis-2d/mapView/Map';
+import { DrawEvent, DrawGeometryType, ShEvent } from 'ym-gis-2d/interaction/Draw';
+import { default as Feature } from 'ym-gis-2d/entity/Feature';
 import { default as IStyle } from 'ym-gis-2d/entity/style/IStyle';
 type __VLS_Props = {
     map: OLMap;
-    geometryType?: "polygon" | "point" | "polyline" | "rectangle" | "circle";
+    geometryType?: DrawGeometryType;
     style?: IStyle;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    drawEnd: (...args: any[]) => void;
+    drawStart: (event: DrawEvent) => any;
+    drawEnd: (feature: Feature | undefined) => any;
+    drawAbort: (event: DrawEvent) => any;
+    drawAddPoint: (event: ShEvent) => any;
+    drawMoving: (event: DrawEvent) => any;
 }, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onDrawEnd?: ((...args: any[]) => any) | undefined;
+    onDrawStart?: ((event: DrawEvent) => any) | undefined;
+    onDrawEnd?: ((feature: Feature | undefined) => any) | undefined;
+    onDrawAbort?: ((event: DrawEvent) => any) | undefined;
+    onDrawAddPoint?: ((event: ShEvent) => any) | undefined;
+    onDrawMoving?: ((event: DrawEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 export default _default;

package/components/draw/Draw.vue.js

@@ -7,14 +7,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     geometryType: {},
     style: {}
   },
-  emits: ["drawEnd"],
+  emits: ["drawStart", "drawAddPoint", "drawMoving", "drawEnd", "drawAbort"],
   setup(__props, { emit: __emit }) {
     const emit = __emit;
     const props = __props;
-    watch(() => props.geometryType, (newVal) => {
+    watch(() => props.geometryType, () => {
       init();
     });
-    watch(() => props.map.currentEditLayer, (newVal) => {
+    watch(() => props.map.currentEditLayer, () => {
       init();
     });
     onMounted(() => {
@@ -52,6 +52,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         style: props.style
       });
       props.map.interactionManager.addInteraction("draw", draw);
+      draw.on("drawStart", (event) => {
+        emit("drawStart", event);
+      });
+      draw.on("drawAddPoint", (event) => {
+        emit("drawAddPoint", event);
+      });
+      draw.on("drawMoving", (event) => {
+        emit("drawMoving", event);
+      });
       draw.on("drawEnd", (event) => {
         const features = event.feature;
         if (features) {
@@ -61,18 +70,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         emit("drawEnd", features);
       });
+      draw.on("drawAbort", (event) => {
+        emit("drawAbort", event);
+      });
     }
     function getTempLayerByGeometryType(geometryType) {
       switch (geometryType) {
         case "point":
           return props.map.getPointTempLayer();
         case "polyline":
+        case "dashline":
+        case "arrowline":
+        case "straightarrow":
           return props.map.getLineTempLayer();
         case "polygon":
-          return props.map.getPolygonTempLayer();
         case "rectangle":
-          return props.map.getPolygonTempLayer();
         case "circle":
+        case "arrow":
           return props.map.getPolygonTempLayer();
         default:
           return void 0;

package/components/draw/index.d.ts

@@ -1,14 +1,22 @@
 export declare const Draw: import('../../utils').WithInstall<import('vue').DefineComponent<{
     map: import('ym-gis-2d/mapView/Map').default;
-    geometryType?: "polygon" | "point" | "polyline" | "rectangle" | "circle";
+    geometryType?: import('ym-gis-2d/interaction/Draw').DrawGeometryType;
     style?: import('ym-gis-2d/entity/style/IStyle').default;
 }, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    drawEnd: (...args: any[]) => void;
+    drawStart: (event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any;
+    drawEnd: (feature: import('ym-gis-2d/entity/Feature').default | undefined) => any;
+    drawAbort: (event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any;
+    drawAddPoint: (event: import('ym-gis-2d/interaction/Draw').ShEvent) => any;
+    drawMoving: (event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any;
 }, string, import('vue').PublicProps, Readonly<{
     map: import('ym-gis-2d/mapView/Map').default;
-    geometryType?: "polygon" | "point" | "polyline" | "rectangle" | "circle";
+    geometryType?: import('ym-gis-2d/interaction/Draw').DrawGeometryType;
     style?: import('ym-gis-2d/entity/style/IStyle').default;
 }> & Readonly<{
-    onDrawEnd?: ((...args: any[]) => any) | undefined;
+    onDrawStart?: ((event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any) | undefined;
+    onDrawEnd?: ((feature: import('ym-gis-2d/entity/Feature').default | undefined) => any) | undefined;
+    onDrawAbort?: ((event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any) | undefined;
+    onDrawAddPoint?: ((event: import('ym-gis-2d/interaction/Draw').ShEvent) => any) | undefined;
+    onDrawMoving?: ((event: import('ym-gis-2d/interaction/Draw').DrawEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>>;
 export default Draw;

package/components/heatmap/Heatmap.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./Heatmap.vue2.js";
 /* empty css             */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _Heatmap = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2062a8dc"]]);
+const _Heatmap = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-86446aae"]]);
 export {
   _Heatmap as default
 };

package/components/heatmap/Heatmap.vue2.js

@@ -10,7 +10,7 @@ import DraggablePanel from "../../panel/DraggablePanel.vue.js";
 import { Heatmap } from "ol/layer";
 import { Vector } from "ol/source";
 import { Feature } from "ol";
-import { Point } from "ol/geom";
+import { Point, MultiPoint } from "ol/geom";
 const _hoisted_1 = { class: "heatmap-widget-host" };
 const _hoisted_2 = { class: "control-panel" };
 const _hoisted_3 = { class: "panel-section" };
@@ -74,21 +74,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("activeInteraction", { success: false, message: "" });
     }
     function changeSourceData() {
-      var _a, _b;
+      var _a, _b, _c;
       const heatLayer = getHeatLayer();
       heatLayer.title = (_a = reactiveValue.sourceData) == null ? void 0 : _a.title;
       (_b = heatLayer.getSource()) == null ? void 0 : _b.clear();
       const selectedData = reactiveValue.sourceData;
-      if (selectedData) {
+      if ((_c = selectedData == null ? void 0 : selectedData.points) == null ? void 0 : _c.length) {
         const vectorSource = heatLayer.getSource();
+        const coords = [];
         selectedData.points.forEach((pt) => {
+          const coordinate = [pt.x, pt.y];
+          coords.push(coordinate);
           const feature = new Feature({
-            geometry: new Point([pt.x, pt.y]),
+            geometry: new Point(coordinate),
             weight: pt.weight
           });
           vectorSource == null ? void 0 : vectorSource.addFeature(feature);
         });
         heatLayer.setSource(vectorSource);
+        props.map.locationGeometry(new MultiPoint(coords), void 0, 1.2, false);
       }
     }
     function getHeatLayer() {
@@ -124,7 +128,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref: "locationRef",
           class: "el-current",
           title: "热力图控制",
-          drag: false,
+          drag: true,
           width: 320,
           height: props.data.length > 1 ? 458 : 408,
           showMaximize: false,

package/components/heatmap/index.css

@@ -1,27 +1,23 @@
-.heatmap-widget-host[data-v-2062a8dc] {
+.heatmap-widget-host[data-v-86446aae] {
   position: absolute;
   inset: 0;
   z-index: 10;
   pointer-events: none;
 }
-.heatmap-widget-host[data-v-2062a8dc] .el-current.draggable-panel {
-  position: absolute !important;
-  left: 12px;
-  top: 12px;
-  transform: none !important;
+.heatmap-widget-host[data-v-86446aae] .el-current.draggable-panel {
   pointer-events: auto;
   max-height: calc(100% - 24px);
 }
-.control-panel[data-v-2062a8dc] {
+.control-panel[data-v-86446aae] {
   padding: 0px 10px;
 }
-.control-panel .gradient-preview[data-v-2062a8dc] {
+.control-panel .gradient-preview[data-v-86446aae] {
   height: 25px;
   border-radius: 5px;
   margin-bottom: 10px;
   border: 1px solid #ddd;
 }
-.control-panel .legend[data-v-2062a8dc] {
+.control-panel .legend[data-v-86446aae] {
   display: flex;
   justify-content: space-between;
   font-size: 0.85rem;

package/components/legend/Legend.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./Legend.vue2.js";
 /* empty css            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _Legend = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d6cb883f"]]);
+const _Legend = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8a0f0076"]]);
 export {
   _Legend as default
 };

package/components/legend/index.css

@@ -1,11 +1,11 @@
-.legend-container[data-v-d6cb883f] {
+.legend-container[data-v-8a0f0076] {
   position: absolute;
   left: 10px;
   top: 10px;
   background-color: var(--system-primary-color);
   border: 1px solid var(--system-primary-border-color);
 }
-.legend-container[data-v-d6cb883f] .legend {
+.legend-container[data-v-8a0f0076] .legend {
   color: var(--system-primary-text-color);
   margin: 9px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "type": "module",
   "main": "index.js",
   "module": "index.js",
@@ -10,6 +10,6 @@
     "element-plus": "^2.9.0",
     "jszip": "^3.10.1",
     "ol": "^9.2.4",
-    "ym-gis-2d": "1.0.52"
+    "ym-gis-2d": "1.0.53"
   }
 }