center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
6,968 Commits 1 Branch 86 Tags 417 MiB
a0f4372c97
Commit Graph

2430 Commits

Author SHA1 Message Date
wangjiahao
772af522a4 Merge remote-tracking branch 'origin/dev' into dev 2022-07-19 15:59:13 +08:00
wangjiahao
4f71820484 revert: 删除多余代码 2022-07-19 15:59:01 +08:00
junjun
eb085a489d feat(视图): 增加小数精度 2022-07-19 15:45:58 +08:00
wangjiahao
e925dc2364 feat(仪表板) :支持在DataEase中查看模板市场模板并且直接应用模板创建仪表板 2022-07-19 11:57:21 +08:00
fit2cloud-chenyw
67c55c23ef perf(系统管理): 组织角色管理api适配新版UI 2022-07-16 10:05:48 +08:00
fit2cloud-chenyw
adf6326732 perf(仪表板): 优化echarts地图 增加世界地图 2022-07-15 00:24:15 -04:00
taojinlong
1c5ae1ca05 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-14 17:43:59 +08:00
taojinlong
7ae1ce6c02 fix(数据源): 同步 oracle 数据出错 2022-07-14 17:43:47 +08:00
junjun
6b10b217db feat(X-Pack): 行权限 2022-07-14 11:07:55 +08:00
junjun
fc0757613b feat(X-Pack): 行权限 2022-07-13 13:22:46 +08:00
taojinlong
429e27e12a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-13 12:31:30 +08:00
taojinlong
37936e7b37 fix(数据源): 增加sql拼接前缀设置 2022-07-13 12:31:18 +08:00
fit2cloud-chenyw
00e6e18137
Merge pull request #2629 from dataease/pr@dev@perf_dept_manager 
perf(系统管理): 优化组织管理适配新版ui
 2022-07-13 11:13:14 +08:00
fit2cloud-chenyw
6b9ad96023 perf(系统管理): 优化组织管理适配新版ui 2022-07-13 11:11:48 +08:00
taojinlong
7759fd0383 feat(数据源): 基于mongo-bi-connector 新增对mongo数据源的支持 2022-07-12 17:25:20 +08:00
fit2cloud-chenyw
d95c89cfce perf(系统管理): 优化角色管理适配新版ui 2022-07-12 15:36:17 +08:00
fit2cloud-chenyw
b09eaa2ebd perf(系统管理): 优化用户管理增加手机号前缀字段 2022-07-12 12:17:13 +08:00
fit2cloud-chenyw
a6e9c558b8 fix(系统管理): 定时报告选择附件页面过滤掉非视图组件 2022-07-12 11:38:57 +08:00
junjun
b1df267c55 Merge remote-tracking branch 'origin/dev' into dev 2022-07-11 16:43:06 +08:00
junjun
00cf97e035 feat(X-Pack): 重构行权限 2022-07-11 16:42:43 +08:00
fit2cloud-chenyw
a7da54227b perf: 优化定时报告发送视图附件 2022-07-11 16:39:36 +08:00
junjun
d6ef0859b4 feat(X-Pack): 重构行权限 2022-07-09 13:50:39 +08:00
fit2cloud-chenyw
a49b0ed107
Merge pull request #2609 from dataease/pr@dev@feat_email_task_view 
feat(系统管理): 定时报告增加发送视图数据
 2022-07-08 16:55:09 +08:00
fit2cloud-chenyw
01b3ad05d8 feat(系统管理): 定时报告增加发送视图数据 2022-07-08 04:52:26 -04:00
junjun
40357d5382 refactor(视图): 下钻后延续第一层排序规则（仅对升降序有效） 2022-07-08 15:59:28 +08:00
taojinlong
d4a35d7bd8 refactor: 升级版本号 2022-07-07 17:35:17 +08:00
taojinlong
0b586c71cc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-06 23:41:35 +08:00
taojinlong
50cd6367c3 fix(数据集): 处理 sql 参数错误 2022-07-06 23:41:15 +08:00
fit2cloud-chenyw
975d9264ba
Merge pull request #2599 from dataease/pr@dev@fix_panel_share_cancel_error 
fix(仪表板): 删除分享仪表板报错
 2022-07-06 15:45:50 +08:00
