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

3.x develop #349

Merged
merged 335 commits into from
Oct 3, 2024
Merged

3.x develop #349

merged 335 commits into from
Oct 3, 2024

Conversation

zds-s
Copy link
Member

@zds-s zds-s commented Oct 3, 2024

No description provided.

kanyxmo and others added 30 commits August 27, 2024 18:04
# Conflicts:
#	web/package.json
#	web/pnpm-lock.yaml
#	web/src/layouts/style/tabbar.scss
#	web/src/modules/base/views/welcome/index.vue
Signed-off-by: X.Mo <[email protected]>
Signed-off-by: X.Mo <[email protected]>
-调整proTable组件的渲染设置和数据处理逻辑。
-重构单元测试文件,优化测试逻辑和结构。

移除了`useProTableRenderPlugin`和`useCellRenderTo`钩子的导入,改为在`MaProTable`组件中直接使用`proTableRef`引用。实现了加载状态的处理,并重构了查询逻辑以动态获取数据。同时,更新了组件的布局和样式。

单元测试中,对`useCellRenderTo`钩子的测试逻辑进行了调整,并优化了`MaProTable`测试的结构和方法。
优化加载状态处理逻辑,确保使用正确的参数顺序以防止在用户插入时出现错误。另外,引入基于 queryParams 的自动查询功能,以便在组件挂载时自动触发查询。
调整了ma-icon-picker组件的默认道具值,将pageSize设置为70,以提高加载性能。此外,清理了不必要的默认值赋值,使代码更加简洁。
kanyxmo and others added 26 commits September 28, 2024 11:33
Signed-off-by: X.Mo <[email protected]>
Signed-off-by: X.Mo <[email protected]>
Signed-off-by: zds <[email protected]>
Signed-off-by: X.Mo <[email protected]>
@dosubot dosubot bot added the size:XXL This PR changes 1000+ lines, ignoring generated files. label Oct 3, 2024
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@zds-s zds-s merged commit bd84f88 into 3.x Oct 3, 2024
9 of 33 checks passed
@zds-s zds-s deleted the 3.x-develop branch October 3, 2024 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size:XXL This PR changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants