Commit Graph

10676 Commits

Author SHA1 Message Date
wisonic-s
f765203ac4
Merge pull request #6937 from dataease/pr@dev-v2@fix_area_gradient
fix: 面积图开启渐变后颜色随大小改变
2023-11-30 11:18:51 +08:00
wisonic-s
18a8f9ff8f fix: 面积图开启渐变后颜色随大小改变 2023-11-30 11:17:29 +08:00
taojinlong
9cfdf0f9a5
Merge pull request #6936 from dataease/pr@dev-v2@fixDatasource
feat: 读取数据源更新频率配置
2023-11-29 19:30:04 -06:00
taojinlong
60bfa919bc feat: 读取数据源更新频率配置 2023-11-30 09:29:21 +08:00
王嘉豪
86a68b3d3c
Merge pull request #6935 from dataease/pr@dev-v2@refactor_create
refactor: 使用模板中心创建UI优化
2023-11-30 00:02:48 +08:00
wangjiahao
23a3cbd5d0 refactor: 使用模板中心创建UI优化 2023-11-30 00:01:55 +08:00
taojinlong
0e4667e5c9
Merge pull request #6933 from dataease/pr@dev-v2@fixDatasource
feat: 读取数据源更新频率配置
2023-11-29 05:26:47 -06:00
taojinlong
1afa7e612f feat: 读取数据源更新频率配置 2023-11-29 19:05:24 +08:00
fit2cloud-chenyw
cd58637d0f
Merge pull request #6932 from dataease/pr@dev-v2@perf_hide_sync_task
perf: 隐藏同步任务菜单
2023-11-29 18:46:16 +08:00
fit2cloud-chenyw
1e40c280ef perf: 隐藏同步任务菜单 2023-11-29 18:45:16 +08:00
fit2cloud-chenyw
c617a7e86f
Merge pull request #6930 from dataease/pr@dev-v2@perf_hide_bind_setting
perf: 隐藏绑定设置
2023-11-29 18:35:46 +08:00
fit2cloud-chenyw
0ded6b3719 perf: 隐藏绑定设置 2023-11-29 18:34:47 +08:00
fit2cloud-chenyw
642b93a52f
Merge pull request #6928 from dataease/pr@dev-v2@perf_lic_controller
perf: 许可控制
2023-11-29 18:28:22 +08:00
fit2cloud-chenyw
1bdbfaf3b3 perf: 许可控制 2023-11-29 18:27:35 +08:00
dataeaseShu
e08d92d1b7
Merge pull request #6927 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-29 17:59:07 +08:00
dataeaseShu
defc522ed9 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-29 17:58:35 +08:00
dataeaseShu
3fb2921e72 fix: 动态时间切换bug 2023-11-29 17:58:10 +08:00
fit2cloud-chenyw
c177304b18
Merge pull request #6926 from dataease/pr@dev-v2@perf_platform_login_tips
perf: 自动创建用户文案
2023-11-29 17:38:01 +08:00
fit2cloud-chenyw
7ae8074065 perf: 自动创建用户文案 2023-11-29 17:37:13 +08:00
fit2cloud-chenyw
83fec2e45f
Merge pull request #6925 from dataease/pr@dev-v2@style_top_bar
style: 头部返回工作台右侧间距调整为20px
2023-11-29 17:32:08 +08:00
fit2cloud-chenyw
24c780e2be style: 头部返回工作台右侧间距调整为20px 2023-11-29 17:31:16 +08:00
wisonic-s
5f5822fbae
Merge pull request #6924 from dataease/pr@dev-v2@fix_null_value_linkage
fix: 空值联动异常
2023-11-29 17:26:14 +08:00
wisonic-s
ff4411a1ae fix: 空值联动异常 2023-11-29 17:22:08 +08:00
fit2cloud-chenyw
567851fce9
Merge pull request #6922 from dataease/pr@dev-v2@perf_console_log
perf: 删除控制台打印
2023-11-29 17:07:52 +08:00
fit2cloud-chenyw
70332464f4 perf: 删除控制台打印 2023-11-29 17:06:53 +08:00
dataeaseShu
af8ca616f5
Merge pull request #6921 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-29 16:58:12 +08:00
dataeaseShu
35b8205855 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-29 16:57:43 +08:00
dataeaseShu
5ef255705e fix: 快速创建-使用模板创建 2023-11-29 16:55:43 +08:00
王嘉豪
272bb354de
Merge pull request #6916 from dataease/pr@dev-v2@style_update
Pr@dev v2@style update
2023-11-29 13:35:17 +08:00
wangjiahao
fa557b136c Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2 2023-11-29 13:33:35 +08:00
wangjiahao
b3f65f02b1 style: 样式调整 2023-11-29 13:25:15 +08:00
王嘉豪
b0f079dfe5
Merge pull request #6915 from dataease/pr@dev-v2@refactor_market
refactor: 模板管理模板市场合并为模板中心
2023-11-29 13:18:04 +08:00
wangjiahao
6dc0ea250b refactor: 模板管理模板市场合并为模板中心 2023-11-29 13:11:50 +08:00
junjun
3d21167a32 Merge remote-tracking branch 'origin/dev-v2' into dev-v2 2023-11-28 16:40:03 +08:00
junjun
6fa389e6eb Revert "fix: calcite version"
This reverts commit f232e7fcba.
2023-11-28 16:39:48 +08:00
taojinlong
f787bd0ae3
Merge pull request #6900 from dataease/pr@dev-v2@fixDatasource
fix: 替换excel文件失败
2023-11-28 02:34:52 -06:00
taojinlong
a84e27d687 fix: 替换excel文件失败 2023-11-28 16:33:07 +08:00
dataeaseShu
24103273a1
Merge pull request #6892 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-28 14:37:09 +08:00
dataeaseShu
b9fa60cdd9 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-28 14:36:29 +08:00
dataeaseShu
1313d2afc3 fix: 日期过滤组件支持动态值 2023-11-28 14:35:00 +08:00
junjun
f232e7fcba fix: calcite version 2023-11-28 12:36:10 +08:00
王嘉豪
36846e9753
Merge pull request #6889 from dataease/pr@dev-v2@refactor_market-manage
refactor: 模版管理UI变更
2023-11-28 12:19:05 +08:00
wangjiahao
dd51482a48 refactor: 模版管理UI变更 2023-11-28 12:06:55 +08:00
Junjun
faa242e374
Merge pull request #6885 from dataease/pr@dev-v2@fix_calcitev
fix: calcite version
2023-11-28 10:47:05 +08:00
junjun
aca9e57be5 fix: calcite version 2023-11-28 10:45:58 +08:00
王嘉豪
3c1ba64d81
Merge pull request #6884 from dataease/pr@dev-v2@refactor_market-UI
refactor: UI调整
2023-11-28 10:33:43 +08:00
wangjiahao
9235e71401 refactor: UI调整 2023-11-28 10:29:50 +08:00
Junjun
81a3ebf51a
Merge pull request #6882 from dataease/pr@dev-v2@fix_calcite
fix: calcite version
2023-11-28 09:42:51 +08:00
junjun
786ddd5834 fix: calcite version 2023-11-28 09:41:14 +08:00
Junjun
50ef7b5768
Merge pull request #6880 from dataease/pr@dev-v2@feat_calcite
feat: 升级calcite(迁移自定义calcite代码至calcite-de)
2023-11-27 22:10:49 +08:00