Commit Graph

672 Commits

Author SHA1 Message Date
wangjiahao
f4b4dac8ef Merge remote-tracking branch 'origin/main' into main 2021-05-24 10:28:20 +08:00
wangjiahao
872067ce97 fix: 仪表盘列表中的仪表盘可转为默认仪表盘 2021-05-24 10:28:11 +08:00
xiajunjie
5b3962e934 feat(frontend):vue cron组件 2021-05-23 11:04:45 +08:00
xiajunjie
0468039333 feat(frontend):关于logo css fix 2021-05-21 22:03:57 +08:00
junjie
744c9a2dd4 feat(视图):视图增加 过滤器,直接对数据集字段进行过滤 2021-05-21 16:58:39 +08:00
junjie
1833ca5399 feat(视图):视图增加 过滤器,直接对数据集字段进行过滤 2021-05-21 16:45:21 +08:00
fit2cloud-chenyw
27109824f2 fix: 取消收藏后主页不显示当前仪表板 2021-05-21 15:54:20 +08:00
wangjiahao
04abe0c182 Merge remote-tracking branch 'origin/main' into main 2021-05-21 15:19:13 +08:00
wangjiahao
2cbdf52611 fix: 去掉缩略图 2021-05-21 15:18:54 +08:00
fit2cloud-chenyw
f3fa01de1b feat: 外部链接国际化 2021-05-21 15:13:16 +08:00
fit2cloud-chenyw
4f19867823 feat: 仪表板取消收藏实时展示 2021-05-21 14:25:00 +08:00
wangjiahao
a588e9e29a fix: 国际化问题 2021-05-21 13:55:55 +08:00
wangjiahao
fd37b3e331 Merge remote-tracking branch 'origin/main' into main 2021-05-21 13:51:14 +08:00
wangjiahao
70b947200e fix: 保存模板 2021-05-21 13:50:34 +08:00
fit2cloud-chenyw
efe1830d88 feat: 下拉选择组件报错 2021-05-21 12:44:23 +08:00
wangjiahao
5770ee9a42 Merge remote-tracking branch 'origin/main' into main 2021-05-21 12:42:52 +08:00
wangjiahao
2222eda12f fix: 编辑仪表盘 全屏预览问题 2021-05-21 12:42:40 +08:00
taojinlong
ad29a59583 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:55 +08:00
taojinlong
a6a427de18 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:25 +08:00
fit2cloud-chenyw
2261323af5 feat: 时间组件全部用between 2021-05-21 12:23:30 +08:00
fit2cloud-chenyw
955a0ec6bc feat: 时间组件参数改为时间戳 2021-05-21 12:19:32 +08:00
wangjiahao
c38bc7f3d8 fix: 预览大屏无法显示问题 2021-05-21 11:19:15 +08:00
wangjiahao
7e6749e9fb fix: 仪表盘编辑 点击事件问题 2021-05-21 11:04:41 +08:00
wangjiahao
9721a406dc Merge remote-tracking branch 'origin/main' into main 2021-05-21 10:24:55 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
taojinlong
ff24ab3d6e fix: license 更新提示國際化 2021-05-21 10:22:08 +08:00
fit2cloud-chenyw
4f8f9080cf feat: 绑定日期过滤组件 2021-05-20 22:14:07 +08:00
fit2cloud-chenyw
20c0b4b68d feat: 过滤组件绑定 2021-05-20 18:38:28 +08:00
fit2cloud-chenyw
6aab309741 feat: 查询条件绑定视图 2021-05-20 17:44:31 +08:00
fit2cloud-chenyw
3d7a65aa93 feat: 下拉框查询组件非空过滤 2021-05-20 17:07:19 +08:00
junjie
d908467028 feat(仪表盘):仪表盘 过滤组件 2021-05-20 16:56:44 +08:00
fit2cloud-chenyw
df8413731e fix: 修复画布中组件加载多次 2021-05-20 16:45:27 +08:00
junjie
39a282dd65 feat(frontend):菜单管理 i18n fix 2021-05-20 15:33:07 +08:00
junjie
a7da52ef01 feat(backend):数据源form描述非必填;i18n fix 2021-05-20 15:19:49 +08:00
fit2cloud-chenyw
2102c11b16 fix: 外部链接新增umy依赖 2021-05-20 13:41:39 +08:00
fit2cloud-chenyw
75d7d4e35e Merge remote-tracking branch 'origin/main' into main 2021-05-20 12:02:39 +08:00
fit2cloud-chenyw
3f33dc38db feat: 查询组件数据存储到store 2021-05-20 12:02:12 +08:00
wangjiahao
33f6aa36f2 Merge remote-tracking branch 'origin/main' into main 2021-05-20 12:01:34 +08:00
wangjiahao
8f42b81cb6 fix: 保存缩略图 2021-05-20 12:01:19 +08:00
taojinlong
6659beae03 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:27 +08:00
taojinlong
a369122ce4 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:18 +08:00
junjie
38ad68518d feat(frontend):logo 2021-05-20 11:42:20 +08:00
wangjiahao
8618c23814 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:20:48 +08:00
wangjiahao
bbba7a34e5 Merge remote-tracking branch 'origin/main' into main 2021-05-20 11:19:02 +08:00
wangjiahao
d56fc014c4 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:18:31 +08:00
junjie
afb24d7b07 feat(视图):button name fix 2021-05-20 10:37:43 +08:00
wangjiahao
e09484a22f fix: BUG FIX 2021-05-20 00:33:07 +08:00
wangjiahao
f6f668cad7 fix: 修改权限查询效率问题等 2021-05-19 19:47:49 +08:00
wangjiahao
7ebb015bd6 Merge remote-tracking branch 'origin/main' into main 2021-05-19 19:16:49 +08:00
wangjiahao
50be91cc7e fix: 顶级目录权限错误问题 2021-05-19 19:16:34 +08:00
fit2cloud-chenyw
f7cc4599cc fix: 外部链接预览 2021-05-19 19:03:50 +08:00
junjie
d06d8cfedc feat(视图):title样式 bug fix 2021-05-19 18:53:35 +08:00
junjie
c2cb2d125c feat(视图):维度、指标 显示名,错误提示 2021-05-19 18:21:07 +08:00
fit2cloud-chenyw
a092244066 feat: 公共链接页面样式 2021-05-19 18:19:30 +08:00
junjie
bf338aaa0a feat(frontend):视图关联数据集被删除时,友好提示 2021-05-19 18:10:25 +08:00
junjie
53b115f07d feat(frontend):视图关联数据集被删除时,友好提示 2021-05-19 18:03:53 +08:00
fit2cloud-chenyw
abf0f7560c fix: 过滤组件在没有视图时报错 2021-05-19 18:00:39 +08:00
fit2cloud-chenyw
1bf8fe5dff fix: 组织管理查询功能 2021-05-19 17:50:10 +08:00
junjie
d6f799aea2 feat(frontend):Echarts tooltip限制在图表区域内 2021-05-19 17:37:07 +08:00
fit2cloud-chenyw
b55c065554 fix: 菜单管理搜索 2021-05-19 17:25:07 +08:00
junjie
eebb2f0f36 feat(dashboard):UI fix 2021-05-19 17:23:46 +08:00
taojinlong
12e0310256 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 17:16:35 +08:00
taojinlong
bfeaabf510 fix: 国际化 2021-05-19 17:09:35 +08:00
wangjiahao
8b4753d9af Merge remote-tracking branch 'origin/main' into main 2021-05-19 16:58:35 +08:00
wangjiahao
a1c4c61d95 fix: 样式修改 2021-05-19 16:58:21 +08:00
junjie
7ee8e07691 feat(视图):视图title fix 2021-05-19 16:42:39 +08:00
wangjiahao
f615e9fda8 fix: 主题滚动条的问题 2021-05-19 16:37:15 +08:00
wangjiahao
a1923219dd Merge remote-tracking branch 'origin/main' into main 2021-05-19 16:29:33 +08:00
wangjiahao
c0ccf23a20 fix: 仪表板滚动条的问题 2021-05-19 16:29:19 +08:00
junjie
f525d9154a feat:fontsize fix;仪表板视图过滤组件 2021-05-19 16:21:20 +08:00
taojinlong
1d2e5d846d Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:46:50 +08:00
taojinlong
1249c6f91a fix: 国际化 2021-05-19 15:42:43 +08:00
junjie
dc4482dcaa feat(frontend):UI fix 2021-05-19 15:20:48 +08:00
taojinlong
492dd99188 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:14:08 +08:00
taojinlong
6b5d27aa72 fix: 限制標題長度 2021-05-19 15:13:59 +08:00
wangjiahao
71da8bb205 Merge remote-tracking branch 'origin/main' into main 2021-05-19 15:13:18 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
junjie
fee4f9a63f feat(frontend):UI fix 2021-05-19 14:58:21 +08:00
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
junjie
83fa095052 feat(frontend):i8n fix;top-bar 右上角个人信息 i18n样式优化 2021-05-17 17:23:29 +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
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +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
junjie
944b1bbfec feat(视图):图表->label类型fix 2021-05-17 12:47:45 +08:00
junjie
e27baac6fd feat(视图):增加标题文字图标 2021-05-17 12:14:27 +08:00
junjie
f8e1a1a7a3 feat(视图):fix 2021-05-14 18:55:53 +08:00
taojinlong
da8e447349 feat: 国际化 2021-05-14 18:51:35 +08:00
junjie
9def83bfed feat(视图):line 面积bug fix 2021-05-14 18:30:22 +08:00
junjie
c55b7dfe01 feat(视图):图表类型新增:gauge 2021-05-14 18:21:03 +08:00
junjie
422fbbfccc feat(视图):bug fix 2021-05-14 12:39:30 +08:00
junjie
52373e01c8 feat(数据集):自助数据集编辑 2021-05-13 17:41:05 +08:00
junjie
4d24485939 feat(视图):视图表格调整 2021-05-13 17:15:07 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
fit2cloud-chenyw
4b6ed5b064 feat: 头部样式 2021-05-12 18:54:21 +08:00
fit2cloud-chenyw
acb4757ba8 fix: 新用户404 2021-05-12 18:33:09 +08:00
fit2cloud-chenyw
5ef6db9dc2 feat: 新建用户登录404 2021-05-12 18:26:18 +08:00
fit2cloud-chenyw
b637b77812 Merge remote-tracking branch 'origin/main' into main 2021-05-12 16:59:00 +08:00
fit2cloud-chenyw
f62f3e635c feat: 获取标题非空判断 2021-05-12 16:58:36 +08:00
junjie
75337adf7c feat(数据集):数据集优化 2021-05-12 16:39:53 +08:00