gis-view-webgl2 0.1.7 → 0.1.9

package/docs/demos/ConnectDemo.vue

@@ -3,9 +3,11 @@
  * 可视化连线：只靠 points + lines 也能独立成图，再把「新增一条线」的几种常见配置摆在一起。
  *
  * 这一页的初始数据明确是 channels: [] —— 没有任何通道，节点与线路照样能渲染、选中与新增。
- * 「开始连线」走 beginAddChannel（kind 为 line 或 channel），两个节点选完先出草稿：
+ * 「开始连线」按类型分流：独立线路走 beginAddLine，通道走 beginAddChannel，两个节点选完先出草稿：
  * - routing: 'orthogonal' 让预览自动补一个先横后纵的 90° 拐点；
- * - channelDraftStyle 直接交给 beginAddChannel，草稿期间用 updateAddChannelStyle 原地改箭头位置 / 间距 / 配色；
+ * - channelDraftStyle 直接交给 beginAddLine / beginAddChannel，草稿期间用 updateAddChannelStyle 原地改箭头位置 / 间距 / 配色；
+ * - 预置一条已有通道（两组）后，可演示 singleChannel 阻断、existingChannel 新分组或并入指定分组；
+ * - beginAddLine 显式写 existingChannel 时会把新回线挂进已有通道，不写则始终是独立线路；
  * - 取消只收草稿，数据一个字节不动；
  * - 选好起点后点节点以外的位置也会直接取消，事件里的 reason 是 click-outside-node；
  * - 默认添加走 commitAddChannel；
@@ -29,6 +31,10 @@ const arrowSize = ref(12)
 const arrowPositionsText = ref('0.5')
 const circuitSpacing = ref(12)
 const startPointId = ref('')
+const singleChannel = ref(true)
+const existingChannelPolicy = ref('none')
+const groupTarget = ref('')
+const existingGroups = ref([])
 const dotsVisible = ref(true)
 const dotSize = ref(5)
 const startDotColor = ref('#2f6fd0')
@@ -38,6 +44,7 @@ const draftLayer = ref('above')
 const draft = ref(null)
 const actionText = ref('配置好线条之后点「开始连线」，依次点两个节点')
 const dataText = ref('正在创建视图…')
