github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-26 21:22:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
3,944 Commits 35 Branches 90 Tags 430 MiB
d35c03d828
Commit Graph

1593 Commits

Author SHA1 Message Date
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
junjie
199af4407c feat(数据集): 关联数据集 2021-11-29 14:50:45 +08:00
fit2cloud-chenyw
33c6fba964 fix: 公共链接分享密码错误提示位置覆盖 2021-11-29 14:26:21 +08:00
fit2cloud-chenyw
8f00ea4783
Merge pull request #1301 from dataease/pr@dev@fix_my_share_tree 
fix: 我分享的没有及时刷新
 2021-11-29 13:53:37 +08:00
fit2cloud-chenyw
b9348f13ac fix: 我分享的没有及时刷新 2021-11-29 13:52:35 +08:00
wangjiahao
521b35f9b5 refactor: 优化系统响应速度 2021-11-29 11:35:51 +08:00
junjie
79349604fe feat(数据集): 关联数据集 2021-11-26 18:13:27 +08:00
王嘉豪
13198c7c15
Merge pull request #1285 from dataease/pr@dev@fix_panel-edit 
fix: 修复antV视图多事件弹框点击不显示问题
 2021-11-26 12:10:40 +08:00
wangjiahao
ff1a52d7c4 fix: 修复antV视图多事件弹框点击不显示问题 2021-11-26 12:09:48 +08:00
taojinlong
5899876a09 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-26 11:39:42 +08:00
fit2cloud-chenyw
07440bfa8f
Merge pull request #1284 from dataease/pr@dev@refactor_multiple_entry 
fix: 前端改为单页面应用
 2021-11-26 11:39:39 +08:00
taojinlong
436770fe34 fix(数据集): 先选择定时同步再选择数据库可实现不支持定时同步的数据库定时同步 2021-11-26 11:39:30 +08:00
fit2cloud-chenyw
26c54d41bc fix: 前端改为单页面应用 2021-11-26 11:38:25 +08:00
wangjiahao
f4e23f7f60 fix: 修复系统主题标题错位问题 2021-11-26 10:28:43 +08:00
taojinlong
f8f285155d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-25 22:02:15 +08:00
taojinlong
04871b182b fix(数据源): 删除数据源时，同时清理页面缓存 2021-11-25 22:02:07 +08:00
fit2cloudrd
5c8ae8289d
refactor: 优化顶部菜单栏隐藏条件 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-11-25 17:07:31 +08:00
junjie
4848185ba5 feat(数据集): 关联数据集 2021-11-25 16:33:38 +08:00
wangjiahao
1eeda595f1 refactor: 优化数据集查询 2021-11-25 15:17:00 +08:00
junjie
3c78b3bec2 feat(数据集): 关联数据集 2021-11-25 11:33:47 +08:00
taojinlong
db249689c7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-24 18:50:07 +08:00
taojinlong
bf7c8bb333 refactor: 整理代码 2021-11-24 18:49:41 +08:00
wangjiahao
c15c58f63d feat: 增加授权模型统一查询功能，视图使授权模型查询 2021-11-24 18:14:41 +08:00
wangjiahao
066e6b57da fix: 默认仪表板不需要显示编辑按钮 2021-11-24 11:49:40 +08:00
王嘉豪
77a31d7b8c
Merge pull request #1261 from dataease/pr@dev@feat_panel-view-result 
feat: 仪表板支持统一设置视图结果显示数量
 2021-11-24 11:27:17 +08:00
wangjiahao
abb58954af feat: 仪表板支持统一设置视图结果显示数量 2021-11-24 11:25:01 +08:00
XiaJunjie2020
7d07a2c81d
Merge pull request #1256 from dataease/pr@dev@feat_union_dataset 
feat(数据集): 关联数据集
 2021-11-23 17:37:46 +08:00
junjie
0069c5a4b1 feat(数据集): 关联数据集 2021-11-23 17:34:54 +08:00
junjie
7329b819a4 fix(视图): 修复图表类型切换逻辑 2021-11-23 16:54:01 +08:00
junjie
ea3c070d19 feat(数据集): 关联数据集 2021-11-23 15:38:24 +08:00
王嘉豪
16e807bce0
feat(仪表板): 仪表板支持设置移动端布局 
* feat:仪表板移动端布局

