ym-giswidget-2d 1.0.31 → 1.0.33

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

@@ -1,13 +1,13 @@
 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';
 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;
 };
 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/identify/Identify.vue.js

@@ -2,7 +2,6 @@ import { defineComponent, reactive, onMounted, onUnmounted, createBlock, createC
 import Select from "ym-gis-2d/interaction/Select";
 import { ElLoading } from "element-plus";
 import { Popup } from "../popup/index.js";
-import { getSelectPointStyle, getSelectCancePointStyle, getSelectLineStyle, getSelectCancelLineStyle, getSelectPolygonStyle, getSelectCancelPolygonStyle } from "ym-gis-2d/style/StyleManager";
 import FeatureManager from "ym-gis-2d/feature/FeatureManager";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "Identify",
@@ -21,20 +20,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       features: [],
       postion: []
     });
-    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();
     onMounted(() => {
       const select = new Select("rectangle", {
-        pointStyle,
-        cancePointStyle,
-        lineStyle,
-        canceLineStyle,
-        polygonStyle,
-        cancePolygonStyle,
+        pointStyle: props.pointStyle,
+        cancePointStyle: props.cancePointStyle,
+        lineStyle: props.lineStyle,
+        canceLineStyle: props.canceLineStyle,
+        polygonStyle: props.polygonStyle,
+        cancePolygonStyle: props.cancePolygonStyle,
         addTempLayer: true,
         selectTempLayer: false
       });

package/components/identify/index.d.ts

@@ -1,18 +1,18 @@
 export declare const Identify: 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;
 }, {}, {}, {}, {}, 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;
 }> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>>;
 export default Identify;

package/components/layer-tree/LayerTree.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./LayerTree.vue2.js";
 /* empty css               */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _LayerTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-70251e18"]]);
+const _LayerTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-567f3aad"]]);
 export {
   _LayerTree as default
 };

package/components/layer-tree/LayerTree.vue2.js

