2331 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
taojinlong	386d15b7e9	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-08-16 18:05:59 +08:00
taojinlong	d7f363e97b	feat: 数据源高级参数设置	2021-08-16 18:05:46 +08:00
XiaJunjie2020	ff07d48167	Merge pull request #636 from dataease/pr@dev@feat_color ... feat: 视图支持简单颜色修改	2021-08-16 16:35:07 +08:00
junjie	6e1300f937	feat: 视图支持简单颜色修改	2021-08-16 16:34:12 +08:00
XiaJunjie2020	7f8955051a	Merge pull request #635 from dataease/pr@dev@feat_color ... feat: 视图支持简单颜色修改	2021-08-16 16:24:53 +08:00
junjie	3386b1dd73	feat: 视图支持简单颜色修改	2021-08-16 16:23:57 +08:00
fit2cloud-chenyw	94447f0fc4	Merge pull request #634 from dataease/pr@dev@fix_组件弹框树节点增加tip ... fix: 组件弹框树节点增加tip	2021-08-16 16:02:55 +08:00
fit2cloud-chenyw	928384c6e2	fix: 组件弹框树节点增加tip	2021-08-16 16:01:55 +08:00
fit2cloud-chenyw	eb51e7c245	Merge pull request #633 from dataease/pr@dev@fix_condition_component ... fix: 文本列表组件快速检索无效	2021-08-16 15:41:53 +08:00
fit2cloud-chenyw	4d5b35b038	fix: 文本列表组件快速检索无效	2021-08-16 15:40:37 +08:00
fit2cloud-chenyw	705cd03a5f	Merge pull request #632 from dataease/pr@dev@fix_文本列表组件没有滚动条 ... feat: 文本列表组件增加滚动条	2021-08-16 14:46:38 +08:00
fit2cloud-chenyw	cc726fe738	feat: 文本列表组件增加滚动条	2021-08-16 14:45:34 +08:00
taojinlong	ede4ebded2	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-08-16 14:09:23 +08:00
taojinlong	9cda59e224	feat: 定时检测数据源状态信息	2021-08-16 14:09:02 +08:00
fit2cloud-chenyw	268db1c0ea	Merge pull request #631 from dataease/pr@dev@fix_下钻地图空白 ... fix: axios异步执行导致地图切换错误	2021-08-16 13:38:22 +08:00
fit2cloud-chenyw	97f9305605	fix: axios异步执行导致地图切换错误	2021-08-16 13:34:23 +08:00
taojinlong	b8f4a819f9	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-08-16 12:47:35 +08:00
taojinlong	4c8e061e1d	feat: 定时检测数据源状态信息	2021-08-16 12:46:34 +08:00
XiaJunjie2020	9a5057431b	Merge pull request #629 from dataease/pr@dev@fix_mapcode ... fix: 地图code	2021-08-16 11:49:15 +08:00
junjie	3e6b61a88c	fix: 地图code	2021-08-16 11:48:12 +08:00
XiaJunjie2020	2f4a7b039c	Merge pull request #628 from dataease/pr@dev@fix_map ... fix: 地图code，json	2021-08-16 11:20:01 +08:00
junjie	7bd5f3dc0f	fix: 地图code，json	2021-08-16 11:18:48 +08:00
fit2cloud-chenyw	0b27dfdb5f	Merge pull request #627 from dataease/pr@dev@fix_增加下钻函数返回值 ... fix: 增加下钻方法返回值	2021-08-16 11:04:13 +08:00
fit2cloud-chenyw	10a4b2cefa	fix: 增加下钻方法返回值	2021-08-16 11:03:13 +08:00
XiaJunjie2020	6b1abd07f8	Merge pull request #626 from dataease/pr@dev@feat_map ... feat: 地图json，区域	2021-08-16 09:57:30 +08:00
junjie	7905c85110	feat: 地图json，区域	2021-08-16 09:56:19 +08:00
taojinlong	bb7516ac39	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-08-13 22:13:36 +08:00
taojinlong	9623c15d01	fix: 解析excel失败	2021-08-13 17:31:18 +08:00
王嘉豪	74fff3caf3	Merge pull request #622 from dataease/pr@dev@refactor_drill-toobar ... fix:其他组件图标变小问题	2021-08-13 17:15:18 +08:00
wangjiahao	ea87c39705	fix:其他组件图标变小问题	2021-08-13 17:14:25 +08:00
taojinlong	19d08770a9	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-08-13 17:11:15 +08:00
taojinlong	1e67e6669c	fix: 解析excel失败	2021-08-13 17:10:59 +08:00
fit2cloud-chenyw	f2b2c3b4fd	Merge pull request #621 from dataease/pr@dev@fix_delete_areaCode_cache ... fix: 删除行政区划代码前端缓存	2021-08-13 17:07:34 +08:00
fit2cloud-chenyw	93b2dc8b78	fix: 删除行政区划代码前端缓存	2021-08-13 17:06:24 +08:00
王嘉豪	3ace9e6d88	Merge pull request #620 from dataease/pr@dev@refactor_drill-toobar ... refactor:优化下钻，联动弹出窗口	2021-08-13 15:47:08 +08:00
wangjiahao	7f2daa04df	refactor:优化下钻，联动弹出窗口	2021-08-13 15:45:43 +08:00
wangjiahao	af5af6411a	Merge remote-tracking branch 'origin/dev' into dev	2021-08-13 14:10:48 +08:00
wangjiahao	d8a9b0a0a8	refactor:代码回退	2021-08-13 14:10:15 +08:00
fit2cloud-chenyw	3872db731b	Merge pull request #619 from dataease/pr@dev@fix_public_url_pwd_in_iframe ... fix: 外部链接带密码嵌在iframe	2021-08-13 14:01:59 +08:00
fit2cloud-chenyw	8300139508	fix: 外部链接带密码嵌在iframe	2021-08-13 14:00:12 +08:00
王嘉豪	babf7b6f65	Merge pull request #618 from dataease/pr@dev@refactor_panel-resize ... refactor:优化仪表板元素拖动，大小变动延迟渲染，移动使用原始dom	2021-08-13 13:59:49 +08:00
wangjiahao	4e69aa6e1d	refactor:优化仪表板元素拖动，大小变动延迟渲染，移动使用原始dom	2021-08-13 13:58:27 +08:00
XiaJunjie2020	76bdbd7170	Merge pull request #617 from dataease/pr@dev@feat_map ... feat: 地图颜色	2021-08-13 13:37:09 +08:00
junjie	14f28e8baf	feat: 地图颜色	2021-08-13 13:36:10 +08:00
XiaJunjie2020	248cb81172	Merge pull request #616 from dataease/pr@dev@feat_map_style ... feat: 地图样式	2021-08-13 12:43:50 +08:00
junjie	f96e8a2a88	feat: 地图样式	2021-08-13 12:42:59 +08:00
XiaJunjie2020	866744ae75	Merge pull request #615 from dataease/pr@dev@refactor_remove_code ... refactor: 移除注释	2021-08-13 12:11:27 +08:00
fit2cloud-chenyw	48f6889fe5	Merge pull request #614 from dataease/pr@dev@fix_外部链接token机制 ... fix: 外部链接token存储使用vuex不实用cookie	2021-08-13 12:10:48 +08:00
junjie	cc8587aade	refactor: 移除注释	2021-08-13 12:10:36 +08:00
fit2cloud-chenyw	2482fc11c8	fix: 外部链接token存储使用vuex不实用cookie	2021-08-13 12:09:41 +08:00