center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
2,227 Commits 1 Branch 86 Tags 417 MiB
99aac19d46
Commit Graph

302 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
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
4f19867823 feat: 仪表板取消收藏实时展示 2021-05-21 14:25:00 +08:00
wangjiahao
70b947200e fix: 保存模板 2021-05-21 13:50:34 +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
wangjiahao
7e6749e9fb fix: 仪表盘编辑 点击事件问题 2021-05-21 11:04:41 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +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
df8413731e fix: 修复画布中组件加载多次 2021-05-20 16:45:27 +08:00
wangjiahao
8618c23814 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:20:48 +08:00
wangjiahao
d56fc014c4 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:18:31 +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
fit2cloud-chenyw
abf0f7560c fix: 过滤组件在没有视图时报错 2021-05-19 18:00:39 +08:00
wangjiahao
a1c4c61d95 fix: 样式修改 2021-05-19 16:58:21 +08:00
wangjiahao
f615e9fda8 fix: 主题滚动条的问题 2021-05-19 16:37:15 +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
72ea246cdc feat(dashboard):UI fix;i18n fix 2021-05-19 11:59:04 +08:00
junjie
27b0ea6df2 feat(dashboard):新建一级目录 按钮fix 2021-05-19 10:52:46 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
junjie
ff37b43bdf feat(dashboard):UI fix 2021-05-18 17:48:33 +08:00
junjie
ec58faeee6 feat(dashboard):UI fix 2021-05-18 17:31:28 +08:00
junjie
9124a9213d feat(backend):fix 2021-05-18 17:18:47 +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
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
junjie
78d65f032a feat(dashboard):ui fix 2021-05-18 14:09:51 +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
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
taojinlong
da8e447349 feat: 国际化 2021-05-14 18:51:35 +08:00
taojinlong
622169a33e refactor: 去掉调试信息 2021-05-12 11:53:50 +08:00
taojinlong
e3bcf81bc2 refactor: 去掉调试信息 2021-05-12 11:49:07 +08:00
wangjiahao
175f5510c4 feat: 增加flyway 调增模板导入等 2021-05-08 11:49:21 +08:00
wangjiahao
7ff46ff804 fix: 背景图片空url 问题 2021-05-08 11:06:45 +08:00
wangjiahao
104a8a48fa fix: 背景图片空url 问题 2021-05-08 11:04:58 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
wangjiahao
7a27491b53 feat:修改仪表盘编辑侧边弹框样式 2021-05-08 00:04:24 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
wangjiahao
9ba7aeaedc feat:仪表盘支持表格 2021-05-05 23:48:05 +08:00
wangjiahao
2cd2365770 feat:主题设置 2021-05-05 22:14:23 +08:00
wangjiahao
d4da4794ef feat:背景图片设置 2021-04-27 16:25:40 +08:00
wangjiahao
0f644e7842 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/components/Toolbar.vue
#	frontend/src/views/panel/edit/index.vue
 2021-04-27 10:30:04 +08:00
wangjiahao
43489d63f1 feat:恢复显示设置，仪表盘样式设置等 2021-04-27 10:28:55 +08:00
fit2cloud-chenyw
ef5eab2e19 feat: 修改自定义控制范围样式 2021-04-22 15:36:00 +08:00
fit2cloud-chenyw
69f5a09cdc feat: 解决关闭编辑页面但是没有关闭左侧面板 2021-04-22 13:46:59 +08:00
wangjiahao
70a298025b fix:修改主题样式覆盖问题 2021-04-22 12:16:30 +08:00
wangjiahao
ecdd0ab4df feat:合并冲突 2021-04-22 10:33:51 +08:00
wangjiahao
d6ca7a8b8f Merge remote-tracking branch 'origin/main' into main 2021-04-21 18:49:13 +08:00
wangjiahao
290502b35b feat:新建仪表盘修改 同时支持自建 复用 导入 2021-04-21 18:48:57 +08:00
fit2cloud-chenyw
6b285d7391 feat: 分享收藏完善 2021-04-20 14:19:10 +08:00
wangjiahao
3c17fc57c0 Merge remote-tracking branch 'origin/main' into main 2021-04-20 11:47:03 +08:00
wangjiahao
23729a4c0b feat:仪表盘模板导入导出 2021-04-20 11:46:24 +08:00
fit2cloud-chenyw
5327d5170b Merge remote-tracking branch 'origin/main' into main 2021-04-20 10:24:54 +08:00
fit2cloud-chenyw
d8239381cc feat: 修复重复查询条件 2021-04-20 10:24:39 +08:00
wangjiahao
7cdc0c220f Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/custom-component/UserView.vue
 2021-04-19 18:21:07 +08:00
