Compare commits
No commits in common. "394cb3cc18bb558b0c37ec8ff7be23388b66b9e1" and "cd4529567e37ad54a30df0091cb33f7c734ac8fc" have entirely different histories.
394cb3cc18
...
cd4529567e
|
|
@ -638,22 +638,35 @@ const operationDialog = ref({
|
|||
show: false,
|
||||
mode: 'copy' as 'copy' | 'clone' | 'branch',
|
||||
sourceNodeId: '',
|
||||
selectedSourceIds: [] as string[],
|
||||
owner: 'admin' // default owner
|
||||
selectedSourceIds: [] as string[]
|
||||
})
|
||||
|
||||
const toggleSourceSelection = (node: TreeNode) => {
|
||||
// Only allow terminal nodes
|
||||
if (!isTerminalNode(node)) return
|
||||
|
||||
const ids = operationDialog.value.selectedSourceIds
|
||||
|
||||
if (ids.includes(node.id)) {
|
||||
// Toggle off if already selected
|
||||
operationDialog.value.selectedSourceIds = []
|
||||
// Collect ALL terminal descendant IDs (exclude folders from selection list)
|
||||
let terminalsToToggle: string[] = []
|
||||
|
||||
if (isTerminalNode(node)) {
|
||||
terminalsToToggle = [node.id]
|
||||
} else {
|
||||
// Single select: replace any existing selection
|
||||
operationDialog.value.selectedSourceIds = [node.id]
|
||||
terminalsToToggle = getAllTerminalDescendants(node)
|
||||
}
|
||||
|
||||
// If node is a folder with no terminal children, do nothing or just ignore
|
||||
if (terminalsToToggle.length === 0) return
|
||||
|
||||
const allSelected = terminalsToToggle.every(id => ids.includes(id))
|
||||
|
||||
if (allSelected) {
|
||||
operationDialog.value.selectedSourceIds = ids.filter(id => !terminalsToToggle.includes(id))
|
||||
} else {
|
||||
// Add missing
|
||||
const newIds = [...ids]
|
||||
terminalsToToggle.forEach(id => {
|
||||
if (!newIds.includes(id)) newIds.push(id)
|
||||
})
|
||||
operationDialog.value.selectedSourceIds = newIds
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -903,15 +916,11 @@ const closeContextMenu = () => {
|
|||
}
|
||||
|
||||
const openOperationDialog = (mode: 'copy' | 'clone' | 'branch') => {
|
||||
const currentSourceNodeId = contextMenu.value?.nodeId || ''
|
||||
const currentNode = findNode(mockTreeData.value, currentSourceNodeId)
|
||||
|
||||
operationDialog.value = {
|
||||
show: true,
|
||||
mode,
|
||||
sourceNodeId: currentSourceNodeId,
|
||||
selectedSourceIds: [],
|
||||
owner: currentNode?.owner || 'admin'
|
||||
sourceNodeId: contextMenu.value?.nodeId || '',
|
||||
selectedSourceIds: []
|
||||
}
|
||||
dialogExpandedIds.value = new Set(expandedIds.value)
|
||||
closeContextMenu()
|
||||
|
|
@ -1190,7 +1199,6 @@ const executeOperation = () => {
|
|||
if (mode === 'copy') {
|
||||
const newNode = cloneNode(sourceNode, `${destinationNode.id}-${Date.now()}-${processedCount}`)
|
||||
newNode.label = `${newNode.label} (Copy)`
|
||||
newNode.owner = operationDialog.value.owner
|
||||
addChildNode(targetParent, newNode)
|
||||
} else if (mode === 'clone') {
|
||||
const newNode: TreeNode = {
|
||||
|
|
@ -1198,15 +1206,13 @@ const executeOperation = () => {
|
|||
id: `${destinationNode.id}-${Date.now()}-${processedCount}`,
|
||||
label: `${sourceNode.label} (Clone)`,
|
||||
isClone: true,
|
||||
cloneSourceId: sourceNode.id,
|
||||
owner: operationDialog.value.owner
|
||||
cloneSourceId: sourceNode.id
|
||||
}
|
||||
addChildNode(targetParent, newNode)
|
||||
} else if (mode === 'branch') {
|
||||
// Even if source is terminal, "Branch" op might function like copy
|
||||
const newNode = cloneNode(sourceNode, `${destinationNode.id}-${Date.now()}-${processedCount}`)
|
||||
newNode.label = `${newNode.label} (Branch)`
|
||||
newNode.owner = operationDialog.value.owner
|
||||
addChildNode(targetParent, newNode)
|
||||
}
|
||||
processedCount++
|
||||
|
|
@ -1505,7 +1511,6 @@ defineExpose({
|
|||
type="checkbox"
|
||||
:checked="isIdsSelected(node)"
|
||||
:indeterminate.prop="isIdsIndeterminate(node)"
|
||||
:disabled="!isTerminalNode(node)"
|
||||
@change="toggleSourceSelection(node)"
|
||||
style="margin-right: 6px;"
|
||||
/>
|
||||
|
|
@ -1523,16 +1528,10 @@ defineExpose({
|
|||
</div>
|
||||
|
||||
<div class="dialog-footer">
|
||||
<div class="owner-input-group">
|
||||
<label>Owner:</label>
|
||||
<input type="text" v-model="operationDialog.owner" class="dialog-input" />
|
||||
</div>
|
||||
<div class="dialog-actions">
|
||||
<button class="btn btn-secondary" @click="operationDialog.show = false">Cancel</button>
|
||||
<button class="btn btn-primary" @click="executeOperation" :disabled="operationDialog.selectedSourceIds.length === 0">
|
||||
{{ operationDialog.mode === 'copy' ? 'Copy' : operationDialog.mode === 'clone' ? 'Clone' : 'Branch' }}
|
||||
</button>
|
||||
</div>
|
||||
<button class="btn btn-secondary" @click="operationDialog.show = false">Cancel</button>
|
||||
<button class="btn btn-primary" @click="executeOperation" :disabled="operationDialog.selectedSourceIds.length === 0">
|
||||
{{ operationDialog.mode === 'copy' ? 'Copy' : operationDialog.mode === 'clone' ? 'Clone' : 'Branch' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1974,43 +1973,12 @@ defineExpose({
|
|||
|
||||
.dialog-footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
gap: 12px;
|
||||
padding: 16px 20px;
|
||||
border-top: 1px solid #e0e0e0;
|
||||
}
|
||||
|
||||
.owner-input-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.owner-input-group label {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.dialog-input {
|
||||
padding: 6px 8px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 13px;
|
||||
width: 150px;
|
||||
outline: none;
|
||||
transition: border-color 0.2s;
|
||||
}
|
||||
|
||||
.dialog-input:focus {
|
||||
border-color: #0078d4;
|
||||
}
|
||||
|
||||
.dialog-actions {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.btn {
|
||||
padding: 8px 16px;
|
||||
border-radius: 4px;
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ const nodeForModal = computed(() => {
|
|||
return {
|
||||
...props.selectedNode,
|
||||
version: selectedVersionDetail.value.version,
|
||||
status: 'Accepted',
|
||||
status: 'Approved',
|
||||
lastChangedBy: selectedVersionDetail.value.reviewer,
|
||||
lastChangedDate: selectedVersionDetail.value.approvedDate,
|
||||
comment: selectedVersionDetail.value.comment,
|
||||
|
|
|
|||
Loading…
Reference in New Issue