center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,320 Commits 1 Branch 86 Tags 417 MiB
a8b7350012
Commit Graph

837 Commits

Author SHA1 Message Date
wangjiahao
89652ad890 feat: 仪表板支持接收外部参数 2022-03-17 21:14:19 +08:00
wangjiahao
9a8cc0c14a feat: 仪表板模板保存支持保存临时数据 2022-03-14 21:15:33 +08:00
wangjiahao
7173b0f031 refactor: 增加高级选项设置内容实时显示 2022-03-11 16:32:23 +08:00
junjun
b4b736de7e feat: 文本卡 2022-03-10 13:34:19 +08:00
wangjiahao
fea735fb5d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
#	frontend/src/views/chart/view/ChartEdit.vue
 2022-03-10 10:48:18 +08:00
wangjiahao
cf55778229 feat: 视图所有操作移到仪表板 2022-03-10 10:38:33 +08:00
fit2cloud-chenyw
92961673a6 fix: tabs选项卡切换后条件无效 2022-03-03 14:33:43 +08:00
fit2cloud-chenyw
c380781c3b refactor: 分享列表仪表板使用代理权限查看 2022-03-01 21:02:40 +08:00
王嘉豪
f4f80d0b38
Merge branch 'dev' into v1.8 2022-03-01 16:20:38 +08:00
wangjiahao
d25e764fda fix: 修复边框选不上的问题 2022-03-01 16:16:09 +08:00
wangjiahao
50ba73d7ad fix: 时钟样式改变保存按钮未高亮问题 2022-03-01 14:46:18 +08:00
wangjiahao
f7a6051841 refactor: 优化视图跳转设置弹框样式 2022-03-01 12:04:03 +08:00
wangjiahao
9585dc5c9d fix: 气泡地图间隙太大问题 2022-02-28 12:14:49 +08:00
junjun
5141f52abb refactor: 视图权限 2022-02-28 11:19:32 +08:00
wangjiahao
b6cc7fca7d Merge remote-tracking branch 'origin/dev' into dev 2022-02-24 18:14:47 +08:00
wangjiahao
c32fce753d fix: 历史仪表板的公共链接打不开的问题 2022-02-24 18:14:32 +08:00
fit2cloud-chenyw
1072f14204 fix: tabs初始化条件报错 2022-02-24 18:11:49 +08:00
fit2cloud-chenyw
0a63bf4e88 fix: tabs组件中的视图全屏预览错误 2022-02-24 12:33:37 +08:00
fit2cloud-chenyw
af2f2d85c9
Merge pull request #1815 from dataease/pr@dev@fix_buddle_map_zoom 
fix: 气泡地图放大无法显示
 2022-02-23 18:26:25 +08:00
fit2cloud-chenyw
a5c93490e9 fix: 气泡地图放大无法显示 2022-02-23 18:25:04 +08:00
wangjiahao
2ca712521a refactor: tab组件加入视图直接进行复制 2022-02-23 18:21:52 +08:00
wangjiahao
6f9deb1530 refactor: 新建或拖入的组件加上背景设置基本元素 2022-02-23 15:57:26 +08:00
wangjiahao
2dc8325dbb refactor: 文案修改 2022-02-23 15:46:23 +08:00
wangjiahao
a4e55c3fb6 feat: 仪表板组件背景支持上传图片 2022-02-23 15:15:56 +08:00
王嘉豪
ef6d790035
revert: 视图组件支持设置背景图片 
* feat: 视图组件支持设置背景图片

* feat: 视图组件支持设置背景图片

* refactor: 增加白名单

* Revert "feat: 视图组件支持设置背景图片"

This reverts commit fe63b85f09.

# Conflicts:
#	frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
 2022-02-23 12:10:40 +08:00
wangjiahao
0760bd7db1 feat: 仪表板可以对组件设置边框 2022-02-22 21:55:47 +08:00
wangjiahao
63acd92705 Merge remote-tracking branch 'origin/dev' into dev 2022-02-21 17:58:49 +08:00
wangjiahao
fe63b85f09 feat: 视图组件支持设置背景图片 2022-02-21 17:58:33 +08:00
fit2cloud-chenyw
a1f5deaf82 feat: 过滤条件穿透到tab组件内部视图 2022-02-21 16:23:08 +08:00
fit2cloud-chenyw
819a083bae feat: 气泡地图国际化 2022-02-21 12:42:02 +08:00
fit2cloud-chenyw
c1ec061127 refactor: 完善视图插件 2022-02-18 17:44:16 +08:00
fit2cloud-chenyw
4671ea996e feat: 兼容插件视图样式设置 2022-02-17 18:39:44 +08:00
fit2cloud-chenyw
e1ed447063 refactor: 仪表板兼容插件视图 2022-02-17 14:22:30 +08:00
wangjiahao
a58f92ed03 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
 2022-02-14 18:58:33 +08:00