fit2cloud-chenyw
f69332267f fix(仪表板): 删除分享仪表板报错 2022-07-06 03:42:10 -04:00
wangjiahao
c73e3e13a6 perf: 优化flyway，提升初次启动速度 2022-07-06 15:33:35 +08:00
fit2cloud-chenyw
aaa5141cd5 perf(系统): 升级kettle依赖版本号到8.3.0.18-1112(更好下载) 2022-07-05 23:02:33 -04:00
fit2cloud-chenyw
bf33bdabfd fix(数据集): 带参数的数据集设置仪表板过滤器报错空指针 2022-07-05 22:22:54 +08:00
taojinlong
538ac13db6 fix(数据集): 过滤组件选择参数传递后，不再额外拼接过滤条件 2022-07-05 13:42:09 +08:00
王嘉豪
87907beff3
Merge pull request #2570 from dataease/pr@dev@fix_panel-mobile 
fix: 修复导入有移动端布局的仪表板时，列表中没有及时显示移动端标识
 2022-07-04 17:05:26 +08:00
wangjiahao
bf5084f236 fix: 修复导入有移动端布局的仪表板时，列表中没有及时显示移动端标识 2022-07-04 17:04:41 +08:00
taojinlong
6599619aa2 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-04 15:30:41 +08:00
taojinlong
e74c3883f0 fix(数据源): 校验数据源配置的有效性 2022-07-04 15:29:40 +08:00
王嘉豪
663b323124
Merge pull request #2568 from dataease/pr@dev@fix_view-select-icon 
fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题
 2022-07-04 15:02:35 +08:00
wangjiahao
d72f5432f2 fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题 2022-07-04 15:01:53 +08:00
junjun
3bcdc56e50 fix(视图): SQLServer明细表类型转换错误 2022-07-04 12:50:48 +08:00
fit2cloud-chenyw
b73a8d477f fix(系统管理): 授权插件菜单的操作在记录日志时无法获取到菜单名称 2022-07-03 23:07:48 -04:00
taojinlong
ad233b2881 Merge branch 'v1.12' into dev 2022-07-04 00:46:11 +08:00
taojinlong
f5c8c5422e fix(数据集): 数据集参数传递支持 IN 2022-07-04 00:45:03 +08:00
taojinlong
4474970b2d fix(数据源): 超时时间无法修改 2022-07-03 22:02:01 +08:00
taojinlong
969b3d2fcf feat(数据集): 参数值只在编辑 sql 时生效 2022-07-01 18:11:06 +08:00
taojinlong
8d13c10d97 fix(API): 去掉默认 http client 请求头 2022-07-01 17:43:29 +08:00
taojinlong
94871bdbc3 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:34:11 +08:00
taojinlong
3a8fb1de26 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:09:16 +08:00
王嘉豪
da03efd1ec
Merge pull request #2545 from dataease/pr@dev@refactor_template-static 
refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储
 2022-07-01 12:24:37 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
王嘉豪
459b0d49c2
Merge pull request #2541 from dataease/pr@dev@refactor_slow-sql 
refactor: 优惠插件菜单同步慢sql
 2022-07-01 10:38:39 +08:00
