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.

Sign up for GitHub

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

Jump to bottom

fix(ATypographyParagraph): type:check error #3187

Merged
merged 1 commit into from
Oct 25, 2023
Merged

fix(ATypographyParagraph): type:check error #3187

merged 1 commit into from
Oct 25, 2023

Conversation

jiaowoxiaobala
Copy link
Contributor

General

✏️ Mark the necessary items without changing the structure of the PR template.

  • Pull request template structure not broken

Type

ℹ️ What types of changes does your code introduce?

👉 Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

👉 Put an x in the boxes that apply.

  • My code follows the style guidelines of this project
  • Is the code format correct
  • Is the git submission information standard?
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@likui628 likui628 merged commit 83fc4ae into vbenjs:main Oct 25, 2023
2 checks passed
@wangjue666
Copy link
Collaborator

@jiaowoxiaobala 我昨天也看到这个类型问题了, Typography这个组件的props倒是有 style的定义, Typography.Paragraph就没有

@jiaowoxiaobala
Copy link
Contributor Author

@jiaowoxiaobala 我昨天也看到这个类型问题了, Typography这个组件的props倒是有 style的定义, Typography.Paragraph就没有

对

@wangjue666
Copy link
Collaborator

@jiaowoxiaobala 你有兴趣加入vben吗？最近我们正在着手开发vben3项目，同时也在寻找志愿者来帮助维护vben2。如果你有兴趣的话非常欢迎你的加入！

@jiaowoxiaobala
Copy link
Contributor Author

@jiaowoxiaobala 你有兴趣加入vben吗？最近我们正在着手开发vben3项目，同时也在寻找志愿者来帮助维护vben2。如果你有兴趣的话非常欢迎你的加入！

@wangjue666 有兴趣的，不过时间上可能不是那么充裕

@wangjue666
Copy link
Collaborator

@jiaowoxiaobala 好 也提供下你的qq吧，拉你进组织群

zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Oct 25, 2023
@gavinZhang001
Merge branch 'main' into gavin/v4-dev-customrouter-merge
fd9c1c5 
* 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
@jiaowoxiaobala
Copy link
Contributor Author

@jiaowoxiaobala 好 也提供下你的qq吧，拉你进组织群

ok，415313629

@wangjue666
Copy link
Collaborator

@jiaowoxiaobala 嗯嗯，你加下金毛的QQ 63992745， 他来邀请你进

@jiaowoxiaobala
Copy link
Contributor Author

@jiaowoxiaobala 嗯嗯，你加下金毛的QQ 63992745， 他来邀请你进

ok

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jiaowoxiaobala @wangjue666 @likui628