Commit Graph

5880 Commits

Author SHA1 Message Date
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
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +08:00
吕昊泽
00e7b5f349 修复[issue:2339](https://github.com/dataease/dataease/issues/2339)excel创建关联数据集保留原数据类型 2022-05-29 21:38:20 +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
fit2cloud-chenyw
f361ae43e7
Merge pull request #2341 from dataease/pr@dev@fix_update_personinfo
fix: 修改个人信息报错
2022-05-29 09:44:39 +08:00
fit2cloud-chenyw
960040be9a fix: 修改个人信息报错 2022-05-29 09:41:09 +08:00
taojinlong
9572a0fb58 fix: API 数据集校验错误 2022-05-28 22:21:28 +08:00
taojinlong
2d1793f3f5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-28 21:58:06 +08:00
taojinlong
0b468cc22b fix: API 数据集校验错误 2022-05-28 21:57:46 +08:00
fit2cloud-chenyw
319df86b5b fix: 暂时屏蔽视图操作日志 2022-05-28 21:44:55 +08:00
fit2cloud-chenyw
5973f9beac fix: 恢复因为增加日志修改的api 2022-05-28 21:44:36 +08:00
fit2cloud-chenyw
f23580d46d
Merge pull request #2338 from dataease/pr@dev@fix_disable_view_log
fix: 暂时屏蔽视图操作日志
2022-05-28 21:43:48 +08:00
fit2cloud-chenyw
215d262bbf fix: 暂时屏蔽视图操作日志 2022-05-28 21:42:53 +08:00
fit2cloud-chenyw
5a7f3f4c6c
Merge pull request #2337 from dataease/pr@dev@fix_log_api
fix: 恢复因为增加日志修改的api
2022-05-28 21:36:13 +08:00
fit2cloud-chenyw
6fd3ccf91b fix: 恢复因为增加日志修改的api 2022-05-28 21:35:06 +08:00
fit2cloud-chenyw
39ed55c1bb feat: 符号地图插件记录sql 2022-05-28 13:17:53 +08:00
fit2cloud-chenyw
7974ae2abd
Merge pull request #2335 from dataease/pr@dev@feat_symbol_map_plugin_sql
feat: 符号地图插件记录sql
2022-05-28 13:14:49 +08:00
fit2cloud-chenyw
acecae5d7a feat: 符号地图插件记录sql 2022-05-28 13:13:24 +08:00
wangjiahao
ec9f4c59c6 fix: 网页组件编辑状态遮罩未显示问题 2022-05-28 12:13:59 +08:00
taojinlong
718585f3a0 fix: excel 替换、追加不生效 2022-05-28 10:51:11 +08:00
taojinlong
5f8f93f7d4 fix: excel 替换、追加不生效 2022-05-28 10:49:49 +08:00
taojinlong
fcc7430343 build: 升级版本号 2022-05-28 09:42:08 +08:00