wangjiahao
5405332dc2 feat:仪表盘模板导入导出 2021-04-19 18:20:15 +08:00
fit2cloud-chenyw
149eb535bb feat: 增加数字下拉 2021-04-19 18:10:46 +08:00
fit2cloud-chenyw
b87766adce feat: 设置必须绑定数据集字段 2021-04-19 17:40:15 +08:00
fit2cloud-chenyw
5ec60144e8 feat: 过滤条件 2021-04-19 16:50:31 +08:00
fit2cloud-chenyw
fb53686109 feat: 下拉框样式 2021-04-19 15:53:26 +08:00
fit2cloud-chenyw
5af4158dc4 feat:设置条件绑定视图 2021-04-19 15:31:03 +08:00
wangjiahao
f4f43a47aa Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-04-19 11:51:43 +08:00
wangjiahao
11e7eb2a88 feat:仪表盘模板导入导出 2021-04-19 11:51:22 +08:00
fit2cloud-chenyw
e2a5a2f440 feat: 过滤条件格式修改 2021-04-19 11:51:12 +08:00
fit2cloud-chenyw
9de0749200 feat: 查询条件编辑 2021-04-19 10:47:07 +08:00
fit2cloud-chenyw
e5715d6898 feat:优化查询条件 2021-04-16 17:26:13 +08:00
fit2cloud-chenyw
fea7ceec9b feat: 优化过滤组件 2021-04-15 10:33:22 +08:00
junjie
1276109f47 feat(frontend):仪表板样式微调 2021-04-14 15:18:53 +08:00
wangjiahao
73ab098994 feat:仪表盘模板导出功能 2021-04-13 18:43:17 +08:00
wangjiahao
5b60ea57b5 Merge remote-tracking branch 'origin/main' into main 2021-04-09 18:19:59 +08:00
wangjiahao
91a7696615 feat:合并bug修复 2021-04-09 18:19:45 +08:00
junjie
ef57580ecc feat:css调整、hbase 表名调整 2021-04-09 14:30:22 +08:00
wangjiahao
53c1d36c4f Merge remote-tracking branch 'origin/main' into main 2021-04-09 13:53:21 +08:00
wangjiahao
57fe2bc62f feat:样式修改 2021-04-09 13:53:04 +08:00
fit2cloud-chenyw
acdfd5015f feat: 大改前存档 2021-04-09 11:58:03 +08:00
fit2cloud-chenyw
8f2c2fbc30 feat: 条件过滤组件公共功能 2021-04-08 18:18:08 +08:00
wangjiahao
9b036083a3 Merge remote-tracking branch 'origin/main' into main 2021-04-08 17:46:14 +08:00
wangjiahao
ff02cb9a1f fix:禁用localstorage存储仪表盘数据 容易导致浏览器本地存储越界 2021-04-08 17:46:02 +08:00
junjie
ce1d2035ad feat(frontend):css 2021-04-08 17:22:03 +08:00
wangjiahao
8d61299f3e Merge remote-tracking branch 'origin/main' into main 2021-04-08 16:54:53 +08:00
wangjiahao
dfde1da4f4 feat:仪表盘样式适配 2021-04-08 16:54:37 +08:00
fit2cloud-chenyw
dc6419302f feat: 过滤组件年份页面 2021-04-08 11:39:00 +08:00
fit2cloud-chenyw
a0ef8e0a4c feat: 过滤组件样式 2021-04-07 18:19:38 +08:00
fit2cloud-chenyw
4ee166e86c feat: 过滤组件 2021-04-07 17:54:37 +08:00
wangjiahao
09b772bc18 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/components/Editor/PreviewEject.vue
 2021-04-07 11:15:32 +08:00
