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

1753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fit2cloud-chenyw
7b993b609a fix: 中文输入法回车键直接保存 2021-07-12 15:15:19 +08:00
XiaJunjie2020
c4720e8986
Merge pull request #209 from dataease/pr@dev@refactor_SQL拼接 
refactor: 底层SQL拼接
 2021-07-12 15:14:17 +08:00
junjie
6401d1277a refactor: 底层SQL拼接 2021-07-12 15:13:22 +08:00
fit2cloud-chenyw
d02f249b8b
Merge pull request #208 from dataease/pr@dev@fix_组织名称验重 
fix: 组织名称验重
 2021-07-12 14:56:56 +08:00
fit2cloud-chenyw
849450dbe8 fix: 组织名称验重 2021-07-12 14:47:25 +08:00
XiaJunjie2020
426731ef35
Merge pull request #207 from dataease/pr@dev@refactor_底层SQL拼接 
refactor: 底层SQL拼接
 2021-07-12 14:34:34 +08:00
junjie
79151c4fbe refactor: 底层SQL拼接 2021-07-12 14:32:01 +08:00
taojinlong
fb186e9cff
Merge pull request #206 from dataease/pr@dev@refactor 
refactor: 去掉无用代码
 2021-07-12 13:19:08 +08:00
taojinlong
4d57f23c1d refactor: 去掉无用代码 2021-07-12 13:17:59 +08:00
taojinlong
a2a131d925
Merge pull request #205 from dataease/pr@dev@errormsg 
feat(错误信息): 抽取数据的错误信息仅显示错误基本描述
 2021-07-12 11:49:50 +08:00
taojinlong
f8e2c53e85
Merge branch 'dev' into pr@dev@errormsg 2021-07-12 11:49:45 +08:00
taojinlong
fd7d70e86a feat(错误信息): 抽取数据的错误信息仅显示错误基本描述 2021-07-12 11:47:26 +08:00
fit2cloud-chenyw
8a5ccbb26b
Merge pull request #203 from dataease/pr@dev@feat_消息设置 
feat: 增加消息接收设置
 2021-07-12 11:42:59 +08:00
fit2cloud-chenyw
3f15bf573a feat: 去掉unused引用 2021-07-12 11:37:47 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
XiaJunjie2020
cf2623a7b6
Merge pull request #204 from dataease/pr@dev@feat_底层sql代码优化 
feat: 数据集视图底层sql拼接使用stg重构(mysql部分)
 2021-07-10 10:50:49 +08:00
junjie
d58b06928e feat: 数据集视图底层sql拼接使用stg重构(mysql部分) 2021-07-10 10:47:47 +08:00
fit2cloud-chenyw
ff82cffff4 feat: 增加消息接收设置 2021-07-09 18:37:07 +08:00
王嘉豪
0d4376b1dd
Merge pull request #202 from dataease/pr@dev@panel 
fix:【仪表板】图表明细数据下载数值为0不显示问题
 2021-07-09 18:10:50 +08:00
wangjiahao
3094a04e01 fix:【仪表板】图表明细数据下载数值为0不显示问题 2021-07-09 18:07:44 +08:00
王嘉豪
25501a9373
Merge pull request #201 from dataease/pr@dev@panel 
feat:变更仪表板下载视图明细图标
 2021-07-09 17:44:09 +08:00
taojinlong
440342e757
Merge pull request #200 from dataease/repr@dev_v1.0@b7c61e7fb70a31c5c5ef36298ead8eb0787464fd@handle-tinyint 
fix(抽取数据): 处理kettle tinyint 识别错误的问题
 2021-07-09 17:29:50 +08:00
taojinlong
60f4f11d50 fix(抽取数据): 处理kettle tinyint 识别错误的问题 2021-07-09 17:28:28 +08:00
wangjiahao
f5939b1a84 feat:变更仪表板下载视图明细图标 2021-07-09 17:23:53 +08:00
王嘉豪
257d5516f1
Merge pull request #198 from dataease/pr@dev@panel 
fix:国际化错误问题
 2021-07-09 17:10:24 +08:00
