ym-giswidget-2d 1.0.24 → 1.0.25

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

@@ -346,7 +346,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
         addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
-        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => void;
         on: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         once: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         un: import('ol/Map').MapEventHandler<void>;

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

@@ -345,7 +345,7 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
         addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
-        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => void;
         on: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         once: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         un: import('ol/Map').MapEventHandler<void>;

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

@@ -352,7 +352,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
         addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
-        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => void;
         on: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         once: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         un: import('ol/Map').MapEventHandler<void>;

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

@@ -348,7 +348,7 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
         addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
-        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKTs: (wkts: string[], wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => void;
         on: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         once: import('ol/Map').MapEventHandler<import('ol/events').EventsKey>;
         un: import('ol/Map').MapEventHandler<void>;

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

@@ -1,13 +1,15 @@
 import { default as OLMap } from 'ym-gis-2d/mapView/Map';
-import { default as Style } from 'ol/style/Style';
+import { default as IStyle } from 'ym-gis-2d/entity/IStyle';
+import { IMapService } from 'ym-gis-2d/entity';
 type __VLS_Props = {
     map: OLMap;
-    pointStyle?: Style;
-    cancePointStyle?: Style;
-    lineStyle?: Style;
-    canceLineStyle?: Style;
-    polygonStyle?: Style;
-    cancePolygonStyle?: Style;
+    pointStyle?: IStyle;
+    cancePointStyle?: IStyle;
+    lineStyle?: IStyle;
+    canceLineStyle?: IStyle;
+    polygonStyle?: IStyle;
+    cancePolygonStyle?: IStyle;
+    selectLayers?: IMapService[];
 };
 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, {}, any>;
 export default _default;

package/components/select/Select.vue.js

@@ -3,7 +3,7 @@ import Select from "ym-gis-2d/interaction/Select";
 import { ElLoading } from "element-plus";
 import FeatureManager from "ym-gis-2d/feature/FeatureManager";
 import { intersects } from "ym-gis-2d/utils/GeometryUtil";
-import { getSelectPointStyle, getSelectCancePointStyle, getSelectLineStyle, getSelectCancelLineStyle, getSelectPolygonStyle, getSelectCancelPolygonStyle } from "ym-gis-2d/style/StyleManager";
+import { getStyle, getSelectPointStyle, getSelectCancePointStyle, getSelectLineStyle, getSelectCancelLineStyle, getSelectPolygonStyle, getSelectCancelPolygonStyle } from "ym-gis-2d/style/StyleManager";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "Select",
   props: {
@@ -13,27 +13,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     lineStyle: {},
     canceLineStyle: {},
     polygonStyle: {},
-    cancePolygonStyle: {}
+    cancePolygonStyle: {},
+    selectLayers: {}
   },
   setup(__props) {
     const props = __props;
-    const pointStyle = props.pointStyle || getSelectPointStyle();
-    const cancePointStyle = props.cancePointStyle || getSelectCancePointStyle();
-    const lineStyle = props.lineStyle || getSelectLineStyle();
-    const canceLineStyle = props.canceLineStyle || getSelectCancelLineStyle();
-    const polygonStyle = props.polygonStyle || getSelectPolygonStyle();
-    const cancePolygonStyle = props.cancePolygonStyle || getSelectCancelPolygonStyle();
+    const pointStyle = props.pointStyle ? getStyle(props.pointStyle) : getSelectPointStyle();
+    const cancePointStyle = props.cancePointStyle ? getStyle(props.cancePointStyle) : getSelectCancePointStyle();
+    const lineStyle = props.lineStyle ? getStyle(props.lineStyle) : getSelectLineStyle();
+    const canceLineStyle = props.canceLineStyle ? getStyle(props.canceLineStyle) : getSelectCancelLineStyle();
+    const polygonStyle = props.polygonStyle ? getStyle(props.polygonStyle) : getSelectPolygonStyle();
+    const cancePolygonStyle = props.cancePolygonStyle ? getStyle(props.cancePolygonStyle) : getSelectCancelPolygonStyle();
     const tempType = ["copy", "cut", "draw", "import", "union"];
     let holdCtrl = false;
     onMounted(() => {
-      const select = new Select("rectangle", {
-        pointStyle,
-        cancePointStyle,
-        lineStyle,
-        canceLineStyle,
-        polygonStyle,
-        cancePolygonStyle,
-        addTempLayer: false
+      const select = new Select("pointermove", {
+        pointStyle: props.pointStyle,
+        cancePointStyle: props.cancePointStyle,
+        lineStyle: props.lineStyle,
+        canceLineStyle: props.canceLineStyle,
+        polygonStyle: props.polygonStyle,
+        cancePolygonStyle: props.cancePolygonStyle,
+        addTempLayer: false,
+        selectLayers: props.selectLayers
       });
       props.map.interactionManager.addInteraction("select", select);
       let loadingInstance;

package/components/select/index.d.ts

@@ -1,18 +1,20 @@
 export declare const Select: import('../../utils').WithInstall<import('vue').DefineComponent<{
     map: import('ym-gis-2d/mapView/Map').default;
-    pointStyle?: import('ol/style').Style;
-    cancePointStyle?: import('ol/style').Style;
-    lineStyle?: import('ol/style').Style;
-    canceLineStyle?: import('ol/style').Style;
-    polygonStyle?: import('ol/style').Style;
-    cancePolygonStyle?: import('ol/style').Style;
+    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;
+    selectLayers?: import('ym-gis-2d/entity').IMapService[];
 }, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{
     map: import('ym-gis-2d/mapView/Map').default;
-    pointStyle?: import('ol/style').Style;
-    cancePointStyle?: import('ol/style').Style;
-    lineStyle?: import('ol/style').Style;
-    canceLineStyle?: import('ol/style').Style;
-    polygonStyle?: import('ol/style').Style;
-    cancePolygonStyle?: import('ol/style').Style;
+    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;
+    selectLayers?: import('ym-gis-2d/entity').IMapService[];
 }> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>>;
 export default Select;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "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.3"
+    "ym-gis-2d": "1.0.4"
   }
 }