wangjiahao
d1d116e86d refactor: 优惠插件菜单同步慢sql 2022-07-01 10:34:27 +08:00
taojinlong
75a51d9eaa Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-30 22:17:41 +08:00
wangjiahao
929e99ac01 refactor: 代码结构优化，去掉无用的引用 2022-06-30 17:38:25 +08:00
fit2cloud-chenyw
e3fcb702c9 feat: 优化修改初始密码提示 2022-06-30 04:06:16 -04:00
wangjiahao
013d5d5de9 refactor: 样式控制面板视图结果在编辑界面也可生效 2022-06-29 18:19:30 +08:00
taojinlong
1e7bc31c52 fix: db2 V10版本sql 拼接 2022-06-29 11:28:58 +08:00
taojinlong
6fc563024a fix: 排除 Spring Security 2022-06-28 18:10:21 +08:00
taojinlong
00aeffc8dc fix: db2 时间格式化 2022-06-28 17:42:05 +08:00
taojinlong
dfbca77cee fix: mysql json 字段长度 2022-06-28 12:45:19 +08:00
taojinlong
c89dc628fd fix: MySql数据库表名称含有小数点 2022-06-27 18:23:52 +08:00
taojinlong
3f88b27d50 fix: 枚举值过滤 2022-06-27 17:52:35 +08:00
taojinlong
313942b26e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 17:16:53 +08:00
taojinlong
5366fd1a3b feat: 支持查询超时 2022-06-27 17:16:43 +08:00
junjun
cbf0391780 fix: 图表联动参数构建 2022-06-27 16:34:31 +08:00
taojinlong
fb5f713d62 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 12:42:30 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
wangjiahao
a9228bc420 refactor:更新官方示例，新安装系统屏蔽自定义数据集 2022-06-27 12:09:17 +08:00
taojinlong
2421b5c80c fix: 抽取数据 2022-06-26 15:37:33 +08:00
taojinlong
96a7a62062 fix: 抽取数据 2022-06-26 00:04:21 +08:00
taojinlong
72cdab3c06 fix: 尝试修复支持数据库字符集 2022-06-25 23:35:07 +08:00
taojinlong
a5d31401e4 fix: 尝试修复支持数据库字符集 2022-06-25 23:31:20 +08:00
taojinlong
91491eb1ab fix: 尝试修复支持数据库字符集 2022-06-25 17:24:23 +08:00
taojinlong
be11424539 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 15:33:56 +08:00
taojinlong
dc7b06bca5 fix: 参数默认值的時間格式化 2022-06-25 15:33:39 +08:00
wangjiahao
1bc5afa52b refactor: 更新flyway 重置默认主题 2022-06-24 18:05:29 +08:00
fit2cloud-chenyw
9945b90fd5 fix: 过滤组件排序doris无效 2022-06-24 11:37:10 +08:00
fit2cloud-chenyw
4484cd3e6d fix: 过滤器排序功能代码冲突后被覆盖 2022-06-23 22:10:05 +08:00
wangjiahao
f823b35171 refactor: 权限管理授权用户同时显示id和名称 2022-06-23 18:54:23 +08:00
fit2cloud-chenyw
3c0c39ff46 perf: 格式化代码 2022-06-23 10:55:05 +08:00
junjun
2ffea5e26c feat: 视图支持计算字段 2022-06-22 20:34:49 +08:00
junjun
88f060d9ba feat: 视图支持计算字段 2022-06-22 20:18:31 +08:00
junjun
b5e4aea1dc feat: 视图支持计算字段 2022-06-22 19:59:38 +08:00
junjun
30435e00cf test: doris test 2022-06-22 18:19:03 +08:00
taojinlong
f612d21ee5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-22 16:04:20 +08:00
taojinlong
1349431c63 feat: excel 替换数据显示'同步中' 2022-06-22 16:04:07 +08:00
fit2cloud-chenyw
948e7b61f3 fix: 符号地图选择数字提示后报错 2022-06-22 14:33:35 +08:00
fit2cloud-chenyw
559bcb1ebb
Merge pull request #2469 from dataease/pr@dev@fix_log_export 
fix: 日志导出文件使用excel无法打开
 2022-06-22 12:17:54 +08:00
fit2cloud-chenyw
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
taojinlong
de35ff89ca feat: 增加达梦插件 2022-06-22 11:35:00 +08:00
fit2cloud-chenyw
5c73127124
Merge pull request #2467 from dataease/pr@dev@fix_logout_error 
fix: 退出登录错误
 2022-06-22 10:48:31 +08:00
fit2cloud-chenyw
1de0d83284 fix: 退出登录错误 2022-06-22 10:46:01 +08:00
taojinlong
2efeec87b9 fix: 参数过滤空指针 2022-06-21 18:25:55 +08:00
taojinlong
152b4fdeee Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-21 18:14:51 +08:00
taojinlong
e83cc02448 refactor: 移动代码到sdk 2022-06-21 18:14:44 +08:00
fit2cloud-chenyw
a40fb8a8bf fix: 插件视图不能使用sql数据集 2022-06-21 15:37:54 +08:00
fit2cloud-chenyw
3d2e4f5edd
Merge pull request #2461 from dataease/pr@dev@fix_api_auth_error_i18n 
fix: api权限错误提示国际化
 2022-06-21 14:40:45 +08:00