@@ -164,7 +164,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function onOpacityChange(data) {
-      const layer = props.map.getLayersById(data.id);
+      const layer = props.map.getLayerById(data.id);
       if (layer && data.opacity != void 0) {
         layer == null ? void 0 : layer.setOpacity(data.opacity);
       }

package/components/layer-tree/index.css

@@ -1,5 +1,5 @@
 @charset "UTF-8";
-.layer-btn[data-v-70251e18] {
+.layer-btn[data-v-567f3aad] {
   background-color: var(--system-primary-color);
   color: var(--system-primary-text-color);
   font-size: var(--system-primary-text-size);
@@ -12,31 +12,31 @@
   cursor: pointer;
   border-radius: 3px;
 }
-.add-toc-tree[data-v-70251e18] {
+.add-toc-tree[data-v-567f3aad] {
   color: var(--el-text-color-regular) !important;
 }
-.el-tree[data-v-70251e18] {
+.el-tree[data-v-567f3aad] {
   background: unset;
   color: var(--system-primary-text-color);
   font-size: var(--system-primary-text-size);
   overflow: auto;
   max-height: 400px;
 }
-.el-tree[data-v-70251e18] .el-tree-node :hover {
+.el-tree[data-v-567f3aad] .el-tree-node :hover {
   background: unset;
 }
-.el-tree[data-v-70251e18] .el-tree-node :focus {
+.el-tree[data-v-567f3aad] .el-tree-node :focus {
   background: unset;
 }
-.el-tree[data-v-70251e18] .el-tree-node .el-tree-node__content {
+.el-tree[data-v-567f3aad] .el-tree-node .el-tree-node__content {
   background: unset;
   align-items: unset;
   height: 100%;
 }
-.el-tree .active[data-v-70251e18] {
+.el-tree .active[data-v-567f3aad] {
   color: var(--system-primary-text-active-color);
 }
-.el-tree .layer-span[data-v-70251e18] .el-only-child__content {
+.el-tree .layer-span[data-v-567f3aad] .el-only-child__content {
   display: block;
   width: 95px;
   word-wrap: break-word;
@@ -48,30 +48,30 @@
   white-space: nowrap;
   /*强制不换行*/
 }
-.el-tree .custom-tree-node .icontest[data-v-70251e18] {
+.el-tree .custom-tree-node .icontest[data-v-567f3aad] {
   display: flex;
   font-size: var(--system-primary-text-size);
 }
-.el-tree .custom-tree-node .icontest .treeIconImg[data-v-70251e18] {
+.el-tree .custom-tree-node .icontest .treeIconImg[data-v-567f3aad] {
   height: 17px;
   margin: 2px;
 }
-.el-tree .custom-tree-node .opacity-container[data-v-70251e18] {
+.el-tree .custom-tree-node .opacity-container[data-v-567f3aad] {
   display: flex;
 }
-.el-tree .custom-tree-node .opacity-container .opacity-text[data-v-70251e18] {
+.el-tree .custom-tree-node .opacity-container .opacity-text[data-v-567f3aad] {
   margin-left: 13px;
 }
-.el-tree .el-slider[data-v-70251e18] {
+.el-tree .el-slider[data-v-567f3aad] {
   height: 20px;
   margin-bottom: 8px;
 }
-.el-tree .el-slider[data-v-70251e18] .el-slider__runway {
+.el-tree .el-slider[data-v-567f3aad] .el-slider__runway {
   background-color: var(--el-slider-runway-bg-color) !important;
 }
-.el-tree .el-slider[data-v-70251e18] .el-slider__runway .el-slider__bar {
+.el-tree .el-slider[data-v-567f3aad] .el-slider__runway .el-slider__bar {
   background-color: var(--el-slider-main-bg-color) !important;
 }
-[data-v-70251e18] .el-checkbox__label {
+[data-v-567f3aad] .el-checkbox__label {
   margin-left: 14px;
 }

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

@@ -374,12 +374,13 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         };
         getView: () => import('ym-gis-2d/mapView/View').default;
         fitLayer: (layer: import('ym-gis-2d/layers/IBaseLayer').IBaseLayer) => void;
+        fitLayerById: (id: string) => void;
         addMapLayer: (layerInfo: import('ym-gis-2d/entity').IMapService) => Promise<import('ol/layer/Base').default>;
         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;
-        getLayersById: (id: string) => import('ol/layer/Base').default | undefined;
-        getLayersByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
+        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[];
         getTempLayerById: (id: string) => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
         getPointTempLayer: () => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
@@ -389,7 +390,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => 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>;

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

@@ -373,12 +373,13 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
         };
         getView: () => import('ym-gis-2d/mapView/View').default;
         fitLayer: (layer: import('ym-gis-2d/layers/IBaseLayer').IBaseLayer) => void;
+        fitLayerById: (id: string) => void;
         addMapLayer: (layerInfo: import('ym-gis-2d/entity').IMapService) => Promise<import('ol/layer/Base').default>;
         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;
-        getLayersById: (id: string) => import('ol/layer/Base').default | undefined;
-        getLayersByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
+        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[];
         getTempLayerById: (id: string) => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
         getPointTempLayer: () => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
@@ -388,7 +389,7 @@ export declare const MapView: import('../../utils').WithInstall<import('vue').De
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => 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>;

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

@@ -380,12 +380,13 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         };
         getView: () => OLView;
         fitLayer: (layer: import('ym-gis-2d/layers/IBaseLayer').IBaseLayer) => void;
+        fitLayerById: (id: string) => void;
         addMapLayer: (layerInfo: IMapService) => Promise<import('ol/layer/Base').default>;
         addMapLayers: (layerInfo: IMapService[]) => Promise<import('ol/layer/Base').default[]>;
         addLayer: (layer: import('ol/layer/Base').default, fitLayer?: boolean) => void;
         removeLayerById: (id: string) => void;
-        getLayersById: (id: string) => import('ol/layer/Base').default | undefined;
-        getLayersByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
+        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[];
         getTempLayerById: (id: string) => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
         getPointTempLayer: () => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
@@ -395,7 +396,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => 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>;

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

@@ -376,12 +376,13 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
         };
         getView: () => import('ym-gis-2d/mapView/View').default;
         fitLayer: (layer: import('ym-gis-2d/layers/IBaseLayer').IBaseLayer) => void;
+        fitLayerById: (id: string) => void;
         addMapLayer: (layerInfo: import('ym-gis-2d/entity').IMapService) => Promise<import('ol/layer/Base').default>;
         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;
-        getLayersById: (id: string) => import('ol/layer/Base').default | undefined;
-        getLayersByLayerTag: (layerTag: string) => import('ol/layer/Base').default | undefined;
+        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[];
         getTempLayerById: (id: string) => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
         getPointTempLayer: () => import('ol/layer').Vector<import('ym-gis-2d/entity/Feature').default>;
@@ -391,7 +392,7 @@ export declare const MultiScreen: import('../../utils').WithInstall<import('vue'
         resetViewProjection: (projection: string) => void;
         sortTemLayer: () => void;
         getExtent: () => import('ol/extent').Extent;
-        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, fillColor?: string, strokeColor?: string, strokeWidth?: number) => void;
+        addWKT: (wkt: string, wkid: number, tag?: string, location?: boolean, style?: import('ym-gis-2d/entity/IStyle').default) => 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>;

package/components/popup/Popup.vue.js

@@ -2,7 +2,7 @@ import _sfc_main from "./Popup.vue2.js";
 /* empty css           */
 /* empty css           */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _Popup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f55c868e"]]);
+const _Popup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1f9a72ff"]]);
 export {
   _Popup as default
 };

package/components/popup/Popup.vue2.js

@@ -161,7 +161,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let attributesInfos = [];
         for (const key in attributes) {
           const field = fields.find((t) => t.name.toLowerCase() == key.toLowerCase());
-          if (!field || field.fieldType == 6) {
+          if (!field || field.fieldType == 6 || !field.iDisplay) {
             continue;
           }
           let value = attributes[key];

package/components/popup/index.css

@@ -1,4 +1,4 @@
-.identify-popup[data-v-f55c868e] {
+.identify-popup[data-v-1f9a72ff] {
   top: unset !important;
   overflow: unset !important;
   transform: unset !important;
@@ -7,7 +7,7 @@
   left: -50px;
   transform: unset !important;
 }
-.identify-popup[data-v-f55c868e]::after, .identify-popup[data-v-f55c868e]::before {
+.identify-popup[data-v-1f9a72ff]::after, .identify-popup[data-v-1f9a72ff]::before {
   top: 100%;
   border: solid transparent;
   content: " ";
@@ -16,39 +16,39 @@
   position: absolute;
   pointer-events: none;
 }
-.identify-popup[data-v-f55c868e]::after {
+.identify-popup[data-v-1f9a72ff]::after {
   border-top-color: white;
   border-width: 10px;
   left: 48px;
   margin-left: -10px;
 }
-.identify-popup[data-v-f55c868e]::before {
+.identify-popup[data-v-1f9a72ff]::before {
   border-top-color: #cccccc;
   border-width: 11px;
   left: 48px;
   margin-left: -11px;
 }
-.identify-popup .panel-header .el-select[data-v-f55c868e] {
+.identify-popup .panel-header .el-select[data-v-1f9a72ff] {
   --el-fill-color-blank: "";
   --el-input-text-color: var(--system-primary-text-color);
   --el-input-icon-color: var(--system-primary-text-color);
 }
-.identify-popup .identify-popup-content[data-v-f55c868e] {
+.identify-popup .identify-popup-content[data-v-1f9a72ff] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.identify-popup .identify-popup-content .el-table[data-v-f55c868e] {
+.identify-popup .identify-popup-content .el-table[data-v-1f9a72ff] {
   --el-table-bg-color: "";
   --el-table-tr-bg-color: "";
   --el-table-text-color: var(--system-primary-text-color);
   --el-table-row-hover-bg-color: "";
   height: 100%;
 }
-.identify-popup .identify-popup-content .pagination-block[data-v-f55c868e] {
+.identify-popup .identify-popup-content .pagination-block[data-v-1f9a72ff] {
   margin-top: 10px;
 }
-.identify-popup .identify-popup-content .pagination-block .el-pagination[data-v-f55c868e] {
+.identify-popup .identify-popup-content .pagination-block .el-pagination[data-v-1f9a72ff] {
   justify-content: center;
   --el-pagination-bg-color: "";
   --el-pagination-text-color: var(--system-primary-text-color);
@@ -56,6 +56,6 @@
   --el-pagination-button-disabled-bg-color: "";
   --el-pagination-button-color: var(--system-primary-text-color);
 }
-.identify-popup .identify-popup-content .pagination-block .el-pagination[data-v-f55c868e] .el-icon {
+.identify-popup .identify-popup-content .pagination-block .el-pagination[data-v-1f9a72ff] .el-icon {
   color: var(--system-primary-text-color);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "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.11"
+    "ym-gis-2d": "1.0.13"
   }
 }