center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
10,857 Commits 1 Branch 86 Tags 417 MiB
db5f47758a
Commit Graph

10857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fit2cloud-chenyw
83fec2e45f
Merge pull request #6925 from dataease/pr@dev-v2@style_top_bar 
style: 头部返回工作台右侧间距调整为20px
 2023-11-29 17:32:08 +08:00
fit2cloud-chenyw
24c780e2be style: 头部返回工作台右侧间距调整为20px 2023-11-29 17:31:16 +08:00
wisonic-s
5f5822fbae
Merge pull request #6924 from dataease/pr@dev-v2@fix_null_value_linkage 
fix: 空值联动异常
 2023-11-29 17:26:14 +08:00
wisonic-s
ff4411a1ae fix: 空值联动异常 2023-11-29 17:22:08 +08:00
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
af8ca616f5
Merge pull request #6921 from dataease/pr@dev-v2_dzz 
Pr@dev v2 dzz
 2023-11-29 16:58:12 +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
王嘉豪
272bb354de
Merge pull request #6916 from dataease/pr@dev-v2@style_update 
Pr@dev v2@style update
 2023-11-29 13:35:17 +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
junjun
3d21167a32 Merge remote-tracking branch 'origin/dev-v2' into dev-v2 2023-11-28 16:40:03 +08:00
junjun
6fa389e6eb Revert "fix: calcite version" 
This reverts commit f232e7fcba.
 2023-11-28 16:39:48 +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
24103273a1
Merge pull request #6892 from dataease/pr@dev-v2_dzz 
Pr@dev v2 dzz
 2023-11-28 14:37:09 +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
junjun
f232e7fcba fix: calcite version 2023-11-28 12:36:10 +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
Junjun
faa242e374
Merge pull request #6885 from dataease/pr@dev-v2@fix_calcitev 
fix: calcite version
 2023-11-28 10:47:05 +08:00
junjun
aca9e57be5 fix: calcite version 2023-11-28 10:45:58 +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
81a3ebf51a
Merge pull request #6882 from dataease/pr@dev-v2@fix_calcite 
fix: calcite version
 2023-11-28 09:42:51 +08:00
junjun
786ddd5834 fix: calcite version 2023-11-28 09:41:14 +08:00
Junjun
50ef7b5768
Merge pull request #6880 from dataease/pr@dev-v2@feat_calcite 
feat: 升级calcite（迁移自定义calcite代码至calcite-de）
 2023-11-27 22:10:49 +08:00
junjun
5b158cd0bf feat: 升级calcite（迁移自定义calcite代码至calcite-de） 2023-11-27 22:08:05 +08:00
Junjun
bb39956bd4
Merge pull request #6876 from dataease/pr@dev-v2@fix_id 
fix: id序列化
 2023-11-27 18:43:54 +08:00
junjun
bbc95c6d8c fix: id序列化 2023-11-27 18:42:31 +08:00
Junjun
a3af0caa47
Merge pull request #6871 from dataease/pr@dev-v2@feat_calcite 
feat: 升级calcite（迁移自定义calcite代码至calcite-de）
 2023-11-27 17:55:34 +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
98231a9bd2
Merge pull request #6867 from dataease/pr@dev-v2_dzz 
Pr@dev v2 dzz
 2023-11-27 17:00:02 +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
王嘉豪
896cc6c27e
Merge pull request #6866 from dataease/pr@dev-v2@refactor_market 
refactor: 模版市场UI优化
 2023-11-27 16:40:39 +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
5969444127
Merge pull request #6863 from dataease/pr@dev-v2@feat_calcite 
feat: 升级calcite（迁移自定义calcite代码至calcite-de）
 2023-11-27 14:02:14 +08:00
junjun
b084095f66 feat: 升级calcite（迁移自定义calcite代码至calcite-de） 2023-11-27 14:00:43 +08:00
fit2cloud-chenyw
04dc406bc8
Merge pull request #6856 from dataease/pr@dev-v2@perf_platform_login 
feat: 第三方平台登录对接禁止自动创建用户设置
 2023-11-27 11:19:44 +08:00
fit2cloud-chenyw
e6f0a4b9c0 Merge branch 'dev-v2' into pr@dev-v2@perf_platform_login 2023-11-27 11:18:49 +08:00
fit2cloud-chenyw
4b1f78a1ea feat: 第三方平台登录对接禁止自动创建用户设置 2023-11-27 11:13:30 +08:00
fit2cloud-chenyw
c2cc49ffbb
Merge pull request #6855 from dataease/pr@dev-v2@perf_sys_setting_flyway 
perf: 参数设置flyway
 2023-11-27 10:56:22 +08:00