wangjiahao
769b7bc271 feat: 视图归属于仪表板，去掉视图菜单 2022-02-14 18:57:35 +08:00
fit2cloud-chenyw
0aa2a69ff1 feat: 仪表板集成插件视图 2022-02-14 10:08:28 +08:00
wangjiahao
330bd29232 fix: 修复新tab页预览无法打开的问题 2022-02-10 17:10:58 +08:00
fit2cloud-chenyw
a846a8fe74 fix: 日期过滤默认值兼容老版本 2022-02-08 10:58:40 +08:00
junjie
9fc6cedca3 feat: S2 Event 2022-02-07 13:13:50 +08:00
fit2cloud-chenyw
c370079b02 fix: 条件组件兼容老版本 2022-02-05 22:59:34 +08:00
fit2cloud-chenyw
2499f1c354 fix: 数字范围默认值导致仪表板空白 2022-02-05 22:32:59 +08:00
junjie
66b75928b3 feat: S2明细表 2022-01-31 12:07:10 +08:00
wangjiahao
473055f5f3 refactor: 当前过滤组件有默认值时无效触发保存 2022-01-30 10:02:16 +08:00
wangjiahao
e55c06e51b fix: 修复移动端一直加载问题 2022-01-30 09:44:17 +08:00
taojinlong
501d455e05 Merge branch 'v1.7' into dev 2022-01-28 20:01:36 +08:00
wangjiahao
44eb82eaf9 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时，页面未刷新问题 2022-01-28 13:41:41 +08:00
wangjiahao
de581d2214 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时，页面未刷新问题 2022-01-28 13:34:32 +08:00
fit2cloud-chenyw
ccbd5eccc6 fix: 文本过滤组件空默认值异常 2022-01-28 11:42:59 +08:00
fit2cloud-chenyw
6f5fec6928 fix: 文本过滤组件空默认值异常 2022-01-28 11:40:42 +08:00
fit2cloud-chenyw
ac3fa4eca6 fix: 日期范围动态时间季度错误 2022-01-28 11:03:32 +08:00
fit2cloud-chenyw
c8e15a2162 fix: 日期范围动态时间季度错误 2022-01-28 11:01:34 +08:00
fit2cloud-chenyw
d0c55751c7 fix: 数字区间组件不能正常显示 2022-01-27 18:00:43 +08:00
fit2cloud-chenyw
31f9735ab2 fix: 数字区间组件不能正常显示 2022-01-27 17:57:23 +08:00
fit2cloud-chenyw
8207b12e1b fix: 仪表板编辑显示空白 2022-01-27 16:23:57 +08:00
fit2cloud-chenyw
eb6fbc7b5c fix: 仪表板编辑显示空白 2022-01-27 16:20:34 +08:00
fit2cloud-chenyw
0c8bdb20d2 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:09:38 +08:00
fit2cloud-chenyw
d8f211b34e
Merge pull request #1704 from dataease/pr@v1.7@fix_view_mult_request 
fix: 仪表板过滤组件首次加载失效
 2022-01-27 11:07:38 +08:00