wangjiahao
547801ceeb feat:预览增加自适应屏幕尺寸功能 2021-04-07 11:12:02 +08:00
fit2cloud-chenyw
26a25d0338 feat: 删除debugger 2021-04-07 09:49:07 +08:00
fit2cloud-chenyw
a783be2556 feat: 过滤组件弹框选择数据 2021-04-06 19:10:16 +08:00
wangjiahao
1538ff6406 feat:增加预览连接功能 2021-04-06 15:07:13 +08:00
wangjiahao
c4cea61e5e feat:修复编辑视图后 原有画布样式还原问题 2021-04-01 18:54:14 +08:00
wangjiahao
334638adf4 feat:画布增加视图编辑功能 2021-04-01 18:36:51 +08:00
wangjiahao
2d7ad3224b feat:画布切换修改 2021-04-01 17:40:12 +08:00
fit2cloud-chenyw
7fe40040a2 Merge remote-tracking branch 'origin/main' into main 2021-04-01 13:34:06 +08:00
fit2cloud-chenyw
f89f1726cc feat: 过滤组件样式调整 2021-04-01 13:33:40 +08:00
wangjiahao
d7d4c77b66 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-01 11:50:27 +08:00
wangjiahao
c87a6f132c feat:仪表盘预览 2021-04-01 11:38:30 +08:00
fit2cloud-chenyw
ebf90fb02a feat: 组件解偶 使用继承 2021-03-31 18:23:43 +08:00
fit2cloud-chenyw
e3c6b951dc feat: 增加视图和组件判断 2021-03-31 16:35:10 +08:00
fit2cloud-chenyw
8bbb8c7e9b feat: 封装条件组件类 2021-03-30 19:01:46 +08:00
wangjiahao
af24ba2733 feat:封装画布组件 2021-03-30 16:11:59 +08:00
wangjiahao
8016aba46a feat:将画布整合在组件中 2021-03-30 15:38:32 +08:00
fit2cloud-chenyw
ab2a840bd5 feat: 封装条件组件 2021-03-29 21:24:33 +08:00
wangjiahao
50c692fefb feat:恢复冲突 2021-03-29 15:49:29 +08:00
wangjiahao
c154e642c1 Merge remote-tracking branch 'origin/main' into main 2021-03-29 14:57:19 +08:00
wangjiahao
873a03065c feat:增加仪表盘预览等功能 2021-03-29 14:57:04 +08:00
fit2cloud-chenyw
12a226643c feat: 完善公共链接分享 2021-03-29 14:15:39 +08:00
wangjiahao
208878c062 feat:恢复样式 2021-03-26 12:26:48 +08:00
wangjiahao
fcb579d439 feat:增加背景图片 2021-03-26 11:37:32 +08:00
wangjiahao
0a75df5838 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/main.js
 2021-03-25 19:17:25 +08:00
wangjiahao
5db39b5855 feat:更换画布 2021-03-25 19:16:32 +08:00
fit2cloud-chenyw
1eae5f2e37 feat: 创建公共链接 2021-03-25 18:58:05 +08:00
fit2cloud-chenyw
cd41a0684e feat: 仪表板预览 2021-03-23 18:17:31 +08:00
fit2cloud-chenyw
1e21d68157 feat: 仪表板编辑 2021-03-23 17:16:51 +08:00
fit2cloud-chenyw
fb23a459dd feat: 去除测试数据 2021-03-23 14:05:32 +08:00
fit2cloud-chenyw
3b87239aa2 feat: 仪表板选择视图 2021-03-23 13:58:49 +08:00
fit2cloud-chenyw
621e92a06d feat: 格式化 2021-03-23 09:44:44 +08:00
fit2cloud-chenyw
7d248904d3 feat: 合并仪表板代码 2021-03-22 19:05:35 +08:00
wangjiahao
7a529b29d5 Merge remote-tracking branch 'origin/main' into main 2021-03-22 17:27:38 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
fit2cloud-chenyw
7cd71cd601 feat: 仪表板布局 2021-03-19 18:01:45 +08:00
wangjiahao
69ae877b0a feat:格式化代码 2021-03-19 17:06:52 +08:00
wangjiahao
3937624c57 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/vue-drag-resize-rotate/index.vue
#	frontend/src/store/modules/panel.js
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-03-19 15:57:29 +08:00
wangjiahao
592f08ac7b feat:增加仪表盘设计组件及设计 自适应view 组件 2021-03-19 15:54:35 +08:00
fit2cloud-chenyw
670a640606 feat: 分享面板懒加载且动态刷新 2021-03-19 10:00:41 +08:00
fit2cloud-chenyw
9d1a7e4e0f feat: 完善分享列表 2021-03-18 18:30:10 +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
fit2cloud-chenyw
cdbc7ea9ee Merge remote-tracking branch 'origin/main' into main 2021-03-17 18:38:40 +08:00
wangjiahao
1f6f8503b4 feat:增加仪表盘设计组件及设计 增加面板中 view 删除功能 2021-03-17 16:30:40 +08:00
fit2cloud-chenyw
8367033bb4 feat: 仪表盘分享tab 2021-03-17 11:22:18 +08:00
fit2cloud-chenyw
7f4a9d6bd2 feat: 仪表盘分享首次提交 2021-03-16 18:28:19 +08:00
fit2cloud-chenyw
46d24a17bc feat: 删除前端工程中meterSphere组件 2021-03-16 17:53:43 +08:00
fit2cloud-chenyw
2441edd166 feat: ESLint插件格式化前端代码 2021-03-16 12:02:30 +08:00
wangjiahao
915ccf326e feat:增加仪表盘设计组件及设计 2021-03-16 11:38:20 +08:00
wangjiahao
8b80d8fa72 feat:增加仪表盘设计组件及设计 2021-03-12 16:08:55 +08:00
fit2cloud-chenyw
c34ad9a026 feat: ESlint格式化前端代码 2021-03-08 21:10:16 +08:00
wangjiahao
fe9d8a2d44 feat:仪表盘 2021-03-08 18:43:28 +08:00
wangjiahao
f46912392c feat:仪表盘 2021-03-08 14:31:09 +08:00