gis-view-webgl2 0.1.8 → 0.1.9

package/docs/demos/CopyMergeDemo.vue

@@ -25,7 +25,7 @@ const copyItemsText = ref('—')
 const copyLineChannelsText = ref('—')
 const manualText = ref('—')
 const mergeBackendText = ref('合并变更 → 后端事务：—')
-const splitText = ref('解除合并：先选中一个节点（不选就取第一个），再点按钮')
+const splitText = ref('自动解除合并：先选中一个合并后的节点（不选就找第一个带 mergeInfo 的节点）')
 const lastSplitResult = shallowRef(null)
 const copyBackendText = ref('复制落库：—')
 const mergeSyncText = ref('合并落库：—')
@@ -45,8 +45,12 @@ const mergedVoltage = ref('525')
 const mergedColor = ref('#ff5d8f')
 const mergedSize = ref('16')
 const mergedSymbol = ref('square')
-const mergedStrokeColor = ref('#ffffff')
-const mergeTargetId = ref('')
+const mergedStrokeColor = ref('#ffffff')
+/** 合并时取双方最高值的字段；空字符串表示不取任何键 */
+const mergeMaxKeys = ref('')
+/** 拆分 / 自动解除合并后是否选中结果节点 */
+const splitSelect = ref(false)
+const mergeTargetId = ref('')
 const mergeKeep = ref('target')
 const rewriteOnConfirm = ref(true)
 const pointOptions = ref([])
@@ -73,6 +77,7 @@ let disposed = false
 
 const pointLabel = item => String(item?.name ?? item?.label ?? item?.id ?? '节点')
 const pointKey = item => String(item?.id ?? item?.label ?? item?.name ?? '—')
