Commit Graph

699 Commits

Author SHA1 Message Date
wangjiahao
24ad42cf7d Merge remote-tracking branch 'origin/dev' into dev 2022-05-31 16:55:45 +08:00
wangjiahao
d69ebb8ea7 refactor: 模板导入适配新的视图逻辑 2022-05-31 16:54:19 +08:00
junjun
9371b19e5e fix: 恢复视图轴值设置 2022-05-31 16:53:40 +08:00
王嘉豪
027303776e
Merge pull request #2357 from dataease/pr@dev@refactor_style-time
fix: 修复文本卡,时间组件内边距设置失效问题
2022-05-30 18:35:46 +08:00
wangjiahao
b9c265febb fix: 修复文本卡,时间组件内边距设置失效问题 2022-05-30 18:35:01 +08:00
王嘉豪
786a785c8a
Merge pull request #2355 from dataease/pr@dev@refactor_label-color
fix: 复制仪表板,指标卡颜色丢失
2022-05-30 18:04:47 +08:00
wangjiahao
57a7d491db fix: 复制仪表板,指标卡颜色丢失 2022-05-30 18:01:31 +08:00
junjun
fefa99da66 revert: 恢复误删 2022-05-30 17:54:21 +08:00
junjun
ea3fa03350 refactor: 视图字段快速删除样式优化 2022-05-30 17:53:55 +08:00
王嘉豪
2db9553acc
Merge pull request #2354 from dataease/pr@dev@refactor_self-color
refactor: 自定义颜色设置优化
2022-05-30 17:09:27 +08:00
wangjiahao
fa49b2763e refactor: 自定义颜色设置优化 2022-05-30 17:08:37 +08:00
junjun
3edd250c9b refactor: 视图字段快速删除样式优化 2022-05-30 15:18:55 +08:00
wangjiahao
488044bde5 refactor: 批量操作样式优化 2022-05-30 14:42:00 +08:00
junjun
57330d34df feat: 自定义颜色 2022-05-26 18:24:17 +08:00
junjun
db215743e8 fix: 批量操作配置 2022-05-26 17:12:50 +08:00
王嘉豪
7b29538822
Merge pull request #2315 from dataease/pr@dev@refactor_bat-opt
refator: 批量样式设置显示优化
2022-05-26 14:16:30 +08:00
wangjiahao
b0b46fd4c1 refator: 批量样式设置显示优化 2022-05-26 14:15:48 +08:00
王嘉豪
653f539c28
Merge pull request #2312 from dataease/pr@dev@refactor_bat-opt
fix: 批量设置视图样式时,若样式菜单过长,则无法滚动选择到底部的样式选项
2022-05-26 12:09:31 +08:00
wangjiahao
ca41d05200 fix: 批量设置视图样式时,若样式菜单过长,则无法滚动选择到底部的样式选项 2022-05-26 12:08:40 +08:00
taojinlong
e0b380f1ca Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-25 20:24:59 +08:00
taojinlong
8f33d3779e fix: 新建同步任务时数据集无数据无需提示“请先完成数据同步” 2022-05-25 20:24:29 +08:00
wangjiahao
929d1f64e2 fix: 修复批量设置标题颜色改变未生效问题 2022-05-25 14:09:24 +08:00
wangjiahao
19d344f4df refactor: 视图编辑工具栏宽度扩大适配 2022-05-25 13:36:26 +08:00
junjun
e94cd85d17 refactor: 视图样式配置项优化 2022-05-24 17:37:16 +08:00
junjun
b84e9aabb0 feat: 自定义颜色 2022-05-24 10:01:47 +08:00
wangjiahao
b279dd9660 Merge remote-tracking branch 'origin/dev' into dev 2022-05-23 20:44:39 +08:00
junjun
7fa3c0ac53 feat: 自定义颜色 2022-05-23 18:48:45 +08:00
junjun
df759a6ae8 feat: 自定义颜色 2022-05-23 18:27:57 +08:00
wangjiahao
6930dda995 style: 样式修改 2022-05-23 18:19:52 +08:00
wangjiahao
8ee057aac3 refactor: 批量修改样式优化 2022-05-23 15:06:07 +08:00
wangjiahao
544ea07e57 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/views/chart/chart/util.js
#	frontend/src/views/chart/view/ChartEdit.vue
#	frontend/src/views/chart/view/ChartStyle.vue
2022-05-23 13:31:03 +08:00
wangjiahao
9041866e9c refactor: 批量修改样式优化 2022-05-23 13:23:39 +08:00
junjun
3889eff052 feat: 自定义颜色 2022-05-23 11:15:44 +08:00
fit2cloud-chenyw
b72955204d fix: 仪表板浏览器console报错 2022-05-23 11:08:02 +08:00
fit2cloud-chenyw
5a78aa0599
Merge pull request #2291 from dataease/pr@dev@feat_marker_map_label
feat: 气泡地图增加标签字段设置
2022-05-23 10:40:28 +08:00
fit2cloud-chenyw
0c25b5f553 feat: 气泡地图增加标签字段设置 2022-05-23 10:38:16 +08:00
junjun
4fe718bb45 feat: 自定义颜色 2022-05-23 10:23:36 +08:00
wangjiahao
9f01bc4ee0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/views/chart/view/ChartStyle.vue
#	frontend/src/views/panel/list/PanelMain.vue
2022-05-20 13:08:51 +08:00
wangjiahao
fec7a67787 refactor: 批量修改样式优化 2022-05-20 13:08:26 +08:00
wangjiahao
0066fe6000 Merge remote-tracking branch 'origin/dev' into dev 2022-05-20 12:35:16 +08:00
wangjiahao
704cb29d19 refactor: 批量修改样式优化 2022-05-20 12:34:47 +08:00
junjun
fef7dd1e22 feat: 自定义颜色 2022-05-20 10:30:13 +08:00
wangjiahao
0d7e913ad3 refactor: 插件样式设置兼容 2022-05-19 21:14:27 +08:00
fit2cloud-chenyw
bac23c3c4a
Merge pull request #2274 from dataease/pr@dev@fix_plugin_view_miss
fix: 插件视图属性和样式无法显示
2022-05-19 10:51:35 +08:00
fit2cloud-chenyw
2398e685fb fix: 插件视图属性和样式无法显示 2022-05-19 10:49:57 +08:00
junjun
50233116f6 feat: 视图编辑块字段增加快速删除按钮 2022-05-19 10:23:05 +08:00
wangjiahao
57961f6ca9 refactor: 代码结构优化 2022-05-16 19:54:28 +08:00
王嘉豪
b400d42513
Merge pull request #2262 from dataease/pr@dev@refactor_button-style
refactor: 画布内存使用优化
2022-05-16 19:27:01 +08:00
wangjiahao
7f1712f898 refactor: 画布内存使用优化 2022-05-16 19:26:16 +08:00
junjun
1c0c09acc7 feat: 维度自定义排序 2022-05-16 15:43:03 +08:00