Commit Graph

191 Commits

Author SHA1 Message Date
wangjiahao
36a327f81c fix: UI 调整 2021-05-27 17:06:38 +08:00
wangjiahao
1537c8d2f5 Merge remote-tracking branch 'origin/main' into main 2021-05-27 14:17:55 +08:00
wangjiahao
1be642aeca feat: 用户权限可被收回 2021-05-27 14:17:27 +08:00
junjie
8e6d5436bc feat(cron):cron time fix 2021-05-26 19:17:06 +08:00
wangjiahao
070ff39641 feat: 样式修改 2021-05-26 16:41:52 +08:00
junjie
dadf7bd1f6 feat(数据集):关联视图:两个数据集之间,不能有同一关联字段出现多次 2021-05-26 14:03:44 +08:00
taojinlong
911a4e0885 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-26 12:32:48 +08:00
taojinlong
e522d3935d fix: 限制数据集只有一个同步任务 2021-05-26 12:05:16 +08:00
wangjiahao
c61f294e01 Merge remote-tracking branch 'origin/main' into main 2021-05-25 12:36:49 +08:00
wangjiahao
133f5dcae9 feat: 1.仪表盘页面动态添加目录,新建仪表盘无需刷新直接展开,2.新建仪表盘直接进入编辑界面,3.【【仪表盘】右键点开的功能顺序调整】4.【【仪表盘】仪表盘画板中,视图层级操作的文案调整】 2021-05-25 12:36:35 +08:00
junjie
ee3c99e177 feat(backend):关联视图表、字段重复关联校验 测试 2021-05-25 11:03:55 +08:00
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
junjie
ac938c281b feat(数据集):草稿,数据集 关联视图 功能。自助数据集需要关联视图做支撑,先简单做个 数据集 关联视图 的功能,后边再优化 2021-05-07 14:51:40 +08:00
junjie
5a2a5bb368 feat(dialog):dialog 支持拖动位置 2021-05-07 11:04:50 +08:00
junjie
893b56244e fix:线上数据库名称是dataease,flyway remove database名称 2021-05-07 10:26:33 +08:00
wangjiahao
9a6890d6e1 feat:flay_way 2021-05-07 10:22:46 +08:00
wangjiahao
20ce5bbb39 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
2021-05-06 23:42:18 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
fit2cloud-chenyw
484d931fd6 feat: 初始密码和登录超时时间设置在dataease.properties里 2021-05-06 15:43:57 +08:00
fit2cloud-chenyw
33320f6f14 feat: 一级菜单只有一级 表结构 2021-05-06 15:06:19 +08:00
fit2cloud-chenyw
22a9cc9b21 feat: 系统管理按钮样式 2021-05-06 10:40:08 +08:00
fit2cloud-chenyw
54d775de0b feat: 数据源表单隐藏菜添加 2021-04-30 15:48:39 +08:00
fit2cloud-chenyw
ec9cde55b6 feat: 角色表删除code字段 2021-04-30 11:21:11 +08:00
fit2cloud-chenyw
e0a6ae7962 feat: 角色删除code字段 表单增加重复验证 2021-04-30 11:05:59 +08:00
fit2cloud-chenyw
f35c4477a5 feat: 增加隐藏路由菜单数据 2021-04-29 14:02:29 +08:00
fit2cloud-chenyw
1ed42b1fa5 fix: 登录超时时间可配置 2021-04-28 12:16:37 +08:00
taojinlong
35d50d9f4d feat: 抽取数据到doris 2021-04-27 17:39:07 +08:00
fit2cloud-chenyw
92c0a47668 feat: 更新初始化菜单sql 2021-04-22 18:25:20 +08:00
wangjiahao
079f42b27b feat:增加表结构 2021-04-22 10:19:46 +08:00
junjie
4784c1078f feat(数据集):上传excel,保存第一行作为字段 2021-04-20 16:23:47 +08:00
junjie
5f402b35df feat(数据集):flyway fix;excel数据集创建 2021-04-20 11:48:38 +08:00
wangjiahao
11e7eb2a88 feat:仪表盘模板导入导出 2021-04-19 11:51:22 +08:00
junjie
0210db82e6 feat(数据集):数据集字段类型扩展,数值区分 整型与浮点型 2021-04-09 22:42:38 +08:00
junjie
4812751d68 feat(backend):flyway 2021-04-09 15:55:34 +08:00
wangjiahao
873a03065c feat:增加仪表盘预览等功能 2021-03-29 14:57:04 +08:00
fit2cloud-chenyw
ced8c21e28 feat: 公共链接分享 2021-03-26 18:44:41 +08:00
fit2cloud-chenyw
1eae5f2e37 feat: 创建公共链接 2021-03-25 18:58:05 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
wangjiahao
9e02503328 feat:增加仪表盘设计组件及设计 增加默认数据 2021-03-19 16:39:42 +08:00
fit2cloud-chenyw
f0b34763d4 feat: 获取用户信息ehcache缓存机制 2021-03-19 13:05:14 +08:00
TaoJinlong
d171a6ccfa Merge branch 'main' of https://github.com/dataease/dataease into main 2021-03-18 18:00:23 +08:00
TaoJinlong
e97297fd84 feat: 增量更新数据 2021-03-18 17:59:52 +08:00
fit2cloud-chenyw
9e9fb73892 feat: 仪表盘分享页面完善 2021-03-18 16:55:31 +08:00
fit2cloud-chenyw
6440804d93 feat: 仪表盘分享页面 2021-03-17 18:50:29 +08:00
TaoJinlong
5f823af95a fix: sql 2021-03-17 13:17:47 +08:00
fit2cloud-chenyw
5781da135a feat: 仪表板收藏分享 后台接口 2021-03-16 16:59:49 +08:00
wangjiahao
13bb7663f8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
2021-03-12 16:10:18 +08:00
wangjiahao
8b80d8fa72 feat:增加仪表盘设计组件及设计 2021-03-12 16:08:55 +08:00
taojinlong
2c95a3c600 build: 打包 2021-03-11 11:44:59 +08:00
fit2cloud-chenyw
2a766461ca fix: 修复token续命bug 2021-03-10 11:49:18 +08:00
fit2cloud-chenyw
2fe3e8100d feat: 修改用户密码 2021-03-09 15:38:36 +08:00