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

1560 Commits

Author SHA1 Message Date
taojinlong
10d2cd431f Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-24 17:24:21 +08:00
taojinlong
94d86d93c2 fix: 列权限 2022-01-24 17:24:09 +08:00
junjie
bc9ecf570d fix: 创建视图可能deadlock 2022-01-24 16:16:51 +08:00
junjie
316d59c3dd refactor: 数据集报错优化 2022-01-24 13:21:59 +08:00
taojinlong
9ca73fad57 fix: 国际化 2022-01-23 15:19:59 +08:00
taojinlong
10bab20b12 fix: 数据集列权限 2022-01-23 14:29:54 +08:00
wangjiahao
c1600826e4 refactor: 更新flyway 2022-01-21 18:18:44 +08:00
fit2cloud-chenyw
0732305cad
Merge pull request #1675 from dataease/pr@dev@fix_xpack_menus 
fix: xpack菜单重启后偶尔加载不出来
 2022-01-20 17:14:34 +08:00
fit2cloud-chenyw
5ed209d95e fix: xpack菜单重启后偶尔加载不出来 2022-01-20 17:13:36 +08:00
taojinlong
88d122d003 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-20 17:07:17 +08:00
taojinlong
9097b18039 fix: 删除 excel 文件 2022-01-20 17:07:02 +08:00
fit2cloud-chenyw
d02d10c48c refactor: 优化设计缺陷,增加展示字段 2022-01-20 16:38:11 +08:00
fit2cloud-chenyw
3989c343b1 fix: 我分享的仪表板展示空tags 2022-01-20 13:59:47 +08:00
avanb
97adaf7526 refactor: 删除无用代码 2022-01-20 12:54:46 +08:00
ziliang-wan
27a23cb956 refactor: 删除无用代码 2022-01-19 22:45:16 +08:00
fit2cloudrd
bb954cc621
Merge pull request #1660 from song-tianyang/dev 
refactor: 删除没有引用到的繁体国际化字段
 2022-01-19 16:30:18 +08:00
