Commit Graph

6576 Commits

Author SHA1 Message Date
fit2cloud-chenyw
feae7153ef
Merge pull request #2769 from dataease/pr@dev@fix_email_task_without_view
fix(系统管理-定时报告): 定时报告不带视图数据发送报错
2022-08-02 21:56:24 +08:00
fit2cloud-chenyw
0bc9d2de78 fix(系统管理-定时报告): 定时报告不带视图数据发送报错 2022-08-02 21:53:39 +08:00
fit2cloud-chenyw
850543f5c2
Merge pull request #2768 from dataease/pr@dev@style_select_grid
style(仪表板-下拉列表): 预览模式没有纵向滚动条
2022-08-02 21:29:54 +08:00
fit2cloud-chenyw
8f2a3612e2 style(仪表板-下拉列表): 预览模式没有纵向滚动条 2022-08-02 21:28:48 +08:00
fit2cloud-chenyw
8ab50fa483
Merge pull request #2767 from dataease/pr@dev@fix_symbol_map
fix(视图-符号地图): diros数据源拖入标记大小字段报错
2022-08-02 17:53:02 +08:00
fit2cloud-chenyw
661ce85bc7 fix(视图-符号地图): diros数据源拖入标记大小字段报错 2022-08-02 17:52:20 +08:00
wangjiahao
43369ea3c5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 17:20:16 +08:00
wangjiahao
88c5712233 refactor(仪表板): 仪表板画布手机端布局设计最小矩阵尺寸设置为1*1 2022-08-02 17:20:03 +08:00
taojinlong
3e1f92d212 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-02 17:17:54 +08:00
taojinlong
eabbf9a609 fix(数据源): 抽取 api 数据集的字段 2022-08-02 17:17:24 +08:00
fit2cloud-chenyw
1c5fb68461
Merge pull request #2765 from dataease/pr@dev@fix_map_setting
fix(系统管理-地图设置): 上传地图文件没有反应
2022-08-02 17:07:53 +08:00
fit2cloud-chenyw
809d2d8683 fix(系统管理-地图设置): 上传地图文件没有反应 2022-08-02 17:06:51 +08:00
wangjiahao
f859f10fb5 revert: 还原修改密码页面权限限制 2022-08-02 16:37:05 +08:00
wangjiahao
cc4b0465e5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 16:34:25 +08:00
wangjiahao
045f7e14bd style: 编辑按钮区修改排列方式和背景色 2022-08-02 16:34:15 +08:00
dataeaseShu
8968a31850
Merge pull request #2764 from dataease/pr@dev_bag_clear
Pr@dev bag clear
2022-08-02 16:30:18 +08:00
dataeaseShu
b5f56865f9 Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-02 16:29:43 +08:00
dataeaseShu
587e932928 fix: 组织部门为空bug修复 2022-08-02 16:29:35 +08:00
dataeaseShu
006936b7eb fix: 组织部门为空bug修复 2022-08-02 16:28:44 +08:00
wangjiahao
4e13ae5333 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 16:16:07 +08:00
wangjiahao
e5501010e3 fix(仪表板): 修复使用定时同步数据集的视图,在公共链接使用外部参数访问时,自动刷新可能导致外部参数失效的问题 2022-08-02 16:15:54 +08:00
fit2cloud-chenyw
7f9c3bc2e1
Merge pull request #2763 from dataease/pr@dev@fix_maven_confict
fix(系统管理-定时报告): 尝试修复定时报告全屏截图与指定分辨率冲突
2022-08-02 15:53:35 +08:00
fit2cloud-chenyw
67bf1c6cd4 fix(系统管理-定时报告): 尝试修复定时报告全屏截图与指定分辨率冲突 2022-08-02 15:52:52 +08:00
wangjiahao
d18d96478a Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 15:08:22 +08:00
wangjiahao
f44f43e2d5 refactor(模板市场): 模板市场显示由基础设置页面控制 2022-08-02 15:08:11 +08:00
dataeaseShu
e57cf6a682
Merge pull request #2761 from dataease/pr@dev_bag_clear
Pr@dev bag clear
2022-08-02 14:47:36 +08:00
dataeaseShu
00dfc12cd7 Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-02 14:46:41 +08:00
dataeaseShu
a609ec7941 feat: 清除没有用到的依赖 2022-08-02 14:46:15 +08:00
dataeaseShu
b697a213f9 feat: 清除没有用到的依赖 2022-08-02 14:44:02 +08:00
wangjiahao
e78cd47933 fix(仪表板): 修复预览页面可能出现复选框的情况 2022-08-02 14:37:56 +08:00
wangjiahao
f6ba0642ea Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 13:41:18 +08:00
wangjiahao
24ea04821e style: 去掉视图明细文本 2022-08-02 13:41:07 +08:00
Dovahkinn
4fb548ada2
前端项目运行时的部分警告处理 (#2759)
* fix: 执行 eslint 命令, 修复代码

* fix(frontend): justify-content 不支持的值 start, end 改为 flex-start, flex-end

* Update format-utils.js

去掉注释

Co-authored-by: 王嘉豪 <42510293+ziyujiahao@users.noreply.github.com>
2022-08-02 13:22:28 +08:00
wangjiahao
74a6ec51a2 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 11:54:43 +08:00
wangjiahao
53313b5ddd fix(仪表板): 修复矩形组件复用部分样式丢失问题 2022-08-02 11:53:59 +08:00
taojinlong
d2b481c002 fix(数据源): 去除空格 2022-08-02 11:41:24 +08:00
taojinlong
6995cfddc3 fix(数据源驱动): 驱动文件重名判断 2022-08-02 11:07:57 +08:00
fit2cloud-chenyw
885851f64c
Merge pull request #2757 from dataease/pr@dev@fix_email_task_view_number
fix(系统管理-定时报告): 定时报告发送视图数据包含无效小数
2022-08-02 09:06:55 +08:00
fit2cloud-chenyw
a34dbe9e40
Merge pull request #2756 from dataease/pr@dev@fix_time_hide_minite
fix(仪表板-时间过滤器): 精确到小时但是没有隐藏分钟选择器
2022-08-02 09:04:24 +08:00
fit2cloud-chenyw
955977ab13 fix(仪表板-时间过滤器): 精确到小时但是没有隐藏分钟选择器 2022-08-01 20:59:14 +08:00
fit2cloudrd
ae5cc25d8a
style(仪表板): 批量设置、联动设置选择按钮位置变更 (#2755)
* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换,过滤组件默认颜色设置

* refator(仪表板): 主题色切换,适配tab组件

* refactor(仪表板): 符号地图适配主题变化

* style(仪表板): 批量设置、联动设置选择按钮位置变更

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-08-01 18:39:05 +08:00
taojinlong
94b9cbbf6c fix(数据集): 列权限错误 2022-08-01 18:03:44 +08:00
taojinlong
0d7f4bb235 fix(仪表板): 仪表板分享报错 2022-08-01 18:03:41 +08:00
taojinlong
0bdbb72253 fix(数据源): api 数据集预览错误 2022-08-01 18:03:39 +08:00
fit2cloudrd
bcfaf4d4e1
refactor(仪表板): 组件适配主题色变化 (#2752)
* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换,过滤组件默认颜色设置

* refator(仪表板): 主题色切换,适配tab组件

* refactor(仪表板): 符号地图适配主题变化

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-08-01 17:53:58 +08:00
junjun
73cb6b3f46 fix(视图): 瀑布图移除轴值数值格式化功能,防止与指标数值格式化冲突 2022-08-01 17:32:48 +08:00
fit2cloud-chenyw
cfcbe04cae fix(系统管理-定时报告): 定时报告发送视图数据包含无效小数 2022-08-01 17:21:01 +08:00
fit2cloud-chenyw
62517b7fdb
Merge pull request #2749 from dataease/pr@dev@fix_filter_component_copy
fix(仪表板-过滤组件): 复制视图后过滤组件对原视图和目标视图作用效果不一致
2022-08-01 13:39:08 +08:00
fit2cloud-chenyw
6ea655f36d fix(仪表板-过滤组件): 复制视图后过滤组件对原视图和目标视图作用效果不一致 2022-08-01 13:37:52 +08:00
fit2cloud-chenyw
174c3cde4f
Merge pull request #2748 from dataease/pr@dev@fix_tree_select_full_screen_hide
fix(仪表板-树过滤器): 全屏模式下无法显示
2022-08-01 11:51:06 +08:00