taojinlong
|
1fb3f2ee3b
|
Merge branch 'main' of github.com:dataease/dataease into main
|
2021-05-19 13:50:31 +08:00 |
|
taojinlong
|
638b8c10cc
|
fix: 国际化
|
2021-05-19 13:41:25 +08:00 |
|
fit2cloud-chenyw
|
58072f1b13
|
fix: 过滤组件国际化bug
|
2021-05-19 12:50:42 +08:00 |
|
junjie
|
a5f088c1ed
|
Merge remote-tracking branch 'origin/main' into main
|
2021-05-19 11:59:18 +08:00 |
|
junjie
|
72ea246cdc
|
feat(dashboard):UI fix;i18n fix
|
2021-05-19 11:59:04 +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
|
e9dc99526e
|
fix: 删除菜单中目录
|
2021-05-19 11:42:09 +08:00 |
|
junjie
|
27b0ea6df2
|
feat(dashboard):新建一级目录 按钮fix
|
2021-05-19 10:52:46 +08:00 |
|
fit2cloud-chenyw
|
5f8a0126d5
|
feat: 路由名称改为英文
|
2021-05-19 10:30:51 +08:00 |
|
taojinlong
|
14a5d7f667
|
Merge branch 'main' of github.com:dataease/dataease into main
|
2021-05-19 10:18:12 +08:00 |
|
taojinlong
|
144fb84535
|
fix: 国际化
|
2021-05-19 10:17:36 +08:00 |
|
fit2cloud-chenyw
|
1107529dc1
|
fix: 修复线上国际化切换无效问题
|
2021-05-19 10:03:00 +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 |
|
junjie
|
ff37b43bdf
|
feat(dashboard):UI fix
|
2021-05-18 17:48:33 +08:00 |
|
junjie
|
8a82c4687e
|
Merge remote-tracking branch 'origin/main' into main
|
2021-05-18 17:31:42 +08:00 |
|
junjie
|
ec58faeee6
|
feat(dashboard):UI fix
|
2021-05-18 17:31:28 +08:00 |
|
fit2cloud-chenyw
|
0185c0c4af
|
feat: 前端适配后台国际化
|
2021-05-18 17:30:36 +08:00 |
|
taojinlong
|
41deddbbfa
|
fix: excel 数据集
|
2021-05-18 17:28:12 +08:00 |
|
junjie
|
9124a9213d
|
feat(backend):fix
|
2021-05-18 17:18:47 +08:00 |
|
junjie
|
ad0c75eacf
|
feat(dashboard):仪表盘 Table Label支持,大小自适应;收藏取消bug fix
|
2021-05-18 16:38:24 +08:00 |
|
fit2cloud-chenyw
|
2d3eb9050c
|
fix: lic错误信息翻译
|
2021-05-18 16:17:07 +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 |
|
fit2cloud-chenyw
|
31e5cca439
|
feat:前端增加国际化切换
|
2021-05-18 15:46:14 +08:00 |
|
junjie
|
6d54dcece4
|
feat(frontend):UI fix
|
2021-05-18 15:33:39 +08:00 |
|
junjie
|
4535dd2a5e
|
feat(dashboard):ui fix;创建一级目录
|
2021-05-18 15:20:48 +08:00 |
|
taojinlong
|
f07065b6f2
|
Merge branch 'main' of github.com:dataease/dataease into main
# Conflicts:
# backend/src/main/resources/db/migration/V8__system.sql
|
2021-05-18 15:00:31 +08:00 |
|
taojinlong
|
b28e2494fb
|
refactor: 整理sql
|
2021-05-18 14:44:41 +08:00 |
|
fit2cloud-chenyw
|
f8078b0196
|
fix: topBar头部现实lic错误信息
|
2021-05-18 14:33:48 +08:00 |
|
junjie
|
78d65f032a
|
feat(dashboard):ui fix
|
2021-05-18 14:09:51 +08:00 |
|
junjie
|
08153b1f1d
|
feat(frontend):数据集 视图 名称长度限制
|
2021-05-18 13:55:00 +08:00 |
|
taojinlong
|
4e7d0173fc
|
fix: 限制輸入長度
|
2021-05-18 13:47:17 +08:00 |
|
taojinlong
|
27d1083d26
|
fix
|
2021-05-18 12:46:31 +08:00 |
|
taojinlong
|
c637344575
|
resolve conflict
|
2021-05-18 12:45:45 +08:00 |
|
taojinlong
|
776fa22c57
|
feat: 暂时去掉国际化切换
|
2021-05-18 12:42:27 +08:00 |
|
taojinlong
|
b65835a7b9
|
feat: 暂时去掉国际化切换
|
2021-05-18 12:40:47 +08:00 |
|
fit2cloud-chenyw
|
867ae7cb37
|
fix: 链接分享label文字修改
|
2021-05-18 12:30:17 +08:00 |
|
junjie
|
58620d20e3
|
feat(frontend):登陆页调整
|
2021-05-18 12:25:48 +08:00 |
|
fit2cloud-chenyw
|
5fc32d6bba
|
feat: 新增关于页面 以及 lic更新功能
|
2021-05-18 12:23:21 +08:00 |
|
junjie
|
120dd256aa
|
feat(frontend):fix
|
2021-05-18 12:02:04 +08:00 |
|
fit2cloud-chenyw
|
893d5c68e6
|
feat: 用户不选组织报错
|
2021-05-18 11:47:54 +08:00 |
|
junjie
|
afc6563a32
|
feat:非直连数据集做校验;前端登陆样式fix 测试;不同用户创建db类型数据集可以选择相同表
|
2021-05-18 11:24:52 +08:00 |
|
taojinlong
|
dcf8fe751b
|
Merge branch 'main' of github.com:dataease/dataease into main
|
2021-05-18 09:39:13 +08:00 |
|
taojinlong
|
21e38a0ffd
|
feat: 国际化
|
2021-05-18 09:39:00 +08:00 |
|
junjie
|
a9201c794e
|
feat(frontend):i18n fix;run build 样式冲突 fix后测试
|
2021-05-17 19:11:07 +08:00 |
|