Commit Graph

130 Commits

Author SHA1 Message Date
taojinlong
ead3efcef9 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-24 18:45:11 +08:00
taojinlong
a48249c8db fix: 预览 excel数据集时,给出提示信息:处理中/处理失败 2021-05-24 18:44:49 +08:00
wangjiahao
bf52d4ec03 fix: 1.用户添加多个角色 查询报错问题 2021-05-24 18:26:51 +08:00
wangjiahao
432459a062 fix: 1.视图 数据集 默认查询所有数据 2021-05-24 17:55:53 +08:00
wangjiahao
746e6c49c3 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/components/canvas/components/Toolbar.vue
2021-05-24 17:30:13 +08:00
wangjiahao
b59c4967f7 fix: 1.普通仪表盘可转为默认仪表盘同时增加默认仪表盘全新 2.仪表盘,视图,数据集加载慢的问题 3.上传大图片不成功的问题,4.仪表盘页面整体加上loading 5.编辑仪表盘预览改为全屏弹框模式 2021-05-24 17:28:03 +08:00
junjie
dcafd50b2b feat(i18n):后端国际化;cron 组件国际化 2021-05-24 11:03:57 +08:00
taojinlong
49bb1f18d6 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 17:33:56 +08:00
taojinlong
20d9f5ef9c feat: 默认语言为中文 2021-05-21 17:33:47 +08:00
fit2cloud-chenyw
42b1599043 fix: 菜单权限标识错误 2021-05-21 12:30:07 +08:00
taojinlong
a6a427de18 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:25 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
wangjiahao
f6f668cad7 fix: 修改权限查询效率问题等 2021-05-19 19:47:49 +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
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
fit2cloud-chenyw
851d8edb86 fix: 修复flyway中菜单配置 2021-05-19 10:47:38 +08:00
wangjiahao
36d5a80190 feat: 授权flayway 2021-05-18 19:05:03 +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
taojinlong
97c879f94d fix: 更改初始密码 2021-05-18 18:10:53 +08:00
taojinlong
f56889e957 fix: sql 2021-05-18 17:09:55 +08:00
taojinlong
aea71643dc Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:58:46 +08:00
taojinlong
e44081d1a6 fix: 证书产品名称 2021-05-18 16:58:35 +08:00
junjie
5884487e2e feat(backend):flyway 2021-05-18 16:44:26 +08:00
wangjiahao
533d466ca2 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:34:32 +08:00
wangjiahao
025feaa057 feat: 授权flayway 2021-05-18 16:34:16 +08:00
junjie
708752a6ac feat(backend):flyway 2021-05-18 16:31:59 +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
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
9a768d9e8d feat: 菜单增加关于 2021-05-18 14:09:42 +08:00
taojinlong
21e38a0ffd feat: 国际化 2021-05-18 09:39:00 +08:00
fit2cloud-chenyw
8b0ac926f8 feat: 右上角功能菜单数据 2021-05-13 16:03:35 +08:00
taojinlong
e963e586f5 feat: 数据集字段类型:type(原始类型),de_type(dataease 计算使用)、de_extract_type(往 doris 抽取数据使用) 2021-05-13 14:45:01 +08:00
fit2cloud-chenyw
469aa684fc feat: xpack功能初版 2021-05-12 16:19:41 +08:00
taojinlong
a77fb3c7ae fix: 同步日志按时间排序;修复添加定时任务失败 2021-05-12 16:13:13 +08:00
taojinlong
defdc1123c Merge branch 'main' of github.com:dataease/dataease into main 2021-05-11 19:10:03 +08:00
taojinlong
0404536a20 fix: Kettle 状态 2021-05-11 19:09:32 +08:00
fit2cloud-chenyw
2703e881eb feat: 插件管理v0.01 2021-05-11 16:30:21 +08:00
taojinlong
e46644534d fix: 处理doris 字段长度 2021-05-10 18:19:29 +08:00
junjie
a1f210ac91 feat:flyway 菜单名称fix 2021-05-08 14:12:07 +08:00
fit2cloud-chenyw
aaf19048f4 feat: 增加权限管理 模版管理菜单 2021-05-08 12:27:19 +08:00
wangjiahao
175f5510c4 feat: 增加flyway 调增模板导入等 2021-05-08 11:49:21 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
taojinlong
260d09a1a0 feat: 抽取 excel 数据 2021-05-07 16:01:04 +08:00