Commit Graph

2948 Commits

Author SHA1 Message Date
taojinlong
71dc641459 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 22:24:47 +08:00
taojinlong
45140eb362 refactor: 调整顺序 2022-05-23 22:24:22 +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
6b8dbf5093 refactor: 下架显示优化 2022-05-23 16:36:27 +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
taojinlong
13aff751f8 feat: 驱动管理的日志记录 2022-05-22 11:39:10 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00
wangjiahao
8f37ee68c9 refactor: 修改SvgIcon组件,未找到class显示未发现图标防止报错 2022-05-20 20:41:45 +08:00
wangjiahao
a3767831f6 refactor: 丰富富文本插件 2022-05-20 20:16:29 +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
taojinlong
ad01a695b4 feat: 支持数据源驱动管理 2022-05-20 00:31:17 +08:00
wangjiahao
0d7e913ad3 refactor: 插件样式设置兼容 2022-05-19 21:14:27 +08:00
wangjiahao
7db5e73125 Merge remote-tracking branch 'origin/dev' into dev 2022-05-19 18:17:37 +08:00
wangjiahao
9ae6b82113 refactor: 优化仪表板下架逻辑,下架禁止查看 2022-05-19 18:16:33 +08:00
王嘉豪
cb9f427782
Merge pull request #2282 from dataease/pr@dev@refactor_panel-unpublished
refactor: 优化仪表板下架逻辑,下架禁止查看
2022-05-19 17:59:12 +08:00
wangjiahao
f0b9d02603 refactor: 优化仪表板下架逻辑,下架禁止查看 2022-05-19 17:58:19 +08:00
王嘉豪
1cab504402
Merge pull request #2275 from dataease/pr@dev@feat_fulltext
feat: 新增富文本编辑器
2022-05-19 14:01:12 +08:00
wangjiahao
66925df6f9 feat: 新增富文本编辑器 2022-05-19 14:00:00 +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
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
6ca15ce455
Merge pull request #2271 from dataease/pr@dev@feat_log
feat: 操作日志
2022-05-18 18:17:31 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +08:00
wangjiahao
aee2fd9bcf refactor: 模版管理优化,系统模板的管理需要授权 2022-05-17 14:42:03 +08:00
wangjiahao
aae5c707ac refactor: 优化辅助方格显示 2022-05-17 13:18:25 +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
junjun
f46191784b feat: 维度自定义排序 2022-05-16 15:23:55 +08:00
wangjiahao
202539a6bf refactor: 画布区域按钮样式优化 2022-05-16 14:57:39 +08:00
王嘉豪
3d0c8b3b56
Merge pull request #2254 from dataease/pr@dev@feat_panel-publish
refactor: 仪表板列表增加发布标识
2022-05-16 14:33:59 +08:00
wangjiahao
f58f270f41 refactor: 仪表板列表增加发布标识 2022-05-16 14:33:17 +08:00
王嘉豪
3932264403
Merge pull request #2253 from dataease/pr@dev@feat_panel-publish
feat: 仪表板支持发布功能
2022-05-16 13:35:33 +08:00
wangjiahao
bd5409b8d4 feat: 仪表板支持发布功能 2022-05-16 13:34:38 +08:00