web3dlink 2.1.1 → 2.1.3

package/dist/web3dlink.js

@@ -185,14 +185,17 @@ var CommandManager = class {
 		this.transport = e, this.callbacks = {}, this.requestId = 0, this.timeout = 3e3, this.markerEventCallbacks = {
 			Hovered: {},
 			Click: {},
+			DoubleClick: {},
 			Unhovered: {}
 		}, this.secondMarkerEventCallbacks = {
 			Hovered: {},
 			Click: {},
+			DoubleClick: {},
 			Unhovered: {}
 		}, this.followMarkerEventCallbacks = {
 			Hovered: {},
 			Click: {},
+			DoubleClick: {},
 			Unhovered: {}
 		}, this.animationOnDataCallback = { Change: [] }, this.mouseClickCallback = { MouseClick: [] }, this.vtkMouseClickCallback = {}, e.bindMessageHandler((e) => {
 			this._handleRawResponse(e);
@@ -254,17 +257,17 @@ var CommandManager = class {
 		console.warn("注意：非常规响应", t);
 	}
 	_sendPreparePayload(e, t) {
-		if (e === "marker.iconMarker") {
-			let { onMarkerClick: e, onMouseHover: n, onMouseLeave: r, ...i } = t || {}, a = i?.id;
-			return a != null && a !== "" ? (typeof n == "function" && (this.markerEventCallbacks.Hovered[a] = n), typeof e == "function" && (this.markerEventCallbacks.Click[a] = e), typeof r == "function" && (this.markerEventCallbacks.Unhovered[a] = r)) : (typeof n == "function" && (this.markerEventCallbacks.Hovered.__default = n), typeof e == "function" && (this.markerEventCallbacks.Click.__default = e), typeof r == "function" && (this.markerEventCallbacks.Unhovered.__default = r)), i;
+		if (e === "marker.iconMarker" || e === "marker.iconUrlMarker") {
+			let { onMarkerClick: e, onMarkerDoubleClick: n, onMarkerDblClick: r, onMouseHover: i, onMouseLeave: a, ...o } = t || {}, s = n || r, c = o?.id;
+			return c != null && c !== "" ? (typeof i == "function" && (this.markerEventCallbacks.Hovered[c] = i), typeof e == "function" && (this.markerEventCallbacks.Click[c] = e), typeof s == "function" && (this.markerEventCallbacks.DoubleClick[c] = s), typeof a == "function" && (this.markerEventCallbacks.Unhovered[c] = a)) : (typeof i == "function" && (this.markerEventCallbacks.Hovered.__default = i), typeof e == "function" && (this.markerEventCallbacks.Click.__default = e), typeof s == "function" && (this.markerEventCallbacks.DoubleClick.__default = s), typeof a == "function" && (this.markerEventCallbacks.Unhovered.__default = a)), o;
 		}
 		if (e === "marker.secondMarker") {
-			let { onMarkerClick: e, onMouseHover: n, onMouseLeave: r, ...i } = t || {}, a = i?.id;
-			return a != null && a !== "" ? (typeof n == "function" && (this.secondMarkerEventCallbacks.Hovered[a] = n), typeof e == "function" && (this.secondMarkerEventCallbacks.Click[a] = e), typeof r == "function" && (this.secondMarkerEventCallbacks.Unhovered[a] = r)) : (typeof n == "function" && (this.secondMarkerEventCallbacks.Hovered.__default = n), typeof e == "function" && (this.secondMarkerEventCallbacks.Click.__default = e), typeof r == "function" && (this.secondMarkerEventCallbacks.Unhovered.__default = r)), i;
+			let { onMarkerClick: e, onMarkerDoubleClick: n, onMarkerDblClick: r, onMouseHover: i, onMouseLeave: a, ...o } = t || {}, s = n || r, c = o?.id;
+			return c != null && c !== "" ? (typeof i == "function" && (this.secondMarkerEventCallbacks.Hovered[c] = i), typeof e == "function" && (this.secondMarkerEventCallbacks.Click[c] = e), typeof s == "function" && (this.secondMarkerEventCallbacks.DoubleClick[c] = s), typeof a == "function" && (this.secondMarkerEventCallbacks.Unhovered[c] = a)) : (typeof i == "function" && (this.secondMarkerEventCallbacks.Hovered.__default = i), typeof e == "function" && (this.secondMarkerEventCallbacks.Click.__default = e), typeof s == "function" && (this.secondMarkerEventCallbacks.DoubleClick.__default = s), typeof a == "function" && (this.secondMarkerEventCallbacks.Unhovered.__default = a)), o;
 		}
 		if (e === "marker.followMarker") {
-			let { onMarkerClick: e, onMouseHover: n, onMouseLeave: r, ...i } = t || {}, a = i?.id;
-			return a != null && a !== "" ? (typeof n == "function" && (this.followMarkerEventCallbacks.Hovered[a] = n), typeof e == "function" && (this.followMarkerEventCallbacks.Click[a] = e), typeof r == "function" && (this.followMarkerEventCallbacks.Unhovered[a] = r)) : (typeof n == "function" && (this.followMarkerEventCallbacks.Hovered.__default = n), typeof e == "function" && (this.followMarkerEventCallbacks.Click.__default = e), typeof r == "function" && (this.followMarkerEventCallbacks.Unhovered.__default = r)), i;
+			let { onMarkerClick: e, onMarkerDoubleClick: n, onMarkerDblClick: r, onMouseHover: i, onMouseLeave: a, ...o } = t || {}, s = n || r, c = o?.id;
+			return c != null && c !== "" ? (typeof i == "function" && (this.followMarkerEventCallbacks.Hovered[c] = i), typeof e == "function" && (this.followMarkerEventCallbacks.Click[c] = e), typeof s == "function" && (this.followMarkerEventCallbacks.DoubleClick[c] = s), typeof a == "function" && (this.followMarkerEventCallbacks.Unhovered[c] = a)) : (typeof i == "function" && (this.followMarkerEventCallbacks.Hovered.__default = i), typeof e == "function" && (this.followMarkerEventCallbacks.Click.__default = e), typeof s == "function" && (this.followMarkerEventCallbacks.DoubleClick.__default = s), typeof a == "function" && (this.followMarkerEventCallbacks.Unhovered.__default = a)), o;
 		}
 		if (e === "tool.onMouseClick") {
 			let { onMouseClick: e, ...n } = t || {};
@@ -287,7 +290,7 @@ var CommandManager = class {
 	_processEventResponse(e) {
 		if (!e) return !1;
 		let { command: t, data: n = {} } = e;
-		if (t === "marker.iconMarker") {
+		if (t === "marker.iconMarker" || t === "marker.iconUrlMarker") {
 			if (typeof n.recordData == "string") try {
 				n.recordData = JSON.parse(n.recordData);
 			} catch {}
@@ -804,8 +807,8 @@ function flyTo(e) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: n,
 		field: "yaw",
@@ -835,8 +838,8 @@ function focusToID(e) {
 		normalized: n,
 		field: "pitch",
 		value: e.pitch,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: n,
 		field: "yaw",
@@ -869,8 +872,8 @@ function focusToPoint(e) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: n,
 		field: "yaw",
@@ -942,8 +945,8 @@ function aroundMode(e = {}) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: n,
 		field: "yaw",
@@ -1017,8 +1020,8 @@ function firstPersonMode(e = {}) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: n,
 		field: "yaw",
@@ -1084,7 +1087,7 @@ function isEmptyValue(e) {
 	return !!(e == null || e === "" || Array.isArray(e) && e.length === 0);
 }
 function generateUniqueId$1() {
-	return `marker_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+	return `marker_${Date.now()}`;
 }
 function ensureIconStyle(e, t, n) {
 	let r = e?.[t];
@@ -1221,7 +1224,39 @@ function validateConfigByMarkerType(e, t) {
 		"anchor4",
 		"anchor5",
 		"anchor6"
-	].includes(n) ? validateAnchorConfig(r, t) : n === "html" ? validateHtmlMarkerConfig(r, t) : n === "url" ? validateUrlMarkerConfig(r, t) : validateDefaultConfig(r, t);
+	].includes(n) ? validateAnchorConfig(r, t) : n === "html" ? validateHtmlMarkerConfig(r, t) : n === "url" ? validateUrlMarkerConfig(r, t) : n === "lod" ? validateLodConfig(r, t) : validateDefaultConfig(r, t);
+}
+function validateLodConfig(e, t) {
+	if (ensureIconStyle(e, "iconStyle", t), ensureTextStyle(e, "textStyle", t), e.levels === void 0 || e.levels === null) {
+		e.levels = [];
+		return;
+	}
+	if (!Array.isArray(e.levels)) {
+		t.push("[config.levels]必须是数组");
+		return;
+	}
+	e.levels.forEach((e, n) => {
+		if (!e || typeof e != "object" || Array.isArray(e)) {
+			t.push(`[config.levels[${n}]]必须是对象`);
+			return;
+		}
+		t.push(...validateOptionalArray({
+			normalized: e,
+			field: "distance",
+			value: normalizeEmptyArray(e.distance),
+			length: 2
+		})), (!Array.isArray(e.distance) || e.distance.length !== 2) && t.push(`[config.levels[${n}].distance]必填，格式为 [min, max]`), t.push(...validateOptionalString({
+			normalized: e,
+			field: "text",
+			value: e.text,
+			defaultValue: ""
+		})), t.push(...validateOptionalString({
+			normalized: e,
+			field: "iconAddress",
+			value: e.iconAddress,
+			defaultValue: ""
+		})), ensureIconStyle(e, "iconStyle", t), ensureTextStyle(e, "textStyle", t);
+	});
 }
 function validateHtmlMarkerConfig(e, t) {
 	t.push(...validateOptionalNumber({
@@ -1538,8 +1573,8 @@ function validateCaptureConfig(e, t) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), t.push(...validateOptionalNumber({
 		normalized: e,
 		field: "yaw",
@@ -1624,7 +1659,7 @@ function iconMarker(e) {
 		defaultValue: 1,
 		type: "number",
 		list: [0, 1]
-	})), t.push(...verifyEnumerationValue({
+	})), e.markerState === void 0 || e.markerState === null ? n.markerState = !0 : typeof e.markerState == "boolean" ? n.markerState = e.markerState : t.push("[markerState]必须是布尔类型"), t.push(...verifyEnumerationValue({
 		normalized: n,
 		field: "markerType",
 		value: e.markerType,
@@ -1635,6 +1670,7 @@ function iconMarker(e) {
 			"default1",
 			"default2",
 			"default3",
+			"lod",
 			"flashIcon",
 			"component",
 			"customCom",
@@ -1693,7 +1729,7 @@ function followMarker(e) {
 		defaultValue: 1,
 		type: "number",
 		list: [0, 1]
-	})), t.push(...verifyEnumerationValue({
+	})), e.markerState === void 0 || e.markerState === null ? n.markerState = !0 : typeof e.markerState == "boolean" ? n.markerState = e.markerState : t.push("[markerState]必须是布尔类型"), t.push(...verifyEnumerationValue({
 		normalized: n,
 		field: "markerType",
 		value: e.markerType,
@@ -1704,6 +1740,7 @@ function followMarker(e) {
 			"default1",
 			"default2",
 			"default3",
+			"lod",
 			"flashIcon",
 			"component",
 			"customCom",
@@ -1745,6 +1782,65 @@ function removeAllMarker(e) {
 		normalized: { ...e }
 	};
 }
+function removeMarker(e = {}) {
+	let t = [], n = { ...e };
+	return t.push(...validateOptionalArray({
+		normalized: n,
+		field: "groupIds",
+		value: e.groupIds,
+		minLength: 1
+	})), {
+		errors: t,
+		normalized: n
+	};
+}
+function showMarker(e = {}) {
+	let t = [], n = { ...e };
+	return t.push(...validateOptionalArray({
+		normalized: n,
+		field: "groupIds",
+		value: e.groupIds,
+		minLength: 1
+	})), {
+		errors: t,
+		normalized: n
+	};
+}
+function showAllMarker(e = {}) {
+	return {
+		errors: [],
+		normalized: { ...e }
+	};
+}
+function hideMarker(e = {}) {
+	let t = [], n = { ...e };
+	return t.push(...validateOptionalArray({
+		normalized: n,
+		field: "groupIds",
+		value: e.groupIds,
+		minLength: 1
+	})), {
+		errors: t,
+		normalized: n
+	};
+}
+function hideAllMarker(e = {}) {
+	return {
+		errors: [],
+		normalized: { ...e }
+	};
+}
+function iconUrlMarker(e = {}) {
+	let t = [], n = { ...e };
+	return t.push(...validateRequiredString({
+		normalized: n,
+		field: "url",
+		value: e.url
+	})), {
+		errors: t,
+		normalized: n
+	};
+}
 function addClustering(e) {
 	let t = [], n = { ...e };
 	t.push(...verifyEnumerationValue({
@@ -1893,7 +1989,13 @@ function secondMarker(e) {
 var validator$9 = {
 	iconMarker,
 	followMarker,
+	removeMarker,
 	removeAllMarker,
+	showMarker,
+	showAllMarker,
+	hideMarker,
+	hideAllMarker,
+	iconUrlMarker,
 	addClustering,
 	removeClustering,
 	secondMarker
@@ -1905,8 +2007,8 @@ var validator$9 = {
 		let n = `marker.${e}`, r = validator$9[e], i = r ? r(t) : {
 			errors: [],
 			normalized: t
-		};
-		return this.commandManager.sendWithDefault(i, n);
+		}, a = e === "iconUrlMarker" ? { timeout: 12e4 } : {};
+		return this.commandManager.sendWithDefault(i, n, a);
 	}
 }, validateConfig = (e, t, n) => {
 	e && (n === "default" || n === "default1" || n === "default2" || n === "default3" || n === "default4" || n === "flashIcon") && (t.push(...validateOptionalColor({
@@ -1991,8 +2093,8 @@ function cameraFollow(e) {
 		field: "pitch",
 		value: e.pitch,
 		defaultValue: 0,
-		min: -180,
-		max: 180
+		min: -90,
+		max: 90
 	})), {
 		errors: t,
 		normalized: n