fit2cloud-chenyw
32e76cdf82 fix: api权限错误提示国际化 2022-06-21 14:39:40 +08:00
junjun
2620ddd16d feat: 视图支持计算字段 2022-06-21 11:31:44 +08:00
fit2cloud-chenyw
92f037658d fix: 前端超时时间非空判断 2022-06-21 11:18:35 +08:00
junjun
1d0e0e92ad feat: 视图支持计算字段 2022-06-20 18:35:00 +08:00
taojinlong
e5538941ce Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-20 17:40:49 +08:00
junjun
78022a8244 fix: 视图计算字段权限问题 2022-06-20 17:40:13 +08:00
taojinlong
7e5a78334b fix: 获取数据源类型 2022-06-20 17:39:44 +08:00
fit2cloud-chenyw
e39ee7844f fix: 插件上传错误提示 2022-06-20 17:18:07 +08:00
taojinlong
f29aa2ca95 fix: 解析 sql 空指针异常 2022-06-20 14:59:02 +08:00
taojinlong
05f510d3af fix: 回滚代码 2022-06-17 17:17:14 +08:00
Zhimin Ruan
4c3c925510 chore: pom.xml 格式化 2022-06-17 14:38:20 +08:00
taojinlong
2cfc3b457e fix: 依赖冲突 2022-06-17 13:26:40 +08:00
taojinlong
1e12eb5b64 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-17 11:36:55 +08:00
taojinlong
20bb6f4ea5 fix: 同步字段时，顺序错误 2022-06-17 11:36:45 +08:00
fit2cloud-chenyw
c65e461fa8
Merge pull request #2441 from dataease/pr@dev@perf_cas_reset 
perf: 重置cas登录方式api增加管理员校验
 2022-06-17 10:35:46 +08:00
fit2cloud-chenyw
3642805e67 perf: 重置cas登录方式api增加管理员校验 2022-06-17 10:34:41 +08:00
taojinlong
6c9191e9bd refactor: 解决冲突 2022-06-16 23:03:07 +08:00
taojinlong
3293f3a870 feat: 参数管理 2022-06-16 22:41:09 +08:00
fit2cloud-chenyw
a18964f0b7
Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas 
feat: 适配xpack-cas单点登录
 2022-06-16 18:42:06 +08:00
fit2cloud-chenyw
ccd4f7f1a3 fix: 删除不用的包引入 2022-06-16 18:38:20 +08:00
wangjiahao
3b64979625 refactor: 优化代码结构去掉无用的注释 2022-06-16 18:29:30 +08:00
fit2cloud-chenyw
7218b2105e fix: 删除注释 2022-06-16 18:29:08 +08:00
fit2cloud-chenyw
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +08:00
wangjiahao
7673e58088 fix: 数据集预览和更新增加数据源权限校验，防止使用无权限数据源执行sql 2022-06-16 16:20:49 +08:00
wangjiahao
d61c5a5ae7 refactor: 更新flyway版本 2022-06-16 15:13:15 +08:00
wangjiahao
2ce2f94113 fix: 插件操作加入权限控制，解决普通用户或者API能越权上传卸载插件问题 2022-06-16 15:09:52 +08:00
taojinlong
4b5788b63c feat: 参数管理 2022-06-16 14:16:47 +08:00
taojinlong
2284cad01c fix: 校验驱动ID 2022-06-16 14:10:08 +08:00
wangjiahao
a6744f7b9f fix: 修复模板管理中导入模板未存储静态文件的问题 2022-06-16 11:41:02 +08:00
junjun
338cb44f5e feat: 视图支持计算字段 2022-06-13 14:30:43 +08:00
junjun
78caab8f61 fix: 修复文本转数值后做维度的排序问题 2022-06-10 13:27:22 +08:00
taojinlong
9637bef109 refactor: 升级版本号 2022-06-08 16:55:24 +08:00
fit2cloud-chenyw
28b53805c6
Merge pull request #2395 from dataease/pr@dev@fix_sql_inject_msg 
fix: sql注入给出提示
 2022-06-08 12:53:38 +08:00
fit2cloud-chenyw
59e7b9172b fix: sql注入给出提示 2022-06-08 12:52:41 +08:00
taojinlong
28d5912bc6 refactor: 升级版本号 2022-06-08 10:56:21 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
fit2cloud-chenyw
bb1810b1bc fix: 过滤器枚举字段去除分组查询 2022-06-07 19:39:31 +08:00
taojinlong
9fa65bcc36 Merge branch 'main' into dev 2022-06-07 17:44:17 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main 
feat:提高请求超时时间的范围，创建关联数据集时保留原数据类型
 2022-06-07 17:43:16 +08:00
