Merged
Conversation
* 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
# Conflicts:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR 类型
PR 目的
解决方案
PR 测试
Changelog
其他信息
提交前确认