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

2402 Commits

Author SHA1 Message Date
wangjiahao
678581d484 refactor: 过滤组件初始化优化，适配历史过滤组件 2021-12-30 18:31:57 +08:00
王嘉豪
f582cb3d83
Merge pull request #1570 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 17:17:48 +08:00
wangjiahao
5f31ed7ed9 refactor: 过滤组件初始化优化，视频历史过滤组件 2021-12-30 17:14:17 +08:00
王嘉豪
79f82c274d
Merge pull request #1569 from dataease/pr@dev@feat-mobile-reset 
refactor: 国际化
 2021-12-30 15:59:27 +08:00
wangjiahao
4d8bb2d7d5 refactor: 国际化 2021-12-30 15:58:37 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
fit2cloudrd
2dfe2e3cc0
style: 样式修改 (#1563) 
* style: 样式修改

* style: 样式修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-30 14:30:37 +08:00
wangjiahao
f20b58df80 style: 样式修改 2021-12-30 14:29:51 +08:00
junjie
613731700e fix: 弹框回车事件 2021-12-30 13:29:16 +08:00
wangjiahao
b011aaab98 style: 样式修改 2021-12-30 12:32:23 +08:00
wangjiahao
f29b660819 refactor: 仪表板间隙设置优化 2021-12-30 11:47:26 +08:00
fit2cloud-chenyw
1b174f589a fix: 公共链接有效期 2021-12-30 10:39:53 +08:00
junjie
9fa458a704 fix: 删除分组后，右侧界面关闭 2021-12-30 10:18:54 +08:00
fit2cloudrd
a386b6f2c7
style: 样式修改 
style: 样式修改
 2021-12-29 18:52:48 +08:00
taojinlong
55a08f61d2 fix: db2 分页问题 2021-12-29 18:32:23 +08:00
wangjiahao
97d78aca86 style: 移动端布局样式优化 2021-12-29 18:05:36 +08:00
王嘉豪
daa03411b2
Merge pull request #1555 from dataease/feat-mobile-reset 
refactor: 移动端禁用跳转
 2021-12-29 16:43:47 +08:00
wangjiahao
be94b177a0 refactor: 移动端禁用跳转 2021-12-29 16:41:01 +08:00
fit2cloud-chenyw
dae80f9bfc fix: 移动端仪表板访问异常 2021-12-29 14:36:52 +08:00
wangjiahao
1740e4901d feat: 移动端布局增加重置功能 2021-12-29 12:22:10 +08:00
fit2cloud-chenyw
12ab1999a4
Merge pull request #1551 from dataease/pr@dev@fix_filter_decimal 
fix: 过滤组件对小数不支持
 2021-12-29 12:09:12 +08:00
fit2cloud-chenyw
ed63b1d8b0 fix: 过滤组件对小数不支持 2021-12-29 12:08:07 +08:00
wangjiahao
944c160e99 Merge remote-tracking branch 'origin/dev' into dev 2021-12-29 11:54:31 +08:00
wangjiahao
83134fe15e fix: 修复视图分组图标可能被修改的问题 2021-12-29 11:54:17 +08:00
wangjiahao
4ad858d5dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 11:53:02 +08:00
fit2cloud-chenyw
cfcf7c9513 fix: 动态时间组件无效 2021-12-29 11:47:31 +08:00
wangjiahao
9fa671d166 style: tab组件样式修改 2021-12-29 11:39:21 +08:00
wangjiahao
e051792bde refactor: 仪表板新建视图关闭取消按钮 2021-12-29 11:25:27 +08:00
fit2cloud-chenyw
c7c0b5b1c3
Merge pull request #1548 from dataease/pr@dev@fix_eqp_type 
fix: BS/MS多端统一入口
 2021-12-29 10:58:38 +08:00
fit2cloud-chenyw
644f5e59ba fix: BS/MS多端统一入口 2021-12-29 10:57:46 +08:00
wangjiahao
60814ebc5f style: 仪表板树样式修改 2021-12-29 10:52:46 +08:00
junjie
34a048d07a fix: 表格分页问题 2021-12-29 10:28:31 +08:00
taojinlong
8bb5d5b427 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 10:04:48 +08:00
wangjiahao
398d40520c Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 18:45:16 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00
taojinlong
6bb37f0d4e fix: 公共链接行权限 2021-12-28 18:44:11 +08:00
wangjiahao
63f87ad59d refactor: 未获取地图数据，控制台不用报错 2021-12-28 18:44:03 +08:00
wangjiahao
dfe1fd4859 refactor: 代码回退 2021-12-28 18:23:47 +08:00
fit2cloud-chenyw
6f9eb29ca7
Merge pull request #1544 from dataease/pr@dev@fix_preview_filter_valid 
fix: 仪表板预览过滤条件失效
 2021-12-28 18:11:36 +08:00
fit2cloud-chenyw
a39ed6a8c0 fix: 仪表板预览过滤条件失效 2021-12-28 18:09:54 +08:00
wangjiahao
56ebd857cc Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 17:53:02 +08:00
wangjiahao
892a967d24 refactor: 仪表板命名，相同目录下的仪表板和目录允许重名 2021-12-28 17:52:31 +08:00
taojinlong
96a830ebaf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 17:18:00 +08:00
wangjiahao
4cb9e722a5 fix: 新建仪表板刷新浏览器第一次不出现问题 2021-12-28 17:03:48 +08:00
fit2cloud-chenyw
7ebb9b3be4 fix: 下拉列表单选框不能取消 2021-12-28 17:00:34 +08:00
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f47609fce5 refactor: 移动端布局等待区域排列优化 2021-12-28 16:35:30 +08:00
wangjiahao
f90466bc23 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 15:16:51 +08:00
wangjiahao
a725f0fa5d refactor: 移动端视图明细背景优化 2021-12-28 15:15:55 +08:00
taojinlong
ec29826365 fix: token 过期时，上传 excel 跳转登陆页 2021-12-28 15:14:17 +08:00
王嘉豪
f3225713a1
Merge pull request #1538 from dataease/pr@dev@fix_panel-filter 
fix: 修复编辑文本过滤组件后，显示错位问题
 2021-12-28 12:26:33 +08:00
wangjiahao
40081b3c09 fix: 修复编辑文本过滤组件后，显示错位问题 2021-12-28 12:26:01 +08:00
王嘉豪
e5da7bb582
Merge pull request #1537 from dataease/pr@dev@fix_panel-filter 
fix: 修复编辑文本过滤组件后，显示错位问题
 2021-12-28 12:13:41 +08:00
wangjiahao
4a0e577ad1 fix: 修复编辑文本过滤组件后，显示错位问题 2021-12-28 12:12:46 +08:00
fit2cloud-chenyw
d6a91f1fda
Merge pull request #1536 from dataease/pr@dev@refactor_axios_timeout 
refactor: 去除所有前端api自定义超时时间
 2021-12-28 11:47:37 +08:00
fit2cloud-chenyw
87d3ec69f2 refactor: 去除所有前端api自定义超时时间 2021-12-28 11:46:10 +08:00
wangjiahao
8d0a667092 refactor: 去掉代码中固定的超时时间 2021-12-28 11:40:19 +08:00
fit2cloud-chenyw
aa0cb3d725 fix: 时间范围动态时间限制 2021-12-28 11:32:48 +08:00
fit2cloud-chenyw
62a9a50899 fix: 时间范围动态时间兼容老版本 2021-12-27 18:28:55 +08:00
fit2cloud-chenyw
f678ae96ef
Merge pull request #1532 from dataease/pr@dev@feat_date_range_dynamic 
feat: 日期范围动态时间
 2021-12-27 18:09:13 +08:00
fit2cloud-chenyw
8b0c98e9cd feat: 日期范围动态时间 2021-12-27 18:04:59 +08:00
fit2cloudrd
c8814f9daa
fix: 文本搜索组件在预览和编辑时显示不一致 (#1529) 
fix: 文本搜索组件在预览和编辑时显示不一致
 2021-12-27 16:34:27 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
fit2cloud-chenyw
4cab403cb5
Merge branch 'dev' into pr@dev@style_panel_filter 2021-12-27 15:18:52 +08:00
fit2cloud-chenyw
d672f0ef49 style: 过滤组件样式 2021-12-27 15:15:09 +08:00
wangjiahao
215b4936c1 refactor: 地图组件移动端适配调整 2021-12-27 14:33:31 +08:00
wangjiahao
4f8ea205d3 refactor: 移动端布局等待区域优化地图，时间组件排列方式 2021-12-27 14:21:00 +08:00
wangjiahao
0c8454323a refactor: 移动端布局组件等待区域靠左排列 2021-12-27 12:06:42 +08:00
wangjiahao
9485610a77 fix: 仪表板下拉列表组件选择未靠左排列 2021-12-27 11:16:11 +08:00
fit2cloud-chenyw
55d8022b5b fix: 空地图试图切换错误 2021-12-27 11:12:21 +08:00
fit2cloud-chenyw
8409f1dd65 style: 解决仪表板中缩放按钮遮盖 2021-12-25 14:54:46 +08:00
fit2cloud-chenyw
73ceca7477 feat: 地图增加缩放重置按钮 2021-12-25 14:42:07 +08:00
fit2cloud-chenyw
30564208ce fix: 兼容老版本日期控件 2021-12-24 19:04:05 +08:00
fit2cloud-chenyw
a7be631244
Merge pull request #1517 from dataease/pr@dev@fix_filters_logic 
fix: 过滤组件逻辑
 2021-12-24 18:44:33 +08:00
fit2cloud-chenyw
26047142ea fix: 过滤组件逻辑 2021-12-24 18:43:29 +08:00
fit2cloudrd
787ef75b06
refactor: 优化PC移动端布局切换，防止出现错误仪表板布局 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-24 17:54:28 +08:00
wangjiahao
71ae929234 Merge remote-tracking branch 'origin/dev' into dev 2021-12-24 17:29:21 +08:00
wangjiahao
db09c658e3 fix: 仪表板文字组件编辑文字可能保存不上问题 2021-12-24 17:29:08 +08:00
junjie
a5bc88859f feat(视图): 过滤器支持and、or逻辑 2021-12-24 17:27:13 +08:00
fit2cloud-chenyw
d5071d99bd fix: 动态日期逻辑 2021-12-24 17:10:01 +08:00
fit2cloud-chenyw
2acecb6709 style: 移动端适配布局 2021-12-24 14:37:22 +08:00
fit2cloud-chenyw
60e1e7cea9
Merge pull request #1510 from dataease/pr@dev@style_panel_left 
style: 仪表板组件样式
 2021-12-24 13:30:36 +08:00
fit2cloud-chenyw
7c37cccf79 style: 仪表板组件样式 2021-12-24 13:29:24 +08:00
junjie
d714866f74 feat(视图): 地图值不存在时，显示空 2021-12-24 13:29:23 +08:00
junjie
4527e02448 feat(视图): 地图值不存在时，显示空 2021-12-24 13:27:59 +08:00
junjie
ba09b4ebe1 feat: 视图tab样式调整 2021-12-23 18:50:58 +08:00
wangjiahao
77db760939 fix: 修复移动端部分组件无法选中问题 2021-12-23 18:15:49 +08:00
fit2cloud-chenyw
4afe0f8fe1
Merge pull request #1508 from dataease/pr@dev@fix_i18n 
fix: 翻译优化
 2021-12-23 16:05:46 +08:00
fit2cloud-chenyw
5abf7b5278 fix: 翻译优化 2021-12-23 16:04:31 +08:00
wangjiahao
a2a9b51090 fix: 进行了移动设计后，仪表板没有改动，可连续保存 2021-12-23 15:46:43 +08:00
wangjiahao
5236b5ba21 feat: 图片支持超链接设置 2021-12-23 14:44:04 +08:00
wangjiahao
c3608e5ec2 refactor: 仪表板滚动时可以使过滤组件失去焦点隐藏弹框 2021-12-23 12:02:14 +08:00
wangjiahao
100e00e5a6 fix: 新加过滤组件，移动端布局无法保存问题 2021-12-22 18:31:46 +08:00
wangjiahao
30d392b219 fix: 编辑仪表板边界位置工具栏不完整问题 2021-12-22 18:02:30 +08:00
wangjiahao
d1d156c4dd refactor: 移动端加入新组件默认放到最底端 2021-12-22 16:36:33 +08:00
wangjiahao
59101ae774 Merge remote-tracking branch 'origin/dev' into dev 2021-12-22 12:20:15 +08:00
wangjiahao
fa02c8cca2 fix: 部分组件移动端样式消失问题 2021-12-22 12:19:40 +08:00
junjie
b3352c07c9 feat: 数据集入口适配 2021-12-22 11:42:44 +08:00
wangjiahao
ed8e1ee248 fix: 仪表板复制的组件，有可能默认进入移动端布局 2021-12-22 10:42:32 +08:00
junjie
2e09954407 feat(视图): 文本类型过滤组件支持枚举 2021-12-21 16:49:55 +08:00
junjie
c0be638c5a feat(视图): 地图值不存在时，显示空 2021-12-21 16:24:45 +08:00
wangjiahao
cda6b7513f refactor: 仪表板适配后端长屏截图 2021-12-21 16:05:14 +08:00
wangjiahao
b191c845a4 refactor: 移动端布局适配 2021-12-21 12:41:06 +08:00
fit2cloud-chenyw
ca0401f115 fix: 多字段过滤器 2021-12-21 12:35:45 +08:00
fit2cloud-chenyw
3089a502a3 fix: 文字搜索组件报错 2021-12-21 11:56:03 +08:00
fit2cloud-chenyw
4287a78ecb fix: 完善定时报告分辨率提示 2021-12-21 11:31:19 +08:00
fit2cloud-chenyw
3a8f5ca1af fix: 搜索过滤组件兼容老版本 2021-12-21 11:21:22 +08:00
fit2cloud-chenyw
342b797871
Merge pull request #1483 from dataease/pr@dev@feat_时间组件增加时间格式 
feat: 时间组件增加时间格式'无'
 2021-12-21 11:13:47 +08:00
fit2cloud-chenyw
d890222d0a feat: 时间组件增加时间格式'无' 2021-12-21 11:12:48 +08:00
wangjiahao
3222f645a1 feat: 根据设备信息自动识别终端类型 2021-12-21 10:57:37 +08:00
fit2cloud-chenyw
db242ba72b
Merge pull request #1482 from dataease/pr@dev@fix_compatible_filter 
fix: 兼容老版本过滤组件
 2021-12-21 10:37:46 +08:00
fit2cloud-chenyw
c44cb8bf02 fix: 兼容老版本过滤组件 2021-12-21 10:36:41 +08:00
王嘉豪
804ff0db21
Merge pull request #1480 from dataease/pr@dev@refactor_panel-scale 
refactor: 仪表板支持高清PDF导出
 2021-12-20 18:51:26 +08:00
wangjiahao
03cb1f0630 refactor: 仪表板支持高清PDF导出 2021-12-20 18:50:20 +08:00
fit2cloud-chenyw
0f8137ec6d fix: 自定义控制范围失效 2021-12-20 18:20:28 +08:00
fit2cloud-chenyw
b781e8e83a fix: tabs组件新增多个 2021-12-20 17:34:27 +08:00
taojinlong
940147a687 fix: 增加或删除数据源，只有一条数据时操作完需要刷新页面才会更新 2021-12-20 16:46:40 +08:00
junjie
dc36a06cb6 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 14:06:44 +08:00
junjie
721b2774fd feat(视图): 过滤器支持and、or逻辑 2021-12-20 12:39:17 +08:00
王嘉豪
ffe3d8b9ef
Merge pull request #1474 from dataease/pr@dev@refactor_panel-scale 
refactor: 移动端仪表板展示适配
 2021-12-20 12:16:05 +08:00
wangjiahao
e59d5b803d refactor: 移动端仪表板展示适配 2021-12-20 12:14:57 +08:00
junjie
3de3b877d7 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 11:36:56 +08:00
taojinlong
50d3a1c37f refactor: 解决冲突 2021-12-19 14:50:02 +08:00
taojinlong
a79a96f452 feat: 公共链接支持行权限 2021-12-19 14:46:33 +08:00
fit2cloud-chenyw
90bac42dc7
Merge pull request #1468 from dataease/pr@dev@feat_mobile_panel_url 
feat: 新增移动端仪表板api
 2021-12-18 22:37:04 +08:00
fit2cloud-chenyw
2365d3f24e feat: 新增移动端仪表板api 2021-12-18 22:35:59 +08:00
junjie
fe37d09a9e feat(视图): 文本类型过滤组件支持枚举 2021-12-17 18:16:18 +08:00
wangjiahao
9a4469d7a5 refactor: 移动端，web端视图内部属性可以根据屏幕缩放比例自动缩放 2021-12-17 18:11:39 +08:00
fit2cloud-chenyw
5217a52c5b fix: 老版本过滤组件导致死循环 2021-12-17 11:05:20 +08:00
wangjiahao
8ed4024bd6 refactor: 代码冲突回退 2021-12-16 18:24:50 +08:00
fit2cloud-chenyw
21e5624c22
Merge branch 'dev' into pr@dev@refactor_filter_default_value 2021-12-16 18:19:51 +08:00
fit2cloud-chenyw
3a3055280f feat: 新增时间控件动态默认值 2021-12-16 18:16:24 +08:00
wangjiahao
1fba59cc5b refactor: 兼容移动端，下拉类型组件去掉输入事件，防止再调用键盘事件 2021-12-16 17:59:16 +08:00
wangjiahao
732cb32abf refactor: 过滤组件可以跟随仪表板缩放 2021-12-16 17:08:54 +08:00
wangjiahao
0a16c91158 refactor: 代码回退 2021-12-16 12:02:37 +08:00
wangjiahao
01b4924707 refactor: 移动端仪表板视图明细优化，手机端明细展开改为全屏模式 2021-12-16 11:10:50 +08:00
wangjiahao
40d1df6074 fix: 移动端布局重新打开编辑可能出现错位问题 2021-12-15 17:26:23 +08:00
wangjiahao
1eedfb7ad4 refactor: 调整仪表板其他组件图标大小 2021-12-15 13:47:11 +08:00
wangjiahao
fe35463a4a fix: 设置联动信息是，目标视图选项存在uuid问题 2021-12-15 11:34:32 +08:00
wangjiahao
bbb082371d fix: 仪表板Tab组件预览模式图层不明确问题 2021-12-15 11:26:50 +08:00
wangjiahao
76cce15c53 fix: 修复仪表板内组件移动时没有对齐标线问题 2021-12-14 17:52:28 +08:00
wangjiahao
2ea9678dd8 feat: 仪表板处于公共链接模式，跳转的目标仪表板也以公共链接跳转，同时支持传参数 2021-12-14 15:22:03 +08:00
王嘉豪
791a76ca3c
Merge pull request #1437 from dataease/pr@dev@fix_panel-filter 
feat: 仪表板tab组件内视图，支持放大和编辑
 2021-12-14 11:45:24 +08:00
wangjiahao
beb295f38f feat: 仪表板tab组件内视图，支持放大和编辑 2021-12-14 11:43:41 +08:00
junjie
6cb70f33a5 feat(视图): 过滤器支持and、or逻辑 2021-12-13 16:38:22 +08:00
taojinlong
14536b648a Merge branch 'dev' into pr@dev@variable 2021-12-10 23:21:01 +08:00
taojinlong
1e60188abd feat(数据源): 数据集行权限 2021-12-10 23:20:17 +08:00
wangjiahao
2f109a94c9 Merge remote-tracking branch 'origin/dev' into pr@devfix_panel-filter 2021-12-10 17:02:05 +08:00
wangjiahao
31b76c1574 feat: 仪表板选项卡组件内视图支持放大编辑 2021-12-10 17:00:19 +08:00
junjie
139bd804ad feat(视图): 同比环比 2021-12-10 15:58:01 +08:00
junjie
ea3133dd96 feat(视图): 同比环比 2021-12-10 11:37:26 +08:00
junjie
96fa9cc53e feat(数据集): 关联数据集 2021-12-10 11:23:07 +08:00
junjie
bfa247cbc3 feat(视图): 同比环比 2021-12-10 10:43:34 +08:00
junjie
bcabbf905d feat(视图): 同比环比 2021-12-09 18:32:30 +08:00
wangjiahao
99c6cfd9e4 fix: 仪表板编辑移入过滤组件时，点击叉号关闭出现占位未取消的问题 2021-12-09 18:26:42 +08:00
fit2cloud-chenyw
fa37c31fee
Merge pull request #1421 from dataease/pr@dev@feat_report_task_test 
feat: 定时报告镜像测试
 2021-12-09 17:59:47 +08:00
fit2cloud-chenyw
12878873c3 feat: 定时报告镜像测试 2021-12-09 17:58:41 +08:00
junjie
ff2445d195 feat(数据集): 关联数据集 2021-12-09 16:51:21 +08:00
junjie
aead715995 feat(数据集): 关联数据集 2021-12-09 16:24:45 +08:00
wangjiahao
6b0acb4967 Merge remote-tracking branch 'origin/dev' into dev 2021-12-09 14:58:21 +08:00
wangjiahao
530c8e808a feat: 增加移动端仪表板预览入口 2021-12-09 14:57:58 +08:00
fit2cloud-chenyw
5fafcd610b
Merge pull request #1419 from dataease/pr@dev@mobile_star_status 
feat: 移动端收藏状态
 2021-12-09 12:48:18 +08:00
fit2cloud-chenyw
142ff835ca feat: 移动端收藏状态 2021-12-09 12:47:07 +08:00
junjie
46bac1769e feat(视图): 同环比前端UI 2021-12-09 12:05:01 +08:00
fit2cloud-chenyw
908a14c1f6 fix: 公共链接适配移动端嵌入 2021-12-09 10:49:32 +08:00
junjie
f52b94a0ce feat(视图): 同环比前端UI 2021-12-09 10:43:08 +08:00
junjie
dfb83b4a43 feat(视图): 同环比前端UI 2021-12-08 18:42:00 +08:00
taojinlong
94cb9b45e6 feat: 数据集行权限 2021-12-08 17:18:35 +08:00
wangjiahao
11515a5aeb fix: 仪表板预览时右侧边框间隔过大问题 2021-12-08 15:28:54 +08:00
wangjiahao
5998a6c286 feat: 仪表板支持移动端布局展示 2021-12-07 17:32:02 +08:00
taojinlong
7b6d444f1a Merge branch 'dev' into pr@dev@db2 2021-12-07 17:11:06 +08:00
taojinlong
ab7b7f541b feat(数据源): 支持 db2 2021-12-07 17:10:16 +08:00
wangjiahao
58705247ab fix: 修复编辑仪表板时，初始化和编辑视图返回组件位置可能变化的问题 2021-12-06 15:37:04 +08:00
junjie
4f10dafec4 refactor: 视图优化 2021-12-06 14:41:12 +08:00
wangjiahao
e95fd0aeee Merge remote-tracking branch 'origin/dev' into dev 2021-12-06 11:54:51 +08:00
wangjiahao
e9404e6d1f fix: 修复对树形结构操作时，可能有其他节点展开的问题 2021-12-06 11:54:34 +08:00
junjie
297b26ca29 refactor: 计算字段无需展示原始类型 2021-12-06 10:52:57 +08:00
junjie
5d83ffe0cf fix: rollback 2021-12-06 09:59:00 +08:00
junjie
1cd7936505 feat(数据集): 关联数据集 2021-12-03 17:37:22 +08:00
王嘉豪
2a9fdea052
Merge pull request #1387 from dataease/pr@dev@fix_panel-pdf 
fix: 修复仪表板pdf截图问题
 2021-12-03 17:36:10 +08:00
wangjiahao
08d46d8827 fix: 修复仪表板pdf截图问题 2021-12-03 17:35:18 +08:00
junjie
298acdae9a feat(数据集): 关联数据集 2021-12-03 15:58:36 +08:00
junjie
d8a0212a35 feat(数据集): 关联数据集 2021-12-02 18:33:49 +08:00
junjie
d6aa5740c0 feat(数据集): 关联数据集 2021-12-02 18:19:16 +08:00
junjie
a1909f59cd feat(数据集): 关联数据集 2021-12-02 17:54:56 +08:00
junjie
e3efc82fc5 feat(数据集): 关联数据集 2021-12-02 17:04:42 +08:00
王嘉豪
cfbc35fbc7
Merge pull request #1376 from dataease/pr@dev@refactor_panel-open 
refactor: 开启移动端设置
 2021-12-02 16:48:28 +08:00
junjie
4a8bfefac4 feat(数据集): 关联数据集 2021-12-02 16:40:14 +08:00
wangjiahao
601f9e4dcc refactor: 开启移动端设置 2021-12-02 16:37:11 +08:00
junjie
acb54573cb feat(数据集): 关联数据集 2021-12-02 14:58:42 +08:00
fit2cloud-chenyw
a27474644a
Merge pull request #1366 from dataease/pr@v1.5@refactor_eslint_error 
refactor: 前端eslint警告以及报错
 2021-12-01 18:05:57 +08:00
fit2cloud-chenyw
df13bfa008 refactor: 前端eslint警告以及报错 2021-12-01 18:04:53 +08:00
wangjiahao
b86c93be7f Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 17:40:53 +08:00
wangjiahao
abb9f45698 refactor: 视图新建追加自动点击事件，当前新加视图高亮显示 2021-12-01 17:39:27 +08:00
fit2cloud-chenyw
6c8a2d7685 fix: 条件组件新增失败 2021-12-01 17:38:33 +08:00
fit2cloud-chenyw
784d5f335d fix: 文本列表多选切换单选无效 2021-12-01 17:06:51 +08:00
王嘉豪
ad262355f6
Merge pull request #1360 from dataease/pr@1.5@refactor_panel-pdf 
fix: 修复PDF导出没有背景的问题
 2021-12-01 16:48:34 +08:00
fit2cloud-chenyw
901d7a852d refactor: 去除时间控件外边框 2021-12-01 16:47:12 +08:00
wangjiahao
92bdf3717c Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 16:46:32 +08:00
wangjiahao
9247bb6188 fix: 修复PDF导出没有背景的问题 2021-12-01 16:42:12 +08:00
王嘉豪
93d8e58994
Merge pull request #1357 from dataease/pr@v1.5@refactor_panel-pdf 
fix: 画布出现滚动条时，拖入的组件会靠上的问题
 2021-12-01 15:15:00 +08:00
wangjiahao
f75d00eda6 fix: 画布出现滚动条时，拖入的组件会靠上的问题 2021-12-01 15:14:24 +08:00
王嘉豪
c8a84337a9
Merge pull request #1355 from dataease/pr@v1.5@refactor_panel-pdf 
refactor: 仪表板导出pdf优化，防止导出画面不全
 2021-12-01 14:48:53 +08:00
wangjiahao
3ce6aaebfb refactor: 仪表板导出pdf优化，防止导出画面不全 2021-12-01 14:47:19 +08:00
taojinlong
cb9020b903 Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 11:56:57 +08:00
taojinlong
d0436c598b refactor: 国际化处理 2021-12-01 11:56:05 +08:00
wangjiahao
0c97b7b9b3 fix: 修复主题滑块删除最后一下主题，滑块箭头指向不对问题 2021-12-01 11:52:31 +08:00
fit2cloud-chenyw
f86a9a589e
Merge pull request #1349 from dataease/pr@v1.5@fix_panel_date_component 
fix: 仪表板日期组件无法二次编辑
 2021-12-01 11:32:39 +08:00
fit2cloud-chenyw
06d5e913f7 fix: 仪表板日期组件无法二次编辑 2021-12-01 11:31:37 +08:00
王嘉豪
d1c2eb1528
refactor: 仪表板视图刷新超时后给出提示，下次刷新可自动恢复 
* refactor: 仪表板视图刷新超时后给出提示，下次刷新可自动恢复

* refactor: 仪表板视图刷新超时后给出提示，下次刷新可自动恢复
 2021-12-01 11:19:53 +08:00
fit2cloud-chenyw
0a99b6a358 refactor: 定时报告迭代至下版本 2021-12-01 10:48:06 +08:00
wangjiahao
e139abdee5 refactor: 预览仪表板时点击过滤组件，视频不用刷新 2021-12-01 10:45:17 +08:00
xiajunjie
c93b5e3687 refactor: v1.5关闭关联数据集入口 2021-11-30 20:18:11 +08:00
fit2cloud-chenyw
606d80d6e9 fix: 链接分享可以选择今天已经过了的时间 2021-11-30 16:22:54 +08:00
taojinlong
32286160a6 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 15:53:14 +08:00
taojinlong
4d6f933ab8 fix: 数据源名称过长没有以...形式代替导致删除标识与名称重叠 2021-11-30 15:53:03 +08:00
junjie
e5c46a0711 feat(数据集): 关联数据集 2021-11-30 15:43:04 +08:00
wangjiahao
60c5c88304 fix: 过滤组件修改标题字间距选项会跟着一起改变间距问题 2021-11-30 15:37:28 +08:00
王嘉豪
2673af28f0
Merge pull request #1331 from dataease/pr@dev@refactor_auth-model 
fix: 修复默认仪表板保存时无法实时显示在列表中的问题
 2021-11-30 15:26:09 +08:00
wangjiahao
37d6623db5 fix: 修复默认仪表板保存时无法实时显示在列表中的问题 2021-11-30 15:24:51 +08:00
XiaJunjie2020
c365c5c7c1
Merge pull request #1330 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-30 15:21:21 +08:00
junjie
c7aa73cdd0 feat(数据集): 关联数据集 2021-11-30 15:19:51 +08:00
王嘉豪
748158ecb5
Merge pull request #1329 from dataease/pr@dev@refactor_auth-model 
fix: 优化仪表板编辑时，边界可能间隙不一致
 2021-11-30 15:17:09 +08:00
wangjiahao
ef6ae66859 fix: 优化仪表板编辑时，边界可能间隙不一致 2021-11-30 15:14:43 +08:00
taojinlong
d19f0f2a24 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 13:55:21 +08:00
junjie
68f6a6e749 fix(权限): 统一授权数据集tree 2021-11-30 13:38:50 +08:00
taojinlong
f8279b1141 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 12:28:42 +08:00
taojinlong
e654cafa68 refactor: 调整表单样式 2021-11-30 12:28:22 +08:00
wangjiahao
1fdb21a103 fix: 文本组件根据仪表板缩放比例自动缩放文本大小和间隙，防止编辑和预览不一致 2021-11-30 11:46:47 +08:00
王嘉豪
2cd38021be
Merge pull request #1320 from dataease/pr@dev@refactor_panel-speed 
refactor: 代码回退
 2021-11-30 10:33:15 +08:00
wangjiahao
7a605320d8 refactor: 代码回退 2021-11-30 10:31:57 +08:00
junjie
2b2db1c8fc feat(数据集): 关联数据集 2021-11-30 10:06:04 +08:00
王嘉豪
e65b15b89b
Merge pull request #1318 from dataease/pr@dev@refactor_panel-speed 
refactor: 过滤组件样式边界优化
 2021-11-29 19:20:31 +08:00
wangjiahao
02bcadae10 refactor: 过滤组件样式边界优化 2021-11-29 19:18:12 +08:00
junjie
ff7c93ed3c feat(数据集): 关联数据集 2021-11-29 18:28:51 +08:00
taojinlong
dbd2159a6d Merge branch 'dev' of github.com:dataease/dataease into dev 
# Conflicts:
#	frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
 2021-11-29 17:55:45 +08:00
taojinlong
65da67cdc0 fix(数据集): 错别字 2021-11-29 17:49:29 +08:00
taojinlong
63d3e5d015 feat(数据集): 添加同步任务时，过滤掉空目录 2021-11-29 17:48:41 +08:00
XiaJunjie2020
4e6f2f94fe
Merge pull request #1314 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-29 17:21:55 +08:00
fit2cloud-chenyw
b28c84319e
Merge pull request #1313 from dataease/pr@dev@fix_条件组件弹框样式 
fix: 条件组件弹框样式
 2021-11-29 17:21:03 +08:00
junjie
b2dc85232a feat(数据集): 关联数据集 2021-11-29 17:21:02 +08:00
fit2cloud-chenyw
c48e2ef9d6 fix: 条件组件弹框样式 2021-11-29 17:19:41 +08:00
王嘉豪
b912c1fb97
Merge pull request #1312 from dataease/pr@dev@refactor_panel-speed 
refactor: 仪表板视图过滤弹框，去掉搜索条件时无需关闭
 2021-11-29 15:56:38 +08:00
wangjiahao
079f24d7c8 refactor: 仪表板视图过滤弹框，去掉搜索条件时无需关闭 2021-11-29 15:55:48 +08:00
XiaJunjie2020
95f55ddf8e
Merge branch 'dev' into pr@dev@feat_union_dataset 2021-11-29 15:33:43 +08:00
junjie
a6e8d16ccf fix(视图): 修复图表类型有时样式错乱 2021-11-29 15:18:10 +08:00
王嘉豪
3c8ce0e31d
Merge pull request #1306 from dataease/pr@dev@refactor_panel-speed 
refactor: 前端增加菜单缓存，加快相应速度
 2021-11-29 14:55:20 +08:00
wangjiahao
7cc5169ab7 refactor: 前端增加菜单缓存，加快相应速度 2021-11-29 14:54:24 +08:00