ym-giswidget-2d 1.0.47 → 1.0.48

package/components/area-measurement/AreaMeasurement.vue.js

@@ -4,9 +4,10 @@ import "element-plus/es/components/form/style/css";
 import "element-plus/es/components/form-item/style/css";
 import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
-import { defineComponent, reactive, onMounted, onUnmounted, withDirectives, createBlock, openBlock, withCtx, createVNode, unref, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString, vShow } from "vue";
+import { defineComponent, reactive, onMounted, onUnmounted, withDirectives, createBlock, openBlock, withCtx, createVNode, unref, createCommentVNode, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString, vShow } from "vue";
 import DraggablePanel from "../../panel/DraggablePanel.vue.js";
 import Draw from "ym-gis-2d/interaction/Draw";
+import { getArea } from "ym-gis-2d/utils/GeometryUtil";
 const _hoisted_1 = { class: "el-current-value" };
 const _hoisted_2 = { class: "el-current-unit" };
 const _hoisted_3 = { class: "el-current-value" };
@@ -66,6 +67,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           features.fromType = "draw";
         }
       });
+      draw.on("drawaddpoint", (event) => {
+        const features = event.feature;
+        if (features) {
+          features.isSelected = true;
+          features.tempLayer = tempLayer;
+          features.fromType = "draw";
+        }
+      });
+      draw.on("drawmoving", (event) => {
+        var _a;
+        if (!event.coordinates || event.coordinates.length < 2) {
+          return;
+        }
+        const geometry = (_a = event.feature) == null ? void 0 : _a.getGeometry();
+        const area = getArea(geometry, props.map.getView().getProjection());
+        console.log(area);
+      });
     });
     onUnmounted(() => {
       reactiveValue.visible = false;
@@ -82,12 +100,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return withDirectives((openBlock(), createBlock(DraggablePanel, {
         ref: "areaMeasureDom",
         class: "el-current",
-        title: "面积量测",
+        title: "面积测量",
         drag: true,
         width: 300,
-        height: 267,
+        height: 268,
         showMaximize: false,
-        showOk: true,
+        showOk: false,
+        "show-cancel": true,
+        "cancel-text": "关闭",
         onClose: handleClose
       }, {
         default: withCtx(() => [
@@ -128,7 +148,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_component_el_form_item, {
+              unref(reactiveValue).allArea > 0 ? (openBlock(), createBlock(_component_el_form_item, {
+                key: 0,
                 label: "面积",
                 prop: "allArea"
               }, {
@@ -140,8 +161,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ];
                 }),
                 _: 1
-              }),
-              createVNode(_component_el_form_item, {
+              })) : createCommentVNode("", true),
+              unref(reactiveValue).allPerimeter > 0 ? (openBlock(), createBlock(_component_el_form_item, {
+                key: 1,
                 label: "周长",
                 prop: "allArea"
               }, {
@@ -153,7 +175,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ];
                 }),
                 _: 1
-              })
+              })) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["model"])

