Compare commits

...

56 Commits

Author SHA1 Message Date
taojinlong
5314539bba Merge branch 'dev' into v1.18 2023-02-01 17:14:48 +08:00
taojinlong
a3b8775c21 Merge branch 'v1.18' of github.com:dataease/dataease into v1.18 2023-02-01 17:14:44 +08:00
王嘉豪
8a4d05b9cb Merge pull request #4447 from dataease/dev
merge
2023-02-01 16:37:12 +08:00
taojinlong
60d2b1f32e Merge branch 'dev' into v1.18 2023-02-01 15:42:36 +08:00
taojinlong
ada5ca2f1a fix: API 数据集状态显示 2023-02-01 15:39:08 +08:00
fit2cloudrd
a31651a144 Merge pull request #4438 from dataease/dev
merge dev
2023-02-01 15:29:48 +08:00
taojinlong
fb6bd4e4db Merge branch 'dev' into v1.18 2023-01-31 23:47:39 +08:00
xuwei-fit2cloud
53e7ffafe1 Merge pull request #4427 from dataease/dev
merge dev
2023-01-31 15:51:50 +08:00
taojinlong
a7d3a6adf0 fix: 获取 API 数据结构不校验jsonpath 2023-01-31 14:46:42 +08:00
xuwei-fit2cloud
8af32bd561 fix: 修复版本号 2023-01-30 17:46:03 +08:00
taojinlong
c603089341 refactor: 解决冲突 2023-01-30 17:38:45 +08:00
taojinlong
b548e1149a Merge branch 'dev' into v1.18 2023-01-30 16:09:57 +08:00
taojinlong
87f3acbf14 refactor: merge dev 2023-01-30 15:14:35 +08:00
王嘉豪
626919f209 Merge pull request #4342 from dataease/pr@v1.18@fix_edit-bar
fix(仪表板): 修复仪表板制作页面使用撤销操作后视图的操作列表消失问题 #4335
2023-01-10 16:48:23 +08:00
wangjiahao
5ce84babe7 fix(仪表板): 修复仪表板制作页面使用撤销操作后视图的操作列表消失问题 #4335 2023-01-10 16:46:57 +08:00
taojinlong
60ee41e5d0 fix: 修改数据源时,若没有做改动直接保存没法保存 2023-01-10 15:50:02 +08:00
taojinlong
b4b16b3f86 fix(数据集): 创建join语句参数化无法保存 2023-01-10 15:43:01 +08:00
fit2cloud-chenyw
2529eca60a feat(插件管理): 优化插件版本flyway 2023-01-10 15:20:41 +08:00
fit2cloud-chenyw
0438b1e620 feat(插件管理): 升级1.18.1相关插件sql 2023-01-10 15:04:31 +08:00
taojinlong
4205f856b1 refactor: 升级版本号 2023-01-10 15:03:09 +08:00
王嘉豪
d62416aed5 Merge pull request #4331 from dataease/pr@v1.18@fix_details-null-error
fix(视图): 修复导出视图明细当有空值时报错的问题
2023-01-09 20:01:31 +08:00
wangjiahao
5133dff49b fix(视图): 修复导出视图明细当有空值时报错的问题 2023-01-09 20:00:04 +08:00
王嘉豪
056e1a6b11 Merge pull request #4330 from dataease/pr@dev@fix_v1.18-info
Pr@dev@fix v1.18 info
2023-01-09 19:29:52 +08:00
wangjiahao
435b76e8a1 fix: 修复管理员角色权限管理清理过多历史权限问题 2023-01-09 19:16:11 +08:00
wangjiahao
9b689fcd42 fix: 修复默认双碳及能源情况概览内置仪表板部分图例显示不正确问题 2023-01-09 19:15:29 +08:00
fit2cloud-chenyw
e2a099a317 fix(插件管理): 卸载按钮灰置后依然可以卸载 2023-01-09 19:12:29 +08:00
taojinlong
ea004caf67 fix: 精简模式日期视图显示与数据集数据不一致 2023-01-09 15:49:37 +08:00
fit2cloud-chenyw
3084c73ecf fix(公共连接): 移动端无法返回上一级 2023-01-06 12:36:18 +08:00
fit2cloud-chenyw
446a6252df fix(ldap): 测试连接以表单信息为准 2023-01-05 16:51:13 +08:00
fit2cloud-chenyw
f9e0aa188d fix(地图): 数据为0在提示中无法展示出来 2023-01-05 15:37:09 +08:00
fit2cloud-chenyw
4cd381f9c3 fix(地图): 切换数据集后标记字段错误提示优化 2023-01-05 14:36:37 +08:00
fit2cloud-chenyw
ec5e81f61d fix(过滤器): 代码冲突导致初始状态不显示参数列表 2023-01-05 10:01:21 +08:00
fit2cloud-chenyw
346f04cb23 fix(tab): 点击tab内部视图会误触resize事件 2023-01-04 21:50:45 +08:00
王嘉豪
285d96d14d Merge pull request #4292 from dataease/dev
merge
2023-01-04 17:54:26 +08:00
dataeaseShu
6853c1cb52 Merge branch 'v1.18' of https://github.com/dataease/dataease into v1.18 2023-01-04 17:43:39 +08:00
dataeaseShu
825bb45c8b fix: 新建hive数据源-必填项全部为空-点击校验或保存按钮-显示名称无提示 2023-01-04 17:43:36 +08:00
fit2cloud-chenyw
e9557f2321 fix(仪表板): 在第三方平台内禁止使用新Tab预览以及全屏预览功能 2023-01-04 17:37:27 +08:00
taojinlong
04acc258ac Merge branch 'dev' into v1.18 2023-01-04 15:20:33 +08:00
dataeaseShu
47019fb562 Merge branch 'v1.18' of https://github.com/dataease/dataease into v1.18 2023-01-04 14:42:10 +08:00
dataeaseShu
6eab31b618 fix: 数据源校验 查看仪表板 - 更多 - 导出为,显示错位 2023-01-04 14:39:54 +08:00
王嘉豪
84f824ca56 Merge pull request #4275 from dataease/dev
merge
2023-01-04 14:33:11 +08:00
王嘉豪
f57f4b6de0 Merge pull request #4267 from dataease/dev
merge
2023-01-04 11:11:15 +08:00
fit2cloud-chenyw
e4cf9c46e5 fix(定时报告): cron表达式错误文案 2023-01-04 10:58:58 +08:00
fit2cloud-chenyw
4cd81e1a69 fix(api): 恢复错误提交 2023-01-04 10:01:38 +08:00
dataeaseShu
cdf0e18266 fix: 上传两个相同列Excel时,修改某个表最后一列字段类型,另一个Excel的最后一个字段类型会同时改变。 2023-01-03 16:41:14 +08:00
fit2cloud-chenyw
497c4d306b fix(api): api文档token无法续命 2022-12-30 17:21:39 +08:00
fit2cloud-chenyw
38358fb2cb fix(地图): 跟随仪表板复制后丢失经纬度以及标记字段 2022-12-30 17:21:26 +08:00
dataeaseShu
c3b218d864 fix: 上传Excel后,标题上的字段类型下拉框切换字段类型功能异常 2022-12-30 16:06:38 +08:00
taojinlong
581438b9bc Merge branch 'v1.18' of github.com:dataease/dataease into v1.18 2022-12-29 22:26:06 +08:00
taojinlong
1d0a0d2834 fix: 同步数据分页错误 2022-12-29 22:25:47 +08:00
dataeaseShu
e5408c6866 fix: excel数据集无数据源 2022-12-29 18:20:24 +08:00
dataeaseShu
b6f46d995e fix: 创建数据源保存后没有退回数据源列表页面 2022-12-29 17:44:12 +08:00
dataeaseShu
c9c85128aa fix: 创建数据源保存后没有退回数据源列表页面 2022-12-29 17:43:57 +08:00
dataeaseShu
7b603d06cc fix: 拼写检查 2022-12-29 17:03:38 +08:00
dataeaseShu
9ab5896317 fix: 编辑API数据表-设计验收问题汇总 功能button显示不对 2022-12-29 17:03:19 +08:00
王嘉豪
0a2c161429 Merge pull request #4237 from dataease/dev
merge
2022-12-29 15:08:25 +08:00

Diff Content Not Available