fit2cloud-chenyw
e51b0d766b
Merge pull request #2385 from dataease/pr@dev@feat_filter_sort 
feat: 过滤器枚举值排序
 2022-06-07 15:05:26 +08:00
fit2cloud-chenyw
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
junjun
936310b320 feat: 视图计算字段flyway 2022-06-06 15:10:25 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +08:00
fit2cloud-chenyw
2899983be0 fix: 升级版本号1.11.1 2022-06-02 13:30:30 +08:00
fit2cloud-chenyw
3c414d3da2
Merge pull request #2374 from dataease/pr@dev@fix_plugin_view_ds_scheme 
fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据
 2022-06-01 18:57:11 +08:00
fit2cloud-chenyw
ef86c2a885 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:56:02 +08:00
wangjiahao
4258b29a09 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 16:40:55 +08:00
wangjiahao
85c6051712 fix: 过滤跳转设置中联动视图查询出现的无用数据 2022-06-01 16:39:46 +08:00
fit2cloud-chenyw
631acb29e7 fix: 符号地图明细数据错误 2022-06-01 16:34:44 +08:00
fit2cloud-chenyw
fb541e22ec
Merge pull request #2370 from dataease/pr@dev@fix_datasource_group_concat 
fix: 数据源适配group_concat函数
 2022-06-01 16:09:04 +08:00
fit2cloud-chenyw
47ac8ce776 fix: 数据源适配group_concat函数 2022-06-01 16:08:06 +08:00
taojinlong
d01a067c32 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-01 15:56:54 +08:00
taojinlong
d176cfd597 fix: 获取枚举值空指针 2022-06-01 15:56:44 +08:00
wangjiahao
702d815215 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 12:17:18 +08:00
wangjiahao
bf493362a9 fix: 符号地图标志在联动视图选项未显示 2022-06-01 12:15:43 +08:00
fit2cloud-chenyw
87001c3268 fix: 符号地图导出excel缺少字段 2022-06-01 11:15:49 +08:00
taojinlong
6fc0afcfeb Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-06-01 00:50:37 +08:00
taojinlong
f3218fc87d fix: 获取 StarRocks 字段类型 2022-06-01 00:20:07 +08:00
taojinlong
8b9b0e4564 fix: db2 time 类型 2022-06-01 00:17:59 +08:00
taojinlong
2f8beea85b fix: 切换插件类型数据源不生效 2022-05-31 22:17:29 +08:00
taojinlong
8aa0bf2153 fix: 行权限枚举值 2022-05-31 19:03:27 +08:00
wangjiahao
d69ebb8ea7 refactor: 模板导入适配新的视图逻辑 2022-05-31 16:54:19 +08:00
wangjiahao
1810e3481e revert: 代码回退 2022-05-31 15:31:47 +08:00
wangjiahao
edc9878368 refactor: 仪表板保存优化 2022-05-31 13:31:01 +08:00
王嘉豪
23acb3c9c0
Merge pull request #2360 from dataease/pr@dev@refactor_panel-save 
refactor: 优化仪表板保存返回信息
 2022-05-31 12:14:19 +08:00
wangjiahao
38ad5a1922 refactor: 优化仪表板保存返回信息 2022-05-31 12:13:35 +08:00
王嘉豪
feabca531c
Merge pull request #2359 from dataease/refactor_batch-opt-style 
refactor: 缓存清理注解改为异步处理，加快接口处理时间
 2022-05-31 12:05:22 +08:00
wangjiahao
31ba1baa31 refactor: 缓存清理注解改为异步处理，加快接口处理时间 2022-05-31 12:04:43 +08:00
taojinlong
c9bbc2ef2c fix: 自定义驱动 2022-05-30 23:30:40 +08:00
taojinlong
803792fec0 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-30 21:23:10 +08:00
taojinlong
d49f617c91 fix: 自定义驱动 2022-05-30 21:23:03 +08:00
王嘉豪
786a785c8a
Merge pull request #2355 from dataease/pr@dev@refactor_label-color 
fix: 复制仪表板，指标卡颜色丢失
 2022-05-30 18:04:47 +08:00
