Commit Graph

2452 Commits

Author SHA1 Message Date
fit2cloud-chenyw
f6b99f8128
Merge pull request #697 from dataease/pr@dev@feat_map_icon
fix: 表格和视图类型圆角无效
2021-08-25 16:11:21 +08:00
fit2cloud-chenyw
f02a7e7523 fix: 表格和视图类型圆角无效 2021-08-25 16:08:27 +08:00
fit2cloud-chenyw
fab98c0d38
Merge pull request #696 from dataease/pr@dev@fix_表格和文字类型圆角无效
fix: 表格和视图类型圆角无效
2021-08-25 15:51:45 +08:00
fit2cloud-chenyw
a4420a22a7 fix: 表格和视图类型圆角无效 2021-08-25 15:49:59 +08:00
王嘉豪
cfad4e6121
Merge pull request #692 from dataease/pr@dev@refactor_auth-update
refactor:优化页面查询速度
2021-08-24 16:52:28 +08:00
wangjiahao
8d6d49eb14 refactor:优化页面查询速度 2021-08-24 16:51:09 +08:00
taojinlong
596a6ef0bf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-24 15:03:48 +08:00
taojinlong
e83510f4b7 fix: 数据源校验 2021-08-24 15:03:17 +08:00
王嘉豪
a1f3724cf9
Merge pull request #691 from dataease/pr@dev@refactor_style-change
refactor:仪表版首次刷新设置为5分钟
2021-08-24 13:49:34 +08:00
wangjiahao
407bdb52c4 refactor:仪表版首次刷线设置为5分钟 2021-08-24 13:45:45 +08:00
XiaJunjie2020
91a2a27b13
Merge pull request #689 from dataease/pr@dev@feat_radar_size
feat: 雷达图大小
2021-08-24 12:03:27 +08:00
junjie
e97c0d8e36 feat: 雷达图大小 2021-08-24 12:02:33 +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
5751df76e4
Merge pull request #688 from dataease/pr@dev@fix_user-form-ui
fix: 创建用户角色列表遮罩组织树
2021-08-23 17:35:48 +08:00
fit2cloud-chenyw
c79ea5d87b fix: 创建用户角色列表遮罩组织树 2021-08-23 17:34:43 +08:00
fit2cloud-chenyw
788deb4f59
Merge pull request #687 from dataease/pr@dev@fix_public_link_login_dialog
fix: 公共链接弹出登录框
2021-08-23 17:24:32 +08:00
fit2cloud-chenyw
f26adc38c9 fix: 公共链接弹出登录框 2021-08-23 17:23:11 +08:00
taojinlong
9b6312b2e0 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 16:27:31 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时,同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
王嘉豪
50f510f139
Merge pull request #686 from dataease/pr@dev@refactor_style-change
refactor:样式调整,放着transfrom使z-index失效
2021-08-23 15:52:25 +08:00
wangjiahao
523ff395f5 refactor:样式调整,放着transfrom使z-index失效 2021-08-23 15:51:19 +08:00
王嘉豪
647f4dddad
Merge pull request #685 from dataease/pr@dev@refactor_linkage
refactor:仪表板编辑清除联动信息不需要再保存
2021-08-23 15:11:33 +08:00
wangjiahao
9d0951bca3 refactor:仪表板编辑清除联动信息不需要再保存 2021-08-23 15:10:13 +08:00
王嘉豪
21870cb5a0
Merge pull request #684 from dataease/pr@dev@refactor_setbar-index
refactor:编辑时视图的设置按钮永远在最上层
2021-08-23 14:47:54 +08:00
wangjiahao
dab778b109 refactor:编辑时视图的设置按钮永远在最上层 2021-08-23 14:46:46 +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
2826664d1e
Merge pull request #680 from dataease/pr@dev@fix_lic_check_api
fix: api验证lic
2021-08-23 11:37:51 +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
f8a4656541 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 10:17:32 +08:00
taojinlong
85d840d91a fix: 尝试解决导入excle 报找不到字段的问题 2021-08-23 10:17:22 +08:00
王嘉豪
0aa5ef8b43
Merge pull request #677 from dataease/pr@dev@refactor_new-panel
refactor:仪表板保存时清理联动信息
2021-08-23 10:11:28 +08:00
wangjiahao
9a72159a5c refactor:仪表板保存时清理联动信息 2021-08-23 10:10:36 +08:00
taojinlong
d7c383d943 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-20 17:56:03 +08:00
taojinlong
130cbb23cf fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:55:50 +08:00
taojinlong
d6c3368d1f fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:32:52 +08:00
taojinlong
fecdd28d2d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-20 17:14:22 +08:00
taojinlong
df0c6a0759 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:14:07 +08:00
XiaJunjie2020
94f4bb82cd
Merge pull request #673 from dataease/pr@dev@fix_labelfix
fix: 指标卡间隔不生效
2021-08-20 16:50:49 +08:00
junjie
91d1659b40 fix: 指标卡间隔不生效 2021-08-20 16:49:49 +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
王嘉豪
154b4cea5a
Merge pull request #670 from dataease/pr@dev@refactor_new-panel
refactor:增加新的demo仪表板
2021-08-19 15:50:34 +08:00
wangjiahao
1556b1fc91 refactor:增加新的demo仪表板 2021-08-19 15:49:34 +08:00
XiaJunjie2020
3278ee4bbd
Merge pull request #669 from dataease/pr@dev@feat_datasettable
refactor: db数据集增加原表显示
2021-08-19 15:35:46 +08:00