diff --git a/packages/ui-vue/components/lookup/src/components/popup-container.component.tsx b/packages/ui-vue/components/lookup/src/components/popup-container.component.tsx index 2ac302383ef107564d242b6b965bed2fcb491ebf..1a2d84642a5af49d33e67d9b0adf18ea5b8d234e 100644 --- a/packages/ui-vue/components/lookup/src/components/popup-container.component.tsx +++ b/packages/ui-vue/components/lookup/src/components/popup-container.component.tsx @@ -87,7 +87,7 @@ export default defineComponent({ return () => { return
- {renderSearchBar()} + {/* {renderSearchBar()} */} {renderDataComponent.value()} {/*
*/}
; diff --git a/packages/ui-vue/components/lookup/src/composition/use-check-props.ts b/packages/ui-vue/components/lookup/src/composition/use-check-props.ts index d888fc8aab77789b032a3a5fb9bf93dd18cb8006..4c1225589133859d7811cd220ec1d822a70b8a87 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-check-props.ts +++ b/packages/ui-vue/components/lookup/src/composition/use-check-props.ts @@ -83,8 +83,12 @@ export function useCheckProps(props: LookupProps, lookupStates: LookupStates) { return lookupOptions.enableCascade && lookupOptions.multiSelect; } + function isDropdownMode() { + return props.openType === 'Popup'; + } + return { checkPaination, checkMultiSelect, checkColumnOptions, isDoubleList, getNavigationSize, isTreeList, navIsTreeList, navIsList, - isLoadAll, isPathCodeTree, isEnableCascadeCheck + isLoadAll, isPathCodeTree, isEnableCascadeCheck, isDropdownMode }; } diff --git a/packages/ui-vue/components/lookup/src/composition/use-treenode.ts b/packages/ui-vue/components/lookup/src/composition/use-treenode.ts index c45905d2b2b0df48cee25131da80bfe12c24aac2..f1f459c6df1141ec2518fa12f9816b425bcc2dde 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-treenode.ts +++ b/packages/ui-vue/components/lookup/src/composition/use-treenode.ts @@ -175,14 +175,18 @@ export function useTreeNode(lookupStates: LookupStates, useCheckPropsComposition lookupState.flattenTreeNodes?.push(...children); } + const { isDropdownMode } = useCheckPropsComposition; nextTick(() => { gridRef.addChildrenToNode(children, parentId); - // const itemIds = lookupStates.selectionState.value?.map(item => item[lookupOptions.idField]) ?? []; - // const selectedIds = children - // .filter(child => itemIds.includes(child.id)) - // .map(child => child.id); + if (isDropdownMode()) { + return; + } + const itemIds = lookupStates.selectionState.value?.map(item => item[lookupOptions.idField]) ?? []; + const selectedIds = children + .filter(child => itemIds.includes(child.id)) + .map(child => child.id); - // selectedIds.length && gridRef.selectItemByIds(selectedIds); + selectedIds.length && gridRef.selectItemByIds(selectedIds); }); } diff --git a/packages/ui-vue/components/lookup/src/lookup.props.ts b/packages/ui-vue/components/lookup/src/lookup.props.ts index bf3f7aa5175ce134225622b1e21a8e93dee16b6e..9f3877e77f968393cf7ee3f9a73881dbe1172b6a 100644 --- a/packages/ui-vue/components/lookup/src/lookup.props.ts +++ b/packages/ui-vue/components/lookup/src/lookup.props.ts @@ -70,7 +70,7 @@ export const lookupProps = { onlySelectLeaf: { type: Boolean, default: false }, enableFullTree: { type: Boolean, default: true }, enableCascade: { type: Boolean, default: false }, - showCascadeControl: { type: Boolean, default: false }, + showCascadeControl: { type: Boolean, default: true }, cascadeItems: { type: Object, default: { both: true, up: true, diff --git a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts index 062e8d7f1cf2f813bdc12ffd6bda227364229547..1bc0d6c93dab55234228cef163823c3cbc313121 100644 --- a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts +++ b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts @@ -837,12 +837,12 @@ export class LookupPropertyConfig extends InputBaseProperty { $converter: lookupDefaultConverter, title: "显示级联状态", type: "boolean", - visible: !!editorOptions.enableCascade && this.isTree(editorOptions) + visible: false // !!editorOptions.enableCascade && this.isTree(editorOptions) }, cascadeValue: { - description: "级联选择默认状态", + description: "缺省级联选择模式", $converter: lookupDefaultConverter, - title: "级联状态", + title: "缺省级联选择模式", type: "string", visible: !!editorOptions.enableCascade && this.isTree(editorOptions), editor: { diff --git a/packages/ui-vue/components/lookup/src/schema/lookup.schema.json b/packages/ui-vue/components/lookup/src/schema/lookup.schema.json index 1bd934c32e961e0d6276434dc8b81f4fcb157048..25e2977e77face334d87cc033f963ae5c3fe2ef9 100644 --- a/packages/ui-vue/components/lookup/src/schema/lookup.schema.json +++ b/packages/ui-vue/components/lookup/src/schema/lookup.schema.json @@ -222,7 +222,7 @@ }, "showCascadeControl": { "type": "boolean", - "default": false + "default": true }, "cascadeItems": { "type": "object",