Commit Graph

7420 Commits

Author SHA1 Message Date
taojinlong
14f206493a refactor: nikeName -> nickName 2022-09-28 15:45:36 +08:00
wangjiahao
36ad92d06b fix(仪表板): 修复辅助网格开启按钮状态显示问题 2022-09-28 15:42:55 +08:00
xuwei-fit2cloud
2e4b8e4e56
Merge pull request #3236 from dataease/pr@dev@fix_assist_line
fix(视图): echarts辅助线报错
2022-09-28 15:35:11 +08:00
junjun
101c5952c4 fix(视图): echarts辅助线报错 2022-09-28 15:26:46 +08:00
wangjiahao
d74cd5ba63 refactor: 优化字体大小限制,防止过滤组件标题被隐藏 2022-09-28 15:23:50 +08:00
wangjiahao
bd38da01db refactor: 优化字体大小限制,防止过滤组件标题被隐藏 2022-09-28 15:18:43 +08:00
xuwei-fit2cloud
81beaaccbd
Merge pull request #3232 from dataease/pr@dev@fix_user_bind_error
fix(个人信息): 扫码绑定第三方平台错误信息提示
2022-09-28 15:09:15 +08:00
fit2cloud-chenyw
121c011ec4
Update XLarkServer.java
fix(个人信息): 扫码绑定飞书
2022-09-28 15:08:19 +08:00
fit2cloud-chenyw
9cc4e4e5f3
Update XDingtalkServer.java
fix(个人信息): 扫码绑定钉钉
2022-09-28 15:07:33 +08:00
xuwei-fit2cloud
d9f9207f15
Merge pull request #3234 from dataease/pr@dev@fix_assist
fix(视图): 修复没有指标时编辑辅助线报错
2022-09-28 15:04:27 +08:00
junjun
e5a60ac653 fix(视图): 修复没有指标时编辑辅助线报错 2022-09-28 15:02:09 +08:00
taojinlong
bf118ffb7a fix: 系统参数页面调整间隔 2022-09-28 14:47:36 +08:00
fit2cloud-chenyw
c4a4144b24
Merge pull request #3231 from dataease/pr@dev@refactor_calc_style
refactor(数据集): 计算字段UI调整
2022-09-28 14:47:16 +08:00
fit2cloud-chenyw
94bfe751ad fix(个人信息): 扫码绑定第三方平台错误信息提示 2022-09-28 14:44:31 +08:00
junjun
5a4b2aea1f refactor(数据集): 计算字段UI调整 2022-09-28 14:39:00 +08:00
taojinlong
3255cfb449 fix: API 数据集字段类型展示 2022-09-28 13:36:27 +08:00
xuwei-fit2cloud
75f0617402
Merge pull request #3230 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-28 13:34:00 +08:00
xuwei-fit2cloud
ba33092c8c
Merge pull request #3229 from dataease/pr@dev@refactor_dataset-icon
refactor: 优化数据集字段类型图标
2022-09-28 13:31:55 +08:00
dataeaseShu
c6cbc5c666 Merge branch 'dev' into pr@dev_dataset_source 2022-09-28 13:05:24 +08:00
dataeaseShu
be33456b17 fix: 数据集 数据源bugfix 2022-09-28 13:04:06 +08:00
taojinlong
585d737d43 fix: 创建多sheet页的Excel数据集,表中数据格式有问题仍然会创建数据集 2022-09-28 12:04:26 +08:00
wangjiahao
7a58d274a7 refactor: 优化数据集字段类型图标 2022-09-28 11:56:33 +08:00
xuwei-fit2cloud
efd06148f2
Merge pull request #3228 from dataease/pr@dev@perf_user_bind
perf(个人信息): 第三方平台绑定DE用户
2022-09-28 11:53:54 +08:00
fit2cloud-chenyw
0891e0aff0 perf(个人信息): 第三方平台绑定DE用户 2022-09-28 11:50:35 +08:00
xuwei-fit2cloud
ce30b34e5c
Merge pull request #3227 from dataease/pr@dev@refactor_dataset
refactor: 优化国际化文案
2022-09-28 11:38:56 +08:00
xuwei-fit2cloud
a120323073
Merge pull request #3226 from dataease/pr@dev@fix_group_bar
fix(视图): 修复分组柱状图报错
2022-09-28 11:38:16 +08:00
xuwei-fit2cloud
fdc5d8dcd8
Merge pull request #3224 from dataease/pr@dev@dataset
fix: 不同的sql 数据集参数同名
2022-09-28 11:37:35 +08:00
xuwei-fit2cloud
742ba72996
Merge pull request #3225 from dataease/pr@dev@refactor_echarts-table
refactor: 屏蔽echarts表格联动和跳转设置入口
2022-09-28 11:36:30 +08:00
wangjiahao
9367a535c5 refactor: 优化国际化文案 2022-09-28 11:21:07 +08:00
junjun
c47db49f3e fix(视图): 修复分组柱状图报错 2022-09-28 11:16:34 +08:00
taojinlong
76098ef5c5 fix: mysql 时间处理错误 2022-09-28 11:04:02 +08:00
taojinlong
0d7b1f1805 fix: sql 参数识别符拼接错误 2022-09-28 11:03:29 +08:00
wangjiahao
f4cb7e8533 refactor: 屏蔽echarts表格联动和跳转设置入口 2022-09-28 10:48:17 +08:00
taojinlong
9546d512cf fix: 不同的sql 数据集参数同名 2022-09-28 10:26:34 +08:00
taojinlong
98055c354b fix: 不同的sql 数据集参数同名 2022-09-28 10:23:14 +08:00
junjun
1ccf8b615d Merge remote-tracking branch 'origin/dev' into dev 2022-09-28 10:07:05 +08:00
Junjun
b662480244
Merge pull request #3222 from dataease/pr@dev@perf_user_editor
perf(用户管理): 删除第三方平台信息
2022-09-27 18:33:30 +08:00
junjun
bc7308e992 Merge remote-tracking branch 'origin/dev' into dev 2022-09-27 18:25:24 +08:00
fit2cloud-chenyw
a107d1d432 perf(用户管理): 删除第三方平台信息 2022-09-27 18:24:44 +08:00
Junjun
d01105cbd7
Merge pull request #3221 from dataease/pr@dev@revert_app-export
revert: 屏蔽应用导出按钮
2022-09-27 18:23:39 +08:00
wangjiahao
3a09b072f1 revert: 屏蔽应用导出按钮 2022-09-27 18:18:59 +08:00
王嘉豪
10a925b5be
Merge pull request #3216 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-27 18:17:36 +08:00
taojinlong
5b2af3bba3
Merge branch 'dev' into pr@dev_dataset_source 2022-09-27 18:16:24 +08:00
xuwei-fit2cloud
3600b007ea
Merge pull request #3219 from dataease/pr@dev@fix_pop
fix(视图): 修复SQL Server标准差方差错误
2022-09-27 18:15:18 +08:00
王嘉豪
20f55de450
Merge pull request #3212 from dataease/pr@dev@datasource
fix(数据集): sql数据集修改字段先后顺序后,预览不起作用 #3062
2022-09-27 18:13:43 +08:00
taojinlong
0f2813e444 fix(数据集): 格式化 oracle sql 出错 2022-09-27 18:10:04 +08:00
junjun
3173eaca7a Merge remote-tracking branch 'origin/dev' into dev 2022-09-27 18:09:52 +08:00
xuwei-fit2cloud
17cb5285ba
Merge pull request #3213 from dataease/pr@dev@fix_view_margin_limit
fix(视图): 外边距可以输入限制以外的数字
2022-09-27 18:07:11 +08:00
junjun
c24d2521e3 fix(视图): 修复SQL Server标准差方差错误 2022-09-27 18:06:47 +08:00
xuwei-fit2cloud
d22a2a1e2e
Merge pull request #3214 from dataease/pr@dev@perf_view_margin_inherit
perf(视图): 新建视图外边距继承了之前编辑的视图
2022-09-27 18:05:59 +08:00