zhihao-ui 1.2.31 → 1.2.32

package/dist/types/components/Map/Map.vue.d.ts

@@ -1,6 +1,7 @@
 import { Ref } from 'vue';
 import { Map as MapType } from 'ol';
 import { ShipInfoVo } from './interface';
+import { PointMarkerClass } from './render/renderPoint.ts';
 
 declare function __VLS_template(): {
     toolPanel?(_: {}): any;
@@ -9,12 +10,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     zoom: number | null;
     center: [number, number] | null;
     vehicleMode: "truck" | "ship";
-    viewMode: "PC" | "WxMiniprogram" | "APP" | "findShip";
+    viewMode: "PC" | "WxMiniprogram" | "APP" | "findShip" | "markerPosition";
     mmsi?: string;
     shipData?: ShipInfoVo;
 }>>, {
     mapInstance: Ref<MapType | undefined, MapType | undefined>;
     initMap: () => void;
+    pointRender: (mapInstance: MapType, options: {
+        color: string;
+        activeUrl?: string;
+        url?: string;
+        activeColor?: string;
+    }) => PointMarkerClass;
     renderTrucksMarker: (list: import('./interface').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
     renderShip: (list: ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
     renderTrack: (mmsi: string, list: any[], color: string) => void;
@@ -35,7 +42,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     switchGreenDot: () => void;
     zoomTruckIcon: () => void;
     renderTruckTrack: (vclN: string, list: any[], color: string) => void;
-    removerLayer: (index: number) => void;
+    removerLayer: (index: number, id: string) => void;
     renderMarker: (lngLat: string, translate?: boolean, showText?: boolean) => void;
     setMarkerPosition: (val: string) => void;
     getZoomAndCenter: () => {
@@ -63,6 +70,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
             truckStatistics: number;
             shipModelMin: number;
             shipModelMax: number;
+            markerPosition: number;
         };
         projection: {
             data: string;
@@ -110,7 +118,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     zoom: number | null;
     center: [number, number] | null;
     vehicleMode: "truck" | "ship";
-    viewMode: "PC" | "WxMiniprogram" | "APP" | "findShip";
+    viewMode: "PC" | "WxMiniprogram" | "APP" | "findShip" | "markerPosition";
     mmsi?: string;
     shipData?: ShipInfoVo;
 }>>> & Readonly<{

package/dist/types/components/Map/config.d.ts

@@ -20,6 +20,7 @@ export declare const mapZoom: {
     truckStatistics: number;
     shipModelMin: number;
     shipModelMax: number;
+    markerPosition: number;
 };
 export declare const renderShipsLimit = 200;
 export declare const mapDefaultCenter: [number, number];

package/dist/types/components/Map/index.d.ts

@@ -13,14 +13,14 @@ export declare const ZhMap: {
             required: true;
         };
         viewMode: {
-            type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip">;
+            type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip" | "markerPosition">;
             required: true;
         };
         mmsi: {
             type: import('vue').PropType<string>;
         };
         shipData: {
-            type: import('vue').PropType<import('./interface/index.ts').ShipInfoVo>;
+            type: import('vue').PropType<import('./interface').ShipInfoVo>;
         };
     }>> & Readonly<{
         onZoomChanged?: ((...args: any[]) => any) | undefined;
@@ -28,10 +28,16 @@ export declare const ZhMap: {
     }>, {
         mapInstance: import('vue').Ref<import('ol').Map | undefined, import('ol').Map | undefined>;
         initMap: () => void;
-        renderTrucksMarker: (list: import('./interface/index.ts').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
-        renderShip: (list: import('./interface/index.ts').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
+        pointRender: (mapInstance: import('ol').Map, options: {
+            color: string;
+            activeUrl?: string;
+            url?: string;
+            activeColor?: string;
+        }) => import('./render/renderPoint').PointMarkerClass;
+        renderTrucksMarker: (list: import('./interface').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
+        renderShip: (list: import('./interface').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
         renderTrack: (mmsi: string, list: any[], color: string) => void;
-        findTruck: (vehicleInfo?: import('./interface/index.ts').VehicleInfo) => Promise<void>;
+        findTruck: (vehicleInfo?: import('./interface').VehicleInfo) => Promise<void>;
         removeTruckIcon: () => void;
         clearAllTruck: () => void;
         closeTrack: () => void;
@@ -39,16 +45,16 @@ export declare const ZhMap: {
         resetTrackView: (id?: number | string) => void;
         playTrack: (id: number | string, speed: number) => void;
         clearSelectFeature: () => void;
-        findShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, select?: boolean) => any;
-        focusShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, hidden?: boolean) => void;
-        showTracks: import('vue').Ref<import('./interface/index.ts').TrackExtend[], import('./interface/index.ts').TrackExtend[]>;
+        findShip: (id: string, shipData?: import('./interface').ShipInfoVo, select?: boolean) => any;
+        focusShip: (id: string, shipData?: import('./interface').ShipInfoVo, hidden?: boolean) => void;
+        showTracks: import('vue').Ref<import('./interface').TrackExtend[], import('./interface').TrackExtend[]>;
         removeAllTrackLayer: () => void;
-        switchFilterItem: (key: import('./enum/ship.ts').SWITCH_BTN, value: boolean) => void;
+        switchFilterItem: (key: import('./enum').SWITCH_BTN, value: boolean) => void;
         rerenderShip: () => void;
         switchGreenDot: () => void;
         zoomTruckIcon: () => void;
         renderTruckTrack: (vclN: string, list: any[], color: string) => void;
-        removerLayer: (index: number) => void;
+        removerLayer: (index: number, id: string) => void;
         renderMarker: (lngLat: string, translate?: boolean, showText?: boolean) => void;
         setMarkerPosition: (val: string) => void;
         getZoomAndCenter: () => {
@@ -76,6 +82,7 @@ export declare const ZhMap: {
                 truckStatistics: number;
                 shipModelMin: number;
                 shipModelMax: number;
+                markerPosition: number;
             };
             projection: {
                 data: string;
@@ -140,14 +147,14 @@ export declare const ZhMap: {
             required: true;
         };
         viewMode: {
-            type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip">;
+            type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip" | "markerPosition">;
             required: true;
         };
         mmsi: {
             type: import('vue').PropType<string>;
         };
         shipData: {
-            type: import('vue').PropType<import('./interface/index.ts').ShipInfoVo>;
+            type: import('vue').PropType<import('./interface').ShipInfoVo>;
         };
     }>> & Readonly<{
         onZoomChanged?: ((...args: any[]) => any) | undefined;
@@ -155,10 +162,16 @@ export declare const ZhMap: {
     }>, {
         mapInstance: import('vue').Ref<import('ol').Map | undefined, import('ol').Map | undefined>;
         initMap: () => void;
-        renderTrucksMarker: (list: import('./interface/index.ts').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
-        renderShip: (list: import('./interface/index.ts').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
+        pointRender: (mapInstance: import('ol').Map, options: {
+            color: string;
+            activeUrl?: string;
+            url?: string;
+            activeColor?: string;
+        }) => import('./render/renderPoint').PointMarkerClass;
+        renderTrucksMarker: (list: import('./interface').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
+        renderShip: (list: import('./interface').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
         renderTrack: (mmsi: string, list: any[], color: string) => void;
-        findTruck: (vehicleInfo?: import('./interface/index.ts').VehicleInfo) => Promise<void>;
+        findTruck: (vehicleInfo?: import('./interface').VehicleInfo) => Promise<void>;
         removeTruckIcon: () => void;
         clearAllTruck: () => void;
         closeTrack: () => void;
@@ -166,16 +179,16 @@ export declare const ZhMap: {
         resetTrackView: (id?: number | string) => void;
         playTrack: (id: number | string, speed: number) => void;
         clearSelectFeature: () => void;
-        findShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, select?: boolean) => any;
-        focusShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, hidden?: boolean) => void;
-        showTracks: import('vue').Ref<import('./interface/index.ts').TrackExtend[], import('./interface/index.ts').TrackExtend[]>;
+        findShip: (id: string, shipData?: import('./interface').ShipInfoVo, select?: boolean) => any;
+        focusShip: (id: string, shipData?: import('./interface').ShipInfoVo, hidden?: boolean) => void;
+        showTracks: import('vue').Ref<import('./interface').TrackExtend[], import('./interface').TrackExtend[]>;
         removeAllTrackLayer: () => void;
-        switchFilterItem: (key: import('./enum/ship.ts').SWITCH_BTN, value: boolean) => void;
+        switchFilterItem: (key: import('./enum').SWITCH_BTN, value: boolean) => void;
         rerenderShip: () => void;
         switchGreenDot: () => void;
         zoomTruckIcon: () => void;
         renderTruckTrack: (vclN: string, list: any[], color: string) => void;
-        removerLayer: (index: number) => void;
+        removerLayer: (index: number, id: string) => void;
         renderMarker: (lngLat: string, translate?: boolean, showText?: boolean) => void;
         setMarkerPosition: (val: string) => void;
         getZoomAndCenter: () => {
@@ -203,6 +216,7 @@ export declare const ZhMap: {
                 truckStatistics: number;
                 shipModelMin: number;
                 shipModelMax: number;
+                markerPosition: number;
             };
             projection: {
                 data: string;
@@ -261,14 +275,14 @@ export declare const ZhMap: {
         required: true;
     };
     viewMode: {
-        type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip">;
+        type: import('vue').PropType<"PC" | "WxMiniprogram" | "APP" | "findShip" | "markerPosition">;
         required: true;
     };
     mmsi: {
         type: import('vue').PropType<string>;
     };
     shipData: {
-        type: import('vue').PropType<import('./interface/index.ts').ShipInfoVo>;
+        type: import('vue').PropType<import('./interface').ShipInfoVo>;
     };
 }>> & Readonly<{
     onZoomChanged?: ((...args: any[]) => any) | undefined;
@@ -276,10 +290,16 @@ export declare const ZhMap: {
 }>, {
     mapInstance: import('vue').Ref<import('ol').Map | undefined, import('ol').Map | undefined>;
     initMap: () => void;
-    renderTrucksMarker: (list: import('./interface/index.ts').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
-    renderShip: (list: import('./interface/index.ts').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
+    pointRender: (mapInstance: import('ol').Map, options: {
+        color: string;
+        activeUrl?: string;
+        url?: string;
+        activeColor?: string;
+    }) => import('./render/renderPoint').PointMarkerClass;
+    renderTrucksMarker: (list: import('./interface').SinoiovVehicleInfo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | undefined;
+    renderShip: (list: import('./interface').ShipInfoVo[]) => import('ol/layer').Vector<import('ol/source').Vector<any>, any> | import('ol/layer').WebGLPoints<import('ol/source').Vector<import('ol').Feature<import('ol/geom').Geometry>>> | undefined;
     renderTrack: (mmsi: string, list: any[], color: string) => void;
-    findTruck: (vehicleInfo?: import('./interface/index.ts').VehicleInfo) => Promise<void>;
+    findTruck: (vehicleInfo?: import('./interface').VehicleInfo) => Promise<void>;
     removeTruckIcon: () => void;
     clearAllTruck: () => void;
     closeTrack: () => void;
@@ -287,16 +307,16 @@ export declare const ZhMap: {
     resetTrackView: (id?: number | string) => void;
     playTrack: (id: number | string, speed: number) => void;
     clearSelectFeature: () => void;
-    findShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, select?: boolean) => any;
-    focusShip: (id: string, shipData?: import('./interface/index.ts').ShipInfoVo, hidden?: boolean) => void;
-    showTracks: import('vue').Ref<import('./interface/index.ts').TrackExtend[], import('./interface/index.ts').TrackExtend[]>;
+    findShip: (id: string, shipData?: import('./interface').ShipInfoVo, select?: boolean) => any;
+    focusShip: (id: string, shipData?: import('./interface').ShipInfoVo, hidden?: boolean) => void;
+    showTracks: import('vue').Ref<import('./interface').TrackExtend[], import('./interface').TrackExtend[]>;
     removeAllTrackLayer: () => void;
-    switchFilterItem: (key: import('./enum/ship.ts').SWITCH_BTN, value: boolean) => void;
+    switchFilterItem: (key: import('./enum').SWITCH_BTN, value: boolean) => void;
     rerenderShip: () => void;
     switchGreenDot: () => void;
     zoomTruckIcon: () => void;
     renderTruckTrack: (vclN: string, list: any[], color: string) => void;
-    removerLayer: (index: number) => void;
+    removerLayer: (index: number, id: string) => void;
     renderMarker: (lngLat: string, translate?: boolean, showText?: boolean) => void;
     setMarkerPosition: (val: string) => void;
     getZoomAndCenter: () => {
@@ -324,6 +344,7 @@ export declare const ZhMap: {
             truckStatistics: number;
             shipModelMin: number;
             shipModelMax: number;
+            markerPosition: number;
         };
         projection: {
             data: string;
@@ -372,5 +393,4 @@ export declare const ZhMap: {
         toolPanel?(_: {}): any;
     };
 }) & import('vue').Plugin;
-export * from './render/renderPoint.ts';
 export * from './config';

package/dist/types/components/Map/interface/entity/render.d.ts

@@ -21,6 +21,7 @@ export interface DrawPolygonOptions {
     blinkColors?: string[];
 }
 export interface DrawLabelOptions {
+    id: string;
     center: number[];
     text: string;
     color: string;

package/dist/types/components/Map/render/canvasRender/renderTrackStyle.d.ts

@@ -4,8 +4,10 @@ import { ShipTrack } from '../../interface';
 import { Ref } from 'vue';
 
 export declare const renderTrackStyleSetInstance: (instance: Ref<MapType>) => Ref<MapType, MapType>;
-export declare const renderTrackLine: (data: any, id: string, trackColor: string) => void;
+export declare const renderTrackLine: (data: {
+    [key: string]: ShipTrack[];
+}, id: string, trackColor: string) => void;
 export declare const handlePlay: (id: string, speed: number) => void;
-export declare const removeShipTrackLineFeatureByIndex: (index: number) => void;
+export declare const removeShipTrackLineFeatureByIndex: (index: number, id: string) => void;
 export declare const stopAnimation: () => void;
 export declare const setTrackLabelStyle: (featureData: ShipTrack, trackColor: string) => Style;

package/dist/types/components/Map/utils/store.d.ts

@@ -4,7 +4,7 @@ import { default as VectorLayer } from 'ol/layer/Vector';
 import { default as WebGLPointsLayer } from 'ol/layer/WebGLPoints';
 import { default as VectorSource } from 'ol/source/Vector';
 import { Geometry } from 'ol/geom';
-import { ShipInfoVo, ShipMapData } from '../interface';
+import { ShipInfoVo, ShipTrack, ShipMapData } from '../interface';
 
 export declare const mapInstance: Ref<MapType | undefined, MapType | undefined>;
 export declare const shipsLayer: Ref<VectorLayer | undefined>;
@@ -22,7 +22,9 @@ export declare const trackLabelLayer: Ref<VectorLayer | undefined>;
 export declare const shipLabels: Ref<any>;
 export declare const trackLabels: Ref<any>;
 export declare const showTrackLayer: Ref<boolean>;
-export declare const allTracks: Ref<number[][][]>;
+export declare const allTracks: Ref<{
+    [key: string]: ShipTrack[];
+}>;
 export declare const currentTrackId: Ref<string>;
 export declare const showTrackAnimatMarker: Ref<boolean>;
 export declare const hiddenOrther: Ref<boolean>;

package/dist/types/components/utils.d.ts

@@ -2,3 +2,4 @@ export declare const dateFormat: (str?: string | Date, format?: string) => strin
 /**校验数字 */
 export declare const validateNumber: (value: string | number) => boolean;
 export declare function digitUppercase(n: number): string;
+export declare function getForegroundColor(backgroundColor: string, threshold?: number): "white" | "black";