Skip to content

feat: 多租户分支合并#75

Merged
Charles7c merged 13 commits intocontinew-org:tenant-devfrom
xtanyu:tenant
Jul 10, 2025
Merged

feat: 多租户分支合并#75
Charles7c merged 13 commits intocontinew-org:tenant-devfrom
xtanyu:tenant

Conversation

@xtanyu
Copy link
Copy Markdown
Contributor

@xtanyu xtanyu commented Jul 10, 2025

PR 类型

  • 新 feature
  • Bug 修复
  • 功能增强
  • 文档变更
  • 代码样式变更
  • 重构
  • 性能改进
  • 单元测试
  • CI/CD
  • 其他

PR 目的

解决方案

PR 测试

Changelog

模块 Changelog Related issues

其他信息

提交前确认

  • PR 代码经过了完整测试,并且通过了代码规范检查
  • 已经完整填写 Changelog,并链接到了相关 issues
  • PR 代码将要提交到 dev 分支

xtanyu and others added 13 commits December 2, 2024 18:03
* feat:多租户逻辑,租户管理,租户套餐管理

* chore: 租户相关内容从opne目录下剥离

* fix: 修复按钮权限错误

* feat: 修改租户登录信息
* feat:多租户逻辑,租户管理,租户套餐管理

* chore: 租户相关内容从opne目录下剥离

* fix: 修复按钮权限错误

* feat: 修改租户登录信息

* feat: 新增验证码配置开关

* fix: 修复租户套餐选择时数据异常的问题

---------

Co-authored-by: Gyq灬明 <[email protected]>
* feat: 新增验证码配置开关

* refactor: 优化登录验证码开关代码

* style: 菜单树地三层横向布局

* feat: 面包屑新增过渡动画效果(同步 GiDemo 更新)

* refactor: 优化路由守卫代码(同步 GiDemo 更新)

* release: v3.4.1

* fix: 修复 AccountLogin 组件多次初始化的问题(图形验证码接口被调用 2 次)

* docs: 更新 README 文档

* fix: 修复 GiTable 插槽类型不完全问题(同步 GiDemo 更新)

* feat: 新增应用配置开关属性,迁移主题配置至 `src/config/setting.ts`,新增色弱模式与哀悼模式

* refactor(GiForm): 优化 GiForm 代码

* fix: 合并dev,修复合并dev后租户组件在else中不加载的问题

---------

Co-authored-by: Gyq灬明 <[email protected]>
Co-authored-by: Charles7c <[email protected]>
Co-authored-by: KAI <[email protected]>
# Conflicts:
#	.env.development
#	.env.production
#	.env.test
#	.github/ISSUE_TEMPLATE/bug_report.yml
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	CHANGELOG.md
#	README.md
#	config/plugins/app-info.ts
#	package.json
#	src/apis/auth/type.ts
#	src/apis/system/client.ts
#	src/apis/system/type.ts
#	src/components/GiForm/src/GiForm.vue
#	src/components/GiForm/src/type.ts
#	src/components/GiTable/src/GiTable.vue
#	src/components/SplitPanel/index.vue
#	src/layout/components/HeaderRightBar/index.vue
#	src/stores/modules/dict.ts
#	src/stores/modules/user.ts
#	src/styles/arco-ui/index.less
#	src/styles/global.scss
#	src/types/components.d.ts
#	src/utils/http.ts
#	src/views/code/generator/GenConfigDrawer.vue
#	src/views/code/generator/GenPreviewModal.vue
#	src/views/code/generator/index.vue
#	src/views/monitor/log/index.vue
#	src/views/monitor/online/index.vue
#	src/views/open/app/index.vue
#	src/views/schedule/job/index.vue
#	src/views/schedule/log/index.vue
#	src/views/setting/message/index.vue
#	src/views/system/client/ClientAddModal.vue
#	src/views/system/client/ClientDetailDrawer.vue
#	src/views/system/client/index.vue
#	src/views/system/config/components/MailSetting.vue
#	src/views/system/config/index.vue
#	src/views/system/dept/index.vue
#	src/views/system/dict/index.vue
#	src/views/system/menu/MenuAddModal.vue
#	src/views/system/menu/index.vue
#	src/views/system/notice/index.vue
#	src/views/system/role/RoleAddDrawer.vue
#	src/views/system/role/RoleAddModal.vue
#	src/views/system/role/index.vue
#	src/views/system/storage/index.vue
#	src/views/system/user/UserAddDrawer.vue
#	src/views/system/user/index.vue
@Charles7c Charles7c changed the base branch from dev to feat/tenant July 10, 2025 12:34
@Charles7c Charles7c changed the base branch from feat/tenant to tenant-dev July 10, 2025 12:36
@Charles7c Charles7c merged commit e662565 into continew-org:tenant-dev Jul 10, 2025
1 check passed
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.

2 participants