Commit Graph

64 Commits

Author SHA1 Message Date
fit2cloud-chenyw
1bf8fe5dff fix: 组织管理查询功能 2021-05-19 17:50:10 +08:00
fit2cloud-chenyw
b55c065554 fix: 菜单管理搜索 2021-05-19 17:25:07 +08:00
taojinlong
1249c6f91a fix: 国际化 2021-05-19 15:42:43 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
taojinlong
4399978965 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 11:56:09 +08:00
taojinlong
d1d9596624 fix: 国际化 2021-05-19 11:56:00 +08:00
fit2cloud-chenyw
f15253368f feat: <关于>中按钮使用user.isAdmin过滤 2021-05-19 11:52:01 +08:00
fit2cloud-chenyw
5f8a0126d5 feat: 路由名称改为英文 2021-05-19 10:30:51 +08:00
wangjiahao
8a88c0bca9 Merge remote-tracking branch 'origin/main' into main 2021-05-18 18:39:32 +08:00
wangjiahao
1c48fc8848 feat: 授权国际化等 2021-05-18 18:39:18 +08:00
fit2cloud-chenyw
a0b6661c5f fix: 国际化头部参数错误 2021-05-18 18:33:52 +08:00
fit2cloud-chenyw
3970913f43 fix: 新加了组织后,编辑已有用户时,无法选择看见新加的组织 2021-05-18 18:16:04 +08:00
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
taojinlong
b28e2494fb refactor: 整理sql 2021-05-18 14:44:41 +08:00
taojinlong
c637344575 resolve conflict 2021-05-18 12:45:45 +08:00
taojinlong
b65835a7b9 feat: 暂时去掉国际化切换 2021-05-18 12:40:47 +08:00
fit2cloud-chenyw
5fc32d6bba feat: 新增关于页面 以及 lic更新功能 2021-05-18 12:23:21 +08:00
fit2cloud-chenyw
893d5c68e6 feat: 用户不选组织报错 2021-05-18 11:47:54 +08:00
taojinlong
8fadc27a29 feat: 去掉角色代碼; 2021-05-17 15:37:06 +08:00
taojinlong
38c0aa90bc feat: 去掉角色代碼; 2021-05-17 15:36:11 +08:00
taojinlong
1bdc6454c7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-17 14:20:00 +08:00
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
taojinlong
da8e447349 feat: 国际化 2021-05-14 18:51:35 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
fit2cloud-chenyw
469aa684fc feat: xpack功能初版 2021-05-12 16:19:41 +08:00
taojinlong
e3bcf81bc2 refactor: 去掉调试信息 2021-05-12 11:49:07 +08:00
fit2cloud-chenyw
9d6680ad31 feat: 插件管理v0.01 2021-05-11 16:32:21 +08:00
fit2cloud-chenyw
0bda4eb062 feat: 插件管理v0.01 2021-05-11 16:30:37 +08:00
taojinlong
1eb4d7f24b fix: 数据源密码不要明文显示 2021-05-10 10:37:05 +08:00
fit2cloud-chenyw
d1f3d3a7f0 feat: 一级菜单只存一级 2021-05-06 14:43:57 +08:00
fit2cloud-chenyw
22a9cc9b21 feat: 系统管理按钮样式 2021-05-06 10:40:08 +08:00
wangjiahao
cd5f1af773 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Editor/ContextMenu.vue
2021-05-05 22:14:47 +08:00
wangjiahao
2cd2365770 feat:主题设置 2021-05-05 22:14:23 +08:00
fit2cloud-chenyw
e0a6ae7962 feat: 角色删除code字段 表单增加重复验证 2021-04-30 11:05:59 +08:00
fit2cloud-chenyw
389d50a846 feat: 角色api错误 2021-04-29 16:15:11 +08:00
fit2cloud-chenyw
9ed610802c feat: 数据源弹框改为隐藏路由 2021-04-29 15:38:03 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
fit2cloud-chenyw
e32be3b5a5 feat: 用户管理弹窗修改 2021-04-28 17:09:05 +08:00
fit2cloud-chenyw
52d31b504e fix: 表格按照最新fit2cloud-ui样式 2021-04-28 14:54:55 +08:00
fit2cloud-chenyw
be033a5c66 fix: 顶级组织不能编辑为非顶级组织 2021-04-28 13:27:56 +08:00
fit2cloud-chenyw
e8fa566549 fix: 一级菜单禁用keep-alive缓存组件 2021-04-28 12:23:06 +08:00
fit2cloud-chenyw
2946017dd5 fix: 角色代码必填 2021-04-28 12:16:52 +08:00
wangjiahao
43489d63f1 feat:恢复显示设置,仪表盘样式设置等 2021-04-27 10:28:55 +08:00
TaoJinlong
e97297fd84 feat: 增量更新数据 2021-03-18 17:59:52 +08:00
fit2cloud-chenyw
46d24a17bc feat: 删除前端工程中meterSphere组件 2021-03-16 17:53:43 +08:00
fit2cloud-chenyw
a05fb2db52 fix: 处理token过期错误 2021-03-15 18:23:12 +08:00
fit2cloud-chenyw
0bf906779e feat: 完善权限管理 2021-03-15 17:23:21 +08:00
fit2cloud-chenyw
ac8f8271ae feat: 新增树表格 2021-03-15 14:56:01 +08:00
fit2cloud-chenyw
105d8a2a5f feat: datasource采用新的列表 2021-03-15 12:12:14 +08:00