* feat(仪表板): 仪表板支持设置移动端布局
 2021-11-23 15:34:42 +08:00
junjie
d0561e8699 feat(数据集): 关联数据集 2021-11-23 14:31:24 +08:00
wangjiahao
cde5fb9ee6 refactor: 移除画布设计时滚动条，优化设计体验 2021-11-23 11:35:02 +08:00
wangjiahao
bc5c98c98c fix: 修复仪表板编辑按钮权限取值不对问题 2021-11-23 10:49:18 +08:00
taojinlong
e50158bc57 feat(数据集): 行权限 2021-11-22 15:40:29 +08:00
junjie
7ad24c38c3 feat(数据集): 关联数据集 2021-11-19 18:42:59 +08:00
junjie
6559ad7582 feat(数据集):关联数据集 2021-11-18 18:16:43 +08:00
wangjiahao
fcb5d1cec6 refactor:仪表板刷新时，不显示视图的动画效果；仪表板初始化时显示loading框 2021-11-16 15:06:02 +08:00
wangjiahao
c53e121ce8 refactor:从仪表板进入视图编辑界面时，顶部菜单去掉 2021-11-15 18:52:58 +08:00
fit2cloud-chenyw
34d9a477b8
Merge pull request #1204 from dataease/pr@dev@feat_消息订阅增加邮件渠道 
feat: 消息订阅增加邮件渠道
 2021-11-15 16:24:42 +08:00
fit2cloud-chenyw
5ce64f0d09 feat: 消息订阅增加邮件渠道 2021-11-15 16:23:24 +08:00
taojinlong
6c6fb924c5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-15 15:57:13 +08:00
taojinlong
566a317005 feat: 行权限 2021-11-15 15:53:40 +08:00
王嘉豪
e2883a86bf
Merge pull request #1202 from dataease/pr@dev@refactor_panel 
feat:仪表编辑状态，自动隐藏顶部餐单栏
 2021-11-15 14:57:51 +08:00
wangjiahao
3f5624a630 feat:仪表编辑状态，自动隐藏顶部餐单栏 2021-11-15 14:57:14 +08:00
junjie
19a8ed02a0 feat:词云 2021-11-15 13:11:21 +08:00
wangjiahao
71438db6e1 refactor:组件调色板优化 2021-11-15 11:53:42 +08:00
junjie
22e204a0b7 feat:词云 2021-11-15 11:29:13 +08:00
王嘉豪
09f4e13b3f
Merge pull request #1189 from dataease/pr@dev@refactor_panel-edit 
refactor:优化组件间隙和仪表板画布间隙
 2021-11-12 12:07:44 +08:00
wangjiahao
ffa54ad6de refactor:优化组件间隙和仪表板画布间隙 2021-11-12 12:07:06 +08:00
王嘉豪
c3e7584e1e
Merge pull request #1182 from dataease/pr@dev@refactor_panel-edit 
refactor:修改仪表板按钮样式
 2021-11-12 10:39:58 +08:00
wangjiahao
5746be12a4 refactor:修改仪表板按钮样式 2021-11-12 10:38:41 +08:00
taojinlong
d283f6a980 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-11 17:56:41 +08:00
taojinlong
d82f121cf1 refactor: 任务状态字体颜色调整 2021-11-11 17:54:54 +08:00
fit2cloud-chenyw
a584f141ed
Merge pull request #1176 from dataease/pr@dev@feat_short_link 
feat: 完善公共链接
 2021-11-11 16:58:28 +08:00
fit2cloud-chenyw
17a3b79e5b feat: 完善公共链接 2021-11-11 16:56:54 +08:00
junjie
efda0da019 feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-11 16:38:16 +08:00
wangjiahao
133ae7c70b refactor:增加仪表板编辑快捷入口 2021-11-11 15:43:07 +08:00
junjie
e27fe72703 fix(视图):尝试解决源码运行，视图类型样式错乱的问题 2021-11-11 14:35:50 +08:00
fit2cloud-chenyw
6afdfca886 fix: 前端用户列表控制台报错 2021-11-11 14:16:56 +08:00
fit2cloud-chenyw
54a2c63d4c fix: 取消短链接 2021-11-11 14:16:42 +08:00
junjie
86fd2cfbbd fix(视图):尝试解决源码运行，视图类型样式错乱的问题 2021-11-11 14:03:52 +08:00
taojinlong
99638187bb
Merge pull request #1164 from dataease/hive 
feat: 支持 hive 数据源
 2021-11-10 18:45:15 +08:00
