Commit Graph

3029 Commits

Author SHA1 Message Date
王嘉豪
99d7fb2b98
Merge pull request #2310 from dataease/pr@dev@refactor_rich-text
refactor: 优化富文本工具栏分组
2022-05-26 11:38:24 +08:00
wangjiahao
c1c8f7a18e refactor: 优化富文本工具栏分组 2022-05-26 11:37:33 +08:00
taojinlong
5490dd15bb Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 11:35:48 +08:00
taojinlong
f4b52c5489 fix: 国际化错误 2022-05-26 11:35:39 +08:00
dataeaseShu
c7133be62d
Merge pull request #2307 from dataeaseShu/pr@dev_feat_filter_position_text
feat(textattr+deoutwidet): 【仪表板】筛选框文字支持排列设置(靠上、居中等)
2022-05-26 10:18:19 +08:00
dataeaseShu
71dc03b4be feat: 【仪表板】筛选框文字支持排列设置(靠上、居中等) 2022-05-26 10:10:07 +08:00
王嘉豪
539a8993b5
Merge pull request #2308 from dataease/pr@dev@refactor_view-copy
refactor: 复用存量视图自动勾选
2022-05-26 09:59:04 +08:00
wangjiahao
27fe16fd0a refactor: 复用存量视图自动勾选 2022-05-26 09:58:00 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00
taojinlong
e0b380f1ca Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-25 20:24:59 +08:00
taojinlong
5582e7797a fix: 新建数据源时,驱动选项无法选择上 2022-05-25 20:24:51 +08:00
taojinlong
8f33d3779e fix: 新建同步任务时数据集无数据无需提示“请先完成数据同步” 2022-05-25 20:24:29 +08:00
wangjiahao
fb894df6c9 refactor: 富文本增加字体选项 2022-05-25 17:51:19 +08:00
wangjiahao
9135aa4e97 fix: 修复富文本表格、图片等拖拽焦点编辑时错位问题 2022-05-25 16:54:44 +08:00
wangjiahao
e176d364c6 fix: 修复复用存量视图未清理历史选择框的问题 2022-05-25 14:51:15 +08:00
wangjiahao
929d1f64e2 fix: 修复批量设置标题颜色改变未生效问题 2022-05-25 14:09:24 +08:00
wangjiahao
46c00aa3f4 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 13:41:30 +08:00
wangjiahao
19d344f4df refactor: 视图编辑工具栏宽度扩大适配 2022-05-25 13:36:26 +08:00
taojinlong
8d517f450d fix: 替换excel数据集时提示信息显示不正确 2022-05-25 12:55:03 +08:00
wangjiahao
73a9a0bd05 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 10:54:16 +08:00
wangjiahao
d8c73873a2 feat: 仪表板复用时支持选择存量视图 2022-05-25 10:53:50 +08:00
taojinlong
a346a7718d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-24 23:05:35 +08:00
taojinlong
c29875ffa9 feat: 替换excel时,提示信息 2022-05-24 23:05:25 +08:00
wangjiahao
1a75c3ed33 Merge remote-tracking branch 'origin/dev' into dev 2022-05-24 22:32:31 +08:00
wangjiahao
da26a5b40f feat: 仪表板编辑时可以按照仪表板复用视图 2022-05-24 22:32:11 +08:00
fit2cloud-chenyw
43eaf4809c
Merge pull request #2299 from dataease/pr@dev@perf_de_log
perf: 优化审计日志
2022-05-24 17:56:50 +08:00
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +08:00
junjun
e94cd85d17 refactor: 视图样式配置项优化 2022-05-24 17:37:16 +08:00
wangjiahao
292ecf16d5 refactor: 批量操作记录所有合并属性 2022-05-24 10:06:32 +08:00
junjun
b84e9aabb0 feat: 自定义颜色 2022-05-24 10:01:47 +08:00
taojinlong
540d1f1620 refactor: 调整顺序 2022-05-23 23:19:03 +08:00
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
junjun
620ff4af58 feat: 维度自定义排序 2022-05-16 13:25:56 +08:00
fit2cloudrd
866a840dc5
feat: 仪表板编辑视图支持批量设置样式 (#2238)
* feat: 仪表板编辑视图支持多选

* feat: 仪表板编辑视图支持批量设置样式

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-05-15 22:22:54 +08:00
junjun
a9a2832932 feat: 维度自定义排序 2022-05-15 11:09:39 +08:00
fit2cloud-chenyw
a350372ed5 feat: 仪表板条件组件设置标题位置 2022-05-12 18:12:21 +08:00
fit2cloud-chenyw
3ad6dd6f28 fix: 异步加载默认登录方式 2022-05-12 16:28:50 +08:00
fit2cloud-chenyw
0f015c764e fix: 默认登录方式无效 2022-05-12 15:52:09 +08:00
junjun
757f7774a2 feat: 自定义排序 2022-05-11 21:48:50 +08:00
junjun
6b12ba6a20 revert: rollback 2022-05-11 13:11:59 +08:00
fit2cloud-chenyw
2e0d919066
Merge pull request #2241 from dataease/pr@dev@feat_symbol_map_perf
feat: 适配符号地图插件
2022-05-10 17:09:45 +08:00
fit2cloud-chenyw
971e097ae2 feat: 适配符号地图插件 2022-05-10 17:08:00 +08:00
junjun
2d4b26ebf7 feat: 维度自定义排序 2022-05-10 11:38:08 +08:00
satan
5d674fcca9 修复[issue 1298](https://github.com/dataease/dataease/issues/1298) :"个人信息建议可以修改某些字段" 2022-05-10 10:48:58 +08:00
wangjiahao
b9bdfa3486 refactor: 视图样式处理逻辑抽取 2022-05-09 15:49:19 +08:00
junjun
6c0132c23c test: 临时提交测试 2022-05-09 14:27:49 +08:00
junjun
03a257d447 feat: 辅助线增加显示名称同时位置跟随坐标轴 2022-05-09 10:21:59 +08:00
wangjiahao
c8b37c0f48 feat: 仪表板编辑状态时,拦截浏览器路由切换 2022-05-07 10:43:08 +08:00
junjun
fe0be547fd feat: 视图显示名额外显示原始名 2022-05-06 16:11:22 +08:00
fit2cloud-chenyw
41d8b5c92a feat: 默认登录方式设置 2022-05-05 16:26:51 +08:00
fit2cloud-chenyw
a8b7350012 fix: tab中放地图钻取后查看详情图形错误 2022-05-04 17:55:15 +08:00