center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
2,691 Commits 1 Branch 86 Tags 417 MiB
5b86ad0907
Commit Graph

1083 Commits

Author SHA1 Message Date
taojinlong
e83510f4b7 fix: 数据源校验 2021-08-24 15:03:17 +08:00
taojinlong
461f5135de Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-24 11:54:29 +08:00
taojinlong
7adf045701 fix: 时间类型长度 2021-08-24 11:52:42 +08:00
fit2cloud-chenyw
f26adc38c9 fix: 公共链接弹出登录框 2021-08-23 17:23:11 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
taojinlong
378a034f85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 12:12:29 +08:00
taojinlong
9c910893ce fix: 识别日期类型 2021-08-23 12:12:12 +08:00
fit2cloud-chenyw
aef2d49f35 fix: api验证lic 2021-08-23 11:36:52 +08:00
fit2cloud-chenyw
ad10184c1f
Merge pull request #679 from dataease/pr@dev@feat_完善apiModelProperty 
feat: 完善apiModelProperties
 2021-08-23 11:34:16 +08:00
fit2cloud-chenyw
96291da02a feat: 完善apiModelProperties 2021-08-23 11:33:07 +08:00
taojinlong
85d840d91a fix: 尝试解决导入excle 报找不到字段的问题 2021-08-23 10:17:22 +08:00
taojinlong
130cbb23cf fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:55:50 +08:00
taojinlong
df0c6a0759 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:14:07 +08:00
taojinlong
f7baa9a032 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 22:22:06 +08:00
taojinlong
4681c10b76 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:42:41 +08:00
taojinlong
53fc333341 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 16:22:54 +08:00
taojinlong
371750f70d fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:22:41 +08:00
wangjiahao
1556b1fc91 refactor:增加新的demo仪表板 2021-08-19 15:49:34 +08:00
fit2cloud-chenyw
6883911ccc
Merge pull request #668 from dataease/pr@dev@feat_public_short_link 
feat: 公共链接分享增加短链接
 2021-08-19 14:55:39 +08:00
fit2cloud-chenyw
acab3ceb24 feat: 公共链接分享增加短链接 2021-08-19 14:54:32 +08:00
taojinlong
36b0a2a614 fix: 检测数据源状态 2021-08-19 14:09:51 +08:00
taojinlong
e1835b5326 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 10:10:36 +08:00
taojinlong
5f60eb3faf feat: 抽取数据适配[新增字段] 2021-08-19 09:55:23 +08:00
junjie
f3902e3bac fix: 计算字段dataease name 2021-08-19 09:54:12 +08:00
taojinlong
b84225bee7 feat: 抽取数据适配[新增字段] 2021-08-19 09:48:33 +08:00
junjie
3b5bb9b17b feat: 字段编辑优化界面显示 2021-08-18 14:01:56 +08:00
wangjiahao
1dca2e0ff7 refactor:去除无用代码 2021-08-17 17:55:56 +08:00
taojinlong
ffbd32febf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 16:19:32 +08:00
taojinlong
f1f20b2dbe feat: 抽取数据适配[新增字段] 2021-08-17 16:16:04 +08:00
wangjiahao
81a84a54e3 refactor:去除无用代码 2021-08-17 14:40:01 +08:00
fit2cloud-chenyw
24ed0baeb2
Merge pull request #644 from dataease/pr@dev@fix_msg_timer_error 
fix: 定时查询未读消息条数错误
 2021-08-17 12:26:32 +08:00
fit2cloud-chenyw
2fbed9fdec fix: 定时查询未读消息条数错误 2021-08-17 12:25:22 +08:00
taojinlong
238bc186fb Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 12:21:13 +08:00
taojinlong
d4d7261df9 feat: sqlserver、pg内置函数 2021-08-17 12:20:47 +08:00
junjie
1dc681216a fix: doris函数 2021-08-17 12:17:09 +08:00
fit2cloud-chenyw
d2b6fe4356
Merge pull request #642 from dataease/pr@dev@refactor_system_style 
refactor: 优化分享组织树
 2021-08-17 11:09:23 +08:00
