vue2server7 7.0.44 → 7.0.45

package/frontEnd/src/components/OrgTreeSelect.vue

@@ -43,6 +43,7 @@
             :highlight-current="true"
             :expand-on-click-node="false"
             :default-expanded-keys="defaultExpandedKeys"
+            :default-expand-all="defaultExpandAll"
             :filter-node-method="filterNode"
             :check-strictly="checkStrictly"
             :show-checkbox="multiple"
@@ -125,6 +126,8 @@ interface OrgTreeSelectProps {
   checkStrictly?: boolean
   /** 默认展开的节点 */
   defaultExpandedKeys?: (string | number)[]
+  /** 是否默认展开所有节点 */
+  defaultExpandAll?: boolean
 }
 
 /** 组件事件类型定义 */
@@ -152,7 +155,8 @@ const props = withDefaults(defineProps<OrgTreeSelectProps>(), {
   labelKey: 'name',
   childrenKey: 'children',
   checkStrictly: false,
-  defaultExpandedKeys: () => []
+  defaultExpandedKeys: () => [],
+  defaultExpandAll: false
 })
 
 const emit = defineEmits<OrgTreeSelectEmits>()
@@ -400,12 +404,16 @@ defineExpose<OrgTreeSelectExpose>({
 }
 
 .org-tree-select__tree-wrapper {
-  max-height: 400px;
+  height: 400px;
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
   padding: 8px;
 }
 
+.org-tree-select__tree-wrapper :deep(.el-scrollbar__wrap) {
+  max-height: 384px;
+}
+
 .org-tree-select__node {
   display: flex;
   align-items: center;

package/frontEnd/src/components/OrgTreeSelectCascade.vue

@@ -43,6 +43,7 @@
             :highlight-current="true"
             :expand-on-click-node="false"
             :default-expanded-keys="defaultExpandedKeys"
+            :default-expand-all="defaultExpandAll"
             :filter-node-method="filterNode"
             :check-strictly="true"
             :show-checkbox="multiple"
@@ -123,6 +124,8 @@ interface OrgTreeSelectProps {
   childrenKey?: string
   /** 默认展开的节点 */
   defaultExpandedKeys?: (string | number)[]
+  /** 是否默认展开所有节点 */
+  defaultExpandAll?: boolean
 }
 
 /** 组件事件类型定义 */
@@ -149,7 +152,8 @@ const props = withDefaults(defineProps<OrgTreeSelectProps>(), {
   nodeKey: 'id',
   labelKey: 'name',
   childrenKey: 'children',
-  defaultExpandedKeys: () => []
+  defaultExpandedKeys: () => [],
+  defaultExpandAll: false
 })
 
 const emit = defineEmits<OrgTreeSelectEmits>()
@@ -451,12 +455,16 @@ defineExpose<OrgTreeSelectExpose>({
 }
 
 .org-tree-select__tree-wrapper {
-  max-height: 400px;
+  height: 400px;
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
   padding: 8px;
 }
 
+.org-tree-select__tree-wrapper :deep(.el-scrollbar__wrap) {
+  max-height: 384px;
+}
+
 .org-tree-select__node {
   display: flex;
   align-items: center;

package/frontEnd/src/pages/OrgTreeSelectPage.vue

@@ -78,6 +78,23 @@
         当前值：<code>{{ JSON.stringify(cascadeValue) }}</code>
       </div>
     </el-card>
+
+    <el-card class="demo-card" shadow="never">
+      <template #header>
+        <span>默认全部展开 <code>default-expand-all</code></span>
+      </template>
+      <OrgTreeSelect
+        v-model="expandAllValue"
+        :data="orgData"
+        multiple
+        default-expand-all
+        placeholder="默认展开所有节点"
+        class="demo-control"
+      />
+      <div class="demo-output">
+        当前值：<code>{{ JSON.stringify(expandAllValue) }}</code>
+      </div>
+    </el-card>
   </section>
 </template>
 
@@ -251,6 +268,7 @@ const multipleValue = ref<string[]>([])
 const disabledValue = ref<string>('25001')
 const expandedValue = ref<string | null>(null)
 const cascadeValue = ref<string[]>([])
+const expandAllValue = ref<string[]>([])
 
 function onSingleChange(value: string | number | (string | number)[] | null, node?: OrgTreeNode | OrgTreeNode[]) {
   console.log('单选变化:', value, node)

package/package.json

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