Commit Graph

10828 Commits

Author SHA1 Message Date
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
junjun
5b158cd0bf feat: 升级calcite(迁移自定义calcite代码至calcite-de) 2023-11-27 22:08:05 +08:00
Junjun
bb39956bd4
Merge pull request #6876 from dataease/pr@dev-v2@fix_id
fix: id序列化
2023-11-27 18:43:54 +08:00
junjun
bbc95c6d8c fix: id序列化 2023-11-27 18:42:31 +08:00
Junjun
a3af0caa47
Merge pull request #6871 from dataease/pr@dev-v2@feat_calcite
feat: 升级calcite(迁移自定义calcite代码至calcite-de)
2023-11-27 17:55:34 +08:00
junjun
c63e06449c feat: 升级calcite(迁移自定义calcite代码至calcite-de) 2023-11-27 17:54:38 +08:00
Junjun
09da6bbd2a
Merge pull request #6868 from dataease/pr@dev-v2@revert_calcite
revert: revert
2023-11-27 17:09:30 +08:00
junjun
7dff8a5606 revert: revert 2023-11-27 17:08:41 +08:00
dataeaseShu
98231a9bd2
Merge pull request #6867 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-27 17:00:02 +08:00
dataeaseShu
30479ddfc1 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-27 16:59:17 +08:00
dataeaseShu
c6e8498d10 fix: 动态时间 2023-11-27 16:54:21 +08:00
王嘉豪
896cc6c27e
Merge pull request #6866 from dataease/pr@dev-v2@refactor_market
refactor: 模版市场UI优化
2023-11-27 16:40:39 +08:00
王嘉豪
b563b81a56
Merge branch 'dev-v2' into pr@dev-v2@refactor_market 2023-11-27 16:40:09 +08:00
wangjiahao
8d68fb916b refactor: 模版市场UI优化 2023-11-27 16:33:55 +08:00
Junjun
5969444127
Merge pull request #6863 from dataease/pr@dev-v2@feat_calcite
feat: 升级calcite(迁移自定义calcite代码至calcite-de)
2023-11-27 14:02:14 +08:00
junjun
b084095f66 feat: 升级calcite(迁移自定义calcite代码至calcite-de) 2023-11-27 14:00:43 +08:00
fit2cloud-chenyw
04dc406bc8
Merge pull request #6856 from dataease/pr@dev-v2@perf_platform_login
feat: 第三方平台登录对接禁止自动创建用户设置
2023-11-27 11:19:44 +08:00
fit2cloud-chenyw
e6f0a4b9c0 Merge branch 'dev-v2' into pr@dev-v2@perf_platform_login 2023-11-27 11:18:49 +08:00
fit2cloud-chenyw
4b1f78a1ea feat: 第三方平台登录对接禁止自动创建用户设置 2023-11-27 11:13:30 +08:00
fit2cloud-chenyw
c2cc49ffbb
Merge pull request #6855 from dataease/pr@dev-v2@perf_sys_setting_flyway
perf: 参数设置flyway
2023-11-27 10:56:22 +08:00
fit2cloud-chenyw
99b233167e perf: 参数设置flyway 2023-11-27 10:51:10 +08:00
fit2cloudrd
0d64e7ab95
Merge pull request #6854 from dataease/pr@v2_modify_originlist
refactor: 修改跨域设置
2023-11-27 10:30:57 +08:00
xuwei-fit2cloud
3cf30b1794 refactor: 修改跨域设置 2023-11-27 10:27:53 +08:00
fit2cloud-chenyw
98381dec47
Merge pull request #6852 from dataease/pr@dev-v2@perf_auto_create_user
perf: 自动创建用户设置(xpack)
2023-11-27 09:09:27 +08:00
fit2cloud-chenyw
4b9038f4f1 perf: 自动创建用户设置(xpack) 2023-11-27 09:05:34 +08:00
fit2cloud-chenyw
9a21b85f60
Merge pull request #6851 from dataease/pr@dev-v2@perf_aksk
perf: ak/sk创建
2023-11-25 16:57:54 +08:00
fit2cloud-chenyw
583ba3d81c perf: ak/sk创建 2023-11-25 16:57:06 +08:00
fit2cloud-chenyw
ee3a04d36b
Merge pull request #6850 from dataease/pr@dev-v2@feat_apikey_flyway
feat: ak/sk相关flyway
2023-11-25 16:51:14 +08:00
fit2cloud-chenyw
0db2aeb29a feat: ak/sk相关flyway 2023-11-25 16:50:11 +08:00
fit2cloud-chenyw
b65c310b9c
Merge pull request #6849 from dataease/pr@dev-v2@perf_apisix_aksk
perf: apisix集成ak/sk机制
2023-11-25 16:41:55 +08:00
fit2cloud-chenyw
278f394962 perf: apisix集成ak/sk机制 2023-11-25 16:41:10 +08:00
fit2cloud-chenyw
4f8c8c8964
Merge pull request #6848 from dataease/pr@dev-v2@fix_no_license_error
fix: 社区版本浏览器控制台报错没有许可
2023-11-25 16:40:04 +08:00
fit2cloud-chenyw
359b8116f8 fix: 社区版本浏览器控制台报错没有许可 2023-11-25 16:39:16 +08:00
fit2cloud-chenyw
3a0c1b1e1d
Merge pull request #6847 from dataease/pr@dev-v2@feat_aksk_auth
feat: ak/sk认证校验
2023-11-25 16:16:58 +08:00
fit2cloud-chenyw
0d48370fe4 feat: ak/sk认证校验 2023-11-25 16:16:05 +08:00
fit2cloud-chenyw
432a8d0fca
Merge pull request #6846 from dataease/pr@dev-v2@feat_apikey_page
feat: ApiKey配置页
2023-11-25 11:47:49 +08:00
fit2cloud-chenyw
011bebd86e feat: ApiKey配置页 2023-11-25 11:46:21 +08:00
fit2cloud-chenyw
a54a126b94
Merge pull request #6844 from dataease/pr@dev-v2@perf_lic_tips
perf: 企业版license文案信息
2023-11-24 18:05:59 +08:00
fit2cloud-chenyw
bcbf186858 perf: 企业版license文案信息 2023-11-24 18:05:15 +08:00
fit2cloud-chenyw
d3a64e1247
Merge pull request #6843 from dataease/pr@dev-v2@perf_about_copywriting
perf: license文案信息
2023-11-24 17:41:38 +08:00
fit2cloud-chenyw
7f1788415b perf: license文案信息 2023-11-24 17:40:15 +08:00
fit2cloud-chenyw
3b2e29d79c
Merge pull request #6842 from dataease/pr@dev-v2@feat_geo_persistence
feat: 自定义地图目录持久化
2023-11-24 17:26:40 +08:00
fit2cloud-chenyw
c07b1d7fee feat: 自定义地图目录持久化 2023-11-24 17:25:40 +08:00
fit2cloud-chenyw
5b06365d5e
Merge pull request #6841 from dataease/pr@dev-v2@feat_custom_geometry
feat: 自定义地图设置
2023-11-24 17:20:57 +08:00
fit2cloud-chenyw
60b0f322e7 feat: 自定义地图设置 2023-11-24 17:19:55 +08:00
dataeaseShu
f9aac282b6
Merge pull request #6833 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-24 09:51:15 +08:00
dataeaseShu
4cb022654e Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-24 09:50:27 +08:00
dataeaseShu
00e2713da4 fix: 【工作台】间距不对 2023-11-24 09:49:37 +08:00
fit2cloud-chenyw
831a92b91c
Merge pull request #6829 from dataease/pr@dev-v2@perf_cors_config
perf: 跨域配置
2023-11-23 22:29:08 +08:00