song-tianyang
09a4615582
refactor: 删除没有引用到的繁体国际化字段 2022-01-19 16:28:34 +08:00
MatataYou
da1fcd0dd4
refactor: 删除没有引用到的中文国际化字段 2022-01-19 16:24:58 +08:00
tzlaosiji
e3fe583fe4
refactor: 删除没有引用到的英文国际化字段 2022-01-19 16:19:46 +08:00
taojinlong
7b478beae3 feat: 数据集列权限 2022-01-19 11:54:00 +08:00
taojinlong
d5a3276a1c feat: 数据集列权限 2022-01-19 11:49:13 +08:00
junjie
b00132a3fb fix: 函数描述错别字 2022-01-18 18:36:17 +08:00
fit2cloudrd
5e32cd9dde
refactor: 首页修改 (#1651) 
* refactor:首页修改

* refactor: 首页修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-18 12:38:33 +08:00
taojinlong
e4f44bd2d4 feat: 列权限 2022-01-18 10:58:19 +08:00
taojinlong
caba975c2f refactor: 恢复 2022-01-17 18:23:26 +08:00
taojinlong
d64f0050a3
Merge pull request #1615 from rc452860/dev 
feat: 添加数据库数据集时显示表注释
 2022-01-17 18:16:45 +08:00
taojinlong
be5b1b07c2 refactor: 修复冲突 2022-01-17 18:05:26 +08:00
taojinlong
7d90a503c9 feat: 数据集列权限 2022-01-17 18:00:53 +08:00
fit2cloud-chenyw
563d7bee95 fix: token超时时间计算错误 2022-01-14 15:19:31 +08:00
fit2cloud-chenyw
624bffd8c0
Merge pull request #1638 from dataease/pr@dev@feat_priority_task_pool 
feat: 定时报告使用优先级线程池
 2022-01-13 17:29:32 +08:00
fit2cloud-chenyw
9cd891556f feat: 定时报告使用优先级线程池 2022-01-13 17:28:25 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
a23e2601d7
Merge pull request #1634 from dataease/pr@dev@feat_default_pwd 
feat: 默认密码
 2022-01-12 17:47:26 +08:00
fit2cloud-chenyw
1714b7b017 feat: 默认密码 2022-01-12 17:46:14 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
wangjiahao
95186bd330 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2022-01-12 11:17:01 +08:00
wangjiahao
9c1a055b3f feat: 新增首页导航 2022-01-12 11:14:51 +08:00
fit2cloud-chenyw
0a3580ddae refactor: 优化主题切换 2022-01-12 11:07:03 +08:00
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
fit2cloud-chenyw
eaed04f441 fix: 邮件预览日志 2022-01-10 15:34:59 +08:00
fit2cloud-chenyw
d424e15400 fix: 多字段枚举NPE异常 2022-01-10 15:28:33 +08:00
taojinlong
0f678140cf
Merge pull request #1596 from rc452860/dev 
fix: 数据源类型为oracle时候不同步字段注释问题
 2022-01-10 14:23:00 +08:00
junjie
dc1102d67f feat(数据集): 计算字段语法校验 2022-01-10 11:25:08 +08:00
taojinlong
4b33d79b47 fix: 处理原始表字段注释太长的问题 2022-01-06 15:17:28 +08:00
wangjiahao
4f5cf69378 Merge remote-tracking branch 'origin/v1.6' into v1.6 2022-01-06 11:37:14 +08:00
wangjiahao
65d37de5b0 refactor: 更新flyway 2022-01-06 11:36:37 +08:00
taojinlong
9562f5e207 fix: sql 错误 2022-01-06 07:43:02 +08:00
wangjiahao
f896e4efec refactor: 更新flyway 2022-01-06 00:00:19 +08:00
turc
3be575c98e fix: 数据源类型为oracle时候不同步字段注释问题 2022-01-05 13:36:15 +08:00
fit2cloud-chenyw
ad936cd963 fix: 周表达式无效 2022-01-04 17:53:02 +08:00
fit2cloud-chenyw
2747de3aa8
Merge pull request #1594 from dataease/pr@dev@fix_cron 
fix: 周表达式无效
 2022-01-04 17:52:10 +08:00
fit2cloud-chenyw
314b9fae66 fix: 周表达式无效 2022-01-04 17:50:33 +08:00
junjie
5acf996055 fix: 数据集权限树 2022-01-04 17:44:11 +08:00
junjie
a0d4fd1812 fix: 数据集权限树 2022-01-04 17:32:25 +08:00
taojinlong
aba661e1b5 fix: 查询数据时，先校验数据源有效性 2022-01-04 17:13:15 +08:00
taojinlong
ecad805dc4 fix: 查询数据时，先校验数据源有效性 2022-01-04 17:12:30 +08:00
taojinlong
71a78c0595 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 16:23:11 +08:00
taojinlong
617da997a8 fix: 公共链接校验 token 2022-01-04 16:22:53 +08:00
taojinlong
7ae8b80bf1 fix: 公共链接校验 token 2022-01-04 16:21:51 +08:00
wangjiahao
071d236d77 refactor: 增加移动端布局示例 2022-01-04 16:01:36 +08:00
taojinlong
8f50764fa2 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 12:08:37 +08:00
taojinlong
d35c03d828 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
9f98c73e08 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:04:43 +08:00
fit2cloud-chenyw
9b15f26ccb refactor: 移动端代码合并 2022-01-04 11:53:10 +08:00
fit2cloud-chenyw
a50c94fbd5 fix: 移动端分页api 2022-01-04 11:52:46 +08:00
taojinlong
832c244736 fix: 定时任务过滤数据集 2022-01-04 11:15:51 +08:00
taojinlong
a5216ba596 build: v1.6 2022-01-04 11:15:49 +08:00
taojinlong
6ce8e851d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 11:15:09 +08:00
taojinlong
8ca71983e1 fix: 定时任务过滤数据集 2022-01-04 11:14:19 +08:00
fit2cloud-chenyw
2ba5690ba9 refactor: 移动端代码合并 2022-01-03 21:13:45 +08:00
fit2cloud-chenyw
b246111524 fix: 移动端分页api 2022-01-03 20:34:56 +08:00
taojinlong
f0cad41560 build: v1.6 2021-12-31 17:46:06 +08:00
taojinlong
64e5c34f05 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 17:42:29 +08:00
taojinlong
927bdbdebf fix: mongo sql 拼接问题 2021-12-31 16:34:21 +08:00
fit2cloud-chenyw
765ab7587f fix: 公共链接跳转白名单 2021-12-31 11:46:03 +08:00
taojinlong
55459dd8aa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:42:52 +08:00
xiajunjie
fcbe38d040 fix: 字段重名 2021-12-31 00:22:07 +08:00
xiajunjie
1eb4dc6e01 fix: 字段重名 2021-12-31 00:21:01 +08:00
xiajunjie
7812d73545 fix: 字段重名 2021-12-30 20:31:01 +08:00
taojinlong
31f7cc0c85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 16:26:52 +08:00
taojinlong
d4e7c888aa fix: 编辑行权限，字段名可以重复 2021-12-30 16:26:41 +08:00
fit2cloud-chenyw
983b166dea fix: 优化打印日志 2021-12-30 15:57:45 +08:00
taojinlong
0aa40304fc fix: 获取用户角色 ID 2021-12-30 15:48:01 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
junjie
f39f56e0fe fix: 数据集文本转日期 2021-12-30 14:44:36 +08:00
fit2cloud-chenyw
d451100a57 fix: 打印邮件堆栈异常 2021-12-30 13:48:28 +08:00
fit2cloud-chenyw
b8cc97fad8 fix: 邮件截图报错 2021-12-30 12:38:00 +08:00
fit2cloud-chenyw
b2e4307ba5 fix: 多字段枚举接口免登录 2021-12-29 18:47:01 +08:00
taojinlong
55a08f61d2 fix: db2 分页问题 2021-12-29 18:32:23 +08:00
taojinlong
d5a0f9a9c6 fix: sql 数据集不允许有重复字段 2021-12-29 17:52:54 +08:00
junjie
37e98ea808 fix: 下钻字段容错 2021-12-29 16:13:28 +08:00
junjie
da1d0b8282 fix: 下钻字段容错 2021-12-29 16:11:55 +08:00
taojinlong
fac31a30b5 fix: Db2 增量更新 2021-12-29 15:16:47 +08:00
taojinlong
e7da047b21 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 14:51:04 +08:00
taojinlong
4642df5bbb fix: 每个字段，同一类型的行權限，限制只有一条记录 2021-12-29 14:50:52 +08:00
junjie
94c8d0467a fix: sql过滤 2021-12-29 11:56:48 +08:00
junjie
6a30bd496a fix: sql过滤 2021-12-29 11:55:28 +08:00
taojinlong
d5f8ce4abd fix: 每个字段，同一类型的行權限，限制只有一条记录 2021-12-29 11:42:57 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00