taojinlong
de4f71c6bc feat: 支持 hive 数据源 2021-11-10 18:42:44 +08:00
fit2cloud-chenyw
5cfedd4a44
Merge pull request #1163 from dataease/pr@dev@feat_完善我的分享 
feat: 完善我的分享
 2021-11-10 18:05:21 +08:00
fit2cloud-chenyw
08ea1fafea feat: 完善我的分享 2021-11-10 18:04:20 +08:00
junjie
dc24bf4b18 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 17:38:14 +08:00
junjie
fb533cde83 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 17:10:49 +08:00
junjie
30fee4e97d feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 16:11:45 +08:00
junjie
902ac5bb7a feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 13:44:08 +08:00
junjie
c5230ed42a feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-10 10:08:14 +08:00
fit2cloud-chenyw
f04aee4cf2
Merge pull request #1154 from dataease/pr@dev@feat_share_out 
feat: 新增我分享的
 2021-11-09 18:25:07 +08:00
fit2cloud-chenyw
db55c0782a feat: 新增我分享的 2021-11-09 18:23:45 +08:00
wangjiahao
30f55f72f6 fix:【仪表板】排版整齐后，通过新建视图，向仪表板中添加，位置有些错乱 2021-11-09 18:05:03 +08:00
junjie
0bb4c9da53 feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-09 12:13:41 +08:00
王嘉豪
c6aa9af3e7
Merge pull request #1148 from dataease/pr@dev@feat_panel-video 
refactor:优化授权查询模型
 2021-11-09 11:20:39 +08:00
junjie
05710c4cad feat:视图根据图表类型分类 2021-11-09 11:16:35 +08:00
wangjiahao
f32ba3be80 feat:仪表板新增视频组件 2021-11-08 19:03:09 +08:00
junjie
708e2098ab feat:视图根据图表类型分类 2021-11-08 17:57:38 +08:00
junjie
57d5a6f02e feat:词云 2021-11-08 11:30:13 +08:00
junjie
5e5d456f84 refactor: 瀑布图图例文字优化 2021-11-05 13:55:28 +08:00
junjie
392f6fd434 fix: 视图指标卡标题位置修复 2021-11-04 17:17:39 +08:00
wangjiahao
846e90e6f5 fix:边界问题 2021-11-04 10:50:36 +08:00
wangjiahao
c7ad0a5b39 fix:边界问题 2021-11-04 10:50:00 +08:00
wangjiahao
f31eb4efbc feat:刷新时间可以选择单位 2021-11-03 17:44:20 +08:00
王嘉豪
f802d8e4f2
Merge pull request #1060 from dataease/pr@dev@refactor_panel-show 
refactor:仪表板刷新到秒级别
 2021-11-03 16:58:47 +08:00
wangjiahao
d739f203d9 fix:跳转设置删除配置后再打开显示字段id 2021-11-03 15:07:32 +08:00
taojinlong
d7aa576a02 fix: 校验数据源 2021-11-03 11:28:57 +08:00
junjie
34e187792b fix: 直连sql，不支持数据关联 2021-11-03 11:14:14 +08:00
junjie
0dac6cead2 fix: 创建关联关系弹框清空上次选项 2021-11-03 11:12:52 +08:00
junjie
2a78e0810f fix: 创建视图阻止回车事件提交form 2021-11-03 11:12:08 +08:00
wangjiahao
adb31a388f refactor:切换矩阵式与悬浮时建议优化 2021-11-02 23:08:38 +08:00
wangjiahao
95fdfc16c6 fix:选择时间组件后拖动时间组件,顶部的操作栏不会跟着一起移动 2021-11-02 16:40:49 +08:00
wangjiahao
fcc05f3121 refactor:跳转设置,联动视图增加图标 2021-11-02 16:12:49 +08:00
junjie
aac301b462 feat:词云 2021-11-02 16:06:12 +08:00
junjie
40cf834a48 refactor: 轴线自定义刻度数限制不超过100 2021-11-02 16:01:30 +08:00
XiaJunjie2020
d8a80fba39
Merge pull request #1110 from dataease/pr@dev@refactor_axis_split_count 
refactor: 轴线自定义刻度数限制不超过100
 2021-11-02 15:46:53 +08:00
