Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tree): remove expandedKeys prop default value #3184

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

jiaowoxiaobala
Copy link
Contributor

@jiaowoxiaobala jiaowoxiaobala commented Oct 24, 2023

修复路由comp/tree/basic页面第二个默认展开案例的bug。

参照文档antdv,如果有expandedKeys prop(即源码中的不为undefined),defaultExpandAll prop会失效。

// components/vc-tree/Tree.tsx
if (
  props.expandedKeys !== undefined ||
  (init && newAutoExpandParent !== oldAutoExpandParent)
) {
  // ...
} else if (!init && props.defaultExpandAll) {
 // ....
}

@likui628 likui628 merged commit 92875cb into vbenjs:main Oct 24, 2023
2 checks passed
zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Oct 25, 2023
* main: (26 commits)
  fix(BasicTable): pagination exceeds page height. close vbenjs#3185
  chore(ATypographyParagraph): fix type:check (vbenjs#3187)
  chore(TableFooter): resolve ts type error
  fix(tree): remove expandedKeys prop default value (vbenjs#3184)
  fix(Upload): The file name is too long bug (vbenjs#3182)
  feat: 增加文本省略组件 (vbenjs#3180)
  站内支持API接口地址切换 (vbenjs#3162)
  feat: Form增加ImageUpload组件 (vbenjs#3172)
  chore(demo): basicTree组件增加icon 和 switcherIcon示例
  fix(BasicTree):  not inherit slot and not show icon slot. close vbenjs#1902
  chore(BasicTable): resolve BasicTable component ts type error
  chore(BasicTree): Resolve ts type error
  fix(ApiCascader): apiParamKey not working
  fix(Menu): tab标签切换选中状态焦点重复. fix vbenjs#1681
  fix: SimpleRootMenuContextProps type error (vbenjs#3176)
  refactor: cipher (vbenjs#3174)
  feat: add pinia persist plugin (vbenjs#3173)
  fix(ApiTree): 多触发一次onchange
  chore(ApiSelect): 该组件设定成手动触发验证
  fix(ApiSelect): BasicForm emit ield-value-change twice
  ...

# Conflicts:
#	pnpm-lock.yaml
#	src/components/Form/src/components/ApiSelect.vue
#	src/locales/lang/en/common.ts
#	src/locales/lang/en/sys.ts
#	src/locales/lang/zh-CN/common.ts
#	src/locales/lang/zh-CN/sys.ts
#	src/utils/env.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants