Commit Graph

2915 Commits

Author SHA1 Message Date
fit2cloud-chenyw
44ae960c52 feat(过滤器): 文本下拉组件选项可按照中文排序 2022-12-15 19:03:50 +08:00
fit2cloud-chenyw
6ec988e509
Merge pull request #4102 from dataease/pr@dev@perf_auto_login
perf(登录): 第三方平台内免登进入DE隐藏登录以及修改密码按钮
2022-12-15 16:07:01 +08:00
fit2cloud-chenyw
f59fbed46f perf(登录): 第三方平台内免登进入DE隐藏登录以及修改密码按钮 2022-12-15 16:05:02 +08:00
xuwei-fit2cloud
e7f04e8326
Merge pull request #4098 from dataease/pr@dev@refactor_new-subject
refactor(仪表板): 新增默认仪表板主题
2022-12-15 14:56:32 +08:00
wangjiahao
301d7be798 refactor(仪表板): 新增默认仪表板主题 2022-12-15 14:48:27 +08:00
fit2cloud-chenyw
a516023ea3
Merge pull request #4095 from dataease/pr@dev@feat_map_mark
feat(视图): 色彩地图增加标记功能
2022-12-15 14:27:31 +08:00
fit2cloud-chenyw
4fa41d8676 feat(视图): 色彩地图增加标记功能 2022-12-15 14:01:28 +08:00
wangjiahao
1c92558161 refactor(仪表板): 更新仪表板默认主题设置 2022-12-13 17:07:08 +08:00
wangjiahao
68c50614a5 refactor: 调整flyway 2022-12-13 11:42:05 +08:00
taojinlong
513ae189a4
Merge pull request #4072 from dataease/pr@dev@datasource
feat(数据源): 数据源敏感信息加密
2022-12-12 17:38:27 +08:00
taojinlong
214c5f1a84 feat(数据源): 数据源敏感信息加密 2022-12-12 17:17:55 +08:00
junjun
5a04c47b4b fix(视图): 修复复制仪表板后视图计算字段表达式为空的问题 #4062 2022-12-12 17:16:30 +08:00
wangjiahao
b85fb8938b feat(应用): 应用模板支持选择存量数据源 2022-12-07 18:21:15 +08:00
wangjiahao
5fc59d7801 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 17:22:04 +08:00
wangjiahao
1099b00d34 build: 更新版本号至1.18.0 2022-12-06 17:21:22 +08:00
fit2cloud-chenyw
62242d67cc feat(飞书): 工作台免登进入DataEase 2022-12-06 16:36:28 +08:00
fit2cloud-chenyw
4d4807b821 feat(xpack): 钉钉工作台免登进入DataEase 2022-12-05 13:44:59 +08:00
fit2cloud-chenyw
0aabb23165
Merge pull request #3994 from dataease/pr@dev@feat_report_img_down_api
feat(定时报告): 下载定时报告图片api
2022-12-02 09:04:18 +08:00
fit2cloud-chenyw
a3a064b486 perf(定时报告): 删除测试代码 2022-12-01 17:20:58 +08:00
fit2cloud-chenyw
904d2c95a2 feat(定时报告): 下载定时报告图片api 2022-12-01 17:13:21 +08:00
王嘉豪
951c0003f7
Merge pull request #3988 from dataease/pr@devrefactor_template-data-change
refactor: 更新默认模板数据
2022-12-01 14:58:42 +08:00
wangjiahao
dbad8857ba refactor: 更新默认模板数据 2022-12-01 11:47:29 +08:00
wisonic-s
22323141bc fix(typo): typo 2022-11-30 19:38:57 +08:00
taojinlong
a22eb627c3 fix: 分页条数为0 2022-11-30 19:06:04 +08:00
taojinlong
4e25a992c7 Merge branch 'dev' into pr@dev@fix_dataset 2022-11-30 18:39:17 +08:00
xuwei-fit2cloud
5b5072dfb2
Merge pull request #3962 from dataease/pr@dev@fix_table_field
fix(视图): 修复doris明细表字段类型转换报错的问题
2022-11-30 15:50:48 +08:00
junjun
d21b38c443 fix(视图): 修复doris明细表字段类型转换报错的问题 2022-11-30 15:47:55 +08:00
xuwei-fit2cloud
1700a8696a
Merge pull request #3961 from dataease/pr@dev@fix_system_i18n
fix(系统管理): 国际化缺失
2022-11-30 15:45:51 +08:00
taojinlong
d1e09c33ca fix: sqlserver 时间格式 2022-11-30 15:42:08 +08:00
fit2cloud-chenyw
29e4296034 fix(系统管理): 国际化缺失 2022-11-30 15:37:10 +08:00
taojinlong
4e3b2a7ae2 fix: 上传excel限制文件大小 2022-11-30 15:18:12 +08:00
Junjun
84952f3c87
Merge pull request #3953 from dataease/pr@dev@fix_app-custom-doris
fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题
2022-11-30 13:42:27 +08:00
wangjiahao
c1509be15b fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题 2022-11-30 13:36:23 +08:00
taojinlong
b259e30460 fix(数据集): doris数据集不支持分页 2022-11-30 00:12:07 +08:00
taojinlong
2ea1bbe6f6
Merge pull request #3943 from dataease/pr@dev@fix_dataset
fix(数据集): 数据集时间格式化问题
2022-11-30 00:05:19 +08:00
taojinlong
ab923a29c2 fix(数据集): 数据集时间格式化问题 2022-11-29 23:58:51 +08:00
xuwei-fit2cloud
a378126e13
Merge pull request #3938 from dataease/pr@dev@fix_dataset
fix(数据集): 日期格式化
2022-11-29 20:43:28 +08:00
taojinlong
73cc64d914 fix(数据集): 日期格式化 2022-11-29 18:14:57 +08:00
xuwei-fit2cloud
a8e9d5d4f3 chore: 添加typos文件 2022-11-29 15:16:20 +08:00
taojinlong
4d06267df2 fix(数据集): API 数据集更新失败 2022-11-29 15:04:33 +08:00
fit2cloud-chenyw
5c3b5add4d
Merge pull request #3915 from dataease/pr@dev@fix_app-clear-cache
refactor(应用): 删除应用日志勾选删除相关资源时,清理掉浏览器相关资源的缓存
2022-11-29 10:48:30 +08:00
wangjiahao
822de40487 refactor(应用): 删除应用日志勾选删除相关资源时,清理掉浏览器相关资源的缓存 2022-11-29 10:33:53 +08:00
xuwei-fit2cloud
80093dba16
Merge pull request #3912 from dataease/pr@dev@fix_app-union-dataset
fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题
2022-11-29 08:58:12 +08:00
taojinlong
72026e9a6a fix(数据集): 数据集脱敏规则 2022-11-28 22:31:26 +08:00
wangjiahao
1d08506f0c fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题 2022-11-28 22:23:30 +08:00
Junjun
c7ce770914
Merge pull request #3906 from dataease/pr@dev@fix_login_error_msg
fix(登录): 登录失败提示信息
2022-11-28 17:06:31 +08:00
junjun
e12d31be12 fix(视图): 修复明细表分页错误 2022-11-28 16:23:11 +08:00
fit2cloud-chenyw
38c3986ba4 fix(登录): 登录失败提示信息 2022-11-28 16:18:37 +08:00
junjun
a86e93ef4e Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/resources/db/migration/V44__1.17.sql
2022-11-28 16:04:28 +08:00
Junjun
c2b2bf7036
Merge pull request #3903 from dataease/pr@dev@fix_app-rename
fix(应用): 修复应用重命名、控制台报错相关问题
2022-11-28 15:25:46 +08:00
junjun
858203106d refactor(插件): 优化插件显示 2022-11-28 15:19:48 +08:00
wangjiahao
b4a47f6569 fix(应用): 修复应用重命名、控制台报错相关问题 2022-11-28 14:56:30 +08:00
fit2cloud-chenyw
794e017a7c fix(过滤器): 日期范围过滤器参数设置单个结束时间有效 2022-11-28 13:23:35 +08:00
taojinlong
2ec594f1f7 fix(数据集): 自定义脱敏规则 2022-11-28 10:23:46 +08:00
junjun
cc6edeae9e fix(数据集): 修复es数据集导出报错 2022-11-25 17:19:11 +08:00
junjun
a4b2ec8250 feat(视图): 部分数据源不支持直连分页,使用前端分页 2022-11-25 16:50:03 +08:00
junjun
1308aa1d73 feat(视图): 部分数据源不支持直连分页,使用前端分页 2022-11-25 16:31:26 +08:00
fit2cloud-chenyw
27a9cb95e7
Merge pull request #3873 from dataease/pr@dev@refactor_spell
refactor: 单词拼写优化
2022-11-25 15:12:51 +08:00
wangjiahao
4a0e4503ba refactor: 单词拼写优化 2022-11-25 13:24:03 +08:00
taojinlong
da4485a300
Merge pull request #3870 from dataease/pr@dev@fix_panel_rename
fix(仪表板): 重命名报错无权限
2022-11-25 12:22:10 +08:00
fit2cloud-chenyw
49cdd6b224
Merge pull request #3868 from dataease/pr@dev@fix_background-style
chore: 变更flyway配置,不检查sql文件中的el变量
2022-11-25 12:19:26 +08:00
fit2cloud-chenyw
6e6228a7fa fix(仪表板): 重命名报错无权限 2022-11-25 11:30:54 +08:00
wangjiahao
3fe49d2750 chore: 变更flyway配置,不检查sql文件中的el变量 2022-11-25 10:52:04 +08:00
taojinlong
f91566de06 fix: 表格分页 2022-11-24 19:20:08 +08:00
taojinlong
2b5fba0fe8 refactor: 去掉打印 2022-11-24 19:08:19 +08:00
taojinlong
07ed991283 Merge branch 'dev' into pr@dev@dataset 2022-11-24 19:07:14 +08:00
taojinlong
59a8dc4544 feat: 数据集脱敏规则 2022-11-24 19:06:38 +08:00
fit2cloud-chenyw
ce1651fa82 feat(过滤器): 时间范围过滤器支持动态参数 2022-11-24 12:09:56 +08:00
fit2cloud-chenyw
a61e6b684c fix(过滤器): 选择名为count的字段排序会被sql注入拦截 2022-11-23 14:01:34 +08:00
fit2cloud-chenyw
2990887854
Merge branch 'dev' into pr@dev@feat_report_task_editor 2022-11-23 11:34:35 +08:00
fit2cloud-chenyw
164d398ca5 feat(定时报告): 富文本编辑器 2022-11-23 11:32:47 +08:00
xuwei-fit2cloud
9eba57819f
Merge pull request #3830 from dataease/pr@dev@dateformat
feat: 日期格式的支持
2022-11-23 09:10:03 +08:00
taojinlong
0764e477bf refactor: 删除注释 2022-11-22 18:56:38 +08:00
taojinlong
8dca4400c1 feat: 日期格式的支持 2022-11-22 18:55:25 +08:00
taojinlong
1cbec36a2d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-22 16:05:15 +08:00
taojinlong
4fbf4626cb feat: 单次执行的任务,可以手动触发执行一次同步数据的任务 2022-11-22 16:04:54 +08:00
xuwei-fit2cloud
b1041b7fb3
Merge pull request #3824 from dataease/pr@dev@excel
feat: Excel空单元格不参与类型判断
2022-11-22 15:02:00 +08:00
taojinlong
98acbb10d3 feat: Excel空单元格不参与类型判断 2022-11-22 14:00:11 +08:00
taojinlong
d89ebba748 feat: 日期格式的支持 2022-11-22 10:52:17 +08:00
xuwei-fit2cloud
ef1774c730
Merge pull request #3795 from dataease/pr@dev@feat_line_hide_empty_data
Pr@dev@feat line hide empty data
2022-11-18 16:10:01 +08:00
wisonic-s
50938eb702 Merge branch 'dev' into pr@dev@feat_line_hide_empty_data
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
2022-11-18 15:47:37 +08:00
王嘉豪
9e608844a6
Merge branch 'dev' into pr@dev@feat_panel-default 2022-11-18 15:43:37 +08:00
wisonic-s
d32043ef8b feat(视图-AntV折线图): 折线图支持隐藏无数据的点
AntV折线图支持对空数据进行处理,可选线条断开,置0或者跳过空值
https://www.tapd.cn/55578866/prong/stories/view/1155578866001009888
2022-11-18 15:43:32 +08:00
wangjiahao
9875240437 feat(仪表板): 进入仪表板菜单默认打开第一个默认仪表板且默认仪表板增加置顶功能 2022-11-18 15:37:08 +08:00
xuwei-fit2cloud
58d0220119
Merge pull request #3785 from dataease/pr@dev@refactor_ui
Merge remote-tracking branch 'origin/dev' into dev
2022-11-18 10:58:50 +08:00
xuwei-fit2cloud
0bb3da598b
Merge pull request #3783 from dataease/pr@dev@dateformat2
feat(数据集): 日期格式支持
2022-11-18 10:57:33 +08:00
junjun
ab59dfdda1 refactor: 优化数据源类型展示 2022-11-18 10:52:21 +08:00
taojinlong
6cf8943a06 feat(数据集): 日期格式支持 2022-11-18 00:56:44 +08:00
junjun
eee3c25d63 refactor(视图): 优化视图计算字段交互 2022-11-17 19:59:51 +08:00
fit2cloud-chenyw
c6c629fbd9
Merge branch 'dev' into pr@dev@perf_public_link_style 2022-11-17 16:18:51 +08:00
fit2cloud-chenyw
1be57a2f1c perf(公共链接): 交互区域样式 2022-11-17 16:03:00 +08:00
xuwei-fit2cloud
60f6ced036
Merge pull request #3775 from dataease/pr@dev@perf_api_doc
perf(api文档): 企业用户登录后才可以查看api
2022-11-17 13:07:03 +08:00
fit2cloud-chenyw
bdc8ff58d0 perf(api文档): 企业用户登录后才可以查看api 2022-11-17 12:45:27 +08:00
junjun
8e5d4572da fix(视图): 修复明细表分页导致的视图异常 2022-11-16 18:05:29 +08:00
Junjun
3ef38df2b6
Merge pull request #3765 from dataease/pr@dev@refactor_panel-watermark-link
refactor(仪表板): 优化仪表板公共链接水印展示逻辑,用户信息取分享人
2022-11-16 14:02:50 +08:00
wangjiahao
65b6e88203 refactor(仪表板): 优化仪表板公共链接水印展示逻辑,用户信息取分享人 2022-11-16 13:54:50 +08:00
王嘉豪
1c54cc5af6
Merge pull request #3763 from zxyle/dev
fix: 修复系统登录后密码被返回
2022-11-16 10:13:27 +08:00
xuwei-fit2cloud
32ab0b7f76
Merge pull request #3762 from dataease/pr@dev@feat_report_task_fire_now
feat(定时报告): 立即执行后台
2022-11-16 09:55:56 +08:00
Xiang Zheng
7c84b6a68b
fix(应用): 修复应用登录后密码被返回 2022-11-15 20:26:33 +08:00
fit2cloud-chenyw
6acf341fe0 feat(定时报告): 立即执行后台 2022-11-15 19:05:03 +08:00