Commit Graph

10505 Commits

Author SHA1 Message Date
dataeaseShu
9c15ebf4c2
Merge pull request #6689 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-15 09:57:02 +08:00
dataeaseShu
326bd4d9c8 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-15 09:56:18 +08:00
dataeaseShu
5316ca9c6e fix: vue-codemirror 2023-11-15 09:55:37 +08:00
Junjun
6d47614d1f
Merge pull request #6688 from dataease/pr@dev-v2@fix_type
fix: 修复一些数据库不支持的类型
2023-11-15 09:35:03 +08:00
junjun
cde4f62579 fix: 修复一些数据库不支持的类型 2023-11-15 09:32:54 +08:00
王嘉豪
a5e21bd8b7
Merge pull request #6686 from dataease/pr@dev-v2@fix_template-app
fix: 模版部分导入应用问题修复
2023-11-14 23:40:27 +08:00
wangjiahao
5e5c388531 fix: 模版部分导入应用问题修复 2023-11-14 23:38:54 +08:00
王嘉豪
0bfbd63c6f
Merge pull request #6645 from Djooxx/dev-v2
fix-NPE
2023-11-14 15:39:08 +08:00
dataeaseShu
a17e0b8480
Merge pull request #6676 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-14 15:15:32 +08:00
dataeaseShu
322d8172d2 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-14 15:14:47 +08:00
dataeaseShu
3726bf09bd fix: 删除无用依赖 2023-11-14 15:13:48 +08:00
王嘉豪
b759f67848
Merge pull request #6674 from dataease/pr@dev-v2@revert_template
revert: revert
2023-11-14 14:41:02 +08:00
wangjiahao
7826536479 revert: revert 2023-11-14 14:38:15 +08:00
王嘉豪
b89c7a0714
Merge pull request #6673 from dataease/pr@dev-v2@refactor_template
refactor: 富文本、表格等模版适配优化
2023-11-14 13:17:26 +08:00
wangjiahao
b6a4419707 refactor: 富文本、表格等模版适配优化 2023-11-14 13:16:08 +08:00
fit2cloud-chenyw
a8cfe028e6
Merge pull request #6671 from dataease/pr@dev-v2@perf_xpack_base_config
perf: 删除xpack-base空配置文件
2023-11-14 11:34:41 +08:00
fit2cloud-chenyw
d33296ac1d perf: 删除xpack-base空配置文件 2023-11-14 11:33:30 +08:00
王嘉豪
cd8afcb432
Merge pull request #6669 from dataease/pr@dev-v2@fix_template
fix: 打包问题
2023-11-13 18:15:48 +08:00
wangjiahao
7692783af5 fix: 打包问题 2023-11-13 18:15:07 +08:00
dataeaseShu
3786aec205
Merge pull request #6668 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-11-13 17:45:14 +08:00
dataeaseShu
afce036c46 fix: 数据集重命名字段后,字段名过长的情况下,右侧功能菜单消失,无法进行其他操作 2023-11-13 17:44:03 +08:00
dataeaseShu
93c8cf223b fix: 过滤组件参数化获取数据不是最新的 2023-11-13 17:35:10 +08:00
王嘉豪
3d07d09fa0
Merge pull request #6665 from dataease/pr@dev-v2@fix_template-market
fix: 打包问题
2023-11-13 16:28:24 +08:00
wangjiahao
9c452d1cd2 fix: 打包问题 2023-11-13 16:08:09 +08:00
王嘉豪
b9e38d3717
Merge pull request #6658 from dataease/pr@dev@refactor_template-market
refactor: 模版市场优化
2023-11-13 15:03:42 +08:00
wangjiahao
e636ead79f refactor: 模版市场优化 2023-11-13 15:01:39 +08:00
fit2cloud-chenyw
c0f201c599
Merge pull request #6649 from dataease/pr@dev-v2@feat_allatori_jar
feat: allatori依赖包
2023-11-12 17:51:32 +08:00
fit2cloud-chenyw
83ac46faf2 feat: allatori依赖包 2023-11-12 17:50:41 +08:00
fit2cloud-chenyw
340034ffe1
Merge pull request #6648 from dataease/pr@dev-v2@perf_cache
perf: 混淆模式缓存key失效
2023-11-12 16:02:48 +08:00
fit2cloud-chenyw
fb90dcfe66 perf: 混淆模式缓存key失效 2023-11-12 16:01:03 +08:00
fit2cloud-chenyw
5cfffcfbe3
Merge pull request #6647 from dataease/pr@dev-v2@feat_allatori
feat: allatori机制
2023-11-12 15:01:32 +08:00
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