1770 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
XiaJunjie2020	0f5209173f	Merge pull request #280 from dataease/pr@dev@refactor_视图样式调整 ... refactor: 视图样式调整	2021-07-22 12:08:50 +08:00
junjie	acace5e57d	refactor: 视图样式调整	2021-07-22 12:07:17 +08:00
wangjiahao	8b435075ca	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # frontend/src/components/canvas/components/RectangleAttr.vue	2021-07-22 11:46:03 +08:00
wangjiahao	b71a1d0a29	feat:仪表板矩形组件增加透明度样式设置	2021-07-22 11:44:57 +08:00
XiaJunjie2020	4fffb7ca04	Merge pull request #279 from dataease/pr@dev@fix_视图样式 ... fix: 视图样式	2021-07-22 11:18:37 +08:00
junjie	4087b60366	fix: 视图样式	2021-07-22 11:02:33 +08:00
XiaJunjie2020	2d7b9abc11	Merge pull request #278 from dataease/pr@dev@refactor_界面样式调整 ... refactor: 界面样式调整	2021-07-22 10:50:14 +08:00
junjie	fa257167e6	refactor: 界面样式调整	2021-07-22 10:49:23 +08:00
wangjiahao	cafca05eee	feat:仪表板矩形组件增加透明度样式设置	2021-07-22 10:20:38 +08:00
wangjiahao	5f95db6a53	Merge remote-tracking branch 'origin/dev' into dev	2021-07-22 10:02:31 +08:00
wangjiahao	ad1b829356	fix:Mac M1 arm64 chrome浏览器版本适配，修复仪表板编辑是全屏模式可能出现滚动条问题	2021-07-22 10:02:17 +08:00
XiaJunjie2020	43a369319c	Merge pull request #277 from dataease/pr@dev@fix_堆叠bug修复 ... fix: 堆叠bug修复	2021-07-21 18:58:27 +08:00
junjie	ee0ecadfcb	fix: 堆叠bug修复	2021-07-21 18:57:16 +08:00
XiaJunjie2020	cfe171d87f	Merge pull request #276 from dataease/pr@dev@fix_过滤器兼容flyway ... feat: 过滤器兼容flyway	2021-07-21 18:34:17 +08:00
junjie	6825383d9a	feat: 过滤器兼容flyway	2021-07-21 18:30:13 +08:00
XiaJunjie2020	7ebe7d96e4	Merge pull request #275 from dataease/pr@dev@feat_视图字段排序增加icon标识 ... feat: 视图字段排序增加icon标识	2021-07-21 18:18:59 +08:00
junjie	3a8adf4023	feat: 视图字段排序增加icon标识	2021-07-21 18:17:30 +08:00
fit2cloud-chenyw	1ef870c8cc	Merge pull request #272 from dataease/pr@dev@feat_行政区代码表 ... feat: 行政区划代码表	2021-07-21 18:00:15 +08:00
fit2cloud-chenyw	62ef6d01af	Merge pull request #273 from dataease/pr@dev@fix_菜单滚动条 ... fix: 添加菜单滚动条	2021-07-21 17:56:53 +08:00
fit2cloud-chenyw	08f1e10654	fix: 添加菜单滚动条	2021-07-21 17:53:36 +08:00
fit2cloud-chenyw	0620d58313	feat: 行政区划代码表	2021-07-21 17:51:03 +08:00
XiaJunjie2020	5cf91bb848	Merge pull request #270 from dataease/pr@dev@feat_堆叠图支持堆叠项 ... feat: 堆叠图支持堆叠项	2021-07-21 17:37:58 +08:00
junjie	a8e6e2d0e1	feat: 堆叠图支持堆叠项	2021-07-21 17:36:50 +08:00
fit2cloud-chenyw	13ccfb2073	Merge pull request #269 from dataease/pr@dev@feat_图标类型地图 ... feat: 替换缩略图	2021-07-21 17:25:34 +08:00
fit2cloud-chenyw	5715563714	feat: 替换缩略图	2021-07-21 17:23:58 +08:00
fit2cloud-chenyw	f0a2532b51	feat: 视图图表类型增加地图	2021-07-21 17:12:40 +08:00
taojinlong	b03598db1d	Merge pull request #267 from dataease/pr@dev@excel ... Merge branch 'dev' into pr@dev@excel	2021-07-21 15:10:52 +08:00
taojinlong	403350e3b9	Merge branch 'dev' into pr@dev@excel	2021-07-21 15:09:48 +08:00
taojinlong	d4a95c28f3	feat: SAX 解析 excel	2021-07-21 15:07:51 +08:00
XiaJunjie2020	7ed6e64242	Merge pull request #266 from dataease/pr@dev@fix_创建视图报错 ... fix: 创建视图报错	2021-07-20 19:00:02 +08:00
junjie	4316db704a	fix: 创建视图报错	2021-07-20 18:58:49 +08:00
XiaJunjie2020	6b6372fd43	Merge pull request #265 from dataease/pr@dev@fix_单指标图表可能下标越界 ... fix: 单指标图表可能下标越界	2021-07-20 17:53:42 +08:00
junjie	8369a8ffc6	fix: 单指标图表可能下标越界	2021-07-20 17:52:51 +08:00
XiaJunjie2020	12e2388a59	Merge pull request #263 from dataease/pr@dev@refactor_视图文案优化 ... feat: 视图维度指标拖动区域文案细节优化	2021-07-20 13:36:42 +08:00
junjie	694022ad71	feat: 视图维度指标拖动区域文案细节优化	2021-07-20 13:35:48 +08:00
XiaJunjie2020	13b90feeb9	Merge pull request #262 from dataease/pr@dev@feat_视图过滤重新设计，支持单维度指标展示 ... feat: 视图过滤重新设计，支持单维度指标展示	2021-07-20 12:18:59 +08:00
junjie	7411ba40da	feat: 视图过滤重新设计，支持单维度指标展示	2021-07-20 12:16:37 +08:00
XiaJunjie2020	e803a2cbfd	Merge pull request #261 from dataease/pr@dev@feat_过滤组件条件调整，视图界面调整 ... feat: 过滤组件条件调整,视图界面调整	2021-07-19 16:06:31 +08:00
junjie	c429821c5c	feat: 过滤组件条件调整,视图界面调整	2021-07-19 16:04:51 +08:00
XiaJunjie2020	15cc4cef7c	Merge pull request #260 from dataease/pr@dev@feat_过滤组件调整 ... feat: 过滤组件条件调整	2021-07-19 15:51:01 +08:00
junjie	7957ac5a40	feat: 过滤组件条件调整	2021-07-19 15:47:23 +08:00
XiaJunjie2020	678b748d21	Merge pull request #257 from dataease/pr@dev@refactor_视图UI布局初步调整 ... refactor: 视图UI布局初步调整	2021-07-19 12:37:27 +08:00
junjie	5c4bb9f7c5	refactor: 视图UI布局初步调整	2021-07-19 12:36:25 +08:00
wangjiahao	f1e25099a7	fix:增加仪表板，视图等请求超时时间	2021-07-19 11:54:33 +08:00
fit2cloud-chenyw	e4c3da41a5	Merge pull request #255 from dataease/pr@dev@fix_恢复默认请求超时时间10s ... fix: 默认请求超时时间10s	2021-07-19 11:28:25 +08:00
fit2cloud-chenyw	0589488167	fix: 默认请求超时时间10s	2021-07-19 11:24:18 +08:00
fit2cloud-chenyw	89dd680593	Merge pull request #254 from dataease/pr@dev@feat_禁止token续命白名单 ... feat: 前端增加token免续命白名单	2021-07-19 11:10:55 +08:00
fit2cloud-chenyw	aca2a9b19f	feat: 前端增加token免续命白名单	2021-07-19 11:08:00 +08:00
王嘉豪	65c4b67e68	Merge pull request #253 from dataease/pr@dev@fix仪表板Mac-M1版电脑保存模板时失败的问题 ... fix:仪表板Mac M1版电脑保存模板时失败的问题	2021-07-16 17:55:51 +08:00
wangjiahao	a42e37aa47	fix:仪表板Mac M1版电脑保存模板时失败的问题	2021-07-16 17:55:00 +08:00