ym-giswidget-2d 1.0.47 → 1.0.49

package/components/area-measurement/AreaMeasurement.vue.d.ts

@@ -1,8 +1,27 @@
 import { default as OLMap } from 'ym-gis-2d/mapView/Map';
+import { default as IFont } from 'ym-gis-2d/entity/IFont';
 type __VLS_Props = {
     map: OLMap;
+    color?: Array<number> | string;
+    opacity?: number;
+    outlineColor?: Array<number> | string;
+    outlineOpacity?: number;
+    outlineWidth?: number;
+    font?: IFont;
+    unit?: "square-meters" | "square-kilometers" | "mu" | "hectare";
+    precision?: number;
+    showLabel?: boolean;
+    spheroid?: boolean;
 };
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    activeInteraction: (...args: any[]) => void;
+}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
+    onActiveInteraction?: ((...args: any[]) => any) | undefined;
+}>, {
+    precision: number;
+    showLabel: boolean;
+    spheroid: boolean;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     areaMeasureDom: ({
         $: import('vue').ComponentInternalInstance;
         $data: {};

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

@@ -4,9 +4,11 @@ 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, computed, onMounted, toRaw, 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 AreaMeasure from "ym-gis-2d/interaction/AreaMeasure";
+import measureUnits from "ym-gis-2d/entity/measure/AreaMeasureUnits";
+import { polygonToLines, getLength } 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" };
@@ -14,65 +16,93 @@ const _hoisted_4 = { class: "el-current-unit" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "AreaMeasurement",
   props: {
-    map: {}
+    map: {},
+    color: {},
+    opacity: {},
+    outlineColor: {},
+    outlineOpacity: {},
+    outlineWidth: {},
+    font: {},
+    unit: {},
+    precision: { default: 2 },
+    showLabel: { type: Boolean, default: true },
+    spheroid: { type: Boolean, default: false }
   },
-  setup(__props) {
+  emits: ["activeInteraction"],
+  setup(__props, { emit: __emit }) {
+    const emit = __emit;
     const props = __props;
     let reactiveValue = reactive({
       visible: true,
       allArea: 0,
       allPerimeter: 0,
-      measureTypes: [
-        {
-          type: "square-meters",
-          label: "平方米",
-          persimeterLabel: "米"
-        },
-        {
-          type: "square-kilometers",
-          label: "平方公里",
-          persimeterLabel: "千米"
-        },
-        {
-          type: "mu",
-          label: "亩",
-          persimeterLabel: "米"
-        },
-        {
-          type: "hectare",
-          label: "公顷",
-          persimeterLabel: "千米"
-        }
-      ]
+      hasArea: 0,
+      hasPerimeter: 0
     });
-    reactiveValue.currentType = reactiveValue.measureTypes[0];
-    onMounted(() => {
-      const tempLayer = props.map.getPolygonTempLayer();
-      let source = void 0;
-      const layersource = tempLayer == null ? void 0 : tempLayer.getSource();
-      if (layersource) {
-        source = layersource;
+    reactiveValue.currentType = measureUnits[0];
+    const measureData = computed(() => {
+      var _a;
+      switch ((_a = reactiveValue.currentType) == null ? void 0 : _a.type) {
+        case "square-meters":
+          return {
+            area: `${reactiveValue.allArea.toFixed(props.precision)}`,
+            perimeter: `${reactiveValue.allPerimeter.toFixed(props.precision)}`
+          };
+        case "square-kilometers":
+          return {
+            area: `${(reactiveValue.allArea * 1e-6).toFixed(props.precision)}`,
+            perimeter: `${(reactiveValue.allPerimeter * 1e-3).toFixed(props.precision)}`
+          };
+        case "mu":
+          return {
+            area: `${(reactiveValue.allArea * 15e-4).toFixed(props.precision)}`,
+            perimeter: `${reactiveValue.allPerimeter.toFixed(props.precision)}`
+          };
+        case "hectare":
+          return {
+            area: `${(reactiveValue.allArea * 1e-4).toFixed(props.precision)}`,
+            perimeter: `${(reactiveValue.allPerimeter * 1e-3).toFixed(props.precision)}`
+          };
+        default:
+          return {
+            area: `${reactiveValue.allArea.toFixed(props.precision)} `,
+            perimeter: `${reactiveValue.allPerimeter.toFixed(props.precision)} `
+          };
       }
-      const draw = new Draw("polygon", {
-        source,
-        tipText: "点击开始测量，双击结束测量"
+    });
+    onMounted(() => {
+      let { map, ...options } = toRaw(props);
+      const areaMeasure = new AreaMeasure(options);
+      props.map.interactionManager.addInteraction("areaMeasure", areaMeasure);
+      areaMeasure.on("measureMoving", (e) => {
+        reactiveValue.allArea = reactiveValue.hasArea + e.area;
+        const lines = polygonToLines(e.geom);
+        if (lines) {
+          reactiveValue.allPerimeter = reactiveValue.hasPerimeter + getLength(lines[0], props.map.getView().getProjection());
+        }
       });
-      props.map.interactionManager.addInteraction("areaMeasure", draw);
-      draw.on("drawend", (event) => {
-        const features = event.feature;
-        if (features) {
-          features.isSelected = true;
-          features.tempLayer = tempLayer;
-          features.fromType = "draw";
+      areaMeasure.on("measureEnd", (e) => {
+        reactiveValue.hasArea += e.area;
+        const lines = polygonToLines(e.geom);
+        if (lines) {
+          reactiveValue.hasPerimeter += getLength(lines[0], props.map.getView().getProjection());
         }
       });
     });
     onUnmounted(() => {
       reactiveValue.visible = false;
+      const areaMeasure = props.map.interactionManager.getInteraction("areaMeasure");
+      areaMeasure.clearMeasure();
       props.map.interactionManager.removeInteraction("areaMeasure");
     });
     function handleClose() {
-      reactiveValue.visible = false;
+      emit("activeInteraction", { success: false, message: "" });
+    }
+    function changeUnit() {
+      const areaMeasure = props.map.interactionManager.getInteraction("areaMeasure");
+      if (reactiveValue.currentType && areaMeasure) {
+        areaMeasure.setUnit(reactiveValue.currentType.type);
+      }
     }
     return (_ctx, _cache) => {
       const _component_el_option = ElOption;
@@ -82,12 +112,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(() => [
@@ -112,10 +144,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(reactiveValue).currentType = $event),
                     "value-key": "type",
                     class: "el-current",
-                    "popper-class": "el-current"
+                    "popper-class": "el-current",
+                    onChange: changeUnit
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(unref(reactiveValue).measureTypes, (item) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(unref(measureUnits), (item) => {
                         return openBlock(), createBlock(_component_el_option, {
                           key: item.type,
                           label: item.label,
@@ -128,32 +161,34 @@ 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"
               }, {
                 default: withCtx(() => {
                   var _a;
                   return [
-                    createElementVNode("span", _hoisted_1, toDisplayString(unref(reactiveValue).allArea), 1),
+                    createElementVNode("span", _hoisted_1, toDisplayString(measureData.value.area), 1),
                     createElementVNode("span", _hoisted_2, toDisplayString((_a = unref(reactiveValue).currentType) == null ? void 0 : _a.label), 1)
                   ];
                 }),
                 _: 1
-              }),
-              createVNode(_component_el_form_item, {
+              })) : createCommentVNode("", true),
+              unref(reactiveValue).allPerimeter > 0 ? (openBlock(), createBlock(_component_el_form_item, {
+                key: 1,
                 label: "周长",
                 prop: "allArea"
               }, {
                 default: withCtx(() => {
                   var _a;
                   return [
-                    createElementVNode("span", _hoisted_3, toDisplayString(unref(reactiveValue).allPerimeter), 1),
+                    createElementVNode("span", _hoisted_3, toDisplayString(measureData.value.perimeter), 1),
                     createElementVNode("span", _hoisted_4, toDisplayString((_a = unref(reactiveValue).currentType) == null ? void 0 : _a.persimeterLabel), 1)
                   ];
                 }),
                 _: 1
-              })
+              })) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["model"])

package/components/area-measurement/index.d.ts

@@ -1,8 +1,36 @@
 export declare const AreaMeasurement: import('../../utils').WithInstall<import('vue').DefineComponent<{
     map: import('ym-gis-2d/mapView/Map').default;
-}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{
+    color?: Array<number> | string;
+    opacity?: number;
+    outlineColor?: Array<number> | string;
+    outlineOpacity?: number;
+    outlineWidth?: number;
+    font?: import('ym-gis-2d/entity/IFont').default;
+    unit?: "square-meters" | "square-kilometers" | "mu" | "hectare";
+    precision?: number;
+    showLabel?: boolean;
+    spheroid?: boolean;
+}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    activeInteraction: (...args: any[]) => void;
+}, string, import('vue').PublicProps, Readonly<{
     map: import('ym-gis-2d/mapView/Map').default;
-}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
+    color?: Array<number> | string;
+    opacity?: number;
+    outlineColor?: Array<number> | string;
+    outlineOpacity?: number;
+    outlineWidth?: number;
+    font?: import('ym-gis-2d/entity/IFont').default;
+    unit?: "square-meters" | "square-kilometers" | "mu" | "hectare";
+    precision?: number;
+    showLabel?: boolean;
+    spheroid?: boolean;
+}> & Readonly<{
+    onActiveInteraction?: ((...args: any[]) => any) | undefined;
+}>, {
+    precision: number;
+    showLabel: boolean;
+    spheroid: boolean;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     areaMeasureDom: ({
         $: import('vue').ComponentInternalInstance;
         $data: {};

package/components/export/Export.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./Export.vue2.js";
 /* empty css            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _Export = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-11975a70"]]);
+const _Export = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e716c04f"]]);
 export {
   _Export as default
 };

package/components/export/index.css

@@ -1,3 +1,3 @@
-.panel-content[data-v-11975a70] .el-form-item {
+.panel-content[data-v-e716c04f] .el-form-item {
   margin-bottom: 10px;
 }

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-75b81512"]]);
 export {
   _HorizontallyTopToolbar as default
 };

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

@@ -192,7 +192,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function handleActiveInteraction(event, tool) {
       if (!event.success) {
-        ElMessage.error(event.message);
+        if (event.message) {
+          ElMessage.error(event.message);
+        }
         tool.component = void 0;
         const find = reactiveValue.activeIds.findIndex((t) => t == tool.id);
         if (find > -1) {

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

@@ -1,4 +1,4 @@
-.toolbar-contain[data-v-3c8586f4] {
+.toolbar-contain[data-v-75b81512] {
   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-75b81512] {
   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-75b81512] {
   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-75b81512] {
   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-75b81512] {
   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-75b81512] {
   color: var(--system-primary-text-active-color);
 }
-.toolbar-contain .toolbar-split[data-v-3c8586f4] {
+.toolbar-contain .toolbar-split[data-v-75b81512] {
   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-75b81512] {
   height: 2px;
   background: #7EA08E;
   margin: auto;
   opacity: 0.5;
   margin: 0px 10px;
 }
-.component-position[data-v-3c8586f4] {
+.component-position[data-v-75b81512] {
   position: absolute;
   right: 300px;
 }

package/components/identify/Identify.vue.d.ts

@@ -1,5 +1,5 @@
 import { default as OLMap } from 'ym-gis-2d/mapView/Map';
-import { default as IStyle } from 'ym-gis-2d/entity/IStyle';
+import { default as IStyle } from 'ym-gis-2d/entity/style/IStyle';
 import { IMapService } from 'ym-gis-2d/entity';
 type __VLS_Props = {
     map: OLMap;
@@ -17,7 +17,7 @@ declare function __VLS_template(): {
         footer?(_: {
             feature: {
                 isSelected?: boolean | undefined;
-                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
                 layerId?: string | undefined;
                 tag?: string | undefined;
                 tempLayer?: {

package/components/identify/Identify.vue.js

@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       props.map.interactionManager.addInteraction("identify", select);
       let loadingInstance = null;
-      select.on("selectstart", (event) => {
+      select.on("selectStart", (event) => {
         loadingInstance = ElLoading.service({ text: "正在查询...", background: "rgba(0, 0, 0, 0.5)", target: props.map.getTarget() });
       });
       select.on("selected", (event) => {

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?: import('ym-gis-2d/entity/style/IStyle').default;
+        cancePointStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        lineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        canceLineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        polygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        cancePolygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
     }> & 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?: import('ym-gis-2d/entity/style/IStyle').default;
+        cancePointStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        lineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        canceLineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        polygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+        cancePolygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
     }> & Readonly<{}>, {}, {}, {}, {}, {}>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -31,18 +31,18 @@ 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?: import('ym-gis-2d/entity/style/IStyle').default;
+    cancePointStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+    lineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+    canceLineStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+    polygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
+    cancePolygonStyle?: import('ym-gis-2d/entity/style/IStyle').default;
 }> & 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?(_: {
             feature: {
                 isSelected?: boolean | undefined;
-                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
                 layerId?: string | undefined;
                 tag?: string | undefined;
                 tempLayer?: {

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

@@ -101,6 +101,17 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
                                 "fill-opacity": string;
                             }[];
                         } | undefined;
+                        Raster?: {
+                            colormap: {
+                                entries: {
+                                    color: string;
+                                    label: string;
+                                    quantity: number;
+                                }[];
+                                type: string;
+                            };
+                            opacity: number;
+                        } | undefined;
                         imgUrl?: string | undefined;
                     }[];
                 }[];
@@ -391,8 +402,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

@@ -100,6 +100,17 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
                                 "fill-opacity": string;
                             }[];
                         } | undefined;
+                        Raster?: {
+                            colormap: {
+                                entries: {
+                                    color: string;
+                                    label: string;
+                                    quantity: number;
+                                }[];
+                                type: string;
+                            };
+                            opacity: number;
+                        } | undefined;
                         imgUrl?: string | undefined;
                     }[];
                 }[];
@@ -390,8 +401,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

@@ -107,6 +107,17 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
                                 "fill-opacity": string;
                             }[];
                         } | undefined;
+                        Raster?: {
+                            colormap: {
+                                entries: {
+                                    color: string;
+                                    label: string;
+                                    quantity: number;
+                                }[];
+                                type: string;
+                            };
+                            opacity: number;
+                        } | undefined;
                         imgUrl?: string | undefined;
                     }[];
                 }[];
@@ -397,8 +408,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

@@ -103,6 +103,17 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
                                 "fill-opacity": string;
                             }[];
                         } | undefined;
+                        Raster?: {
+                            colormap: {
+                                entries: {
+                                    color: string;
+                                    label: string;
+                                    quantity: number;
+                                }[];
+                                type: string;
+                            };
+                            opacity: number;
+                        } | undefined;
                         imgUrl?: string | undefined;
                     }[];
                 }[];
@@ -393,8 +404,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/popup/Popup.vue.d.ts

@@ -14,7 +14,7 @@ declare function __VLS_template(): {
         footer?(_: {
             feature: {
                 isSelected?: boolean | undefined;
-                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
                 layerId?: string | undefined;
                 tag?: string | undefined;
                 tempLayer?: {

package/components/popup/index.d.ts

@@ -184,7 +184,7 @@ export declare const Popup: import('../../utils').WithInstall<{
         footer?(_: {
             feature: {
                 isSelected?: boolean | undefined;
-                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+                fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
                 layerId?: string | undefined;
                 tag?: string | undefined;
                 tempLayer?: {

package/components/select/Select.vue.d.ts

@@ -19,7 +19,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
     setSelectLayers: typeof setSelectLayers;
     features: {
         isSelected?: boolean | undefined;
-        fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+        fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
         layerId?: string | undefined;
         tag?: string | undefined;
         tempLayer?: {

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;
@@ -45,7 +45,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       props.map.interactionManager.addInteraction("select", toRaw(reactiveData.selectTool));
       let loadingInstance;
-      reactiveData.selectTool.on("selectstart", (event) => {
+      reactiveData.selectTool.on("selectStart", (event) => {
         if (props.showLoading) {
           loadingInstance = ElLoading.service({ text: "正在查询...", background: "rgba(0, 0, 0, 0.5)", target: props.map.getTarget() });
         }

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";
@@ -13,7 +13,7 @@ export declare const Select: import('../../utils').WithInstall<import('vue').Def
     setSelectLayers: (layers: import('ym-gis-2d/entity').IMapService[]) => void;
     features: {
         isSelected?: boolean | undefined;
-        fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | undefined;
+        fromType?: "draw" | "import" | "cut" | "copy" | "union" | "identify" | "measure" | undefined;
         layerId?: string | undefined;
         tag?: string | undefined;
         tempLayer?: {
@@ -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.49",
   "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.28"
   }
 }