Merge branch 'master' of http://106.15.36.190:3000/DKJ/MID

src/components/TreeView.vue

@@ -638,35 +638,22 @@ const operationDialog = ref({
   show: false,
   mode: 'copy' as 'copy' | 'clone' | 'branch',
   sourceNodeId: '',
-  selectedSourceIds: [] as string[]
+  selectedSourceIds: [] as string[],
+  owner: 'admin' // default owner
 })
 
 const toggleSourceSelection = (node: TreeNode) => {
+  // Only allow terminal nodes
+  if (!isTerminalNode(node)) return
+
   const ids = operationDialog.value.selectedSourceIds
   
-  // Collect ALL terminal descendant IDs (exclude folders from selection list)
+  if (ids.includes(node.id)) {
-  let terminalsToToggle: string[] = []
+    // Toggle off if already selected
-  
+    operationDialog.value.selectedSourceIds = []
-  if (isTerminalNode(node)) {
-    terminalsToToggle = [node.id]
   } else {
-    terminalsToToggle = getAllTerminalDescendants(node)
+    // Single select: replace any existing selection
-  }
+    operationDialog.value.selectedSourceIds = [node.id]
-  
-  // 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
   }
 }
 
@@ -916,11 +903,15 @@ 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: contextMenu.value?.nodeId || '',
+    sourceNodeId: currentSourceNodeId,
-    selectedSourceIds: []
+    selectedSourceIds: [],
+    owner: currentNode?.owner || 'admin'
   }
   dialogExpandedIds.value = new Set(expandedIds.value)
   closeContextMenu()
@@ -1199,6 +1190,7 @@ 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 = {
@@ -1206,13 +1198,15 @@ const executeOperation = () => {
           id: `${destinationNode.id}-${Date.now()}-${processedCount}`,
           label: `${sourceNode.label} (Clone)`,
           isClone: true,
-          cloneSourceId: sourceNode.id
+          cloneSourceId: sourceNode.id,
+          owner: operationDialog.value.owner
         }
         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++
@@ -1511,6 +1505,7 @@ defineExpose({
                   type="checkbox" 
                   :checked="isIdsSelected(node)" 
                   :indeterminate.prop="isIdsIndeterminate(node)"
+                  :disabled="!isTerminalNode(node)"
                   @change="toggleSourceSelection(node)"
                   style="margin-right: 6px;"
                 />
@@ -1528,10 +1523,16 @@ defineExpose({
         </div>
 
         <div class="dialog-footer">
-          <button class="btn btn-secondary" @click="operationDialog.show = false">Cancel</button>
+          <div class="owner-input-group">
-          <button class="btn btn-primary" @click="executeOperation" :disabled="operationDialog.selectedSourceIds.length === 0">
+            <label>Owner:</label>
-            {{ operationDialog.mode === 'copy' ? 'Copy' : operationDialog.mode === 'clone' ? 'Clone' : 'Branch' }}
+            <input type="text" v-model="operationDialog.owner" class="dialog-input" />
-          </button>
+          </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>
         </div>
       </div>
     </div>
@@ -1973,12 +1974,43 @@ defineExpose({
 
 .dialog-footer {
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
-  gap: 12px;
+  align-items: center;
   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;

src/components/views/ReleaseView.vue

@@ -150,7 +150,7 @@ const nodeForModal = computed(() => {
   return {
     ...props.selectedNode,
     version: selectedVersionDetail.value.version,
-    status: 'Approved',
+    status: 'Accepted',
     lastChangedBy: selectedVersionDetail.value.reviewer,
     lastChangedDate: selectedVersionDetail.value.approvedDate,
     comment: selectedVersionDetail.value.comment,