wangjiahao
57a7d491db fix: 复制仪表板，指标卡颜色丢失 2022-05-30 18:01:31 +08:00
taojinlong
9be4a14b27 fix: 创建数据表时需要指定排序为 utf8mb4_general_ci 2022-05-30 15:08:19 +08:00
taojinlong
2ae62dff1e fix: 替换excel时，提示影响计算字段 2022-05-30 10:40:52 +08:00
taojinlong
7879eed3ff fix: API 数据集校验错误 2022-05-30 10:40:44 +08:00
fit2cloud-chenyw
fb446e3943 fix: 修改log文件名称 2022-05-30 10:24:45 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
fit2cloud-chenyw
5e6e00e84c fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:08:38 +08:00
fit2cloud-chenyw
ce1f06705e
Merge pull request #2346 from dataease/pr@dev@fix_log_filter_error 
fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误
 2022-05-30 10:07:53 +08:00
fit2cloud-chenyw
966d7f90a7 fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:06:50 +08:00
taojinlong
a4a665203d fix: 替换excel时，提示影响计算字段 2022-05-30 01:11:53 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +08:00
吕昊泽
00e7b5f349 修复[issue:2339](https://github.com/dataease/dataease/issues/2339)excel创建关联数据集保留原数据类型 2022-05-29 21:38:20 +08:00
fit2cloud-chenyw
32108e8686 fix: 纯内网环境主题切换失效 2022-05-29 13:39:06 +08:00
fit2cloud-chenyw
127caff11e fix: 纯内网环境主题切换失效 2022-05-29 13:37:26 +08:00
fit2cloud-chenyw
792a86667f fix: 修改个人信息报错 2022-05-29 09:46:29 +08:00
fit2cloud-chenyw
960040be9a fix: 修改个人信息报错 2022-05-29 09:41:09 +08:00
taojinlong
2d1793f3f5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-28 21:58:06 +08:00
taojinlong
0b468cc22b fix: API 数据集校验错误 2022-05-28 21:57:46 +08:00
fit2cloud-chenyw
319df86b5b fix: 暂时屏蔽视图操作日志 2022-05-28 21:44:55 +08:00
fit2cloud-chenyw
5973f9beac fix: 恢复因为增加日志修改的api 2022-05-28 21:44:36 +08:00
fit2cloud-chenyw
215d262bbf fix: 暂时屏蔽视图操作日志 2022-05-28 21:42:53 +08:00
fit2cloud-chenyw
6fd3ccf91b fix: 恢复因为增加日志修改的api 2022-05-28 21:35:06 +08:00
fit2cloud-chenyw
39ed55c1bb feat: 符号地图插件记录sql 2022-05-28 13:17:53 +08:00
fit2cloud-chenyw
7974ae2abd
Merge pull request #2335 from dataease/pr@dev@feat_symbol_map_plugin_sql 
feat: 符号地图插件记录sql
 2022-05-28 13:14:49 +08:00
fit2cloud-chenyw
acecae5d7a feat: 符号地图插件记录sql 2022-05-28 13:13:24 +08:00
taojinlong
718585f3a0 fix: excel 替换、追加不生效 2022-05-28 10:51:11 +08:00
taojinlong
5f8f93f7d4 fix: excel 替换、追加不生效 2022-05-28 10:49:49 +08:00
taojinlong
25e5fb40f1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-27 22:02:48 +08:00
taojinlong
33f43369f2 fix: 驱动插件操作日志 2022-05-27 22:02:39 +08:00
wangjiahao
54d7466fef Merge remote-tracking branch 'origin/dev' into dev 2022-05-27 19:48:57 +08:00
wangjiahao
3c6d2fb98f refactor: 使用Gson 替换fastjson 2022-05-27 19:48:05 +08:00
taojinlong
0b04549d57 build: 升级版本 2022-05-27 16:51:32 +08:00
fit2cloud-chenyw
cddde4a4f9 perf: 优化操作日志 2022-05-27 13:30:46 +08:00
fit2cloud-chenyw
7ebbf09dda fix: 移动端查看分享错误 2022-05-27 12:05:11 +08:00
fit2cloud-chenyw
0dd419c7fe fix: 树形没有按照字段先后顺序构建树 2022-05-26 23:30:34 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
fit2cloud-chenyw
04fe29a96c
Merge pull request #2324 from dataease/pr@dev@fix_log_i18n 
fix: 操作日志国际化
 2022-05-26 21:23:12 +08:00
fit2cloud-chenyw
791c27910c fix: 操作日志国际化 2022-05-26 21:22:09 +08:00
taojinlong
ac29f9db2b fix: 菜单授权报错 2022-05-26 18:07:04 +08:00
taojinlong
dd2e9a6e6f fix: 删除数据源权限错误 2022-05-26 15:28:04 +08:00
junjun
1d8e2658bf feat: 支持树形过滤器sql 2022-05-26 14:30:03 +08:00
junjun
9068d80516 test: 树形过滤器sql拼接 2022-05-26 13:18:20 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select 
feat: 过滤条件增加下拉树
 2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +08:00
junjun
83081b94e5 test: 树形过滤器sql拼接 2022-05-26 12:38:06 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00
taojinlong
8f33d3779e fix: 新建同步任务时数据集无数据无需提示“请先完成数据同步” 2022-05-25 20:24:29 +08:00
taojinlong
c0f13964bf Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-25 12:49:42 +08:00
taojinlong
7122929c15 build: 升级依赖版本 2022-05-25 12:49:35 +08:00
wangjiahao
73a9a0bd05 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 10:54:16 +08:00
wangjiahao
d8c73873a2 feat: 仪表板复用时支持选择存量视图 2022-05-25 10:53:50 +08:00
fit2cloud-chenyw
adff099263
Merge pull request #2302 from dataease/pr@dev@fix_about_version 
fix: 关于页面中版本号错误
 2022-05-25 10:10:01 +08:00
fit2cloud-chenyw
ab111a9d32 fix: 关于页面中版本号错误 2022-05-25 10:08:37 +08:00
wangjiahao
1a75c3ed33 Merge remote-tracking branch 'origin/dev' into dev 2022-05-24 22:32:31 +08:00
wangjiahao
da26a5b40f feat: 仪表板编辑时可以按照仪表板复用视图 2022-05-24 22:32:11 +08:00
taojinlong
199e491401 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-24 20:58:47 +08:00
taojinlong
3c6c1f9c03 feat: 添加 presto 插件 2022-05-24 20:58:31 +08:00
fit2cloud-chenyw
b66ed1f96c perf: 优化审计日志图标 2022-05-24 17:59:54 +08:00
fit2cloud-chenyw
43eaf4809c
Merge pull request #2299 from dataease/pr@dev@perf_de_log 
perf: 优化审计日志
 2022-05-24 17:56:50 +08:00
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +08:00
taojinlong
3e9abcb9d1 refactor: 打印日志 2022-05-23 19:44:24 +08:00
taojinlong
c657f56c29 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 17:22:49 +08:00
taojinlong
ff12a33d87 refactor: 格式化代码 2022-05-23 17:22:27 +08:00
fit2cloud-chenyw
d7a1654ae0
Merge pull request #2294 from dataease/pr@dev@feat_marker_map_sql 
feat: 符号地图sql
 2022-05-23 15:47:53 +08:00
fit2cloud-chenyw
4bb9f244b6 feat: 符号地图sql 2022-05-23 15:46:39 +08:00
taojinlong
8401f4e14f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 13:51:21 +08:00
taojinlong
928713b4e0 refactor: 驱动路径 2022-05-23 13:51:12 +08:00
fit2cloud-chenyw
5a78aa0599
Merge pull request #2291 from dataease/pr@dev@feat_marker_map_label 
feat: 气泡地图增加标签字段设置
 2022-05-23 10:40:28 +08:00
fit2cloud-chenyw
0c25b5f553 feat: 气泡地图增加标签字段设置 2022-05-23 10:38:16 +08:00
taojinlong
13aff751f8 feat: 驱动管理的日志记录 2022-05-22 11:39:10 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00
wangjiahao
fec7a67787 refactor: 批量修改样式优化 2022-05-20 13:08:26 +08:00
taojinlong
ad01a695b4 feat: 支持数据源驱动管理 2022-05-20 00:31:17 +08:00
王嘉豪
cb9f427782
Merge pull request #2282 from dataease/pr@dev@refactor_panel-unpublished 
refactor: 优化仪表板下架逻辑，下架禁止查看
 2022-05-19 17:59:12 +08:00
wangjiahao
f0b9d02603 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 17:58:19 +08:00
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
cc8ab2d623 feat: 操作日志数据结构 2022-05-18 18:23:12 +08:00
fit2cloud-chenyw
6ca15ce455
Merge pull request #2271 from dataease/pr@dev@feat_log 
feat: 操作日志
 2022-05-18 18:17:31 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +08:00