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

3070 Commits

Author SHA1 Message Date
taojinlong
a4a665203d fix: 替换excel时，提示影响计算字段 2022-05-30 01:11:53 +08:00
fit2cloud-chenyw
b63ffb4513 fix: 接受消息设置联动错误 2022-05-29 11:01:22 +08:00
fit2cloud-chenyw
f1be625f7f style: 禁止数据源中修改全局控件样式，恢复关联数据集form中样式属性 2022-05-29 10:00:46 +08:00
taojinlong
9572a0fb58 fix: API 数据集校验错误 2022-05-28 22:21:28 +08:00
fit2cloud-chenyw
6fd3ccf91b fix: 恢复因为增加日志修改的api 2022-05-28 21:35:06 +08:00
wangjiahao
ec9f4c59c6 fix: 网页组件编辑状态遮罩未显示问题 2022-05-28 12:13:59 +08:00
taojinlong
fcc7430343 build: 升级版本号 2022-05-28 09:42:08 +08:00
wangjiahao
44c32293c4 fix: 已下架仪表板分享页面还能看到问题 2022-05-27 20:20:31 +08:00
taojinlong
0b04549d57 build: 升级版本 2022-05-27 16:51:32 +08:00
fit2cloud-chenyw
ade22509ec fix: tabs选项卡不能选择视图 2022-05-27 12:49:24 +08:00
fit2cloud-chenyw
75c1bc62cc
Merge pull request #2332 from dataease/pr@dev@fix_tree_single_multi_switch 
fix: 树过滤器单多模式切换
 2022-05-27 12:35:53 +08:00
fit2cloud-chenyw
adbd045bb7 fix: 树过滤器单多模式切换 2022-05-27 12:34:45 +08:00
王嘉豪
78bfb0cc58
Merge pull request #2331 from dataease/pr@dev@fix-panel-unpublished 
refactor: 仪表板未发布状态显示优化
 2022-05-27 12:09:11 +08:00
wangjiahao
c373863946 refactor: 仪表板未发布状态显示优化 2022-05-27 12:08:38 +08:00
王嘉豪
f7f73a9d16
Merge pull request #2327 from dataease/pr@dev@fix-panel-unpublished 
refactor: 仪表板未发布状态显示优化
 2022-05-27 10:54:14 +08:00
wangjiahao
ff7495d5f2 refactor: 仪表板未发布状态显示优化 2022-05-27 10:52:49 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
王嘉豪
ad830ee8fb
Merge pull request #2323 from dataease/pr@dev@fix_panel-symbol 
style: 富文本初始化文案修改
 2022-05-26 18:46:42 +08:00
wangjiahao
d50bbe7904 style: 富文本初始化文案修改 2022-05-26 18:46:02 +08:00
王嘉豪
dac21cfa13
Merge pull request #2322 from dataease/pr@dev@fix_panel-symbol 
fix: 移动端布局设置时符号地图显示问题
 2022-05-26 18:42:47 +08:00
wangjiahao
91ccc41c0b fix: 移动端布局设置时符号地图显示问题 2022-05-26 18:41:34 +08:00
junjun
e048d4cacd Merge remote-tracking branch 'origin/dev' into dev 2022-05-26 18:24:35 +08:00
junjun
57330d34df feat: 自定义颜色 2022-05-26 18:24:17 +08:00
fit2cloud-chenyw
0a677777ae style: 树形过滤器默认样式 2022-05-26 17:51:32 +08:00
fit2cloud-chenyw
d9772989b6 fix: 删除测试代码 2022-05-26 17:39:06 +08:00
fit2cloud-chenyw
d1dd787198
Merge pull request #2319 from dataease/pr@dev@perf_base_logic 
perf: 优化树形过滤器
 2022-05-26 17:37:32 +08:00
fit2cloud-chenyw
5113e93bb2 perf: 优化树形过滤器 2022-05-26 17:35:53 +08:00
junjun
db215743e8 fix: 批量操作配置 2022-05-26 17:12:50 +08:00
dataeaseShu
3b05d47567
Merge pull request #2317 from dataease/pr@dev_feat_filter_width 
feat: 【仪表板】筛选框文字支持排列设置（靠上、居中等）宽度自适应
 2022-05-26 15:35:51 +08:00
dataeaseShu
4880237964 feat: 【仪表板】筛选框文字支持排列设置（靠上、居中等）宽度自适应 2022-05-26 15:34:07 +08:00
taojinlong
68fb4980a1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 15:17:52 +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
fit2cloud-chenyw
a0fb3a62ad perf: 树形过滤器基本逻辑 2022-05-26 13:15:50 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select 
feat: 过滤条件增加下拉树
 2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +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
王嘉豪
4b74619a13
Merge pull request #2311 from dataease/pr@dev@refactor_rich-text 
fix: 复用视图，在预览视图时出现显示问题
 2022-05-26 11:47:38 +08:00
wangjiahao
72ad660a39 fix: 复用视图，在预览视图时出现显示问题 2022-05-26 11:47:04 +08:00
taojinlong
9f0659d37f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 11:44:44 +08:00
王嘉豪
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