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

4141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fit2cloudrd
cef9af2eb7
Merge pull request #1657 from dataease/dev 
Dev
 2022-01-18 18:06:58 +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
fit2cloudrd
01da63c338
Merge pull request #1650 from dataease/dev 
Dev
 2022-01-18 11:24:52 +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
fit2cloud-chenyw
93d749f573 fix: 动态年月逻辑错误 2022-01-14 17:34:35 +08:00
fit2cloud-chenyw
0180e8369b
Merge pull request #1644 from dataease/pr@dev@fix_token_time_out 
fix: token超时时间计算错误
 2022-01-14 15:20:33 +08:00
fit2cloud-chenyw
563d7bee95 fix: token超时时间计算错误 2022-01-14 15:19:31 +08:00
wangjiahao
7a61f375fa Merge remote-tracking branch 'origin/dev' into dev 2022-01-14 14:30:16 +08:00
wangjiahao
411db74fe4 refactor: 样式修改 2022-01-14 14:30:00 +08:00
fit2cloud-chenyw
9280b2983e
Merge pull request #1643 from dataease/pr@dev@fix_panel_filter 
fix: 过滤组件默认值不能覆盖编辑的预览值
 2022-01-14 14:24:20 +08:00
fit2cloud-chenyw
8700045786 fix: 过滤组件默认值不能覆盖编辑的预览值 2022-01-14 14:21:34 +08:00
王嘉豪
f99652f871
Merge pull request #1642 from dataease/feat_panel-switch-picture 
refactor: 组件间隙在有背景颜色时也保持一致
 2022-01-14 11:00:54 +08:00
wangjiahao
c287b41afb refactor: 组件间隙在有背景颜色时也保持一致 2022-01-14 10:57:36 +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
fit2cloudrd
4576995acf
Merge pull request #1637 from dataease/dev 
Dev
 2022-01-13 16:50:15 +08:00
王嘉豪
723d8fadfe
Merge pull request #1636 from dataease/pr@dev@feat_panel-switch-picture 
feat: 仪表板允许对原有图片组件直接更换
 2022-01-13 16:24:45 +08:00
wangjiahao
6cfd2a9a13 feat: 仪表板允许对原有图片组件直接更换 2022-01-13 16:22:53 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
b6a011c904
Merge pull request #1635 from dataease/pr@dev@fix_default_pwd 
fix: 修改密码向导被首页遮盖
 2022-01-12 18:09:01 +08:00
fit2cloud-chenyw
9419196993 fix: 修改密码向导被首页遮盖 2022-01-12 18:07:50 +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
7527d6561b refactor: 样式修改 2022-01-12 17:25:47 +08:00
wangjiahao
0e4f0d4259 refactor: 首页导航样式适配 2022-01-12 16:58:55 +08:00
wangjiahao
659899e31c Merge remote-tracking branch 'origin/dev' into dev 2022-01-12 16:57:57 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
fit2cloud-chenyw
fc84c994f2
Merge pull request #1632 from dataease/pr@dev@style_switch_theme_style 
style: 主题切换样式
 2022-01-12 14:46:05 +08:00
fit2cloud-chenyw
7becaac8c1 style: 主题切换样式 2022-01-12 14:43:19 +08:00
fit2cloud-chenyw
cc776a428a refactor: 去除mobile的编译目录 2022-01-12 12:37:07 +08:00
fit2cloud-chenyw
977c520ab4 fix: 地图复位中心点错误 2022-01-12 12:25:01 +08:00
fit2cloud-chenyw
abf0a4a5d1
Merge pull request #1628 from dataease/pr@dev@refactor_dynamic_filter_year_month 
refactor: 优化年月过滤组件动态时间
 2022-01-12 11:28:29 +08:00
fit2cloud-chenyw
2170371b02 refactor: 优化年月过滤组件动态时间 2022-01-12 11:27:34 +08:00
Junjie
e39979b4a0
Merge pull request #1627 from dataease/pr@dev@fix_name 
fix: 修复左侧tree重命名右侧更新不及时的问题
 2022-01-12 11:27:29 +08:00
junjie
ee917eeab3 fix: 修复左侧tree重命名右侧更新不及时的问题 2022-01-12 11:26:29 +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