Commit Graph

10605 Commits

Author SHA1 Message Date
fit2cloud-chenyw
4b1f78a1ea feat: 第三方平台登录对接禁止自动创建用户设置 2023-11-27 11:13:30 +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
fit2cloud-chenyw
4c8e859329 perf: 跨域配置 2023-11-23 22:28:17 +08:00
fit2cloud-chenyw
8f99a9dd1c
Merge pull request #6828 from dataease/pr@dev-v2@fix_miss_code
fix: 漏提代码
2023-11-23 22:20:40 +08:00
fit2cloud-chenyw
f30ecd1812 fix: 漏提代码 2023-11-23 22:19:35 +08:00
fit2cloud-chenyw
8df0b54183
Merge pull request #6827 from dataease/pr@dev-v2@feat_geo_json_upload
feat: 地理信息文件上传
2023-11-23 22:17:32 +08:00
fit2cloud-chenyw
e9a5bbe0a1 feat: 地理信息文件上传 2023-11-23 22:14:37 +08:00
fit2cloud-chenyw
9f067e3255
Merge pull request #6825 from dataease/pr@dev-v2@fix_authentication_status
fix: 查询第三方平台状态错误
2023-11-23 20:44:56 +08:00
fit2cloud-chenyw
92ada5b068 fix: 查询第三方平台状态错误 2023-11-23 20:43:21 +08:00
fit2cloud-chenyw
a73848f3d8
Merge pull request #6821 from dataease/pr@dev-v2@feat_basic_setting
feat: 系统参数-基础设置
2023-11-23 17:33:03 +08:00
fit2cloud-chenyw
e778f41989 feat: 系统参数-基础设置 2023-11-23 17:31:48 +08:00
dataeaseShu
77524634af
Merge pull request #6819 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-23 17:06:53 +08:00
dataeaseShu
6177bbab7c Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-23 17:05:50 +08:00
dataeaseShu
16f6e76730 fix: 嵌入式的场景下,部分静态资源无法加载。 2023-11-23 17:04:56 +08:00
fit2cloud-chenyw
1d16aa76ee
Merge pull request #6813 from dataease/pr@dev-v2@perf_lark_qr_style
perf: 飞书扫码登录样式优化
2023-11-23 13:29:37 +08:00
fit2cloud-chenyw
db62421454 perf: 飞书扫码登录样式优化 2023-11-23 13:28:24 +08:00
dataeaseShu
bdecb41032
Merge pull request #6807 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-23 10:19:26 +08:00
dataeaseShu
ea19bc38b0 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-23 10:18:17 +08:00
dataeaseShu
251b6c3a29 fix: 嵌入式的场景下,部分静态资源无法加载。 2023-11-23 09:48:38 +08:00
fit2cloud-chenyw
9e75cacd6d
Merge pull request #6804 from dataease/pr@dev-v2@feat_lark_setting
feat: 飞书扫码登录
2023-11-22 23:02:03 +08:00
fit2cloud-chenyw
076e3ced48 feat: 飞书扫码登录 2023-11-22 22:32:10 +08:00
fit2cloud-chenyw
da5ccc873d
Merge pull request #6784 from dataease/pr@dev-v2@feat_lark_setting
feat: 飞书设置
2023-11-21 18:23:29 +08:00
fit2cloud-chenyw
a8e9cc8843 feat: 飞书设置 2023-11-21 18:21:46 +08:00
王嘉豪
2efb7db320
Merge pull request #6783 from dataease/pr@dev-v2@fix_map-export
fix: 修复地图导出图片,PDF出现区域空白问题
2023-11-21 17:09:43 +08:00
wangjiahao
296c6de279 fix: 修复地图导出图片,PDF出现区域空白问题 2023-11-21 17:08:49 +08:00