Commit Graph

7337 Commits

Author SHA1 Message Date
wangjiahao
73dd7bec01 revert: 暂时屏蔽应用市场菜单 2022-09-23 18:35:44 +08:00
wangjiahao
4356d01c33 refactor: 修改国际化文案 2022-09-23 18:31:49 +08:00
王嘉豪
e14850e688
Merge pull request #3171 from dataease/pr@dev@fix_text-component
fix(仪表板): 优化文字组件修改字号时数字变动异常 #3099
2022-09-23 18:14:18 +08:00
wangjiahao
4b4e9f135f fix(仪表板): 优化文字组件修改字号时数字变动异常 #3099 2022-09-23 18:12:52 +08:00
wangjiahao
feb67dba6e fix(仪表板): 修复汇总表配置跳转字段后切换明细表跳转字段未清空 2022-09-23 18:10:03 +08:00
dataeaseShu
6b77bd2ade
Merge pull request #3169 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-23 17:55:43 +08:00
dataeaseShu
7875cec4b8 Merge branch 'dev' into pr@dev_dataset_source 2022-09-23 17:51:18 +08:00
dataeaseShu
e39dd4fe8a fix: 字段管理国际化 2022-09-23 17:49:28 +08:00
Junjun
0f46b2f7bd
Merge pull request #3168 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-23 16:37:16 +08:00
dataeaseShu
21e467bfad Merge branch 'dev' into pr@dev_dataset_source 2022-09-23 16:27:47 +08:00
dataeaseShu
e0fe611948 fix: 路由冲突 2022-09-23 16:27:12 +08:00
fit2cloudrd
e73deb62b6
fix: 修复系统demo用户没有部分官方数据集权限问题 (#3165)
* fix(系统配置): 修复外观配置菜单切换导致路由刷新问题

* fix: 修复系统demo用户没有部分官方数据集权限问题

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-09-23 15:03:07 +08:00
dataeaseShu
9e663f04e7
Merge pull request #3166 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-23 15:01:01 +08:00
dataeaseShu
269c6334d8 Merge branch 'dev' into pr@dev_dataset_source 2022-09-23 15:00:15 +08:00
dataeaseShu
e656b04b24 fix: 视图过滤 边框色值问题 2022-09-23 14:59:29 +08:00
Junjun
fcfafdd352
Merge pull request #3164 from dataease/pr@dev@fix_router-change
fix(系统配置): 修复外观配置菜单切换导致路由刷新问题
2022-09-23 14:29:10 +08:00
王嘉豪
24faf0c463
Merge branch 'dev' into pr@dev@fix_router-change 2022-09-23 14:28:03 +08:00
wangjiahao
7f0c749601 fix(系统配置): 修复外观配置菜单切换导致路由刷新问题 2022-09-23 14:14:32 +08:00
xuwei-fit2cloud
8717f51cf3
Merge pull request #3161 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-23 13:08:59 +08:00
xuwei-fit2cloud
a503fe1937
Merge pull request #3162 from dataease/pr@dev@refactor-system-setting
refactor(系统配置): 系统配置菜单拆分
2022-09-23 13:06:23 +08:00
wangjiahao
ea17177c08 refactor(系统配置): 系统配置菜单拆分 2022-09-23 12:46:39 +08:00
dataeaseShu
2b175b9abf Merge branch 'dev' into pr@dev_dataset_source 2022-09-23 11:18:14 +08:00
dataeaseShu
ffc8271611 fix: 数据集创建 返回对应的数据集 数据源bug 路由切换bug 2022-09-23 11:17:18 +08:00
dataeaseShu
88f0510948
Merge pull request #3158 from dataease/pr@dev@refactor_dataset_api
refactor(数据集): 数据集接口调整
2022-09-22 17:27:45 +08:00
junjun
6506ce9d7c refactor(数据集): 数据集接口调整 2022-09-22 17:24:23 +08:00
junjun
4693f78671 refactor(数据集): 数据集接口调整 2022-09-22 17:17:39 +08:00
junjun
9f6515197c Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 17:05:54 +08:00
xuwei-fit2cloud
ce170e6422
Merge pull request #3156 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 16:55:29 +08:00
taojinlong
0f906acbad fix(数据集): 抽取数据精度丢失 2022-09-22 16:33:01 +08:00
dataeaseShu
0f563f4feb Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 16:21:48 +08:00
dataeaseShu
f7f8f0ab1b fix: 数据源类型 布局 2022-09-22 16:21:07 +08:00
junjun
b0ca765e21 Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 15:26:29 +08:00
xuwei-fit2cloud
d78d7bc035
Merge pull request #3154 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 15:10:06 +08:00
dataeaseShu
962c1b8be9 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 14:58:07 +08:00
dataeaseShu
d90a49716c fix: 插件国际化 表格记忆select 2022-09-22 14:57:38 +08:00
王嘉豪
6fe510c93d
Merge pull request #3153 from dataease/pr@dev@feat_view_margin_setting
feat(视图): echarts视图外边距设置
2022-09-22 14:44:21 +08:00
junjun
a8a0cca4f2 Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 14:43:05 +08:00
fit2cloud-chenyw
fcba8662b4
Merge pull request #3150 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 14:40:45 +08:00
fit2cloud-chenyw
aa2cb5eb77 feat(视图): echarts视图外边距设置 2022-09-22 14:20:24 +08:00
junjun
16b14aa542 Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 13:02:17 +08:00
xuwei-fit2cloud
161fc5a23d
Merge pull request #3151 from dataease/pr@dev@refactor_app-dock
refactor: 应用对接定时数据集立即同步
2022-09-22 12:59:43 +08:00
xuwei-fit2cloud
334c6e261a
Merge pull request #3152 from dataease/pr@dev@refactor_threshold_bg_color
refactor(视图): 阈值默认背景色调整
2022-09-22 12:59:10 +08:00
junjun
ae0886d554 Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 12:23:29 +08:00
taojinlong
067e1facb2 feat: 区分数据库类型 2022-09-22 11:50:29 +08:00
junjun
8859f4c017 refactor(视图): 阈值默认背景色调整 2022-09-22 11:46:26 +08:00
wangjiahao
6671856890 refactor: 应用对接定时数据集立即同步 2022-09-22 11:26:31 +08:00
dataeaseShu
d97a127f05 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 11:26:09 +08:00
dataeaseShu
dd5ce34902 fix: 预览数据 滚动条问题修复 2022-09-22 11:25:31 +08:00
junjun
9aed15e28b Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 10:04:48 +08:00
taojinlong
d3b369bb44
Merge pull request #3139 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 09:53:46 +08:00