taojinlong
a9f5e1a6a5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-02 15:45:27 +08:00
taojinlong
76141c85dc feat: 更新数据源,左侧树状结构保持不变 2021-11-02 15:44:35 +08:00
junjie
d2a6ad05b4 refactor: 轴线自定义刻度数限制不超过100 2021-11-02 15:35:53 +08:00
fit2cloud-chenyw
f58adcda97 fix: 公共链接分享老密码过长 2021-11-02 15:20:32 +08:00
fit2cloud-chenyw
39d240d6b0 refactor: 主题另存为功能 2021-11-02 15:20:18 +08:00
junjie
96749e35e3 feat:词云 2021-11-02 12:33:06 +08:00
XiaJunjie2020
2e32349cdb
Merge pull request #1106 from dataease/pr@dev@feat_word_cloud 
feat:词云
 2021-11-02 12:19:23 +08:00
junjie
e3d9f78200 fix: 指针图图例修复 2021-11-02 12:14:47 +08:00
junjie
5300ed1a7d feat:词云 2021-11-02 12:01:42 +08:00
junjie
f38186cee0 feat:调色板默认色 2021-11-02 10:32:30 +08:00
fit2cloud-chenyw
afda4530ec fix: 基础设置表单验证 2021-11-01 18:46:21 +08:00
taojinlong
896b6a4c66 feat: redshift mongo 只有直连模式 2021-11-01 18:31:38 +08:00
taojinlong
ddde405508 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-01 18:28:18 +08:00
fit2cloud-chenyw
4fc2031371 Merge branch 'dev' of fit2cloud:dataease/dataease into dev 2021-11-01 18:00:22 +08:00
fit2cloud-chenyw
c4204e2866 refactor: 优化公共链接参数长度 2021-11-01 17:59:48 +08:00
taojinlong
e1dd3f90de feat: redshift 数据源 2021-11-01 17:33:31 +08:00
wangjiahao
c7bfab9654 fix:文本链接修改，仪表板底色修改，保存按钮还是灰的问题 2021-11-01 17:24:56 +08:00
junjie
83d6a83a6b feat:瀑布图 2021-11-01 16:38:42 +08:00
taojinlong
99f680523f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-01 15:00:56 +08:00
taojinlong
308a0f9393 feat: redshift 2021-11-01 15:00:33 +08:00
taojinlong
e012c76ef0 perf: 优化任务日志的请求超时 2021-11-01 14:13:19 +08:00
fit2cloud-chenyw
1d6467f54f feat: 开源版用户列表隐藏角色和组织 2021-11-01 14:11:54 +08:00
wangjiahao
7d4bea2190 fix:修改跳转设置可能保存不上的问题 2021-11-01 12:12:56 +08:00
junjie
e2e489e2b7 feat:瀑布图 2021-11-01 10:48:47 +08:00
fit2cloud-chenyw
a4101d4b66
Merge pull request #1031 from dataease/pr@dev@custom_theme 
feat: 新增自定义主题
 2021-10-31 02:05:15 +08:00
fit2cloud-chenyw
50ff8d5b44 feat: 自定义主题基本功能 2021-10-31 02:01:52 +08:00
wangjiahao
001c974e9f refactor:仪表板刷新到秒级别 2021-10-29 17:46:04 +08:00
王嘉豪
97ddcf69c9
Merge pull request #1057 from dataease/pr@dev@refactor_panel-show 
fix:仪表板跳转联动选项值显示异常
 2021-10-29 13:51:16 +08:00
wangjiahao
7ca65ff280 fix:仪表板跳转联动选项值显示异常 2021-10-29 13:47:18 +08:00
XiaJunjie2020
04c7a3c979
Merge pull request #1052 from dataease/pr@dev@fix_antv 
fix: antv点击坐标
 2021-10-29 13:40:24 +08:00