fit2cloud-chenyw
d99229dd44 refactor: 优化分享组织树 2021-08-17 11:08:11 +08:00
taojinlong
7c391ed8cf refactor: 代码格式化 2021-08-16 18:27:20 +08:00
taojinlong
d7f363e97b feat: 数据源高级参数设置 2021-08-16 18:05:46 +08:00
taojinlong
9cda59e224 feat: 定时检测数据源状态信息 2021-08-16 14:09:02 +08:00
taojinlong
b8f4a819f9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 12:47:35 +08:00
taojinlong
4c8e061e1d feat: 定时检测数据源状态信息 2021-08-16 12:46:34 +08:00
junjie
3e6b61a88c fix: 地图code 2021-08-16 11:48:12 +08:00
junjie
7bd5f3dc0f fix: 地图code，json 2021-08-16 11:18:48 +08:00
junjie
7905c85110 feat: 地图json，区域 2021-08-16 09:56:19 +08:00
taojinlong
9623c15d01 fix: 解析excel失败 2021-08-13 17:31:18 +08:00
taojinlong
19d08770a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 17:11:15 +08:00
taojinlong
1e67e6669c fix: 解析excel失败 2021-08-13 17:10:59 +08:00
fit2cloud-chenyw
93b2dc8b78 fix: 删除行政区划代码前端缓存 2021-08-13 17:06:24 +08:00
taojinlong
af79e725a3 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 12:04:31 +08:00
taojinlong
8f494f3755 feat: 替换excel时，替换成功后，才更新数据集字段 2021-08-13 12:04:17 +08:00
fit2cloud-chenyw
f7699aae6b feat: 地图联动 2021-08-13 11:23:35 +08:00
taojinlong
c36fd88f3f feat: 支持excel多sheet页 2021-08-13 09:51:54 +08:00
taojinlong
b4a09f37dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-12 19:23:16 +08:00
taojinlong
4a9009dee1 feat: 支持同时导入excel的多sheet页 2021-08-12 19:23:01 +08:00
junjie
b2718c6c14 feat: 堆叠图下钻 2021-08-12 15:11:54 +08:00
王嘉豪
f6058ed78b
Merge pull request #599 from dataease/pr@dev@feat_panel-up-drill 
refactor:恢复超级管理员无需授权功能
 2021-08-12 11:57:29 +08:00
wangjiahao
db3a3c3f27 refactor:恢复超级管理员无需授权功能 2021-08-12 11:52:02 +08:00
王嘉豪
62a3c61a0a
Merge pull request #598 from dataease/pr@dev@feat_panel-up-drill 
feat:【用户管理】增加根据角色/组织进行查询的支持
 2021-08-12 11:24:03 +08:00
wangjiahao
d714f146a0 feat:【用户管理】增加根据角色/组织进行查询的支持，增加查看指定用户拥有的所有权限的功能 2021-08-12 11:22:27 +08:00
junjie
b29d4b3cf2 feat: 视图下钻 2021-08-11 18:44:07 +08:00
junjie
c75f9c5fb7 feat: 视图下钻 2021-08-11 18:10:34 +08:00
junjie
85c744f679 feat: 视图上卷 2021-08-11 17:01:51 +08:00
fit2cloud-chenyw
5d2340975c fix: 数据集消息获取接受人权限错误 2021-08-11 15:55:34 +08:00
fit2cloud-chenyw
e3cff22620
Merge pull request #587 from dataease/pr@dev@feat_包装api接口文档 
feat: 包装api接口文档
 2021-08-11 15:03:05 +08:00
fit2cloud-chenyw
99aac19d46 feat: 包装api接口文档 2021-08-11 14:58:29 +08:00
fit2cloud-chenyw
483b187aee fix: 删除xpack api 2021-08-11 11:45:41 +08:00
junjie
3a6f89eb21 feat: 视图下钻 2021-08-11 10:35:00 +08:00
taojinlong
75d223f417 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-11 09:54:03 +08:00
taojinlong
4cef74e41a fix: 解析 excel 报错 2021-08-11 09:53:48 +08:00
fit2cloud-chenyw
5235c72582
Merge pull request #579 from dataease/pr@dev@fix_spring依赖bug 
fix: spring依赖bug
 2021-08-10 19:44:46 +08:00
fit2cloud-chenyw
e973fd31df ftx: spring依赖bug 2021-08-10 19:43:36 +08:00
fit2cloud-chenyw
2ec0194d16 ftx: 增加lic验证log 2021-08-10 19:13:53 +08:00
taojinlong
808ac5ed54
Merge pull request #577 from dataease/pr@dev@pg 
feat: 支持 postgresql
 2021-08-10 19:12:22 +08:00