fit2cloud-chenyw
ddfd392858 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:06:29 +08:00
wangjiahao
227e82969c fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:15:26 +08:00
wangjiahao
e47443adef fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:05:56 +08:00
wangjiahao
58a76eca08 refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:17:21 +08:00
wangjiahao
0b4581fd98 Merge remote-tracking branch 'origin/v1.7' into v1.7 2022-01-26 14:15:53 +08:00
wangjiahao
6f7a8c56da refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:15:34 +08:00
fit2cloud-chenyw
565d288b1d fix: 下拉列表组件逻辑错误 2022-01-26 13:27:58 +08:00
fit2cloud-chenyw
7b290dc643 fix: 下拉列表组件逻辑错误 2022-01-26 13:26:04 +08:00
wangjiahao
9885b9cc4a feat: 仪表板预览界面支持刷新，仪表板加载代码优化 2022-01-25 16:38:19 +08:00
taojinlong
a639ba1374 refactor: 冲突 2022-01-25 13:58:51 +08:00
fit2cloudrd
6dcf172546
refactor: 移动端样式修改 (#1685) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-25 12:11:47 +08:00
fit2cloudrd
8f2539cbdc
refactor: 移动端样式修改 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-25 12:02:51 +08:00
wangjiahao
178c91e692 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:35:44 +08:00
wangjiahao
3f232a36a6 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:34:12 +08:00
wangjiahao
65139d788a fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:50:29 +08:00
wangjiahao
5c511339c8 fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:48:53 +08:00
wangjiahao
bc998c9d79 fix: 移动端布局自动滚动移动到顶部组件高度变大问题 2022-01-20 17:03:38 +08:00
wangjiahao
372685035e refactor: 移动端布局拖动组件接近上下边界画布可以自动滚动 2022-01-20 11:33:41 +08:00
wangjiahao
c0f0a6fa3d fix: 防止新建视图一直loading 2022-01-18 16:52:28 +08:00
fit2cloud-chenyw
93d749f573 fix: 动态年月逻辑错误 2022-01-14 17:34:35 +08:00
wangjiahao
7a61f375fa Merge remote-tracking branch 'origin/dev' into dev 2022-01-14 14:30:16 +08:00
wangjiahao
411db74fe4 refactor: 样式修改 2022-01-14 14:30:00 +08:00
fit2cloud-chenyw
9280b2983e
Merge pull request #1643 from dataease/pr@dev@fix_panel_filter 
fix: 过滤组件默认值不能覆盖编辑的预览值
 2022-01-14 14:24:20 +08:00
fit2cloud-chenyw
8700045786 fix: 过滤组件默认值不能覆盖编辑的预览值 2022-01-14 14:21:34 +08:00
wangjiahao
c287b41afb refactor: 组件间隙在有背景颜色时也保持一致 2022-01-14 10:57:36 +08:00
wangjiahao
6cfd2a9a13 feat: 仪表板允许对原有图片组件直接更换 2022-01-13 16:22:53 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
2170371b02 refactor: 优化年月过滤组件动态时间 2022-01-12 11:27:34 +08:00
fit2cloud-chenyw
7d9214c203 feat: 年份、年月组件增加动态时间 2022-01-11 16:30:47 +08:00
fit2cloud-chenyw
44ba1f8db6 fix: 动态日期过滤组件月份逻辑 2022-01-10 12:06:42 +08:00
fit2cloud-chenyw
dc4c9ca3ac fix: 动态时间组件 2022-01-07 14:14:22 +08:00
taojinlong
93ff28704d fix: 兼容以前的公共链接 2022-01-06 15:16:50 +08:00
wangjiahao
abf8d04569 style: 样式修改 2021-12-31 16:16:30 +08:00
wangjiahao
69d53f0bb6 fix: 过滤组件标题不同仪表板大小时显示位置不同问题 2021-12-31 15:34:05 +08:00
wangjiahao
239b649bca refactor: 优化文字组件FontSize值范围设置 2021-12-31 11:27:36 +08:00
fit2cloud-chenyw
5701437698 fix: 下拉列表逻辑 2021-12-31 10:29:26 +08:00
王嘉豪
6b7c0671bd
Merge pull request #1575 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 19:05:29 +08:00
wangjiahao
34455d7ef2 refactor: 过滤组件初始化优化，适配历史过滤组件 2021-12-30 19:04:23 +08:00
王嘉豪
80a502e989
Merge pull request #1574 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 18:32:54 +08:00
wangjiahao
678581d484 refactor: 过滤组件初始化优化，适配历史过滤组件 2021-12-30 18:31:57 +08:00
王嘉豪
f582cb3d83
Merge pull request #1570 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 17:17:48 +08:00
wangjiahao
5f31ed7ed9 refactor: 过滤组件初始化优化，视频历史过滤组件 2021-12-30 17:14:17 +08:00
王嘉豪
79f82c274d
Merge pull request #1569 from dataease/pr@dev@feat-mobile-reset 
refactor: 国际化
 2021-12-30 15:59:27 +08:00
wangjiahao
4d8bb2d7d5 refactor: 国际化 2021-12-30 15:58:37 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
fit2cloudrd
2dfe2e3cc0
style: 样式修改 (#1563) 
* style: 样式修改

* style: 样式修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-30 14:30:37 +08:00
wangjiahao
f20b58df80 style: 样式修改 2021-12-30 14:29:51 +08:00
wangjiahao
b011aaab98 style: 样式修改 2021-12-30 12:32:23 +08:00
wangjiahao
f29b660819 refactor: 仪表板间隙设置优化 2021-12-30 11:47:26 +08:00
fit2cloudrd
a386b6f2c7
style: 样式修改 
style: 样式修改
 2021-12-29 18:52:48 +08:00
wangjiahao
1740e4901d feat: 移动端布局增加重置功能 2021-12-29 12:22:10 +08:00
fit2cloud-chenyw
12ab1999a4
Merge pull request #1551 from dataease/pr@dev@fix_filter_decimal 
fix: 过滤组件对小数不支持
 2021-12-29 12:09:12 +08:00
fit2cloud-chenyw
ed63b1d8b0 fix: 过滤组件对小数不支持 2021-12-29 12:08:07 +08:00
wangjiahao
944c160e99 Merge remote-tracking branch 'origin/dev' into dev 2021-12-29 11:54:31 +08:00
fit2cloud-chenyw
cfcf7c9513 fix: 动态时间组件无效 2021-12-29 11:47:31 +08:00
wangjiahao
9fa671d166 style: tab组件样式修改 2021-12-29 11:39:21 +08:00
wangjiahao
398d40520c Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 18:45:16 +08:00
wangjiahao
63f87ad59d refactor: 未获取地图数据，控制台不用报错 2021-12-28 18:44:03 +08:00
wangjiahao
dfe1fd4859 refactor: 代码回退 2021-12-28 18:23:47 +08:00
fit2cloud-chenyw
6f9eb29ca7
Merge pull request #1544 from dataease/pr@dev@fix_preview_filter_valid 
fix: 仪表板预览过滤条件失效
 2021-12-28 18:11:36 +08:00
fit2cloud-chenyw
a39ed6a8c0 fix: 仪表板预览过滤条件失效 2021-12-28 18:09:54 +08:00
taojinlong
96a830ebaf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 17:18:00 +08:00
fit2cloud-chenyw
7ebb9b3be4 fix: 下拉列表单选框不能取消 2021-12-28 17:00:34 +08:00
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f90466bc23 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 15:16:51 +08:00
wangjiahao
a725f0fa5d refactor: 移动端视图明细背景优化 2021-12-28 15:15:55 +08:00
taojinlong
ec29826365 fix: token 过期时，上传 excel 跳转登陆页 2021-12-28 15:14:17 +08:00
fit2cloud-chenyw
62a9a50899 fix: 时间范围动态时间兼容老版本 2021-12-27 18:28:55 +08:00
fit2cloud-chenyw
f678ae96ef
Merge pull request #1532 from dataease/pr@dev@feat_date_range_dynamic 
feat: 日期范围动态时间
 2021-12-27 18:09:13 +08:00
fit2cloud-chenyw
8b0c98e9cd feat: 日期范围动态时间 2021-12-27 18:04:59 +08:00
fit2cloudrd
c8814f9daa
fix: 文本搜索组件在预览和编辑时显示不一致 (#1529) 
fix: 文本搜索组件在预览和编辑时显示不一致
 2021-12-27 16:34:27 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
fit2cloud-chenyw
4cab403cb5
Merge branch 'dev' into pr@dev@style_panel_filter 2021-12-27 15:18:52 +08:00
fit2cloud-chenyw
d672f0ef49 style: 过滤组件样式 2021-12-27 15:15:09 +08:00
wangjiahao
4f8ea205d3 refactor: 移动端布局等待区域优化地图，时间组件排列方式 2021-12-27 14:21:00 +08:00
wangjiahao
0c8454323a refactor: 移动端布局组件等待区域靠左排列 2021-12-27 12:06:42 +08:00
wangjiahao
9485610a77 fix: 仪表板下拉列表组件选择未靠左排列 2021-12-27 11:16:11 +08:00
fit2cloud-chenyw
30564208ce fix: 兼容老版本日期控件 2021-12-24 19:04:05 +08:00
fit2cloud-chenyw
a7be631244
Merge pull request #1517 from dataease/pr@dev@fix_filters_logic 
fix: 过滤组件逻辑
 2021-12-24 18:44:33 +08:00
fit2cloud-chenyw
26047142ea fix: 过滤组件逻辑 2021-12-24 18:43:29 +08:00
fit2cloudrd
787ef75b06
refactor: 优化PC移动端布局切换，防止出现错误仪表板布局 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-24 17:54:28 +08:00
wangjiahao
71ae929234 Merge remote-tracking branch 'origin/dev' into dev 2021-12-24 17:29:21 +08:00
wangjiahao
db09c658e3 fix: 仪表板文字组件编辑文字可能保存不上问题 2021-12-24 17:29:08 +08:00
fit2cloud-chenyw
d5071d99bd fix: 动态日期逻辑 2021-12-24 17:10:01 +08:00
fit2cloud-chenyw
2acecb6709 style: 移动端适配布局 2021-12-24 14:37:22 +08:00
fit2cloud-chenyw
60e1e7cea9
Merge pull request #1510 from dataease/pr@dev@style_panel_left 
style: 仪表板组件样式
 2021-12-24 13:30:36 +08:00
fit2cloud-chenyw
7c37cccf79 style: 仪表板组件样式 2021-12-24 13:29:24 +08:00
wangjiahao
77db760939 fix: 修复移动端部分组件无法选中问题 2021-12-23 18:15:49 +08:00
wangjiahao
a2a9b51090 fix: 进行了移动设计后，仪表板没有改动，可连续保存 2021-12-23 15:46:43 +08:00
wangjiahao
5236b5ba21 feat: 图片支持超链接设置 2021-12-23 14:44:04 +08:00
wangjiahao
c3608e5ec2 refactor: 仪表板滚动时可以使过滤组件失去焦点隐藏弹框 2021-12-23 12:02:14 +08:00