junjie
c5f997ac4e fix: antv点击坐标 2021-10-29 13:39:14 +08:00
wangjiahao
5ce24a47b2 refactor:仪表板跳转优化，样式调整，国际化等 2021-10-29 12:53:25 +08:00
junjie
69e0f49c8e feat: 视图支持设置结果展示 2021-10-29 10:32:06 +08:00
wangjiahao
d9071fdc52 refactor:代码回退 2021-10-28 18:36:05 +08:00
junjie
5d57b7ad1e feat: 视图支持设置结果展示 2021-10-28 18:02:56 +08:00
junjie
d7ad1b86d2 feat: 视图支持设置结果展示 2021-10-28 17:22:46 +08:00
wangjiahao
1a5159f40d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V27__de1.4.sql
 2021-10-28 17:05:50 +08:00
wangjiahao
8ec93a1337 feat:仪表板支持仪表板之间跳转，外部链接跳转 2021-10-28 17:05:16 +08:00
junjie
34df55d281 feat: 明细表page size属性位置调整 2021-10-28 14:33:21 +08:00
junjie
2f46571f17 feat: 表格合计调整 2021-10-28 11:37:50 +08:00
junjie
18c2c190d2 fix: rollback 2021-10-25 17:01:05 +08:00
taojinlong
1ef965357d feat: 登录时，对用户名密码加密 2021-10-25 15:36:51 +08:00
taojinlong
54ef74ff4b feat: 支持mongodb 2021-10-25 12:22:01 +08:00
fit2cloud-chenyw
1e4b40dd23
Merge pull request #1007 from dataease/pr@dev@feat_basic_setting 
feat: 增加超时时间配置
 2021-10-22 15:08:41 +08:00
fit2cloud-chenyw
b609955a44 feat: 增加超时时间配置 2021-10-22 15:06:50 +08:00
junjie
027844a850 feat:瀑布图 2021-10-22 10:19:30 +08:00
junjie
11f2ae5b67 feat:瀑布图 2021-10-22 10:05:53 +08:00
fit2cloud-chenyw
dc3288dba3 style: UI微调 2021-10-21 18:26:10 +08:00
junjie
6fd580e2f7 feat:antv 2021-10-21 17:37:13 +08:00
junjie
90c2b261ba feat:antv 2021-10-21 16:11:51 +08:00
fit2cloud-chenyw
4bbbee07e0 fix: 去除仪表板分享有效期'此刻' 2021-10-21 14:38:06 +08:00
fit2cloud-chenyw
18d7561aec
Merge pull request #999 from dataease/pr@dev@feat_email 
feat: 增加邮件配置
 2021-10-21 13:51:24 +08:00
fit2cloud-chenyw
d3952387c1 feat: 增加邮件配置 2021-10-21 13:49:58 +08:00
junjie
485304b113 feat:瀑布图 2021-10-21 11:36:39 +08:00
junjie
4d0d4e2bc6 feat:瀑布图 2021-10-21 11:09:34 +08:00
junjie
1abfbef7b6 feat:瀑布图 2021-10-21 10:49:03 +08:00
junjie
78f5a9892a feat:详情icon 2021-10-20 17:12:09 +08:00
fit2cloud-chenyw
ccc539f5b0
Merge pull request #984 from dataease/pr@dev@feat_public_link_over_time 
feat: 公共链接增加有效期
 2021-10-20 14:05:47 +08:00
fit2cloud-chenyw
a7144fd0cb feat: 公共链接增加有效期 2021-10-20 14:03:50 +08:00
junjie
656cd6f2c9 refactor：代码优化 2021-10-20 12:25:51 +08:00
junjie
e80060c042 feat:视图、数据集title后增加'...'图标 2021-10-20 11:46:49 +08:00
junjie
d2e40baf2d feat:增加默认颜色等 2021-10-20 11:32:05 +08:00
wangjiahao
55e39cbf04 feat:增加图片样式组件，统一样式组件设置 2021-10-19 19:11:40 +08:00
fit2cloud-chenyw
1bf3f1d5e2 feat: 增加仪表板时间组件 2021-10-19 15:00:24 +08:00
junjie
5be5814f7d feat:antv 2021-10-15 16:49:15 +08:00
junjie
e924a9af2d feat:antv 2021-10-15 12:36:06 +08:00
junjie
2cefa6f20f feat:antv 2021-10-15 12:26:52 +08:00
王嘉豪
0b5f5b10e7
Merge pull request #944 from dataease/pr@dev@feat_panel-hyperlinks 
refactor:PDF导出，模板导出等增加数据准备提示，PDF导出后自动关闭对话框
 2021-10-15 10:37:38 +08:00