+const eventText = ref('channelDraft：尚未触发')
 const cancelText = ref('尚未取消：选好起点后点一下节点以外的空白处，应收到 reason = click-outside-node')
 const logLines = ref([])
 const logText = computed(() => logLines.value.length
@@ -78,6 +85,15 @@ const createInitialLines = () => {
 
 const isChannel = computed(() => linkKind.value !== 'line')
 const circuits = computed(() => linkKind.value === 'channel-3' ? 3 : linkKind.value === 'channel-2' ? 2 : 1)
+const addMethod = computed(() => isChannel.value ? 'beginAddChannel' : 'beginAddLine')
+const groupLineCount = group => Number(group?.lineCount ?? group?.lineIndexes?.length ?? group?.lineIds?.length ?? 0)
+const groupOptions = computed(() => existingGroups.value.map((group, index) => ({
+	value: String(group.id),
+	label: `第 ${index + 1} 组 · ${String(group.id)} · ${groupLineCount(group)} 回`
+})))
+const existingText = computed(() => existingGroups.value.length
+	? `已有通道 connect-existing-channel：${existingGroups.value.map((group, index) => `第 ${index + 1} 组 ${groupLineCount(group)} 回`).join(' / ')}`
+	: '已有通道：未预置（先点上方按钮创建一条两组的通道）')
 const arrowPositions = computed(() => arrowPositionsText.value.split(',').map(value => Number(value.trim())).filter(value => Number.isFinite(value)))
 const startPointLabel = computed(() => {
 	const point = points.find(item => String(item.id) === String(startPointId.value))
@@ -100,7 +116,12 @@ const draftText = computed(() => {
 	}
 	const to = current.to.item?.name ?? current.to.id
 	const bends = current.path?.length ?? 0
-	return `${kind} · ${from} → ${to} · ${current.routing === 'orthogonal' ? '正交折线' : '直线'} · 中间拐点 ${bends} · 箭头 ${current.style?.arrow ? current.style.arrowPositions.map(value => `${Math.round(value * 100)}%`).join('/') : '关'} · 回线间距 ${current.style?.circuitSpacing ?? 0}px`
+	const policy = current.existingChannel
+		? ` · existingChannel=${current.existingChannel}${current.targetGroupId !== null ? ` → ${String(current.targetGroupId)}` : ''}`
+		: ''
+	const single = current.singleChannel ? ' · singleChannel' : ''
+	const blocked = current.blocked ? ` · 已阻断：${current.reason ?? '未知原因'}` : ''
+	return `${kind}${single}${policy} · ${from} → ${to} · ${current.routing === 'orthogonal' ? '正交折线' : '直线'} · 中间拐点 ${bends} · 箭头 ${current.style?.arrow ? current.style.arrowPositions.map(value => `${Math.round(value * 100)}%`).join('/') : '关'} · 回线间距 ${current.style?.circuitSpacing ?? 0}px${blocked}`
 })
 
 const pushLog = (name, text) => {
@@ -143,24 +164,91 @@ const currentLineProps = () => ({
 	direction: arrow.value ? { count: 1, size: arrowSize.value } : false
 })
 
+/** 读取预置通道的分组，供 joinGroup 下拉直接选择；预置前后 / 草稿 ready 时都刷新一次 */
+const refreshExistingGroups = () => {
+	if (!view) {
+		return
+	}
+	const between = view.getChannelBetween('node-0', 'node-1')
+	existingGroups.value = between?.hasChannel ? [...(between.groups ?? [])] : []
+	if (!existingGroups.value.some(group => String(group.id) === String(groupTarget.value))) {
+		groupTarget.value = existingGroups.value[0]?.id ?? ''
+	}
+}
+
+/** 预置一条 node-0 ↔ node-1 的通道，带两个分组，专门演示单一通道和指定分组 */
+const seedExistingChannel = () => {
+	if (!view) {
+		return
+	}
+	view.endAddChannel()
+	draft.value = null
+	const between = view.getChannelBetween('node-0', 'node-1')
+	if (between?.hasChannel) {
+		refreshExistingGroups()
+		actionText.value = `已有通道 ${String(between.channelId)} 已存在，共 ${existingGroups.value.length} 组；可以直接开始连线`
+		pushLog('seed-existing', actionText.value)
+		return
+	}
+	const lineA = 'connect-existing-line-a'
+	const lineB = 'connect-existing-line-b'
+	const result = view.addChannel({
+		id: 'connect-existing-channel',
+		name: '演示已有通道（两组）',
+		from: 'node-0',
+		to: 'node-1'
+	}, [
+		{ id: lineA, name: '已有通道 · A 组回线', color: '#2f6fd0', width: 2.2 },
+		{ id: lineB, name: '已有通道 · B 组回线', color: '#d9544d', width: 2.2 }
+	], [
+		{ id: 'connect-existing-group-a', name: 'A 组', lineIds: [lineA] },
+		{ id: 'connect-existing-group-b', name: 'B 组', lineIds: [lineB] }
+	], { select: true })
+	refreshExistingGroups()
+	refreshState()
+	if (!result.ok) {
+		actionText.value = `预置已有通道失败：${result.reason ?? '未知原因'}`
+	}
+	else {
+		actionText.value = `已预置已有通道 ${String(result.channelId)}：node-0 ↔ node-1，共 ${existingGroups.value.length} 组；现在可用 singleChannel / newGroup / joinGroup 演示`
+	}
+	pushLog('addChannel(预置已有通道)', actionText.value)
+	emit('notice', actionText.value)
+}
+
 const startDraft = () => {
 	if (!view) {
 		return
 	}
 	view.endAddChannel()
-	view.beginAddChannel({
+	const options = {
 		...(startPointId.value ? { from: startPointId.value } : {}),
-		kind: isChannel.value ? 'channel' : 'line',
 		circuits: circuits.value,
 		routing: routing.value,
 		select: true,
 		channelDraftStyle: currentDraftStyle(),
 		lineProps: currentLineProps()
-	})
+	}
+	if (existingChannelPolicy.value !== 'none') {
+		options.existingChannel = existingChannelPolicy.value
+	}
+	if (existingChannelPolicy.value === 'joinGroup' && groupTarget.value !== '') {
+		options.groupId = groupTarget.value
+	}
+	if (isChannel.value) {
+		// beginAddChannel 的单一通道模式：已有通道时按 existingChannel 处理，不写时默认 block
+		options.singleChannel = singleChannel.value
+		view.beginAddChannel(options)
+	}
+	else {
+		// beginAddLine 不认 singleChannel；要挂进已有通道必须显式写 existingChannel
+		view.beginAddLine(options)
+	}
+	const modeText = existingChannelPolicy.value === 'none' ? '未指定已有通道策略' : `existingChannel=${existingChannelPolicy.value}`
 	actionText.value = startPointId.value
-		? `开始连线：起点已指定为 ${startPointLabel.value}，下一次点节点只选终点（${isChannel.value ? `通道 ${circuits.value} 回` : '独立线路'} / ${routing.value === 'orthogonal' ? '正交折线' : '直线'}）`
-		: `开始连线：先点起点，再点终点（${isChannel.value ? `通道 ${circuits.value} 回` : '独立线路'} / ${routing.value === 'orthogonal' ? '正交折线' : '直线'}）`
-	pushLog('beginAddChannel', actionText.value)
+		? `${addMethod.value}：起点已指定为 ${startPointLabel.value}，下一次点节点只选终点（${isChannel.value ? `通道 ${circuits.value} 回` : '独立线路'} / ${modeText}）`
+		: `${addMethod.value}：先点起点，再点终点（${isChannel.value ? `通道 ${circuits.value} 回` : '独立线路'} / ${modeText}）`
+	pushLog(addMethod.value, actionText.value)
 }
 
 const cancelDraft = () => {
@@ -184,17 +272,15 @@ const commitDraft = () => {
 	if (!view || !canFinish.value) {
 		return
 	}
-	const result = view.commitAddChannel()
+	const result = view.commitAddChannel(undefined, { select: true })
 	refreshState()
 	if (!result.ok) {
-		actionText.value = `commitAddChannel 没有落地：${result.reason ?? '未知原因'}`
+		actionText.value = `commitAddChannel → blocked：${result.reason ?? '未知原因'}`
 	}
 	else {
 		const lines = result.lines?.length ?? (result.line ? 1 : 0)
-		actionText.value = `commitAddChannel → ${result.kind === 'line' ? '独立线路' : '通道'} ${String(result.channelId ?? result.lineId ?? '')} · ${lines} 回线`
-		if (result.lineIds?.length) {
-			view.selectFeatures(result.lineIds)
-		}
+		const group = result.groupId !== undefined && result.groupId !== null ? ` · 分组 ${String(result.groupId)}` : ''
+		actionText.value = `commitAddChannel → ${result.kind === 'line' ? '独立线路' : '通道'} ${String(result.channelId ?? result.lineId ?? '')} · ${lines} 回线${group}`
 	}
 	pushLog('commitAddChannel', actionText.value)
 	emit('notice', actionText.value)
@@ -238,7 +324,7 @@ const commitWithObject = () => {
 			groups: [{ id: channelId, lineIds, ...(middle ? { path: middle } : {}) }]
 		}
 	}
-	const result = view.commitAddChannel(payload)
+	const result = view.commitAddChannel(current.kind === 'line' ? { line: payload } : { channel: payload }, { select: true })
 	refreshState()
 	if (!result.ok) {
 		actionText.value = `commitAddChannel(对象) 没有落地：${result.reason ?? '未知原因'}`
@@ -246,9 +332,6 @@ const commitWithObject = () => {
 	else {
 		const lines = result.lines?.length ?? (result.line ? 1 : 0)
 		actionText.value = `commitAddChannel(对象) → ${result.kind === 'line' ? '线路对象' : '通道对象'} ${String(result.channelId ?? result.lineId ?? '')} · ${lines} 回线`
-		if (result.lineIds?.length) {
-			view.selectFeatures(result.lineIds)
-		}
 	}
 	pushLog('commitAddChannel(对象)', actionText.value)
 	emit('notice', actionText.value)
@@ -303,23 +386,27 @@ const addWithChannels = () => {
 	sequence += 1
 	const middle = middlePathOf(current)
 	const kind = current.kind === 'line' ? 'line' : 'channel'
-	const result = view.addChannels([{
-		id: `connect-${kind}-${sequence}`,
-		name: `${kind === 'line' ? '独立线路' : '可视化通道'} ${sequence}`,
-		from: current.from.id,
-		to: current.to.id,
-		kind,
-		...(kind === 'channel' ? { circuits: current.circuits } : {}),
-		...(middle ? { path: middle } : {}),
-		lineProps: currentLineProps()
-	}])
+	const result = kind === 'line'
+		? view.addLine({
+			id: `connect-line-${sequence}`,
+			name: `独立线路 ${sequence}`,
+			from: current.from.id,
+			to: current.to.id,
+			...(middle ? { path: middle } : {}),
+			lineProps: currentLineProps()
+		}, undefined, { select: true })
+		: view.addChannels([{
+			id: `connect-channel-${sequence}`,
+			name: `可视化通道 ${sequence}`,
+			from: current.from.id,
+			to: current.to.id,
+			...(middle ? { path: middle } : {}),
+			lineData: Array.from({ length: Math.max(Number(current.circuits) || 1, 1) }, () => ({ ...currentLineProps() }))
+		}], { select: true })
 	refreshState()
 	if (result.ok) {
 		view.endAddChannel()
 		draft.value = null
-		if (result.lineIds.length) {
-			view.selectFeatures(result.lineIds)
-		}
 		actionText.value = `addChannels → ${result.count} 条 · ${result.lineIds.length} 回线${result.channelIds.length ? ` · 通道 ${result.channelIds.join(' / ')}` : ' · 未新建通道'}${middle ? ` · path ${middle.length} 拐点` : ''}`
 	}
 	else {
@@ -338,6 +425,11 @@ const resetScene = () => {
 	view.clearHistory()
 	view.fitView(56)
 	draft.value = null
+	existingGroups.value = []
+	groupTarget.value = ''
+	existingChannelPolicy.value = 'none'
+	singleChannel.value = true
+	eventText.value = 'channelDraft：尚未触发'
 	sequence = 0
 	actionText.value = '已恢复为 channels: [] 的纯点 + 线场景'
 	refreshState()
@@ -366,6 +458,15 @@ onMounted(() => {
 		},
 		onChannelDraft: payload => {
 			draft.value = payload
+			const target = payload.targetGroupId !== undefined && payload.targetGroupId !== null ? ` · targetGroup=${String(payload.targetGroupId)}` : ''
+			eventText.value = `channelDraft：phase=${payload.phase} · kind=${payload.kind ?? '—'} · blocked=${payload.blocked === true} · singleChannel=${payload.singleChannel === true} · existingChannel=${payload.existingChannel ?? 'null'}${target}${payload.reason ? ` · reason=${payload.reason}` : ''}`
+			if (payload.phase === 'ready' && payload.hasChannel) {
+				refreshExistingGroups()
+			}
+			if (payload.phase === 'blocked') {
+				actionText.value = `失败事件（phase=blocked）：${payload.reason ?? '当前草稿不允许新增'}`
+				emit('notice', actionText.value)
+			}
 			if (payload.phase === 'cancel') {
 				cancelText.value = `取消：phase = ${payload.phase} · reason = ${payload.reason ?? '未提供'} · 起点 ${payload.from?.item?.name ?? payload.from?.id ?? '—'}`
 				actionText.value = payload.reason === 'click-outside-node'
@@ -438,7 +539,36 @@ onBeforeUnmount(() => {
 					</label>
 					<label>回线间距 <input v-model.number="circuitSpacing" type="range" min="6" max="28" step="1" data-demo="connect-spacing" /> {{ circuitSpacing }}px</label>
 				</div>
-				<p class="dv-hint">草稿样式直接传给 <code>beginAddChannel({ channelDraftStyle })</code>；连线期间改颜色 / 线宽 / 箭头位置 / 回线间距会走 <code>updateAddChannelStyle()</code>，预览立即更新。正交折线会自动补一个 90 度拐点；落地线路用完整 path，通道只写中间拐点。</p>
+				<p class="dv-hint">草稿样式直接传给 <code>beginAddLine</code> / <code>beginAddChannel</code>；连线期间改颜色 / 线宽 / 箭头位置 / 回线间距会走 <code>updateAddChannelStyle()</code>，预览立即更新。正交折线会自动补一个 90 度拐点；落地线路用完整 path，通道只写中间拐点。</p>
+			</div>
+
+			<div class="dv-group">
+				<h3>单一通道与已有分组</h3>
+				<div class="dv-row">
+					<button type="button" class="dv-button" data-demo="connect-seed-existing" :disabled="isDraftLive" @click="seedExistingChannel">预置已有通道（两组）</button>
+				</div>
+				<div class="dv-row">
+					<label><input v-model="singleChannel" type="checkbox" data-demo="connect-single-channel" :disabled="!isChannel || isDraftLive" /> singleChannel</label>
+					<label>已有通道时
+						<select v-model="existingChannelPolicy" data-demo="connect-existing-mode" :disabled="isDraftLive">
+							<option value="none">不指定（线路默认独立）</option>
+							<option value="auto">auto · 新分组优先</option>
+							<option value="newGroup">newGroup · 新分组</option>
+							<option value="joinGroup">joinGroup · 指定分组</option>
+							<option value="block">block · 直接失败</option>
+						</select>
+					</label>
+				</div>
+				<div class="dv-row">
+					<label>目标分组
+						<select v-model="groupTarget" data-demo="connect-group-target" :disabled="existingChannelPolicy !== 'joinGroup' || isDraftLive">
+							<option v-if="!groupOptions.length" value="">先预置已有通道</option>
+							<option v-for="group in groupOptions" :key="group.value" :value="group.value">{{ group.label }}</option>
+						</select>
+					</label>
+				</div>
+				<p class="dv-readout" data-demo="connect-existing-readout">{{ existingText }}</p>
+				<p class="dv-hint"><code>beginAddChannel({ singleChannel: true })</code> 在两端已有通道时默认阻断；显式 <code>existingChannel</code> 可改为新分组 / 指定分组 / 自动。<code>beginAddLine</code> 不读 singleChannel，但显式写 <code>existingChannel: 'newGroup' / 'joinGroup'</code> 时，会把新回线加进已有通道。</p>
 			</div>
 
 			<div class="dv-group">
@@ -481,6 +611,7 @@ onBeforeUnmount(() => {
 				<p class="dv-readout" data-demo="connect-draft-readout">{{ draftText }}</p>
 				<p class="dv-readout" data-demo="connect-data-readout">{{ dataText }}</p>
 				<p class="dv-readout" data-demo="connect-action-readout">{{ actionText }}</p>
+				<p class="dv-readout" data-demo="connect-event-readout">{{ eventText }}</p>
 				<p class="dv-readout" data-demo="connect-cancel-readout">{{ cancelText }}</p>
 			</div>
 

package/docs/demos/CopyMergeDemo.vue

@@ -25,7 +25,8 @@ 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('合并落库：—')
 const backendMode = ref('success')
@@ -44,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([])
@@ -72,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) => {
@@ -101,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 ?? '')
@@ -748,42 +762,64 @@ const prepareMerge = () => {
 	return actionText.value
 }
 
-/** 节点拆分：把连在来源节点上的线路隔一条分给第二份，通道端点默认跟随成员线路 */
+/** 解除合并：优先用 mergeInfo 自动恢复全部来源；没有合并记录时才退回手工两份拆分 */
 const splitSelectedPoint = () => {
 	const data = view?.getData()
 	if (!data?.points?.length) return '没有可拆分的节点'
-	const source = selectedPoints.value[0] ?? data.points[0]
-	const linked = data.lines
-		.map((line, index) => ({ line, index }))
-		.filter(({ line }) => String(line.from) === String(source.id) || String(line.to) === String(source.id))
-	const movedLines = linked.filter((_entry, index) => index % 2 === 1).map(entry => entry.line.id ?? entry.index)
+	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',
-			lines: movedLines
-		}
-	])
+	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}`
+		splitText.value = `解除合并失败：${result.reason}`
 		actionText.value = splitText.value
 		pushLog('splitPoint', splitText.value)
 		return splitText.value
 	}
-	splitText.value = `splitPoint：${pointLabel(source)} → ${result.pointIds.join(' / ')} · 改线 ${result.linesChanged} / 删线 ${result.removedLines} · 改通道 ${result.channelsChanged} / 删通道 ${result.removedChannels} · 第 2 份接回线 ${movedLines.length} 条`
+	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 ?? []) {
+			lineSlot.set(String(lineId), assignment.index)
+		}
+	}
+	const channelsKept = (data.channels ?? []).every((channel) => {
+		const slots = new Set()
+		for (const lineId of channel.lineIds ?? []) {
+			const slot = lineSlot.get(String(lineId))
+			if (slot !== undefined) slots.add(slot)
+		}
+		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 ? '保持完整' : '发生拆分'} · ${splitSelect.value ? '已选中拆分结果' : '未选中拆分结果'}`
 	actionText.value = splitText.value
 	pushLog('splitPoint', splitText.value)
-	view.selectFeatures(result.pointIds)
 	refreshState()
 	return splitText.value
 }
@@ -804,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)
@@ -829,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') {
@@ -868,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}`
@@ -921,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
@@ -1000,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)
@@ -1166,22 +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>
+				<h3>4 · 解除合并</h3>
+				<div class="dv-row">
+					<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>
+					<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)</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>