Commit Graph

10674 Commits

Author SHA1 Message Date
fit2cloud-chenyw
08edbabf5a feat: allatori机制 2023-11-12 14:59:27 +08:00
HaHa
a06a156996 fix-NPE 2023-11-11 01:35:27 +08:00
dataeaseShu
7ade926aef
Merge pull request #6640 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-10 17:25:50 +08:00
dataeaseShu
2f2da81081 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-10 17:24:55 +08:00
dataeaseShu
acc88c2a52 fix: 创建数据源-高级设置-查询超时的上下尖头位置优化 2023-11-10 17:23:36 +08:00
dataeaseShu
a9654bbd45 fix: 资源列表树,如果子目录展开后没有收起,那么上层目录点击收起无响应 2023-11-10 17:05:09 +08:00
dataeaseShu
fcf256dbaf
Merge pull request #6633 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-10 14:04:25 +08:00
dataeaseShu
352dc49877 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-10 14:03:44 +08:00
dataeaseShu
f22f4cb164 fix: 数据复制报错 2023-11-10 14:00:45 +08:00
王嘉豪
399ed238f6
Merge pull request #6625 from dataease/pr@dev-v2@feat_template-market
feat: 模版市场
2023-11-10 08:42:23 +08:00
wangjiahao
2d864eea23 feat: 模版市场 2023-11-10 08:39:42 +08:00
dataeaseShu
abc46e7e8a
Merge pull request #6611 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-09 10:10:48 +08:00
dataeaseShu
da3412fa04 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-09 10:09:51 +08:00
dataeaseShu
e6ebbf01ba fix: 数据集复制 2023-11-09 10:08:45 +08:00
taojinlong
c5dd598647
Merge pull request #6608 from dataease/pr@dev-v2@fixDatasource
fix: 初始化数据引擎失败
2023-11-08 04:14:02 -06:00
taojinlong
29f36f1474 fix: 初始化数据引擎失败 2023-11-08 18:12:07 +08:00
fit2cloud-chenyw
bf8cd7e593
Merge pull request #6606 from dataease/pr@dev-v2@feat_template_sql
feat: 模版管理菜单sql
2023-11-08 17:44:27 +08:00
fit2cloud-chenyw
90f0d83546 feat: 模版管理菜单sql 2023-11-08 17:43:45 +08:00
fit2cloud-chenyw
53c1d2549a
Merge pull request #6605 from dataease/pr@dev@feat_template_menu
Pr@dev@feat template menu
2023-11-08 17:15:10 +08:00
fit2cloud-chenyw
cb671dcb76 perf: 代码中暴漏本地之外的数据库 2023-11-08 16:59:54 +08:00
fit2cloud-chenyw
75cfcd4941 feat: 模版菜单 2023-11-08 16:59:00 +08:00
dataeaseShu
0ca9f1f4fd
Merge pull request #6598 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-08 16:19:40 +08:00
dataeaseShu
fdab12aa5d fix: 创建数据源-高级设置-查询超时的上下尖头位置优化 2023-11-08 16:18:52 +08:00
dataeaseShu
86fb749c48 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-08 16:12:44 +08:00
dataeaseShu
674b3fbe66 fix: 自定义SQL编辑页无法调节左侧侧边栏宽度 #6535 2023-11-08 16:00:41 +08:00
dataeaseShu
303be6026e fix: 支持数据源的复制 2023-11-08 15:48:13 +08:00
fit2cloudrd
19d93070b9
Merge pull request #6592 from dataease/pr@dev-v2_version_check
refactor: 安装脚本增加版本判断
2023-11-08 15:34:10 +08:00
xuwei-fit2cloud
f85b6b2f03 refactor: 安装脚本增加版本判断 2023-11-08 15:31:51 +08:00
dataeaseShu
60966fb6e3 fix: 支持数据集的复制 2023-11-08 14:50:22 +08:00
王嘉豪
0451646e0b
Merge pull request #6589 from dataease/pr@dev-v2@style_style-type
style: 修改样式类型
2023-11-08 14:41:04 +08:00
wangjiahao
8c83226e49 style: 修改样式类型 2023-11-08 14:40:01 +08:00
dataeaseShu
94ec27862c fix: 添加一个数据集后能否直接关闭数据集创建页面或者给个选择 2023-11-08 14:02:19 +08:00
fit2cloudrd
ce949c1bbb
Merge pull request #6582 from dataease/pr@dev-v2_fix_desktop_flyway
fix: 修复desktop flyway
2023-11-08 11:25:26 +08:00
xuwei-fit2cloud
a496217b0a fix: 修复desktop flyway 2023-11-08 11:24:31 +08:00
王嘉豪
466aecc512
Merge pull request #6581 from dataease/pr@dev-v2@feat_template-market
feat: 模版市场
2023-11-08 10:48:09 +08:00
wangjiahao
2a881be1fd feat: 模版市场 2023-11-08 10:45:34 +08:00
fit2cloudrd
d8ccdbad1d
Merge pull request #6573 from dataease/pr@dev-v2_compose_version
fix: 修复compose文件版本
2023-11-07 17:34:19 +08:00
xuwei-fit2cloud
48dbf78e23 fix: 修复compose文件版本 2023-11-07 17:33:39 +08:00
fit2cloudrd
1eab52f1b0
Merge pull request #6571 from dataease/pr@dev-v2_healthcheck
refactor: 修改healthcheck文案
2023-11-07 17:28:54 +08:00
xuwei-fit2cloud
56f83891b2 refactor: 修改healthcheck文案 2023-11-07 17:28:16 +08:00
fit2cloudrd
9fa81f273e
Merge pull request #6569 from dataease/pr@dev-v2_healthcheck
refactor: 修改healthcheck方法
2023-11-07 17:24:02 +08:00
xuwei-fit2cloud
6cf59b443e refactor: 修改healthcheck方法 2023-11-07 17:23:07 +08:00
dataeaseShu
c08a334d5a
Merge pull request #6564 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-07 15:46:54 +08:00
dataeaseShu
a888a09cd0 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-07 15:46:02 +08:00
dataeaseShu
605f87cb82 fix: 数据集 SQL 数据集,数据比较返回结果错误 2023-11-07 15:43:14 +08:00
ulleo
1ac9470795
Merge pull request #6556 from ulleo/dev-v2
fix: 公共链接文案错误
2023-11-07 11:28:13 +08:00
ulleo
9134bec40e fix: 公共链接文案错误 2023-11-07 11:26:28 +08:00
王嘉豪
af74e023f3
Merge pull request #6552 from dataease/pr@dev-v2@revert_revert-useless
revert: revert
2023-11-06 18:16:19 +08:00
wangjiahao
2b80021f0f revert: revert 2023-11-06 18:15:04 +08:00
王嘉豪
85c1ce9080
Merge pull request #6551 from dataease/pr@dev-v2@feat_template-manage
Pr@dev v2@feat template manage
2023-11-06 18:10:24 +08:00