package/components/horizontally-top-toolbar/HorizontallyTopToolbar.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./HorizontallyTopToolbar.vue2.js";
 /* empty css                            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _HorizontallyTopToolbar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3c8586f4"]]);
+const _HorizontallyTopToolbar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f42f3be5"]]);
 export {
   _HorizontallyTopToolbar as default
 };

package/components/horizontally-top-toolbar/index.css

@@ -1,4 +1,4 @@
-.toolbar-contain[data-v-3c8586f4] {
+.toolbar-contain[data-v-f42f3be5] {
   position: absolute;
   top: 44px;
   display: flex;
@@ -9,7 +9,7 @@
   border: 1px solid var(--system-primary-border-color);
   border-radius: 3px;
 }
-.toolbar-contain .toolbar-item-contain[data-v-3c8586f4] {
+.toolbar-contain .toolbar-item-contain[data-v-f42f3be5] {
   height: 43px;
   line-height: 43px;
   display: flex;
@@ -18,41 +18,42 @@
   align-items: center;
   cursor: pointer;
 }
-.toolbar-contain .toolbar-item-contain .toolbar-item[data-v-3c8586f4] {
+.toolbar-contain .toolbar-item-contain .toolbar-item[data-v-f42f3be5] {
   display: flex;
   align-items: center;
   padding: 0px 10px;
 }
-.toolbar-contain .toolbar-item-contain .toolbar-icon[data-v-3c8586f4] {
+.toolbar-contain .toolbar-item-contain .toolbar-icon[data-v-f42f3be5] {
   width: 24px;
   height: 24px;
   margin-right: 6px;
 }
-.toolbar-contain .toolbar-item-contain .toolbar-children-contain[data-v-3c8586f4] {
+.toolbar-contain .toolbar-item-contain .toolbar-children-contain[data-v-f42f3be5] {
   position: absolute;
   top: 50px;
   background: var(--system-primary-color);
   border: 1px solid var(--system-primary-border-color);
   border-radius: 3px;
+  margin: 0px -1px;
 }
-.toolbar-contain .active[data-v-3c8586f4] {
+.toolbar-contain .active[data-v-f42f3be5] {
   color: var(--system-primary-text-active-color);
 }
-.toolbar-contain .toolbar-split[data-v-3c8586f4] {
+.toolbar-contain .toolbar-split[data-v-f42f3be5] {
   width: 2px;
   height: 20px;
   background: #7EA08E;
   margin: auto;
   opacity: 0.5;
 }
-.toolbar-contain .toolbar-h-split[data-v-3c8586f4] {
+.toolbar-contain .toolbar-h-split[data-v-f42f3be5] {
   height: 2px;
   background: #7EA08E;
   margin: auto;
   opacity: 0.5;
   margin: 0px 10px;
 }
-.component-position[data-v-3c8586f4] {
+.component-position[data-v-f42f3be5] {
   position: absolute;
   right: 300px;
 }

package/components/identify/index.d.ts

@@ -2,12 +2,12 @@ export declare const Identify: import('../../utils').WithInstall<{
     new (...args: any[]): import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
         map: import('ym-gis-2d/mapView/Map').default;
         selectLayers?: import('ym-gis-2d/entity').IMapService[];
-        pointStyle?: import('ym-gis-2d/entity/IStyle').default;
-        cancePointStyle?: import('ym-gis-2d/entity/IStyle').default;
-        lineStyle?: import('ym-gis-2d/entity/IStyle').default;
-        canceLineStyle?: import('ym-gis-2d/entity/IStyle').default;
-        polygonStyle?: import('ym-gis-2d/entity/IStyle').default;
-        cancePolygonStyle?: import('ym-gis-2d/entity/IStyle').default;
+        pointStyle?: IStyle;
+        cancePointStyle?: IStyle;
+        lineStyle?: IStyle;
+        canceLineStyle?: IStyle;
+        polygonStyle?: IStyle;
+        cancePolygonStyle?: IStyle;
     }> & Readonly<{}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {}, false, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {}, any, import('vue').ComponentProvideOptions, {
         P: {};
         B: {};
@@ -18,12 +18,12 @@ export declare const Identify: import('../../utils').WithInstall<{
     }, Readonly<{
         map: import('ym-gis-2d/mapView/Map').default;
         selectLayers?: import('ym-gis-2d/entity').IMapService[];
-        pointStyle?: import('ym-gis-2d/entity/IStyle').default;
-        cancePointStyle?: import('ym-gis-2d/entity/IStyle').default;
-        lineStyle?: import('ym-gis-2d/entity/IStyle').default;
-        canceLineStyle?: import('ym-gis-2d/entity/IStyle').default;
-        polygonStyle?: import('ym-gis-2d/entity/IStyle').default;
-        cancePolygonStyle?: import('ym-gis-2d/entity/IStyle').default;
+        pointStyle?: IStyle;
+        cancePointStyle?: IStyle;
+        lineStyle?: IStyle;
+        canceLineStyle?: IStyle;
+        polygonStyle?: IStyle;
+        cancePolygonStyle?: IStyle;
     }> & Readonly<{}>, {}, {}, {}, {}, {}>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -31,12 +31,12 @@ export declare const Identify: import('../../utils').WithInstall<{
 } & import('vue').ComponentOptionsBase<Readonly<{
     map: import('ym-gis-2d/mapView/Map').default;
     selectLayers?: import('ym-gis-2d/entity').IMapService[];
-    pointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    lineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    canceLineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    polygonStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePolygonStyle?: import('ym-gis-2d/entity/IStyle').default;
+    pointStyle?: IStyle;
+    cancePointStyle?: IStyle;
+    lineStyle?: IStyle;
+    canceLineStyle?: IStyle;
+    polygonStyle?: IStyle;
+    cancePolygonStyle?: IStyle;
 }> & Readonly<{}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {}, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
     $slots: {
         footer?(_: {

package/components/map-view/MapView.vue.d.ts

@@ -391,8 +391,8 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
-        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
+        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/style/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
+        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/style/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
         locationWKT: (wkt: string, proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationWKTs: (wkts: string[], proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationGeometry: (geometry: import('ol/geom').Geometry, proj?: string, ratio?: number, isFlash?: boolean) => void;

package/components/map-view/index.d.ts

@@ -390,8 +390,8 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
-        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
+        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/style/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
+        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/style/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
         locationWKT: (wkt: string, proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationWKTs: (wkts: string[], proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationGeometry: (geometry: import('ol/geom').Geometry, proj?: string, ratio?: number, isFlash?: boolean) => void;

package/components/multi-screen/MultiScreen.vue.d.ts

@@ -397,8 +397,8 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
-        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
+        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/style/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
+        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/style/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
         locationWKT: (wkt: string, proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationWKTs: (wkts: string[], proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationGeometry: (geometry: import('ol/geom').Geometry, proj?: string, ratio?: number, isFlash?: boolean) => void;

package/components/multi-screen/index.d.ts

@@ -393,8 +393,8 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
-        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
+        addWKT: (wkt: string, proj: string, tag?: string, location?: boolean, properties?: any, style?: import('ym-gis-2d/entity/style/IStyle').default) => import('ym-gis-2d/entity/Feature').default | undefined;
+        addWKTs: (wkts: string[], proj: string, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/style/IStyle').default, properties?: any) => import('ym-gis-2d/entity/Feature').default[] | undefined;
         locationWKT: (wkt: string, proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationWKTs: (wkts: string[], proj?: string, ratio?: number, isFlash?: boolean) => void;
         locationGeometry: (geometry: import('ol/geom').Geometry, proj?: string, ratio?: number, isFlash?: boolean) => void;

package/components/select/Select.vue.js

@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     cancePolygonStyle: {},
     selectLayers: {},
     showLoading: { type: Boolean, default: true },
-    selectType: { default: "point" }
+    selectType: { default: "rectangle" }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;

package/components/select/index.d.ts

@@ -1,11 +1,11 @@
 export declare const Select: import('../../utils').WithInstall<import('vue').DefineComponent<{
     map: import('ym-gis-2d/mapView/Map').default;
-    pointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    lineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    canceLineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    polygonStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePolygonStyle?: import('ym-gis-2d/entity/IStyle').default;
+    pointStyle?: IStyle;
+    cancePointStyle?: IStyle;
+    lineStyle?: IStyle;
+    canceLineStyle?: IStyle;
+    polygonStyle?: IStyle;
+    cancePolygonStyle?: IStyle;
     selectLayers?: import('ym-gis-2d/entity').IMapService[];
     showLoading?: boolean;
     selectType?: "point" | "pointermove" | "polyline" | "polygon" | "rectangle" | "circle";
@@ -135,12 +135,12 @@ export declare const Select: import('../../utils').WithInstall<import('vue').Def
     }[] | undefined;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{
     map: import('ym-gis-2d/mapView/Map').default;
-    pointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePointStyle?: import('ym-gis-2d/entity/IStyle').default;
-    lineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    canceLineStyle?: import('ym-gis-2d/entity/IStyle').default;
-    polygonStyle?: import('ym-gis-2d/entity/IStyle').default;
-    cancePolygonStyle?: import('ym-gis-2d/entity/IStyle').default;
+    pointStyle?: IStyle;
+    cancePointStyle?: IStyle;
+    lineStyle?: IStyle;
+    canceLineStyle?: IStyle;
+    polygonStyle?: IStyle;
+    cancePolygonStyle?: IStyle;
     selectLayers?: import('ym-gis-2d/entity').IMapService[];
     showLoading?: boolean;
     selectType?: "point" | "pointermove" | "polyline" | "polygon" | "rectangle" | "circle";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "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.26"
+    "ym-gis-2d": "1.0.27"
   }
 }