Commit Graph

5595 Commits

Author SHA1 Message Date
王嘉豪
feabca531c
Merge pull request #2359 from dataease/refactor_batch-opt-style
refactor: 缓存清理注解改为异步处理,加快接口处理时间
2022-05-31 12:05:22 +08:00
wangjiahao
31ba1baa31 refactor: 缓存清理注解改为异步处理,加快接口处理时间 2022-05-31 12:04:43 +08:00
taojinlong
c9bbc2ef2c fix: 自定义驱动 2022-05-30 23:30:40 +08:00
taojinlong
803792fec0 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-30 21:23:10 +08:00
taojinlong
d49f617c91 fix: 自定义驱动 2022-05-30 21:23:03 +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
f365527520 Merge branch 'v1.11' into dev 2022-05-30 15:52:04 +08:00
taojinlong
987fd07403 feat: 调整驱动管理页面 2022-05-30 15:51:39 +08:00
taojinlong
722648bb14 Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-05-30 15:49:33 +08:00
junjun
fe2473241b refactor: 视图字段快速删除样式优化 2022-05-30 15:19:21 +08:00
junjun
3edd250c9b refactor: 视图字段快速删除样式优化 2022-05-30 15:18:55 +08:00
taojinlong
8ecf790781 Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-05-30 15:08:34 +08:00
taojinlong
9be4a14b27 fix: 创建数据表时需要指定排序为 utf8mb4_general_ci 2022-05-30 15:08:19 +08:00
王嘉豪
ae2c447dcc
Merge pull request #2352 from dataease/dev
Dev
2022-05-30 14:43:59 +08:00
王嘉豪
4b90099144
Merge pull request #2351 from dataease/pr@dev@refactor_batch-opt-style
refactor: 批量操作样式优化
2022-05-30 14:43:07 +08:00
wangjiahao
488044bde5 refactor: 批量操作样式优化 2022-05-30 14:42:00 +08:00
王嘉豪
16127de38a
Merge pull request #2350 from dataease/dev
Dev
2022-05-30 13:50:17 +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
bd11d84240
Merge pull request #2349 from dataease/pr@dev_fix_filter_center
fix: 文字位置去除 中 中场景,默认上 中
2022-05-30 11:36:26 +08:00
dataeaseShu
97cfaaec99 fix: 文字位置去除 中 中场景,默认上 中 2022-05-30 11:34:52 +08:00
taojinlong
2ae62dff1e fix: 替换excel时,提示影响计算字段 2022-05-30 10:40:52 +08:00
taojinlong
a132fa3891 fix: API 数据集校验错误 2022-05-30 10:40:46 +08:00
taojinlong
7879eed3ff fix: API 数据集校验错误 2022-05-30 10:40:44 +08:00
fit2cloud-chenyw
fb446e3943 fix: 修改log文件名称 2022-05-30 10:24:45 +08:00
fit2cloud-chenyw
764dcbe781
Merge pull request #2348 from dataease/pr@dev@fix_log_filename
fix: 修改log文件名称
2022-05-30 10:23:28 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
fit2cloud-chenyw
5e6e00e84c fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:08:38 +08:00
fit2cloud-chenyw
ce1f06705e
Merge pull request #2346 from dataease/pr@dev@fix_log_filter_error
fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误
2022-05-30 10:07:53 +08:00
fit2cloud-chenyw
966d7f90a7 fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:06:50 +08:00
taojinlong
a4a665203d fix: 替换excel时,提示影响计算字段 2022-05-30 01:11:53 +08:00
fit2cloud-chenyw
32108e8686 fix: 纯内网环境主题切换失效 2022-05-29 13:39:06 +08:00
fit2cloud-chenyw
620661f1bd
Merge pull request #2344 from dataease/pr@dev@fix_theme_switch
fix: 纯内网环境主题切换失效
2022-05-29 13:38:20 +08:00
fit2cloud-chenyw
127caff11e fix: 纯内网环境主题切换失效 2022-05-29 13:37:26 +08:00
fit2cloud-chenyw
48ce12182b
Merge pull request #2343 from dataease/pr@dev@fix_msg_setting
fix: 接受消息设置联动错误
2022-05-29 11:03:04 +08:00
fit2cloud-chenyw
b63ffb4513 fix: 接受消息设置联动错误 2022-05-29 11:01:22 +08:00
fit2cloud-chenyw
9662fb72fd
Merge pull request #2342 from dataease/pr@dev@style_dataset_union_form
style: 禁止数据源中修改全局控件样式,恢复关联数据集form中样式属性
2022-05-29 10:01:45 +08:00
fit2cloud-chenyw
f1be625f7f style: 禁止数据源中修改全局控件样式,恢复关联数据集form中样式属性 2022-05-29 10:00:46 +08:00
fit2cloud-chenyw
792a86667f fix: 修改个人信息报错 2022-05-29 09:46:29 +08:00