taojinlong
670bc54546 feat: 支持 postgresql 2021-08-10 19:11:14 +08:00
fit2cloud-chenyw
a211b8b765
Merge pull request #572 from dataease/pr@dev@feat_add_xpack_api 
feat: 增加xpack插件内api
 2021-08-10 17:54:21 +08:00
fit2cloud-chenyw
80548698b9 feat: 增加xpack插件内api 2021-08-10 17:51:11 +08:00
taojinlong
d9ebc295b4 Merge branch 'dev' into pr@dev@pg 2021-08-10 17:06:57 +08:00
taojinlong
347b64eff2 feat: pg 2021-08-10 17:01:20 +08:00
junjie
affdf3ad00 feat: 视图下钻 2021-08-10 17:00:15 +08:00
junjie
18b68616ac Merge branch 'dev' of /Users/gin/dataease/dataease with conflicts. 2021-08-10 16:13:22 +08:00
wangjiahao
b3c7aa5d16 refactor:仪表版多组件间联动 2021-08-10 15:50:00 +08:00
fit2cloud-chenyw
3ea7da10ca feat: 使用ak，sk访问api接口以及swagger 2021-08-10 14:24:13 +08:00
fit2cloud-chenyw
9adde0ca10
Merge pull request #561 from dataease/pr@dev@feat_aksk_sql 
feat: 添加ak,sk的flyway
 2021-08-09 16:53:21 +08:00
fit2cloud-chenyw
8b421b8f91 feat: 添加ak,sk的flyway 2021-08-09 16:52:04 +08:00
junjie
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
taojinlong
c7a6378c80 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-09 16:25:56 +08:00
taojinlong
55fc58fda9 fix: 抽取 oralce 数据 2021-08-09 16:25:46 +08:00
fit2cloud-chenyw
c94c02f24b
Merge pull request #558 from dataease/pr@dev@feat_aksk 
feat: 添加ak,sk
 2021-08-09 16:04:02 +08:00
fit2cloud-chenyw
bb711fb406 feat: 添加ak,sk 2021-08-09 16:01:29 +08:00
taojinlong
2edef2432e
Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 14:18:54 +08:00
taojinlong
cbe4965485 feat: sqlserver 2021-08-09 14:17:22 +08:00
junjie
f521f2b7a1 refactor: 视图返回参数构建 2021-08-09 13:43:54 +08:00
taojinlong
dcbea29b55 Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 12:45:42 +08:00
taojinlong
a5dd1e3698 feat: sqlserver 2021-08-09 12:45:01 +08:00
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +08:00
junjie
911573673b feat: 散点图、气泡图 2021-08-06 16:15:59 +08:00
taojinlong
4ec3cdb68d Merge branch 'dev' into pr@dev@sqlserver 2021-08-06 12:25:22 +08:00
taojinlong
c983b661ff feat: sqlserver 2021-08-06 12:19:25 +08:00
taojinlong
1b26790db3 refactor: 恢复覆盖的sql 2021-08-06 10:25:59 +08:00
wangjiahao
7598584b07 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 18:42:03 +08:00
wangjiahao
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
taojinlong
a72c679631 feat: 新增示例数据 2021-08-05 17:58:45 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ea72141d45 refactor:代码回退 2021-08-05 14:02:39 +08:00
taojinlong
ddb6e767fd feat: sqlserver 2021-08-05 13:43:33 +08:00
wangjiahao
4838839e2b refactor:优化联动设置 2021-08-05 13:31:31 +08:00
junjie
41259ae347 fix: 恢复flyway误删 2021-08-05 10:19:58 +08:00
fit2cloud-chenyw
ed0f59097a feat: dev版本号升1.2.0 2021-08-05 10:11:00 +08:00
fit2cloud-chenyw
d51a1c46b0 fix: flywaysql去除重复信息 2021-08-05 09:49:19 +08:00
wangjiahao
9dd6e403c6 refactor:仪表板联动目标视图获取方式优化 2021-08-04 21:44:50 +08:00
taojinlong
dfe654c547 feat: sqlserver 2021-08-04 21:27:37 +08:00
fit2cloud-chenyw
c64343a289 fix: 增加sql注入白名单；sql注入拦截器只验证排序字段 2021-08-04 18:11:37 +08:00
wangjiahao
6bfb5a74c1 Merge branch 'pr@dev@feat_panel-linkage' of github.com:dataease/dataease into feat_panel-linkage 2021-08-04 17:00:29 +08:00
wangjiahao
b09a935a06 refactor:增加视图联动相关表结构等 2021-08-04 16:57:16 +08:00
王嘉豪
c856d1c91d
Merge branch 'dev' into pr@dev@feat_panel-linkage 2021-08-04 16:54:22 +08:00
wangjiahao
1c91e0e831 feat:仪表板联动增加源联动视图虚化样式，过滤非视图组件等 2021-08-04 16:52:49 +08:00
XiaJunjie2020
958cbabb6f
Merge pull request #521 from dataease/pr@dev@feat_视图钻取 
feat: 视图钻取
 2021-08-04 16:50:55 +08:00