+const parsedMergeMaxKeys = () => mergeMaxKeys.value.split(',').map(key => key.trim()).filter(Boolean)
 const itemId = item => (item?.id ?? item?.line_id ?? item?.channel_id ?? '无 id')
 /** 复制载荷的 lines 与 lineChannels 一一对齐：直接列出每条回线复制后属于哪条通道 / 哪一组 */
 const describeLineChannels = (payload) => {
@@ -102,6 +107,14 @@ const describeMergeChanges = changes => describeMergeChangeSets(changes ? [chang
 const describeMergeImpact = impact => (impact
 	? `影响 ${impact.lineCount} 条线路（改线 ${impact.linesChanged} / 删线 ${impact.removedLines}）· 通道 改 ${impact.channelsChanged} / 删 ${impact.removedChannels} / 并 ${impact.mergedChannels}`
 	: '影响读数：当前数据对不上')
+const voltageOf = item => item?.vn_kv ?? item?.voltage ?? item?.voltageKv ?? item?.voltage_level ?? item?.voltageLevel ?? '—'
+/** 合并追溯读数：来源、保留前电压与快照条数，演示解除合并需要的字段都在这里 */
+const describeMergeInfo = (item) => {
+	const info = item?.mergeInfo
+	if (!info || typeof info !== 'object') return 'mergeInfo —'
+	const sourceIds = (info.sourceIds ?? info.points?.map(snapshot => snapshot.id) ?? []).map(id => String(id ?? '无 id')).join(' / ') || '—'
+	return `mergeInfo v${info.version} · 保留前 ${info.targetPoint?.name ?? '—'} / ${voltageOf(info.targetPoint)} kV · 来源 [${sourceIds}] · 快照 线 ${info.lines?.length ?? 0} / 通道 ${info.channels?.length ?? 0}`
+}
 const backendBusy = computed(() => backendBusyCount.value > 0)
 const backendStateText = computed(() => `假后端 v${backendSnapshot.value.version} · 已应用 ${backendSnapshot.value.applied} 条 · op 缓存 ${backendSnapshot.value.cached} · 幂等回放 ${backendSnapshot.value.replays ?? 0} 次 · 模拟延迟 ${backendSnapshot.value.latency}ms`)
 const backendModeHint = computed(() => FAKE_BACKEND_MODES.find(item => item.value === backendMode.value)?.hint ?? '')
@@ -749,27 +762,31 @@ const prepareMerge = () => {
 	return actionText.value
 }
 
-/** 解除合并：splitPoint 的 autoLines=alternate 按通道成组、独立线路单条轮流分配，不会把同通道成员拆散 */
+/** 解除合并：优先用 mergeInfo 自动恢复全部来源；没有合并记录时才退回手工两份拆分 */
 const splitSelectedPoint = () => {
 	const data = view?.getData()
 	if (!data?.points?.length) return '没有可拆分的节点'
-	const source = selectedPoints.value[0] ?? data.points[0]
+	const mergedPoint = selectedPoints.value.find(item => item?.mergeInfo) ?? data.points.find(item => item?.mergeInfo)
+	const source = mergedPoint ?? selectedPoints.value[0] ?? data.points[0]
+	const auto = Boolean(mergedPoint?.mergeInfo)
 	splitRound += 1
 	const offset = 0.42 + splitRound * 0.04
-	const result = view.splitPoint(source.id, [
-		{
-			x: Number(source.x) - offset,
-			y: Number(source.y) - offset * 0.55,
-			name: `${pointLabel(source)} · A`,
-			zone_name: '解除合并后 · A'
-		},
-		{
-			x: Number(source.x) + offset,
-			y: Number(source.y) + offset * 0.55,
-			name: `${pointLabel(source)} · B`,
-			zone_name: '解除合并后 · B'
-		}
-	], { autoLines: 'alternate', label: '解除合并' })
+	const result = auto
+		? view.splitPoint(source.id, null, { label: '解除合并（自动恢复）', select: splitSelect.value })
+		: view.splitPoint(source.id, [
+			{
+				x: Number(source.x) - offset,
+				y: Number(source.y) - offset * 0.55,
+				name: `${pointLabel(source)} · A`,
+				zone_name: '解除合并后 · A'
+			},
+			{
+				x: Number(source.x) + offset,
+				y: Number(source.y) + offset * 0.55,
+				name: `${pointLabel(source)} · B`,
+				zone_name: '解除合并后 · B'
+			}
+		], { autoLines: 'alternate', label: '解除合并（手工拆分）', select: splitSelect.value })
 	lastSplitResult.value = result
 	if (!result.ok) {
 		splitText.value = `解除合并失败：${result.reason}`
@@ -777,6 +794,14 @@ const splitSelectedPoint = () => {
 		pushLog('splitPoint', splitText.value)
 		return splitText.value
 	}
+	if (result.autoRestored) {
+		const restoredNames = (result.items ?? []).map(item => `${pointLabel(item)}（${String(voltageOf(item))} kV）`).join(' / ')
+		splitText.value = `splitPoint（自动解除合并）：${pointLabel(source)} → ${restoredNames} · 恢复来源 ${(result.mergeSourceIds ?? []).map(id => String(id)).join(' / ') || '—'} · 改线 ${result.linesChanged} / 改通道 ${result.channelsChanged} · ${splitSelect.value ? '已选中拆分结果' : '未选中拆分结果'} · mergeInfo 已从保留节点移除`
+		actionText.value = splitText.value
+		pushLog('splitPoint/auto', splitText.value)
+		refreshState()
+		return splitText.value
+	}
 	const lineSlot = new Map()
 	for (const assignment of result.lineAssignments ?? []) {
 		for (const lineId of assignment.lineIds ?? []) {
@@ -792,10 +817,9 @@ const splitSelectedPoint = () => {
 		return slots.size <= 1
 	})
 	const counts = result.lineAssignments.map(assignment => `${assignment.index === 0 ? 'A' : assignment.index === 1 ? 'B' : String(assignment.index + 1)} ${assignment.lineCount}`).join(' / ')
-	splitText.value = `splitPoint（解除合并）：${pointLabel(source)} → ${result.pointIds.join(' / ')} · autoLines=${result.autoLines} · 自动分线 ${result.autoAssignedLines}（${counts}）· 改线 ${result.linesChanged} / 删线 ${result.removedLines} · 改通道 ${result.channelsChanged} / 删通道 ${result.removedChannels} · 通道成组${channelsKept ? '保持完整' : '发生拆分'}`
+	splitText.value = `splitPoint（解除合并）：${pointLabel(source)} → ${result.pointIds.join(' / ')} · autoLines=${result.autoLines} · 自动分线 ${result.autoAssignedLines}（${counts}）· 改线 ${result.linesChanged} / 删线 ${result.removedLines} · 改通道 ${result.channelsChanged} / 删通道 ${result.removedChannels} · 通道成组${channelsKept ? '保持完整' : '发生拆分'} · ${splitSelect.value ? '已选中拆分结果' : '未选中拆分结果'}`
 	actionText.value = splitText.value
 	pushLog('splitPoint', splitText.value)
-	view.selectFeatures(result.pointIds)
 	refreshState()
 	return splitText.value
 }
@@ -816,7 +840,7 @@ const mergePatch = () => {
 	return patch
 }
 
-const mergeSelectedByApi = () => {
+const mergeSelectedByApi = () => {
 	const points = selectedPoints.value
 	if (points.length < 2) return 'mergeSelectedPoints：至少选中两个节点'
 	const targetId = mergeTargetOptions.value.some(item => item.value === mergeTargetId.value)
@@ -841,8 +865,59 @@ const mergeSelectedByApi = () => {
 	actionText.value = mergeText.value
 	pushLog('mergeSelectedPoints', mergeText.value)
 	refreshState()
-	return mergeText.value
-}
+	return mergeText.value
+}
+
+/** 把面板上的字段清单写进 merge.maxKeys；空清单表示所有业务字段都取保留节点 */
+const applyMergeMaxKeys = () => {
+	if (!view) return '画布还没准备好'
+	const maxKeys = parsedMergeMaxKeys()
+	const merge = view.getOptions().merge ?? {}
+	view.updateOptions({ merge: { ...merge, enabled: true, maxKeys } })
+	actionText.value = maxKeys.length
+		? `merge.maxKeys = [${maxKeys.join(', ')}]：合并时这些数值字段取双方最高值`
+		: 'merge.maxKeys = []：合并时所有业务字段保留目标节点（组件不再默认取电压最高）'
+	pushLog('merge.maxKeys', actionText.value)
+	return actionText.value
+}
+
+/** 缺省合并：不传 item，按 merge.maxKeys 决定哪些数值字段取双方最高值 */
+const mergeSelectedByDefault = () => {
+	const points = selectedPoints.value
+	if (points.length < 2) return 'mergeSelectedPoints：至少选中两个节点'
+	const targetId = mergeTargetOptions.value.some(item => item.value === mergeTargetId.value)
+		? mergeTargetId.value
+		: mergeTargetOptions.value[0].value
+	const target = points.find(item => pointKey(item) === targetId)
+	const sources = points.filter(item => pointKey(item) !== targetId).map(item => item.id)
+	const maxKeys = parsedMergeMaxKeys()
+	const maxReadout = maxKeys.length
+		? maxKeys.map((key) => {
+			const values = points.map(item => Number(item[key])).filter(Number.isFinite)
+			return `${key}=${values.length ? Math.max(...values) : '无数字'}`
+		}).join(' / ')
+		: '未配置（全部字段取保留节点）'
+	const result = view.mergeSelectedPoints({
+		target: { id: target?.id ?? targetId },
+		sources,
+		label: 'demo 缺省合并（maxKeys）'
+	})
+	if (result.ok) {
+		const item = result.target?.item
+		view.selectFeatures(target?.id ?? targetId)
+		mergeText.value = `mergeSelectedPoints（缺省规则）· 保留 ${pointLabel(item)} · maxKeys ${maxReadout} · 结果 ${String(voltageOf(item))} kV · 名称 ${item?.name ?? '—'} / 图标 ${String(item?.symbol ?? '—')} · ${describeMergeInfo(item)}`
+		pendingText.value = maxKeys.length
+			? `这次没有 item 改写：maxKeys 列出的字段取参与场站最高值，其余字段取保留节点`
+			: '这次没有 item 改写：maxKeys 为空，全部业务字段（含电压）取保留节点'
+	}
+	else {
+		mergeText.value = `mergeSelectedPoints 失败：${result.reason}`
+	}
+	actionText.value = mergeText.value
+	pushLog('mergeSelectedPoints/default', mergeText.value)
+	refreshState()
+	return mergeText.value
+}
 
 const handlePointMerge = (payload) => {
 	if (payload.phase === 'pending') {
@@ -880,7 +955,7 @@ const handlePointMerge = (payload) => {
 	if (payload.phase === 'merge') {
 		mergeBackendText.value = payload.ok ? describeMergeChanges(payload.changes) : '合并变更 → 后端事务：合并失败，没有变更集'
 		mergeText.value = payload.ok
-			? `merge · 被并 ${pointLabel(payload.source?.item)} → 保留 ${pointLabel(payload.target?.item)} · 最终 ${pointLabel(payload.item)} · 色 ${payload.item?.color ?? '—'} / 尺寸 ${payload.item?.size ?? '—'} / 图标 ${String(payload.item?.symbol ?? '—')} · 改线 ${payload.linesChanged} / 删线 ${payload.removedLines}`
+			? `merge · 被并 ${pointLabel(payload.source?.item)} → 保留 ${pointLabel(payload.target?.item)} · 最终 ${pointLabel(payload.item)} · 电压 ${String(voltageOf(payload.item))} kV · 色 ${payload.item?.color ?? '—'} / 尺寸 ${payload.item?.size ?? '—'} / 图标 ${String(payload.item?.symbol ?? '—')} · 改线 ${payload.linesChanged} / 删线 ${payload.removedLines} · ${describeMergeInfo(payload.item)}`
 			: `merge 失败：${payload.reason}`
 		pendingMerge.value = null
 		pendingText.value = payload.ok ? '合并已落地，拖动来源节点已经收进保留目标' : `合并失败：${payload.reason}`
@@ -933,13 +1008,16 @@ const resetScene = () => {
 	copyText.value = '复制：—'
 	copyLineChannelsText.value = '—'
 	mergeBackendText.value = '合并变更 → 后端事务：—'
-	splitText.value = '拆分：先选中一个节点（不选就取第一个），再点拆分'
+	splitText.value = '自动解除合并：先选中一个合并后的节点（不选就找第一个带 mergeInfo 的节点）'
 	clipboardText.value = '剪贴板：—'
 	copyEventText.value = '还没有 pointCopy 事件'
 	copySourcesText.value = '—'
 	copyItemsText.value = '—'
 	manualText.value = '—'
 	mergeKeep.value = 'target'
+	mergeMaxKeys.value = ''
+	splitSelect.value = false
+	view.updateOptions({ merge: { enabled: true, distance: 12, channelGroups: 'keep', maxKeys: [] } })
 	resetBackendDemo()
 	copyRound = 0
 	pasteRound = 0
@@ -1012,7 +1090,7 @@ onMounted(() => {
 		},
 		// Ctrl+C / Ctrl+V 监听的三件套：copy 打开 + keyboard 打开 + 快捷键映射（不写也是这两个缺省值）
 		shortcuts: { copy: 'ctrl+c', paste: 'ctrl+v' },
-		merge: { enabled: true, distance: 12, channelGroups: 'keep' },
+		merge: { enabled: true, distance: 12, channelGroups: 'keep', maxKeys: [] },
 		onReady: () => {
 			nextTick(() => {
 				view?.fitView(50)
@@ -1178,23 +1256,34 @@ onBeforeUnmount(() => {
 						<input v-model="mergedStrokeColor" data-demo="merge-stroke-color" type="text" />
 					</label>
 				</div>
-				<div class="dv-row">
-					<label><input v-model="rewriteOnConfirm" type="checkbox" /> 手动拖拽合并确认时改写 payload.item</label>
-				</div>
-				<div class="dv-row">
-					<button type="button" class="dv-button dv-button--primary" data-demo="merge-selected" :disabled="!canMerge" @click="mergeSelectedByApi">合并选中（指定保留节点）</button>
-				</div>
+				<div class="dv-row">
+					<label><input v-model="rewriteOnConfirm" type="checkbox" /> 手动拖拽合并确认时改写 payload.item</label>
+				</div>
+				<div class="dv-row cm-form">
+					<label>
+						maxKeys（逗号分隔）
+						<input v-model="mergeMaxKeys" data-demo="merge-max-keys" type="text" placeholder="例如 vn_kv,value；留空则都不取最高" />
+					</label>
+					<button type="button" class="dv-button" data-demo="merge-apply-max-keys" @click="applyMergeMaxKeys">应用 maxKeys</button>
+				</div>
+				<div class="dv-row">
+					<button type="button" class="dv-button dv-button--primary" data-demo="merge-default" :disabled="!canMerge" @click="mergeSelectedByDefault">按缺省规则合并（按 maxKeys 取最高）</button>
+					<button type="button" class="dv-button dv-button--primary" data-demo="merge-selected" :disabled="!canMerge" @click="mergeSelectedByApi">合并选中（指定保留节点）</button>
+				</div>
 				<p class="dv-readout" data-demo="merge-readout">{{ mergeText }}</p>
 				<p class="dv-readout" data-demo="merge-backend-readout">{{ mergeBackendText }}</p>
-				<p class="dv-hint">mergeSelectedPoints 只并选中集；target 可以指定保留谁，item 只改最终节点的字段。拖点相撞走 pending / confirm 两站，确认前也能改写。合并落地后的 changes 可直接作为后端事务：删除来源节点、更新保留节点、更新 / 删除线路与通道。</p>
+				<p class="dv-hint">「按缺省规则合并」不传 item：只有 <code>merge.maxKeys</code> 列出的数值字段取双方最高值（缺省为空，不取任何键），名称 / 图标等其余业务字段取保留节点；合并后的节点带 <code>mergeInfo</code>（来源快照、线路 / 通道快照）。「指定保留节点」仍可用 item 覆盖字段。拖点相撞走 pending / confirm 两站，确认前也能改写。合并落地后的 changes 可直接作为后端事务。</p>
 			</div>
 			<div class="dv-group">
 				<h3>4 · 解除合并</h3>
 				<div class="dv-row">
-					<button type="button" class="dv-button dv-button--primary" data-demo="split-selected" @click="splitSelectedPoint">解除合并（拆分节点）</button>
+					<label><input v-model="splitSelect" data-demo="split-select" type="checkbox" /> 解除合并后选中恢复出的节点</label>
+				</div>
+				<div class="dv-row">
+					<button type="button" class="dv-button dv-button--primary" data-demo="split-selected" @click="splitSelectedPoint">自动解除合并（恢复来源）</button>
 				</div>
 				<p class="dv-readout" data-demo="split-readout">{{ splitText }}</p>
-				<p class="dv-hint"><code>splitPoint(source, [A, B], { autoLines: 'alternate' })</code> 把没显式分配的线路按“同一条通道的成员成组、独立线路单条”轮流分给 A / B；返回的 <code>autoAssignedLines</code> 与 <code>lineAssignments</code> 直接显示每一份接到哪些回线。</p>
+				<p class="dv-hint"><code>splitPoint(source)</code> 省略 parts 时读取节点上的 <code>mergeInfo</code>，恢复合并前的保留站和全部来源节点，并按快照恢复线路端点、通道端点、分组与回线归属。默认 <code>select: false</code>，拆分后不选中任何恢复节点；勾选这一项才传 <code>select: true</code>。没有合并记录时自动退回 <code>splitPoint(source, [A, B], { autoLines: 'alternate' })</code> 的手工拆分；自动路径返回 <code>autoRestored: true</code> 与 <code>mergeSourceIds</code>。</p>
 			</div>
 			<div class="dv-group">
 				<h3>5 · 待确认合并</h3>

package/docs/demos/EventDemo.vue

@@ -59,7 +59,9 @@ const describePayload = (payload) => {
 	if (payload.labelId !== undefined) parts.push(`labelId=${payload.labelId}`)
 	if (payload.count !== undefined) parts.push(`count=${payload.count}`)
 	if (payload.channelId !== undefined) parts.push(`channel=${payload.channelId}`)
-	if (payload.camera !== undefined) parts.push('camera=…')
+	if (payload.camera !== undefined) parts.push('camera=…')
+	if (payload.idleTime !== undefined) parts.push(`idleTime=${Math.round(payload.idleTime)}ms`)
+	if (payload.timeout !== undefined) parts.push(`timeout=${payload.timeout}ms`)
 	if (payload.screen !== undefined) parts.push(`screen=[${payload.screen.map(value => Number(value).toFixed(0)).join(', ')}]`)
 	if (payload.action) {
 		const action = payload.action
@@ -114,8 +116,11 @@ const buildOptions = () => ({
 	channels: dataset.channels,
 	pointStyle: { size: 7, color: '#ffffff', strokeColor: '#4c8dff', strokeWidth: 1.5 },
 	lineStyle: { width: 1.5, color: 'rgba(120, 168, 226, 0.55)' },
-	showGrid: true,
-	fitPadding: 60,
+	showGrid: true,
+	fitPadding: 60,
+	// 停手 3 秒发一次 idle，事件日志与计数里都能看到；
+	// onCameraChange / cameraChange 也在这条链路上，高频开关打开后能看到逐帧载荷。
+	idleTimeout: 3000,
 	label: { content: '{name}', position: 'top', gap: 8, maxCount: 30, draggable: true, editable: true, style: { color: '#27405f', fontSize: '12px' } },
 	// 标签按优化档显示（限数 + 避让），见 docs/GisView.md 的「标签显示优化开关」
 	labelOptimize: true,
@@ -168,7 +173,10 @@ const methods = [
 	{ name: 'focusOn(前三个节点, { select: true })', run: () => { const ids = (view?.getData().points ?? []).slice(0, 3).map(point => point.id ?? 0); return ids.length > 0 ? view?.focusOn(ids, { select: true }) : null } },
 	{ name: 'getStats()', run: () => view?.getStats() },
 	{ name: 'getQuality()', run: () => view?.getQuality() },
-	{ name: 'getCamera()', run: () => view?.getCamera() },
+	{ name: 'getCamera()', run: () => view?.getCamera() },
+	{ name: 'getScale()', run: () => view?.getScale() },
+	{ name: 'setScale(当前 × 1.25)', run: () => view?.setScale(view.getScale() * 1.25) },
+	{ name: 'getIdleTime()', run: () => view?.getIdleTime() },
 	{ name: 'getBounds()', run: () => view?.getBounds() },
 	{ name: 'getFilterResult()', run: () => view?.getFilterResult() },
 	{ name: 'getLabelStates()', run: () => view?.getLabelStates() },