wangjiahao
4399e21704 fix:国际化错误问题 2021-07-09 17:09:25 +08:00
王嘉豪
c1f03afab2
Merge pull request #197 from dataease/pr@dev@panel 
Pr@dev@panel
 2021-07-09 16:55:37 +08:00
wangjiahao
6e17a5f4a2 Merge remote-tracking branch 'origin/dev' into pr@dev@panel 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2021-07-09 16:48:24 +08:00
wangjiahao
05caadb0fe feat:【仪表盘】可支持查看仪表盘中图表的明细数据，在查看窗口可下载明细数据 2021-07-09 16:44:36 +08:00
taojinlong
b027c85790
Merge pull request #195 from dataease/pr@dev@taskmgm 
fix(數據集): 数据集任务，增加简单重复执行的功能
 2021-07-09 16:07:29 +08:00
taojinlong
3b0b5d2f0c fix(數據集): 数据集任务，增加简单重复执行的功能 2021-07-09 16:06:43 +08:00
taojinlong
7b345b400f
Merge pull request #192 from dataease/pr@dev@simple-repeat 
feat(數據集): 数据集任务，增加简单重复执行的功能
 2021-07-09 10:53:21 +08:00
taojinlong
d1174fed5c feat(數據集): 数据集任务，增加简单重复执行的功能 2021-07-09 10:52:20 +08:00
XiaJunjie2020
c507f9313c
Merge pull request #191 from dataease/pr@dev@feat_视图颜色增加多种配色 
feat: 视图颜色增加多种配色方案
 2021-07-08 18:33:08 +08:00
junjie
7c9c690c5d feat: 视图颜色增加多种配色方案 2021-07-08 18:29:26 +08:00
XiaJunjie2020
8b0a0060d3
Merge pull request #187 from dataease/pr@dev@fix_sql根据类型修复 
fix: sql根据类型修复
 2021-07-08 15:49:35 +08:00
junjie
161dd394b4 fix: sql根据类型修复 2021-07-08 15:47:06 +08:00
taojinlong
38487c5b58
Merge pull request #186 from dataease/pr@dev@dataset 
feat(數據集): 添加非直连数据集時，默认全量同步一次
 2021-07-08 15:13:06 +08:00
taojinlong
7f388f1edd feat(數據集): 添加非直连数据集時，默认全量同步一次 2021-07-08 15:11:56 +08:00
taojinlong
d3cc82d59f fix: 代码冲突 2021-07-08 15:07:39 +08:00
taojinlong
cd4806ac3a feat(數據集): 添加非直连数据集時，默认全量同步一次 2021-07-08 15:05:25 +08:00
XiaJunjie2020
299addd49f
Merge pull request #184 from dataease/pr@dev@feat_视图计算返回sql 
feat: 视图返回sql
 2021-07-08 14:28:23 +08:00
junjie
8e08808b83 feat: 视图返回sql 2021-07-08 14:27:34 +08:00
taojinlong
70c51f98c4
Merge pull request #183 from dataease/pr@dev@taskmgm 
feat: 任务管理
 2021-07-08 14:17:15 +08:00
taojinlong
83b56beeb4
Merge branch 'dev' into pr@dev@taskmgm 2021-07-08 14:17:00 +08:00
taojinlong
4ee8896a4f feat: 任务管理 2021-07-08 14:12:30 +08:00
taojinlong
00202fa718 feat: 任务管理 2021-07-08 14:11:59 +08:00
taojinlong
3af3e5798c feat: 任务管理 2021-07-08 14:00:06 +08:00
XiaJunjie2020
7b0a6183a1
Merge pull request #182 from dataease/pr@dev@feat_数据集编辑字段，增加维度_指标选项，而非老版本中通过字段类型判定 
feat: 数据集编辑字段，增加维度指标选项，而非老版本中通过字段类型判定
 2021-07-08 13:51:30 +08:00
junjie
acaf405131 feat: 数据集编辑字段，增加维度指标选项，而非老版本中通过字段类型判定 2021-07-08 13:50:22 +08:00