junjie
05e9f8274e fix: sql注入排除减号 2021-08-04 16:47:11 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
fit2cloud-chenyw
2f06f3720e fix: sql注入和xss攻击 2021-08-04 15:18:12 +08:00
taojinlong
85059c5cfa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-04 10:35:18 +08:00
taojinlong
e438d4e1f0 fix: 原始表添加列时，同步失败 2021-08-04 10:34:50 +08:00
taojinlong
b4a057d46b fix: 更新任务状态-> 执行结束 2021-08-04 10:34:46 +08:00
taojinlong
e4b16b33c3 fix: 没有经过全量更新不能进行增量更新，并记录日志 2021-08-04 10:34:43 +08:00
taojinlong
a3defb1a88 feat: 优化任务状态的切换 2021-08-04 10:34:37 +08:00
taojinlong
d86531967f feat: sqlserver 2021-08-03 17:29:38 +08:00
junjie
5a0fcc52c9 refactor: 堆叠图优化 2021-08-03 16:12:15 +08:00
fit2cloud-chenyw
546152fe27
Merge pull request #501 from dataease/pr@dev@perf_优化地图文件请求速度 
perf: rest请求优化为json文件请求
 2021-08-03 16:06:20 +08:00
fit2cloud-chenyw
1aa5b483fb perf: rest请求优化为json文件请求 2021-08-03 16:05:05 +08:00
junjie
1ceee0f445 feat: 函数库flyway 2021-08-03 15:06:40 +08:00
junjie
a76ab93009 feat: 函数库flyway 2021-08-03 14:35:39 +08:00
fit2cloud-chenyw
b1096a6151 fix: 打包后样式错误 2021-08-03 14:14:35 +08:00
junjie
ddcfd700ff feat: 函数库flyway 2021-08-03 13:24:35 +08:00
taojinlong
41f3b001a7 Merge branch 'dev' into pr@dev@sqlserver 2021-08-03 12:23:23 +08:00
fit2cloud-chenyw
70ee578133 fix: maven打包错误，指定maven-resources-plugin版本解决 2021-08-03 10:46:01 +08:00
fit2cloud-chenyw
6fa6cc83a1 fix: 资源权限逻辑错误 2021-08-03 09:52:49 +08:00
taojinlong
532cdf67b4 fix: 执行问任务后删除文件 2021-08-02 21:18:33 +08:00
taojinlong
ac8f71577b Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:33:10 +08:00
taojinlong
e5c4606334 feat: 可配置kettle 相关的文件是否保留 2021-08-02 18:32:44 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +08:00
taojinlong
fbb884bcbf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:13:33 +08:00
taojinlong
6261dff6cc fix: 校验增量更新sql 2021-08-02 18:13:24 +08:00
fit2cloud-chenyw
e459225f3b feat: 完善全局token 2021-08-02 17:52:43 +08:00
XiaJunjie2020
c2674f738d
Merge pull request #463 from dataease/pr@dev@feat_支持公式编辑 
feat: 支持字段编辑
 2021-08-02 16:37:16 +08:00
taojinlong
4b5d272f63 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 16:36:39 +08:00
taojinlong
285c48143f fix: 更新任务状态 2021-08-02 16:36:23 +08:00
junjie
28d93227f4 feat: 支持字段编辑 2021-08-02 16:34:11 +08:00
fit2cloud-chenyw
91b2b29108
Merge pull request #461 from dataease/pr@dev@feat_去除openApi 
feat: 去除openApi
 2021-08-02 16:09:28 +08:00
fit2cloud-chenyw
17585b4239 feat: 去除openApi 2021-08-02 16:07:59 +08:00