Commit Graph

10828 Commits

Author SHA1 Message Date
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
ulleo
ad0cad2a2d
Merge pull request #6781 from ulleo/dev-v2
fix: 编辑页面下,新添加图表后,设置图表导致联动、跳转,导致原有图表的联动、跳转标识丢失
2023-11-21 16:16:49 +08:00
ulleo
7f113dd609 fix: 编辑页面下,新添加图表后,设置图表导致联动、跳转,导致原有图表的联动、跳转标识丢失 2023-11-21 16:15:34 +08:00
fit2cloud-chenyw
ad75e6df49
Merge pull request #6778 from dataease/pr@dev-v2@perf_embedded_limit
Pr@dev v2@perf embedded limit
2023-11-21 12:22:20 +08:00
fit2cloud-chenyw
3fa33d5784 perf: 嵌入式应用跨域设置 2023-11-21 12:21:14 +08:00
王嘉豪
36e4a28b47
Merge pull request #6775 from dataease/pr@dev-v2@refactor_scale
refactor: 大屏编辑预览状态禁用鼠标比例伸缩功能
2023-11-21 11:13:35 +08:00
wangjiahao
167f708ee6 refactor: 大屏编辑预览状态禁用鼠标比例伸缩功能 2023-11-21 11:12:40 +08:00
fit2cloud-chenyw
07024cd7e5 perf: 嵌入式应用个数限制 2023-11-21 11:04:32 +08:00
王嘉豪
74e5fb7834
Merge pull request #6774 from dataease/pr@dev-v2@fix_scale
fix: 修复大屏伸缩比例直接输入数字未生效问题
2023-11-21 10:59:12 +08:00
wangjiahao
59c6793b04 fix: 修复大屏伸缩比例直接输入数字未生效问题 2023-11-21 10:56:48 +08:00
王嘉豪
219b46e08a
Merge pull request #6773 from dataease/pr@dev-v2@style_preview
style: 优化预览页按钮样式
2023-11-21 10:51:28 +08:00
wangjiahao
a0e1b00ee1 style: 优化预览页按钮样式 2023-11-21 10:50:02 +08:00
fit2cloud-chenyw
b0046a4427
Merge pull request #6771 from dataease/pr@dev-v2@perf_ds_task_sql
feat: 任务管理flyway
2023-11-21 10:13:08 +08:00
fit2cloud-chenyw
8756cc41d8 feat: 任务管理flyway 2023-11-21 10:11:57 +08:00
王嘉豪
341dd0763b
Merge pull request #6770 from dataease/pr@dev@refactor_template-market
refactor: 对接V2模版市场正式环境优化
2023-11-20 19:53:50 +08:00
wangjiahao
372b747bd2 refactor: 对接V2模版市场正式环境优化 2023-11-20 19:51:24 +08:00
fit2cloud-chenyw
4b14332163
Merge pull request #6756 from dataease/pr@dev-v2@feat_embedded_manage
feat: 嵌入式管理
2023-11-17 23:36:24 +08:00
fit2cloud-chenyw
24c1810cd6 feat: 嵌入式管理 2023-11-17 23:35:07 +08:00
fit2cloud-chenyw
715e76c7be
Merge pull request #6752 from dataease/pr@dev-v2@fix_org_switcher
fix: 无法切换组织
2023-11-17 17:52:53 +08:00
王嘉豪
670d46349a
Merge pull request #6753 from dataease/pr@dev-v2@refactor_view-count
fix: 修复富文本图表不识别记录数字段问题
2023-11-17 17:51:15 +08:00
wangjiahao
1651f5413a fix: 修复富文本图表不识别记录数字段问题 2023-11-17 17:48:50 +08:00
fit2cloud-chenyw
21749d5935 fix: 无法切换组织 2023-11-17 17:48:23 +08:00
王嘉豪
0d2d245653
Merge pull request #6750 from dataease/pr@dev-v2@refactor_view-manage
refactor: 仪表板、数据大屏中的图表联动字段使用图表制作中参与的字段
2023-11-17 17:27:30 +08:00
wangjiahao
d25b9ac0dd refactor: 仪表板、数据大屏中的图表联动字段使用图表制作中参与的字段 2023-11-17 17:26:30 +08:00
fit2cloud-chenyw
fe77de49ca
Merge pull request #6748 from dataease/pr@dev-v2@feat_api_doc
feat: api文档
2023-11-17 17:20:49 +08:00
fit2cloud-chenyw
f8f48da89d feat: api文档 2023-11-17 17:19:41 +08:00
王嘉豪
08cc003980
Merge pull request #6741 from dataease/pr@dev-v2@refactor_template
refactor: 优化模版样式应用逻辑等
2023-11-17 16:14:49 +08:00
wangjiahao
fd0e546ca5 refactor: 优化模版样式应用逻辑等 2023-11-17 16:12:52 +08:00