center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
6,539 Commits 1 Branch 86 Tags 417 MiB
930ee86135
Commit Graph

6539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangjiahao
930ee86135 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 14:19:16 +08:00
wangjiahao
4662a2ea2e refactor(仪表板): 仪表板中只允许一个按钮，复用的时候判断当前仪表板是否有按钮再进行选择 2022-08-03 14:19:05 +08:00
fit2cloud-chenyw
7dbc0ffcc9
Merge pull request #2774 from dataease/pr@dev@fix_map_mapping 
fix(视图-地图): 区域映射翻页后搜索功能失效
 2022-08-03 14:13:39 +08:00
fit2cloud-chenyw
df0ac137a3 fix(视图-地图): 区域映射翻页后搜索功能失效 2022-08-03 14:12:51 +08:00
wangjiahao
f8da869ec1 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 13:59:54 +08:00
wangjiahao
557b2f306f fix(模板管理): 模板管理不能创建分类问题 2022-08-03 13:59:44 +08:00
fit2cloud-chenyw
1b206fa81d
Merge pull request #2773 from dataease/pr@dev@style_map_setting 
style(系统管理-地图设置): 新增-上级区域下拉树样式错位
 2022-08-03 13:53:05 +08:00
fit2cloud-chenyw
d74e006cee style(系统管理-地图设置): 新增-上级区域下拉树样式错位 2022-08-03 13:52:18 +08:00
wangjiahao
7b9a7a2aba Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 13:47:11 +08:00
wangjiahao
491c21599e style: 手机端隐藏视图明细按钮 2022-08-03 13:46:59 +08:00
fit2cloud-chenyw
982e8b44ed
Merge pull request #2770 from dataease/pr@dev@fix_email_task 
fix(系统管理-定时报告): 视图附件名称乱码
 2022-08-03 13:31:03 +08:00
fit2cloud-chenyw
2ecd78a933 fix(系统管理-定时报告): 视图附件名称乱码 2022-08-03 13:30:18 +08:00
wangjiahao
b978b0602d style: 模板市场样式优化 2022-08-03 11:40:49 +08:00
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