ym-giswidget-2d 1.0.60 → 1.0.62

package/components/layer-switcher/LayerSwitcher.vue.d.ts

@@ -1,8 +1,11 @@
 import { IMapService } from 'ym-gis-2d/entity';
 import { default as OLMap } from 'ym-gis-2d/mapView/Map';
+interface ILayerSwitcher extends IMapService {
+    isRepels?: boolean;
+}
 type __VLS_Props = {
     map: OLMap;
-    layers: IMapService[];
+    layers: ILayerSwitcher[];
 };
 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, {}, HTMLDivElement>;
 export default _default;

package/components/layer-switcher/LayerSwitcher.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./LayerSwitcher.vue2.js";
 /* empty css                   */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _LayerSwitcher = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2222fecf"]]);
+const _LayerSwitcher = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d9bf6ad4"]]);
 export {
   _LayerSwitcher as default
 };

package/components/layer-switcher/LayerSwitcher.vue2.js

@@ -13,21 +13,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       activeIds: []
       //用户存储当前激活的图层id
     });
-    onMounted(() => {
+    onMounted(async () => {
       for (const layer of props.layers) {
         if (layer.checked) {
-          reactiveValues.activeIds.push(layer.id);
-          props.map.addMapLayer(layer);
+          await addLayer(layer);
         }
       }
     });
-    function addLayer(layer) {
+    async function addLayer(layer) {
       if (reactiveValues.activeIds.indexOf(layer.id) > -1) {
         reactiveValues.activeIds.splice(reactiveValues.activeIds.indexOf(layer.id), 1);
         props.map.removeLayerById(layer.id);
       } else {
+        const ids = props.layers.filter((t) => t.isRepels).map((t) => t.id);
+        if (layer.isRepels && ids && ids.length > 0) {
+          props.map.removeLayerByIds(ids);
+          reactiveValues.activeIds = reactiveValues.activeIds.filter((t) => ids.indexOf(t) === -1);
+        }
         reactiveValues.activeIds.push(layer.id);
-        props.map.addMapLayer(layer);
+        await props.map.addMapLayer(layer);
       }
     }
     return (_ctx, _cache) => {

package/components/layer-switcher/index.css

@@ -1,5 +1,5 @@
 @charset "UTF-8";
-.layerSwitcher[data-v-2222fecf] {
+.layerSwitcher[data-v-d9bf6ad4] {
   width: 106px;
   height: 70px;
   position: absolute;
@@ -16,22 +16,22 @@
   -o-transition: width 0.8s, height 0.8s, -o-transform 0.8s;
   /* Opera */
 }
-.layerSwitcher[data-v-2222fecf]:hover {
+.layerSwitcher[data-v-d9bf6ad4]:hover {
   width: unset;
   padding-right: 5px;
   background: rgba(255, 255, 255, 0.3);
   display: flex;
   align-items: center;
 }
-.layerSwitcher:hover .layer[data-v-2222fecf] {
+.layerSwitcher:hover .layer[data-v-d9bf6ad4] {
   margin-left: 5px;
   position: unset;
 }
-.layerSwitcher:hover span[data-v-2222fecf] {
+.layerSwitcher:hover span[data-v-d9bf6ad4] {
   position: unset !important;
   margin-top: 42px;
 }
-.layerSwitcher .mapTypeCard[data-v-2222fecf] {
+.layerSwitcher .mapTypeCard[data-v-d9bf6ad4] {
   position: absolute;
   top: 5px;
   width: 86px;
@@ -53,7 +53,7 @@
   -o-transition: right 0.8s;
   /* Opera */
 }
-.layerSwitcher .mapTypeCard span[data-v-2222fecf] {
+.layerSwitcher .mapTypeCard span[data-v-d9bf6ad4] {
   width: 84px;
   border-radius: 2px;
   height: 16px;
@@ -67,15 +67,15 @@
   background: #888f88;
   opacity: 0.8;
 }
-.layerSwitcher .layer[data-v-2222fecf] {
+.layerSwitcher .layer[data-v-d9bf6ad4] {
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
 }
-.layerSwitcher .layer[data-v-2222fecf]:hover {
+.layerSwitcher .layer[data-v-d9bf6ad4]:hover {
   border: solid 1px #31a5f7;
 }
-.layerSwitcher .layer:hover span[data-v-2222fecf],
-.layerSwitcher .active span[data-v-2222fecf] {
+.layerSwitcher .layer:hover span[data-v-d9bf6ad4],
+.layerSwitcher .active span[data-v-d9bf6ad4] {
   background: #31a5f7;
 }

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

@@ -400,6 +400,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         addMapLayers: (layerInfo: import('ym-gis-2d/entity').IMapService[]) => Promise<import('ol/layer/Base').default[]>;
         addLayer: (layer: import('ol/layer/Base').default, fitLayer?: boolean) => void;
         removeLayerById: (id: string) => void;
+        removeLayerByIds: (ids: string[]) => void;
         getLayerById: (id: string) => import('ol/layer/Base').default | undefined;
         getLayerByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
         getLayersByIds: (ids: string[]) => import('ol/layer/Base').default[];

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

@@ -395,6 +395,7 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
         addMapLayers: (layerInfo: import('ym-gis-2d/entity').IMapService[]) => Promise<import('ol/layer/Base').default[]>;
         addLayer: (layer: import('ol/layer/Base').default, fitLayer?: boolean) => void;
         removeLayerById: (id: string) => void;
+        removeLayerByIds: (ids: string[]) => void;
         getLayerById: (id: string) => import('ol/layer/Base').default | undefined;
         getLayerByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
         getLayersByIds: (ids: string[]) => import('ol/layer/Base').default[];

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

@@ -402,6 +402,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         addMapLayers: (layerInfo: IMapService[]) => Promise<import('ol/layer/Base').default[]>;
         addLayer: (layer: import('ol/layer/Base').default, fitLayer?: boolean) => void;
         removeLayerById: (id: string) => void;
+        removeLayerByIds: (ids: string[]) => void;
         getLayerById: (id: string) => import('ol/layer/Base').default | undefined;
         getLayerByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
         getLayersByIds: (ids: string[]) => import('ol/layer/Base').default[];

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

@@ -398,6 +398,7 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
         addMapLayers: (layerInfo: import('ym-gis-2d/entity').IMapService[]) => Promise<import('ol/layer/Base').default[]>;
         addLayer: (layer: import('ol/layer/Base').default, fitLayer?: boolean) => void;
         removeLayerById: (id: string) => void;
+        removeLayerByIds: (ids: string[]) => void;
         getLayerById: (id: string) => import('ol/layer/Base').default | undefined;
         getLayerByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
         getLayersByIds: (ids: string[]) => import('ol/layer/Base').default[];

package/components/toc-card/TocCard.vue.d.ts

@@ -7,7 +7,16 @@ type __VLS_Props = {
     showOpacity?: boolean;
     showFilter?: boolean;
 };
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+declare function __VLS_template(): {
+    attrs: Partial<{}>;
+    slots: {
+        title?(_: {}): any;
+    };
+    refs: {};
+    rootEl: any;
+};
+type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
+declare const __VLS_component: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     loaded: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
     onLoaded?: ((...args: any[]) => any) | undefined;
@@ -15,4 +24,10 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {
     showOpacity: boolean;
     showFilter: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/toc-card/TocCard.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./TocCard.vue2.js";
 /* empty css             */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _TocCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b8e4bc23"]]);
+const _TocCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8416d467"]]);
 export {
   _TocCard as default
 };

package/components/toc-card/TocCard.vue2.js

@@ -1,7 +1,7 @@
 import { ElCard } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/card/style/css";
-import { defineComponent, createBlock, openBlock, withCtx, createVNode, unref } from "vue";
+import { defineComponent, createBlock, openBlock, withCtx, renderSlot, createVNode, unref } from "vue";
 import { LayerTree } from "../layer-tree/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "TocCard",
@@ -23,6 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_card = ElCard;
       return openBlock(), createBlock(_component_el_card, { class: "toc-card" }, {
         default: withCtx(() => [
+          renderSlot(_ctx.$slots, "title", {}, void 0, true),
           createVNode(unref(LayerTree), {
             data: props.data,
             map: props.map,
@@ -32,7 +33,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onLoaded: loadedLayer
           }, null, 8, ["data", "map", "editLayerTag", "showOpacity", "showFilter"])
         ]),
-        _: 1
+        _: 3
       });
     };
   }

package/components/toc-card/index.css

@@ -1,4 +1,4 @@
-.toc-card[data-v-b8e4bc23] {
+.toc-card[data-v-8416d467] {
   background-color: var(--system-primary-color);
   position: absolute;
   width: 245px;

package/components/toc-card/index.d.ts

@@ -1,12 +1,40 @@
-export declare const TocCard: import('../../utils').WithInstall<import('vue').DefineComponent<{
-    data: import('ym-gis-2d/entity').IMapService[];
-    map: import('ym-gis-2d/mapView/Map').default;
-    editLayerTag?: string;
-    showOpacity?: boolean;
-    showFilter?: boolean;
-}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    loaded: (...args: any[]) => void;
-}, string, import('vue').PublicProps, Readonly<{
+export declare const TocCard: import('../../utils').WithInstall<{
+    new (...args: any[]): import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
+        data: import('ym-gis-2d/entity').IMapService[];
+        map: import('ym-gis-2d/mapView/Map').default;
+        editLayerTag?: string;
+        showOpacity?: boolean;
+        showFilter?: boolean;
+    }> & Readonly<{
+        onLoaded?: ((...args: any[]) => any) | undefined;
+    }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+        loaded: (...args: any[]) => void;
+    }, import('vue').PublicProps, {
+        showOpacity: boolean;
+        showFilter: boolean;
+    }, false, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {}, any, import('vue').ComponentProvideOptions, {
+        P: {};
+        B: {};
+        D: {};
+        C: {};
+        M: {};
+        Defaults: {};
+    }, Readonly<{
+        data: import('ym-gis-2d/entity').IMapService[];
+        map: import('ym-gis-2d/mapView/Map').default;
+        editLayerTag?: string;
+        showOpacity?: boolean;
+        showFilter?: boolean;
+    }> & Readonly<{
+        onLoaded?: ((...args: any[]) => any) | undefined;
+    }>, {}, {}, {}, {}, {
+        showOpacity: boolean;
+        showFilter: boolean;
+    }>;
+    __isFragment?: never;
+    __isTeleport?: never;
+    __isSuspense?: never;
+} & import('vue').ComponentOptionsBase<Readonly<{
     data: import('ym-gis-2d/entity').IMapService[];
     map: import('ym-gis-2d/mapView/Map').default;
     editLayerTag?: string;
@@ -14,8 +42,14 @@ export declare const TocCard: import('../../utils').WithInstall<import('vue').De
     showFilter?: boolean;
 }> & Readonly<{
     onLoaded?: ((...args: any[]) => any) | undefined;
-}>, {
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    loaded: (...args: any[]) => void;
+}, string, {
     showOpacity: boolean;
     showFilter: boolean;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>>;
+}, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
+    $slots: {
+        title?(_: {}): any;
+    };
+})>;
 export default TocCard;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "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.38"
+    "ym-gis-2d": "1.0.40"
   }
 }

package/components/layer-switcher/index.d.ts

@@ -1,8 +0,0 @@
-export declare const LayerSwitcher: import('../../utils').WithInstall<import('vue').DefineComponent<{
-    map: import('ym-gis-2d/mapView/Map').default;
-    layers: 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;
-    layers: import('ym-gis-2d/entity').IMapService[];
-}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>>;
-export default LayerSwitcher;