vue2server7 7.0.52 → 7.0.54

package/frontEnd/src/components/OrgTreeSelect.vue

@@ -52,6 +52,13 @@
           >
             <template #default="{ node, data }">
               <span class="org-tree-select__node">
+                <el-radio
+                  v-if="!multiple"
+                  :label="data.id"
+                  v-model="selectedValue"
+                  class="org-tree-select__radio"
+                  @click.stop
+                />
                 <el-icon v-if="data.icon" class="org-tree-select__node-icon">
                   <component :is="data.icon" />
                 </el-icon>
@@ -279,19 +286,23 @@ function onDialogOpened(): void {
     if (props.multiple) {
       const keys = Array.isArray(selectedValue.value) ? selectedValue.value : []
       treeRef.value.setCheckedKeys(keys as (string | number)[])
-    } else if (selectedValue.value !== null) {
-      treeRef.value.setCurrentKey(selectedValue.value as string | number)
+    } else {
+      // 单选时，同步 selectedValue 为当前选中的 ID
+      const currentNode = treeRef.value?.getCurrentNode() as OrgTreeNode | null
+      if (currentNode) {
+        selectedValue.value = currentNode.id
+      }
     }
   })
 }
 
 /**
- * 节点点击事件（单选模式）
+ * 节点点击事件（多选模式，单选由 el-radio v-model 处理）
  * @param data - 点击的节点数据
  */
 function onNodeClick(data: OrgTreeNode): void {
   if (props.multiple) return
-  selectedValue.value = data.id
+  // 单选时选中节点由 el-radio v-model 处理，这里同步 selectedNodes 用于确认后返回
   selectedNodes.value = [data]
 }
 
@@ -319,12 +330,10 @@ function onConfirm(): void {
     emit('update:modelValue', keys)
     emit('change', keys, checkedNodes)
   } else {
-    const currentNode = treeRef.value?.getCurrentNode() as OrgTreeNode | null
-    if (currentNode) {
-      selectedValue.value = currentNode.id
-      selectedNodes.value = [currentNode]
-      emit('update:modelValue', currentNode.id)
-      emit('change', currentNode.id, currentNode)
+    // selectedValue 现在直接是选中的 ID
+    if (selectedValue.value !== null && selectedValue.value !== undefined) {
+      emit('update:modelValue', selectedValue.value)
+      emit('change', selectedValue.value, selectedNodes.value[0])
     }
   }
   dialogVisible.value = false
@@ -420,6 +429,15 @@ defineExpose<OrgTreeSelectExpose>({
   gap: 4px;
 }
 
+.org-tree-select__radio {
+  margin-right: 4px;
+}
+
+.org-tree-select__radio :deep(.el-radio__inner) {
+  width: 14px;
+  height: 14px;
+}
+
 .org-tree-select__node-icon {
   color: var(--el-color-primary);
   font-size: 16px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server7",
-  "version": "7.0.52",
+  "version": "7.0.54",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",