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

perf(component): formItem: label支持函数渲染 #3504

Merged
merged 6 commits into from
Jan 21, 2024

Conversation

luchanan
Copy link

@luchanan luchanan commented Jan 5, 2024

(cherry picked from commit abd6e2b1298712e58cc69cdaa55f44e3393b71a5)

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

(cherry picked from commit abd6e2b1298712e58cc69cdaa55f44e3393b71a5)
(cherry picked from commit abd6e2b1298712e58cc69cdaa55f44e3393b71a5)

perf(component): formItem: label支持函数渲染

feat(component): formItem: label支持函数渲染
@likui628 likui628 self-requested a review January 18, 2024 02:14
@@ -140,7 +140,7 @@ interface BaseFormSchema<T extends ComponentType = any> {
// Variable name bound to v-model Default value
valueField?: string;
// Label name
label?: string | VNode;
label?: string | VNode | ((renderCallbackParams: RenderCallbackParams) => any);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里最好不要返回any

@likui628 likui628 merged commit e6a7e4c into vbenjs:main Jan 21, 2024
2 checks passed
@luchanan luchanan deleted the feat-label branch January 23, 2024 07:13
WitMiao pushed a commit to WitMiao/vue-vben-admin that referenced this pull request Jan 23, 2024
* perf(component): formItem: label支持函数渲染

(cherry picked from commit abd6e2b1298712e58cc69cdaa55f44e3393b71a5)

* perf(component): formItem: label支持函数渲染

* feat(component): formItem: label支持函数渲染

* perf(component): formItem: label支持函数渲染

(cherry picked from commit abd6e2b1298712e58cc69cdaa55f44e3393b71a5)

perf(component): formItem: label支持函数渲染

feat(component): formItem: label支持函数渲染

* chore: update label type

---------

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>
@vbenjs vbenjs locked and limited conversation to collaborators Aug 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants