center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
8,195 Commits 1 Branch 86 Tags 417 MiB
4fbf4626cb
Commit Graph

2787 Commits

Author SHA1 Message Date
fit2cloud-chenyw
a9c73c1372 fix(我的分享): 我分享的列表数据重复 2022-10-31 23:33:42 +08:00
taojinlong
79b37c0196 Merge branch 'dev' into pr@dev@dataset 2022-10-31 23:07:55 +08:00
taojinlong
6a2c9ffa48 fix(数据集): 格式化时间 2022-10-31 23:07:18 +08:00
xuwei-fit2cloud
12724a054a
Merge pull request #3564 from dataease/pr@dev@fix_table_wrong_index_number 
Pr@dev@fix table wrong index number
 2022-10-31 22:17:41 +08:00
fit2cloud-chenyw
c6728a263c fix(我的分享): 过滤对已被删除的目标分享 2022-10-31 21:57:52 +08:00
wisonic-s
49c61f6a42 Merge branch 'dev' into pr@dev@fix_table_wrong_index_number 
# Conflicts:
#	frontend/src/views/chart/chart/common/common_table.js
#	frontend/src/views/chart/chart/table/table-info.js
#	frontend/src/views/chart/components/ChartComponentS2.vue
 2022-10-31 19:33:44 +08:00
wisonic-s
78cc8130be fix(视图): 修复表格序号错误 
修复表格序号未按照实际数据排序
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001019105
 2022-10-31 19:12:30 +08:00
fit2cloud-chenyw
dc92b6740b
Merge pull request #3562 from dataease/pr@dev@fix_app-export-i18n 
fix: 修复应用导出后端国际化问题
 2022-10-31 18:54:06 +08:00
wangjiahao
fecc805f93 fix: 修复应用导出后端国际化问题 2022-10-31 18:47:57 +08:00
王嘉豪
25950fc4e7
Merge pull request #3559 from dataease/pr@dev@fix_msg_channel_block 
fix(消息管理): 单一渠道异常阻塞全部消息渠道
 2022-10-31 18:21:21 +08:00
fit2cloud-chenyw
4b2ca88276 fix(消息管理): 单一渠道异常阻塞全部消息渠道 2022-10-31 18:16:57 +08:00
xuwei-fit2cloud
721f3bba63
Merge pull request #3555 from dataease/pr@dev@dataset 
fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务
 2022-10-31 17:46:58 +08:00
taojinlong
008d79adb2 fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务 2022-10-31 17:44:01 +08:00
dataeaseShu
04a7806880
Merge pull request #3550 from dataease/pr@dev@refactor_panel-subject 
refactor(仪表板): 仪表板主题默认配色、文案优化
 2022-10-31 16:55:05 +08:00
wangjiahao
64b0b91fe3 refactor(仪表板): 仪表板主题默认配色、文案优化 2022-10-31 16:53:34 +08:00
fit2cloud-chenyw
527ec29bf8 fix(定时报告): 数字区间过滤器报错 2022-10-31 16:40:30 +08:00
fit2cloud-chenyw
d7fd0471ee fix(定时报告): 两个任务选同一个仪表板不同视图数据覆盖 2022-10-31 15:37:03 +08:00
fit2cloud-chenyw
fc8b215ea6 fix(定时报告): resultMode增加非空判断 2022-10-31 15:28:13 +08:00
fit2cloud-chenyw
47bb7d29ce perf(定时报告): 发送完消息删除临时文件 2022-10-31 14:27:07 +08:00
xuwei-fit2cloud
93522fc79e
Merge pull request #3521 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-10-31 13:47:10 +08:00
taojinlong
faff7d6d16
Merge pull request #3531 from dataease/pr@dev@perf_report_task_view_file 
perf(定时报告): 视图文件格式改为xlsx
 2022-10-31 13:45:30 +08:00
fit2cloud-chenyw
6b0d48df1a fix(拼写错误): 消息相关sql中拼写错误 2022-10-31 12:13:26 +08:00
fit2cloud-chenyw
539000d8ba perf(定时报告): 视图文件格式改为xlsx 2022-10-31 11:49:31 +08:00
taojinlong
e7d6ae9719 fix(数据集): sql执行记录中，去掉打印；建表语句指定编码格式 2022-10-31 11:04:46 +08:00
taojinlong
1d88ee85e6 fix(数据集): 添加数据库数据集时数据预览出错 2022-10-31 10:50:38 +08:00
wangjiahao
7486653ce0 refactror(应用): 应用编辑权限控制优化 2022-10-30 09:29:22 +08:00
taojinlong
beb946f0d6 Merge branch 'dev' into pr@dev@dataset 
# Conflicts:
#	backend/src/main/resources/db/migration/V42__1.16.sql
 2022-10-28 18:30:34 +08:00
taojinlong
c59585ac5b feat(数据集): 【SQL数据集】增加执行记录 2022-10-28 18:22:01 +08:00
wangjiahao
47543b07f6 fix(应用): 修复导入应用数据集字段异常更新问题 2022-10-28 18:08:47 +08:00
xuwei-fit2cloud
1850d0b59d
Merge pull request #3494 from dataease/pr@dev@fix_report_task_invlid_view 
fix(定时报告): 隐藏已被删除的视图
 2022-10-27 17:33:24 +08:00
fit2cloud-chenyw
a78fb8cf2b fix(定时报告): 隐藏已被删除的视图 2022-10-27 17:08:49 +08:00
wisonic-s
fd60670cc2 Merge branch 'dev' into pr@dev@feat_antv_group_stack_bar 2022-10-27 16:50:07 +08:00
wisonic-s
73700dbe59 feat(视图): 支持分组堆叠柱状图 
视图类型增加分组堆叠柱状图
https://www.tapd.cn/55578866/prong/stories/view/1155578866001008801
 2022-10-27 16:49:01 +08:00
xuwei-fit2cloud
3b5b4a3bb9
Merge pull request #3489 from dataease/pr@dev@fix_cas_logout 
fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909
 2022-10-27 16:19:18 +08:00
fit2cloud-chenyw
d12875eb01
Merge branch 'dev' into pr@dev@fix_oidc_exit_error 2022-10-27 16:15:23 +08:00
fit2cloud-chenyw
b19914ce6b fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909 2022-10-27 16:08:21 +08:00
xuwei-fit2cloud
58995c8dd7
Merge pull request #3478 from dataease/pr@fix_flyway-error 
fix: flyway拼写错误格式化问题修改
 2022-10-27 14:08:14 +08:00
wangjiahao
16401ca5a2 refactor: 统一表和函数的字符集和排序规则 2022-10-27 14:05:37 +08:00
王嘉豪
7cc0fa5823
Merge pull request #3479 from dataease/pr@dev@dataset 
fix(数据源): mysql8 获取表字段为空
 2022-10-27 13:40:08 +08:00
taojinlong
8cc4afe88a fix(数据源): mysql8 获取表字段为空 2022-10-27 12:26:43 +08:00
wangjiahao
b6e71ff203 fix: flyway拼写错误格式化问题修改 2022-10-27 11:52:49 +08:00
xuwei-fit2cloud
9bf6c82289
Merge pull request #3470 from dataease/pr@dev@feat_app-connect 
Pr@dev@feat_app-connect
 2022-10-27 11:29:47 +08:00
wangjiahao
e3529ee9b1 refactor(应用): 应用管理增加权限控制 2022-10-27 11:24:08 +08:00
taojinlong
47d525ec3a fix: 升级依赖版本 2022-10-27 11:02:20 +08:00
taojinlong
9979723d2e Merge branch 'dev' into pr@dev@dataset 2022-10-27 10:48:06 +08:00
taojinlong
e77bcd7669 perf(数据集): 增强解析csv文件时代码稳定性 2022-10-27 10:47:55 +08:00
wangjiahao
9623343d4b Merge branch 'dev' into feat_app-connect 
# Conflicts:
#	backend/src/main/resources/db/migration/V42__1.16.sql
 2022-10-26 19:35:29 +08:00
wangjiahao
3cc6dd041b feat(应用市场): 三方应用对接 2022-10-26 19:34:56 +08:00
fit2cloud-chenyw
ee32305816 fix(登出): oidc宕机后无法退出系统 2022-10-26 19:24:19 +08:00
fit2cloud-chenyw
5daa316966
Merge pull request #3458 from dataease/pr@dev@dataset 
fix(数据源): sqlserver 获取表出错
 2022-10-26 15:41:24 +08:00
taojinlong
408dccb1c7 fix(数据源): sqlserver 获取表出错 2022-10-26 15:32:50 +08:00
xuwei-fit2cloud
af7f359f1a
Merge pull request #3457 from dataease/pr@dev@perf_scan_qr_login 
perf(登录): 用户状态为失效情况下扫码登录错误提示
 2022-10-26 15:30:16 +08:00
fit2cloud-chenyw
c227a1b49f perf(登录): 用户状态为失效情况下扫码登录错误提示 2022-10-26 15:18:26 +08:00
taojinlong
db68e63685 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-10-26 15:09:28 +08:00
taojinlong
1f845b3021 fix(数据集): 校验sql参数，只能在直连时使用 2022-10-26 15:08:20 +08:00
fit2cloud-chenyw
3d6a5562ed fix: 开启cas后公共链接无效 2022-10-26 14:32:54 +08:00
fit2cloud-chenyw
dcc337e986 feat(定时报告): 飞书国际版消息渠道 2022-10-25 17:28:37 +08:00
taojinlong
afa581c1d2 feat(数据源): 支持 Kylin 2022-10-25 14:28:43 +08:00
taojinlong
bf92ddaa4e feat(数据源): 支持 Kylin 2022-10-25 13:49:56 +08:00
fit2cloud-chenyw
93776973d8 perf(平台对接): 优化飞书国际版 2022-10-24 17:31:36 +08:00
fit2cloud-chenyw
c01d44f280 fix: 修改拼写错误，格式化代码 2022-10-24 14:42:37 +08:00
fit2cloud-chenyw
3fdeef0312 feat(平台对接): 飞书国际版 2022-10-24 13:22:58 +08:00
fit2cloud-chenyw
86e2ed96d3
Merge pull request #3412 from dataease/pr@dev@feat_chart_percent 
feat(视图): 快速计算支持占比
 2022-10-22 21:43:59 +08:00
junjun
a08ccdeed2 feat(视图): 快速计算支持占比 2022-10-22 14:03:35 +08:00
fit2cloud-chenyw
0718ad8647 feat: 后台所有拼写错误 2022-10-21 23:23:07 +08:00
fit2cloud-chenyw
1a4312213b fix: 部分后台拼写错误 2022-10-21 17:26:31 +08:00
wisonic-s
00da4e8965 Merge branch 'dev' into pr@dev@feat_liquid_dynamic_max 2022-10-20 18:13:44 +08:00
wisonic-s
e5b59e409a feat(视图-水波图): 水波图目标值支持动态值 
水波图目标值支持动态值 https://www.tapd.cn/55578866/prong/stories/view/1155578866001009735
 2022-10-20 18:12:52 +08:00
Junjun
8ba5fcc849
Merge pull request #3404 from dataease/pr@dev@kylin 
typo: 修复单词拼写错误
 2022-10-20 17:59:41 +08:00
fit2cloud-chenyw
cee4b1940c
fix: 删除无用代码 2022-10-20 17:41:17 +08:00
fit2cloud-chenyw
cf8ba02633 feat(定时报告): 视图数据构造时间过滤器条件 2022-10-20 17:29:25 +08:00
taojinlong
8925c7e0df refactor: 拼写错误 2022-10-20 15:27:51 +08:00
fit2cloud-chenyw
bed3413747 perf(定时报告): 根据视图数据范围导出不同数据 2022-10-19 12:45:46 +08:00
xuwei-fit2cloud
84a22b5dec
Merge pull request #3388 from dataease/pr@dev@feat_report_task_view_data_range 
feat(定时报告): 视图数据选项
 2022-10-19 11:41:11 +08:00
fit2cloud-chenyw
f80e85e2d6 feat(定时报告): 视图数据选项 2022-10-19 11:19:19 +08:00
taojinlong
65ca8a9380 feat(数据集): 数据集字段，字符串转时间，可以指定时间格式 2022-10-18 16:26:51 +08:00
fit2cloud-chenyw
e339d565fa perf(数据同步): 数据同步路由组件使用驼峰命名规范 2022-10-18 15:44:16 +08:00
fit2cloud-chenyw
6bf7c40dac perf(路由): 路由组件使用驼峰命名规范 2022-10-18 15:28:15 +08:00
fit2cloud-chenyw
5800da9e16 fix(定时报告): 任务时间选择周日报错 2022-10-16 12:57:53 +08:00
taojinlong
fc06d14c24 fix(数据源): 添加数据源时，校验参数 2022-10-13 20:39:38 +08:00
fit2cloud-chenyw
52bda7571d fix(定时报告): 时间不能选择周六 2022-10-13 16:33:13 +08:00
lxxawfl
417e2a3a83 update org.apache.shiro:shiro-spring 1.7.1 to 1.9.1 2022-10-12 15:24:46 +08:00
junjun
e72e3fa7c8 perf(视图): g2plot代码完善 2022-10-12 10:23:30 +08:00
taojinlong
07ad5201b1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-10-11 16:29:31 +08:00
taojinlong
9f56340dc4 refactor: 升级版本号 2022-10-11 16:29:16 +08:00
taojinlong
bf485add69 fix(数据源): Mysql jdbc反序列化漏洞 2022-10-11 16:01:06 +08:00
xuwei-fit2cloud
48f65dba5a
Merge pull request #3311 from dataease/pr@dev@sqlparser 
fix(数据集): sql 解析支持 union
 2022-10-11 13:49:37 +08:00
taojinlong
c467e26e2a fix(数据集): 抽取数据时判断数据类型错误 2022-10-10 16:02:48 +08:00
taojinlong
4721c55dc0 fix(数据集): sql 解析支持 union 2022-10-09 14:19:01 +08:00
wangjiahao
2f8e8c7afb refactor(视图): 导出视图明细变更为xlsx格式 2022-10-08 11:19:31 +08:00
王嘉豪
3990ad28af
Merge pull request #3289 from dataease/pr@dev@refactor-flyway 
refactor: 调整flyway
 2022-10-05 15:49:37 +08:00
wangjiahao
31e8aa626d refactor: 调整flyway 2022-10-05 15:48:10 +08:00
taojinlong
046624a4f1 fix(数据源): 校验时，展示错误信息 2022-09-30 16:31:36 +08:00
fit2cloud-chenyw
d6aeb68ce6 fix(登录): 第三方平台扫码登录在姓名或邮箱重复情况下依然可以成功 2022-09-30 16:03:56 +08:00
xuwei-fit2cloud
f07cd2b0ff
Merge pull request #3278 from dataease/pr@dev@task 
fix(数据更新): mysql YEAR 类型定时同步错误
 2022-09-30 15:45:37 +08:00
taojinlong
564002c164 fix(数据更新): mysql YEAR 类型定时同步错误 2022-09-30 15:43:45 +08:00
xuwei-fit2cloud
acd2ce2d28
Merge pull request #3277 from dataease/pr@dev@refactor_useless-dataset 
refactor: 清理未使用的数据集
 2022-09-30 15:43:18 +08:00
wangjiahao
d3f90ca1d8 refactor: 清理未使用的数据集 2022-09-30 15:34:50 +08:00
xuwei-fit2cloud
054c8520f1
Merge pull request #3276 from dataease/pr@dev@fix_report_down_error 
fix(定时报告): 第三方平台无法下载报告附件
 2022-09-30 15:31:33 +08:00
fit2cloud-chenyw
2c953f3a89 fix(定时报告): 第三方平台无法下载报告附件 2022-09-30 15:21:04 +08:00
wangjiahao
c188ed552a refactor: 默认的系统管理员角色增加系统配置相关菜单权限 2022-09-30 15:18:47 +08:00
xuwei-fit2cloud
78baaac873
Merge pull request #3273 from dataease/pr@dev@refactor-default-panel 
refactor(仪表板): 更新系统默认仪表板
 2022-09-30 15:11:14 +08:00
wangjiahao
fc20351839 refactor(仪表板): 更新系统默认仪表板 2022-09-30 14:40:43 +08:00
xuwei-fit2cloud
f43e08fd61
Merge pull request #3266 from dataease/pr@dev@dataset 
fix: 数据集预览报错
 2022-09-29 18:00:06 +08:00
Junjun
cfbce4f4bc
Merge pull request #3265 from dataease/pr@dev@refactor_dataset-info 
refactor(数据集): 数据集信息界面创建人显示为别名
 2022-09-29 17:40:29 +08:00
王嘉豪
c1c0667bba
Merge pull request #3264 from dataease/pr@dev@fix_symbol_map 
fix(视图): 符号地图添加数字类型提示报错
 2022-09-29 17:37:16 +08:00
wangjiahao
6b885857ad refactor(数据集): 数据集信息界面创建人显示为别名 2022-09-29 17:33:30 +08:00
taojinlong
6a717c94af fix: 数据集预览报错 2022-09-29 17:31:45 +08:00
fit2cloud-chenyw
4814dc53d1 fix(视图): 符号地图添加数字类型提示报错 2022-09-29 17:18:44 +08:00
taojinlong
dda88f9312 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-29 16:44:06 +08:00
taojinlong
42e5384fb5 fix: oracel sql 参数报错 2022-09-29 16:43:53 +08:00
xuwei-fit2cloud
53d8a6f099
Merge pull request #3262 from dataease/pr@dev@fix_plugin_view_union_ds 
fix(视图): 插件视图无法使用关联数据集
 2022-09-29 16:04:49 +08:00
fit2cloud-chenyw
6ac864e170 fix(视图): 插件视图无法使用关联数据集 2022-09-29 15:59:07 +08:00
wangjiahao
ead9940bf2 refactor(仪表板): 仪表板信息弹窗修改人显示别名 2022-09-29 15:08:57 +08:00
taojinlong
780fe87ef1 fix: 国际化 2022-09-29 15:06:19 +08:00
fit2cloud-chenyw
f168bcdbd8 fix(定时报告): 部分渠道消息发送失败会中断后面其他渠道消息 2022-09-29 14:07:32 +08:00
wangjiahao
3a1b88db2f refactor: 更新视图复制自动命名函数，兼容富文本视图不需要显示标题的情况 2022-09-29 12:01:00 +08:00
xuwei-fit2cloud
e19e3ccc2f
Merge pull request #3245 from dataease/pr@dev@dataset 
fix: 数据集任务展示下次执行时间
 2022-09-28 18:52:46 +08:00
taojinlong
721d342f00 fix: 数据集任务展示下次执行时间 2022-09-28 18:36:27 +08:00
xuwei-fit2cloud
482b0971bd
Merge pull request #3244 from dataease/pr@dev@fix_lark_qr_login 
fix(登录): 飞书扫码登录
 2022-09-28 18:30:22 +08:00
fit2cloud-chenyw
ff226c6514 fix(登录): 飞书扫码登录 2022-09-28 18:25:35 +08:00
fit2cloud-chenyw
3105660f44 fix(用户管理): 删除用户没有删除对应第三方平台信息 2022-09-28 17:40:40 +08:00
fit2cloud-chenyw
f3dcc26f04 fix(登录): 钉钉扫码绑定DE用户后使用扫码登录失败 2022-09-28 16:45:14 +08:00
taojinlong
83c296b3f0
Merge branch 'dev' into pr@dev@dataset 2022-09-28 16:19:00 +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
fit2cloud-chenyw
94bfe751ad fix(个人信息): 扫码绑定第三方平台错误信息提示 2022-09-28 14:44:31 +08:00
taojinlong
585d737d43 fix: 创建多sheet页的Excel数据集，表中数据格式有问题仍然会创建数据集 2022-09-28 12:04:26 +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
a120323073
Merge pull request #3226 from dataease/pr@dev@fix_group_bar 
fix(视图): 修复分组柱状图报错
 2022-09-28 11:38:16 +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
taojinlong
98055c354b fix: 不同的sql 数据集参数同名 2022-09-28 10:23:14 +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
taojinlong
0f2813e444 fix(数据集): 格式化 oracle sql 出错 2022-09-27 18:10:04 +08:00
junjun
c24d2521e3 fix(视图): 修复SQL Server标准差方差错误 2022-09-27 18:06:47 +08:00
taojinlong
106958327e fix(API数据源): 没有子项的字段置灰 2022-09-27 17:25:31 +08:00
taojinlong
5f09346929 fix(API数据源): 请求 form-data 失败 2022-09-27 17:25:04 +08:00
ren_jq
362c5736df upgrade pagehelper to 5.3.1 2022-09-27 15:39:28 +08:00
xuwei-fit2cloud
a51c426035
Merge pull request #3200 from dataease/pr@dev@mysql-function 
refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况
 2022-09-27 15:01:23 +08:00
wangjiahao
7f24ee745c refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况 2022-09-27 14:21:46 +08:00
王嘉豪
cf0d947e50
Merge pull request #3198 from dataease/pr@dev@fix_login_limit_clear 
fix(登录): 登录成功后登录失败次数未清零
 2022-09-27 14:06:34 +08:00
wangjiahao
92d8fe84e6 refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况 2022-09-27 14:03:40 +08:00
fit2cloud-chenyw
ff5291c5b1 fix(登录): 登录限制提示优化 2022-09-27 13:35:09 +08:00
fit2cloud-chenyw
2ad9c9ca8a fix(登录): 登录成功后登录失败次数未清零 2022-09-27 12:52:08 +08:00
xuwei-fit2cloud
2c42e436b8
Merge pull request #3191 from dataease/pr@dev@excel 
Pr@dev@excel
 2022-09-27 10:20:48 +08:00
taojinlong
a900d71849 refactor: 代码格式调整 2022-09-27 10:17:52 +08:00
xuwei-fit2cloud
9cf27bec99
Merge pull request #3192 from dataease/pr@dev@fix_user_bind 
fix(个人信息): 绑定二维码无法显示
 2022-09-27 09:52:49 +08:00