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

3184 Commits

Author SHA1 Message Date
dataeaseShu
c6df81bfae feat: 编译优化 2022-06-08 11:09:23 +08:00
taojinlong
28d5912bc6 refactor: 升级版本号 2022-06-08 10:56:21 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
王嘉豪
a7a37a5043
Merge pull request #2389 from dataease/pr@dev@feat_new-version 
fix: 修复部分类型视图无法自定义颜色的问题
 2022-06-07 18:15:19 +08:00
wangjiahao
35c175aacc fix: 修复部分类型视图无法自定义颜色的问题 2022-06-07 18:13:50 +08:00
taojinlong
9fa65bcc36 Merge branch 'main' into dev 2022-06-07 17:44:17 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main 
feat:提高请求超时时间的范围，创建关联数据集时保留原数据类型
 2022-06-07 17:43:16 +08:00
dataeaseShu
c45f68bd23 feat: 【数据集】新建计算字段时，将字段的ID显示替换成字段名 2022-06-07 16:39:14 +08:00
taojinlong
98727f00bc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-07 16:07:26 +08:00
taojinlong
b1a0acad22 fix: 驱动管理只对管理员可见 2022-06-07 16:07:09 +08:00
junjun
555de25308 feat: 轴值格式化 2022-06-07 15:24:49 +08:00
fit2cloud-chenyw
e51b0d766b
Merge pull request #2385 from dataease/pr@dev@feat_filter_sort 
feat: 过滤器枚举值排序
 2022-06-07 15:05:26 +08:00
fit2cloud-chenyw
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
junjun
3fc0098b65 feat: 增加图表配置默认值 2022-06-07 13:47:17 +08:00
wangjiahao
e4aa5cee21 fix: 修复仪表板不能创建最顶层目录问题 2022-06-02 17:32:14 +08:00
junjun
222e385ef4 fix: 恢复标题位置选项 2022-06-02 15:36:49 +08:00
fit2cloud-chenyw
2899983be0 fix: 升级版本号1.11.1 2022-06-02 13:30:30 +08:00
fit2cloud-chenyw
71d0b343ed perf: 优化选项卡选择组件提示 2022-05-31 23:15:16 +08:00
wangjiahao
29024d4dd4 fix: 过滤跳转设置中联动视图字段部分数字图标未显示 2022-06-01 17:19:51 +08:00
wangjiahao
bf493362a9 fix: 符号地图标志在联动视图选项未显示 2022-06-01 12:15:43 +08:00
wangjiahao
3f62283d26 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 11:10:57 +08:00
wangjiahao
75a3fab1c8 style: 修改checkbox样式 2022-06-01 11:10:44 +08:00
junjun
e5ad92ae91 fix: 恢复组合图副轴设置 2022-06-01 11:04:50 +08:00
taojinlong
6fc0afcfeb Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-06-01 00:50:37 +08:00
taojinlong
0c4735666b fix: 超时重复提示 2022-06-01 00:49:38 +08:00
taojinlong
2f8beea85b fix: 切换插件类型数据源不生效 2022-05-31 22:17:29 +08:00
junjun
01c1a50029 fix: 恢复饼图标签设置 2022-05-31 19:37:02 +08:00
taojinlong
5608e576cd fix: 数据源管理页面优化 2022-05-31 19:03:54 +08:00
wangjiahao
c3a3891578 style: 样式调整 2022-05-31 18:29:14 +08:00
wangjiahao
fe70f98b07 Merge remote-tracking branch 'origin/dev' into dev 2022-05-31 18:22:20 +08:00
wangjiahao
05acc8feee refactor: 新建的过滤组件增加默认跳转方式 2022-05-31 18:21:45 +08:00
junjun
d03245ddc3 fix: 恢复视图轴值设置 2022-05-31 17:07:55 +08:00
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
junjun
6a381dd782 refactor: 数据集搜索优化 2022-05-31 16:52:42 +08:00
fit2cloud-chenyw
140d92b222 perf: 优化树形过滤器 2022-05-31 14:36:25 +08:00
fit2cloud-chenyw
9cd3da04a2
Merge pull request #2362 from dataease/pr@dev@perf_tree_filter 
perf: 优化树形过滤器
 2022-05-31 14:33:30 +08:00
fit2cloud-chenyw
86af8c3421 perf: 优化树形过滤器 2022-05-31 14:31:57 +08:00
wangjiahao
edc9878368 refactor: 仪表板保存优化 2022-05-31 13:31:01 +08:00
王嘉豪
23acb3c9c0
Merge pull request #2360 from dataease/pr@dev@refactor_panel-save 
refactor: 优化仪表板保存返回信息
 2022-05-31 12:14:19 +08:00
wangjiahao
38ad5a1922 refactor: 优化仪表板保存返回信息 2022-05-31 12:13:35 +08:00
王嘉豪
030ffb3e8f
Merge pull request #2358 from dataease/pr@dev@refactor_style-unpublish 
style: 下架图标居中
 2022-05-30 19:00:03 +08:00
wangjiahao
107afad074 style: 下架图标居中 2022-05-30 18:59:23 +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
fit2cloud-chenyw
bab6292bb8
Merge pull request #2356 from dataease/pr@dev@perf_symbol_map 
perf: 优化符号地图
 2022-05-30 18:13:02 +08:00
fit2cloud-chenyw
8c6731bd87 perf: 优化符号地图 2022-05-30 18:10:57 +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
taojinlong
987fd07403 feat: 调整驱动管理页面 2022-05-30 15:51:39 +08:00
junjun
fe2473241b refactor: 视图字段快速删除样式优化 2022-05-30 15:19:21 +08:00
wangjiahao
488044bde5 refactor: 批量操作样式优化 2022-05-30 14:42:00 +08:00
wangjiahao
989d0ea04e refactor: 仪表板视图名称重复判断优化 2022-05-30 13:38:08 +08:00
wangjiahao
c12dcb79bb fix: 仪表板样式优化，修复仪表板公共颜色不显示问题 2022-05-30 13:12:52 +08:00
dataeaseShu
97cfaaec99 fix: 文字位置去除 中 中场景，默认上 中 2022-05-30 11:34:52 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
taojinlong
a4a665203d fix: 替换excel时，提示影响计算字段 2022-05-30 01:11:53 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +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