Commit Graph

448 Commits

Author SHA1 Message Date
fit2cloud-chenyw
567851fce9
Merge pull request #6922 from dataease/pr@dev-v2@perf_console_log
perf: 删除控制台打印
2023-11-29 17:07:52 +08:00
fit2cloud-chenyw
70332464f4 perf: 删除控制台打印 2023-11-29 17:06:53 +08:00
dataeaseShu
35b8205855 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-29 16:57:43 +08:00
dataeaseShu
5ef255705e fix: 快速创建-使用模板创建 2023-11-29 16:55:43 +08:00
wangjiahao
fa557b136c Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2 2023-11-29 13:33:35 +08:00
wangjiahao
b3f65f02b1 style: 样式调整 2023-11-29 13:25:15 +08:00
王嘉豪
b0f079dfe5
Merge pull request #6915 from dataease/pr@dev-v2@refactor_market
refactor: 模板管理模板市场合并为模板中心
2023-11-29 13:18:04 +08:00
wangjiahao
6dc0ea250b refactor: 模板管理模板市场合并为模板中心 2023-11-29 13:11:50 +08:00
taojinlong
f787bd0ae3
Merge pull request #6900 from dataease/pr@dev-v2@fixDatasource
fix: 替换excel文件失败
2023-11-28 02:34:52 -06:00
taojinlong
a84e27d687 fix: 替换excel文件失败 2023-11-28 16:33:07 +08:00
dataeaseShu
b9fa60cdd9 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-28 14:36:29 +08:00
dataeaseShu
1313d2afc3 fix: 日期过滤组件支持动态值 2023-11-28 14:35:00 +08:00
王嘉豪
36846e9753
Merge pull request #6889 from dataease/pr@dev-v2@refactor_market-manage
refactor: 模版管理UI变更
2023-11-28 12:19:05 +08:00
wangjiahao
dd51482a48 refactor: 模版管理UI变更 2023-11-28 12:06:55 +08:00
王嘉豪
3c1ba64d81
Merge pull request #6884 from dataease/pr@dev-v2@refactor_market-UI
refactor: UI调整
2023-11-28 10:33:43 +08:00
wangjiahao
9235e71401 refactor: UI调整 2023-11-28 10:29:50 +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
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
王嘉豪
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
b084095f66 feat: 升级calcite(迁移自定义calcite代码至calcite-de) 2023-11-27 14:00:43 +08:00
fit2cloud-chenyw
99b233167e perf: 参数设置flyway 2023-11-27 10:51:10 +08:00
fit2cloud-chenyw
4b9038f4f1 perf: 自动创建用户设置(xpack) 2023-11-27 09:05:34 +08:00
fit2cloud-chenyw
359b8116f8 fix: 社区版本浏览器控制台报错没有许可 2023-11-25 16:39:16 +08:00
fit2cloud-chenyw
bcbf186858 perf: 企业版license文案信息 2023-11-24 18:05:15 +08:00
fit2cloud-chenyw
7f1788415b perf: license文案信息 2023-11-24 17:40:15 +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
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
f30ecd1812 fix: 漏提代码 2023-11-23 22:19:35 +08:00
fit2cloud-chenyw
e9a5bbe0a1 feat: 地理信息文件上传 2023-11-23 22:14:37 +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
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
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
7f113dd609 fix: 编辑页面下,新添加图表后,设置图表导致联动、跳转,导致原有图表的联动、跳转标识丢失 2023-11-21 16:15:34 +08:00
wangjiahao
167f708ee6 refactor: 大屏编辑预览状态禁用鼠标比例伸缩功能 2023-11-21 11:12:40 +08:00
wangjiahao
59c6793b04 fix: 修复大屏伸缩比例直接输入数字未生效问题 2023-11-21 10:56:48 +08:00
wangjiahao
a0e1b00ee1 style: 优化预览页按钮样式 2023-11-21 10:50:02 +08:00
wangjiahao
372b747bd2 refactor: 对接V2模版市场正式环境优化 2023-11-20 19:51:24 +08:00
fit2cloud-chenyw
24c1810cd6 feat: 嵌入式管理 2023-11-17 23:35:07 +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
王嘉豪
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
王嘉豪
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
fit2cloud-chenyw
a02697a3ef feat: 同步管理 2023-11-16 20:09:12 +08:00
fit2cloud-chenyw
fe1c7dadab perf: xpack嵌入式版 2023-11-16 17:18:54 +08:00
ulleo
99f7027760 feat: 编辑备注输入框增加placeholder提示 2023-11-16 16:10:35 +08:00
dataeaseShu
69d69794ee Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-11-16 15:00:52 +08:00
dataeaseShu
03d34fef34 fix: UI库升级 2023-11-16 15:00:28 +08:00
junjun
25a7e54610 feat: 增加根据数据集ID获取count接口 2023-11-16 11:49:44 +08:00
王嘉豪
9c41375c6b
Merge pull request #6713 from dataease/pr@dev-v2@refactor_commmon
Pr@dev v2@refactor commmon
2023-11-16 11:17:50 +08:00
wangjiahao
40259fbef9 refactor: 文案优化 2023-11-16 11:12:56 +08:00
wangjiahao
a4357579d3 refactor: 更新图片默认尺寸 2023-11-16 09:16:57 +08:00
wangjiahao
a11c9a65b7 refactor: 修改帮助文档链接 2023-11-16 09:15:01 +08:00
dataeaseShu
9f7187ac53 fix: UI库升级 2023-11-15 15:55:08 +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
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
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
王嘉豪
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
afce036c46 fix: 数据集重命名字段后,字段名过长的情况下,右侧功能菜单消失,无法进行其他操作 2023-11-13 17:44:03 +08:00
dataeaseShu
93c8cf223b fix: 过滤组件参数化获取数据不是最新的 2023-11-13 17:35:10 +08:00
wangjiahao
9c452d1cd2 fix: 打包问题 2023-11-13 16:08:09 +08:00
wangjiahao
e636ead79f refactor: 模版市场优化 2023-11-13 15:01:39 +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
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
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
29f36f1474 fix: 初始化数据引擎失败 2023-11-08 18:12:07 +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