wangjiahao
c6482a8e84 refactor:PDF导出，模板导出等增加数据准备提示，PDF导出后自动关闭对话框 2021-10-15 10:36:25 +08:00
junjie
412432acf8 feat:antv 2021-10-14 18:06:19 +08:00
taojinlong
7ff9b00deb feat: druid 替换 c3p0; 以类加载的方式引入数据源驱动；支持myqsl5.1 2021-10-14 17:55:27 +08:00
taojinlong
48fc0234cf fix: excel 替换后，字段标示没有重新渲染 2021-10-14 10:16:31 +08:00
taojinlong
0904b24a8f fix: 【数据集】追加excel时创建excel提示异常 2021-10-13 18:45:29 +08:00
fit2cloud-chenyw
33842ef0d7
Merge pull request #927 from dataease/pr@dev@style_dataset 
style: 数据集样式优化
 2021-10-13 15:32:55 +08:00
fit2cloud-chenyw
f5e0235815 style: 数据集样式优化 2021-10-13 15:31:03 +08:00
wangjiahao
df1336241c refactor: 去掉无用的注释 2021-10-13 15:11:48 +08:00
wangjiahao
e0b3e6a2c1 Merge remote-tracking branch 'origin/v1.3' into v1.3 2021-10-13 14:19:31 +08:00
wangjiahao
7a8198b7c7 refactor: 优化编辑时全屏问题，scroll时 样式组件定位问题，去掉部分前段日志 2021-10-13 14:19:17 +08:00
fit2cloud-chenyw
ccb0f91cdb
Merge pull request #922 from dataease/pr@dev@fix_share 
Pr@dev@fix share
 2021-10-13 12:20:48 +08:00
wangjiahao
1dda00c5a8 refactor: 防止编辑状态全屏错位 2021-10-13 12:20:12 +08:00
fit2cloud-chenyw
cd15048a1d
Merge pull request #921 from dataease/pr@dev@fix_share 
fix: 修复文本列表未及时刷新数据；分享列表不能收藏。
 2021-10-13 12:19:28 +08:00
fit2cloud-chenyw
0c02ffef0f fix: 修复文本列表未及时刷新数据；分享列表不能收藏。 2021-10-13 12:18:25 +08:00
wangjiahao
e1a151a3cc feat: tab组件增加样式设计 2021-10-13 11:30:02 +08:00
wangjiahao
354afd5d7b fix: 主题名称超出边界问题 2021-10-13 10:36:45 +08:00
wangjiahao
ffff72d403 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 18:38:53 +08:00
wangjiahao
b23dd3d8f0 refactor: 主题名称修改优化 2021-10-12 18:38:33 +08:00
fit2cloud-chenyw
6c08fdc967
Merge pull request #914 from dataease/pr@dev@fix_style_tapd 
style: 主题切换样式查漏补缺
 2021-10-12 18:25:52 +08:00
fit2cloud-chenyw
81e795b5f0 style: 主题切换样式查漏补缺 2021-10-12 18:24:27 +08:00
wangjiahao
f4e07fc869 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 17:50:15 +08:00
wangjiahao
e7cb8e63dd refactor: 矩阵按钮修改 文案修改 2021-10-12 17:48:07 +08:00
fit2cloud-chenyw
bd994d61d9 fix: 完善深色主题 2021-10-12 16:36:00 +08:00
wangjiahao
c81ca9d249 fix: 修复过滤组件取消，图片上传取消矩阵模式依然占位的问题 2021-10-12 12:33:00 +08:00
wangjiahao
b5e0c6bd84 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 11:33:51 +08:00
wangjiahao
30a7ec804c refactor: 代码回退 2021-10-12 11:33:27 +08:00
junjie
aa68de259c feat:过滤条件优化 2021-10-12 11:14:05 +08:00