Commit Graph

4257 Commits

Author SHA1 Message Date
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
wangjiahao
57d948b613 Merge remote-tracking branch 'origin/dev' into dev 2022-01-20 17:03:53 +08:00
wangjiahao
bc998c9d79 fix: 移动端布局自动滚动移动到顶部组件高度变大问题 2022-01-20 17:03:38 +08:00
fit2cloud-chenyw
c93840350d
Merge pull request #1674 from dataease/pr@dev@refactor_report_task
refactor: 优化设计缺陷,增加展示字段
2022-01-20 16:40:15 +08:00
fit2cloud-chenyw
d02d10c48c refactor: 优化设计缺陷,增加展示字段 2022-01-20 16:38:11 +08:00
fit2cloud-chenyw
87af7c9bc0
Merge pull request #1673 from dataease/pr@dev@dev@fix_empty_tag
fix: 我分享的仪表板展示空tags
2022-01-20 14:01:04 +08:00
fit2cloud-chenyw
3989c343b1 fix: 我分享的仪表板展示空tags 2022-01-20 13:59:47 +08:00
fit2cloudrd
776578a7ad
Merge pull request #1672 from Avanbchen/dev
refactor: 删除无用代码
2022-01-20 13:05:17 +08:00
avanb
97adaf7526 refactor: 删除无用代码 2022-01-20 12:54:46 +08:00
fit2cloudrd
1bb7bf846f
Merge pull request #1670 from xuxinwen/dev
fix: 修复移动端英文翻译
2022-01-20 12:47:26 +08:00
xinwen
c801e22b24
fix: 修复移动端英文翻译 2022-01-20 12:46:21 +08:00
fit2cloudrd
95ccdd4a55
Merge pull request #1669 from BaiJiangJie/dev
fix: 修复移动端英文翻译错误
2022-01-20 12:38:39 +08:00
Jiangjie.Bai
32e666dc55
fix: 修复移动端英文翻译错误 2022-01-20 12:36:29 +08:00
fit2cloudrd
75e20d324d
Merge pull request #1668 from LeeEirc/dev
fix: 修复英文翻译错误
2022-01-20 12:29:35 +08:00
Eric_Lee
68cc99d578
fix: 修复英文翻译错误 2022-01-20 12:28:00 +08:00
wangjiahao
fae78f31c8 Merge remote-tracking branch 'origin/dev' into dev 2022-01-20 11:35:43 +08:00
wangjiahao
372685035e refactor: 移动端布局拖动组件接近上下边界画布可以自动滚动 2022-01-20 11:33:41 +08:00
fit2cloudrd
9f73398eff
Merge pull request #1666 from ziliang-wan/dev-wzl
refactor: 删除无用代码
2022-01-20 09:48:35 +08:00
ziliang-wan
27a23cb956 refactor: 删除无用代码 2022-01-19 22:45:16 +08:00
junjie
1846b282d6 refactor: 交互调整 2022-01-19 17:46:08 +08:00
fit2cloudrd
b490d15f56
Merge pull request #1662 from zyyfit/dev
fix: 修改英文翻译
2022-01-19 16:41:12 +08:00
zyyfit
e69bfb6ddc
fix: 修改英文翻译 2022-01-19 16:39:46 +08:00
fit2cloudrd
bb954cc621
Merge pull request #1660 from song-tianyang/dev
refactor: 删除没有引用到的繁体国际化字段
2022-01-19 16:30:18 +08:00
fit2cloudrd
c02920e4f2
Merge pull request #1659 from youliyuan-fit2cloud/dev
refactor: 删除没有引用到的中文国际化字段
2022-01-19 16:29:29 +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
fit2cloudrd
739cca754d
Merge pull request #1658 from tzlaosiji/dev
refactor: 删除没有引用到的英文国际化字段
2022-01-19 16:22:21 +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
9ca2c3a2ee refactor: 国际化 2022-01-18 18:39:38 +08:00
junjie
b00132a3fb fix: 函数描述错别字 2022-01-18 18:36:17 +08:00
fit2cloudrd
2c9582d9e6
Merge pull request #1654 from luyang351/dev
docs: 更新 README,补充支持的数据源
2022-01-18 18:00:00 +08:00
wangjiahao
3fae87ba15 Merge remote-tracking branch 'origin/dev' into dev 2022-01-18 16:52:44 +08:00
wangjiahao
c0f0a6fa3d fix: 防止新建视图一直loading 2022-01-18 16:52:28 +08:00
luyang351
b8181c8f75 docs: 更新 README,补充支持的数据源 2022-01-18 16:48:21 +08:00
taojinlong
5c351ea5e4 feat: 重复的数据源连接,保存时增加提示 2022-01-18 16:21:03 +08:00
taojinlong
aa2a44da0e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-18 16:10:08 +08:00
taojinlong
b3f5426e91 feat: 重复的数据源连接,保存时增加提示 2022-01-18 16:09:54 +08:00
taojinlong
18c957cee1 feat: 重复的数据源连接,保存时增加提示 2022-01-18 16:06:28 +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
a53c1c6437
Merge pull request #1648 from dataease/pr@dev@columnpermission
refactor: 修复冲突
2022-01-17 18:06:42 +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
9f0880e06a
Merge pull request #1645 from dataease/pr@dev@fix_filter_time
fix: 动态年月逻辑错误
2022-01-14 17:35:46 +08:00