2005 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
taojinlong	9536f730ed	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-07-29 11:29:03 +08:00
taojinlong	14b456f32a	fix: 校验 excel 第一行不能有空格	2021-07-29 11:28:50 +08:00
fit2cloud-chenyw	552bc90b5e	Merge pull request #405 from dataease/pr@dev@style_数字区间样式修改 ... style: 调整数字区间样式	2021-07-29 11:11:28 +08:00
fit2cloud-chenyw	7f2751dcba	style: 调整数字区间样式	2021-07-29 11:09:36 +08:00
王嘉豪	a3c30432f4	Merge pull request #404 from dataease/pr@dev@refactor_adjust_flyway ... refactor:调整flyway	2021-07-29 10:54:49 +08:00
wangjiahao	6a29e2b45c	refactor:调整flyway	2021-07-29 10:52:44 +08:00
wangjiahao	33da6c00d0	refactor:菜单权限控制增加显示标志，可以区分菜单师傅接受权限控制	2021-07-29 10:48:17 +08:00
taojinlong	43c3e56905	fix: 任务 跳转	2021-07-29 00:44:00 +08:00
XiaJunjie2020	79d014da70	Merge pull request #397 from dataease/pr@dev@refactor_视图纬度指标区分颜色 ... refactor: 视图纬度指标区分颜色	2021-07-28 22:21:06 +08:00
xiajunjie	36dbcc7976	refactor: 视图纬度指标区分颜色	2021-07-28 22:19:50 +08:00
XiaJunjie2020	94bd4406a4	Merge pull request #395 from dataease/pr@dev@fix_底层sql逻辑 ... fix: 底层sql逻辑	2021-07-28 21:47:41 +08:00
xiajunjie	0e95154a4d	fix: 底层sql逻辑	2021-07-28 21:37:23 +08:00
XiaJunjie2020	56d57dc9a2	Merge pull request #393 from dataease/pr@dev@fix_底层sql逻辑 ... fix: 底层sql逻辑	2021-07-28 21:29:36 +08:00
junjie	333df18a7f	fix: 底层sql逻辑	2021-07-28 19:47:10 +08:00
fit2cloud-chenyw	4a2867ee50	fix: 头部消息数字错位	2021-07-28 19:02:04 +08:00
XiaJunjie2020	2be01cfb7b	Merge pull request #390 from dataease/pr@dev@fix_自定义数据集关联问题 ... fix: 自定义数据集关联问题	2021-07-28 19:00:14 +08:00
junjie	dd411588e1	fix: 自定义数据集关联问题	2021-07-28 18:57:52 +08:00
XiaJunjie2020	e6129d83d5	Merge pull request #389 from dataease/pr@dev@test_doris测试 ... test: doris 测试	2021-07-28 18:28:48 +08:00
junjie	62a0d51144	test: doris 测试	2021-07-28 18:27:55 +08:00
fit2cloud-chenyw	dffed82491	fix: 定不定阅总是能接收到"默认消息"	2021-07-28 17:48:28 +08:00
wangjiahao	e10579cb57	Merge remote-tracking branch 'origin/dev' into dev	2021-07-28 17:47:56 +08:00
wangjiahao	5c98e39451	fix:视图按钮权限控制，同步在仪表板编辑时也适用	2021-07-28 17:47:39 +08:00
XiaJunjie2020	6c44ba07da	Merge pull request #388 from dataease/pr@dev@fix_过滤兼容 ... fix: 过滤兼容	2021-07-28 17:27:57 +08:00
junjie	4abdd3a6cb	fix: 过滤兼容	2021-07-28 17:26:07 +08:00
XiaJunjie2020	ce2ad0ce9c	Merge pull request #387 from dataease/pr@dev@fix_flyway兼容 ... fix: flyway兼容	2021-07-28 17:11:39 +08:00
junjie	3098ea882d	fix: flyway兼容	2021-07-28 17:10:41 +08:00
taojinlong	7cc006fe4a	fix: 修复excel 替换/追加	2021-07-28 16:48:44 +08:00
XiaJunjie2020	ddae50a762	Merge pull request #382 from dataease/pr@dev@test_数据集字段编辑测试 ... test: 数据集字段编辑测试	2021-07-28 15:25:19 +08:00
junjie	d95b995b41	test: 数据集字段编辑测试	2021-07-28 15:23:46 +08:00
fit2cloud-chenyw	4cbb74855e	fix: 设置用户名称长度限制	2021-07-28 14:45:32 +08:00
wangjiahao	594d20eb4d	refactor:代码格式化	2021-07-28 14:40:22 +08:00
wangjiahao	343ea39385	Merge remote-tracking branch 'origin/dev' into dev	2021-07-28 14:30:49 +08:00
wangjiahao	aa2a1c7864	refactor:代码格式化	2021-07-28 14:30:31 +08:00
taojinlong	988efcee1b	Merge pull request #379 from dataease/pr@dev@oracle ... fix: 修复抽取oracle数据	2021-07-28 14:18:21 +08:00
taojinlong	bdadbfa2f2	fix: 修复抽取oracle数据	2021-07-28 14:17:08 +08:00
王嘉豪	73e5bf47f5	Merge pull request #378 from dataease/refactor_code_format ... refactor:代码格式化	2021-07-28 14:16:59 +08:00
wangjiahao	6dbed17bf8	refactor:代码格式化	2021-07-28 14:16:01 +08:00
王嘉豪	aad84e8724	Merge pull request #377 from dataease/pr@dev@refactor_code_format ... refactor:代码格式化	2021-07-28 14:06:17 +08:00
wangjiahao	c25adf6ba2	refactor:代码格式化	2021-07-28 14:04:59 +08:00
王嘉豪	8102e564e2	Merge pull request #374 from dataease/pr@dev@fix_panel_edit-close ... fix:关闭仪表板编辑界面时清空画布缓存，修复过滤组件回显问题	2021-07-28 13:49:36 +08:00
fit2cloud-chenyw	a5d5b658c9	Merge pull request #373 from dataease/pr@dev@feat_地图工具栏 ... feat: 增加地图工具栏	2021-07-28 13:43:36 +08:00
fit2cloud-chenyw	f502c4d656	feat: 增加地图工具栏	2021-07-28 13:42:33 +08:00
XiaJunjie2020	2b7adc44c4	Merge pull request #372 from dataease/pr@dev@fix_数据集从编辑切换至添加界面的问题 ... fix: 数据集从编辑切换至添加界面的显示问题	2021-07-28 13:41:29 +08:00
junjie	6a8f5511c3	fix: 数据集从编辑切换至添加界面的显示问题	2021-07-28 13:40:38 +08:00
wangjiahao	f0447a5f92	fix:关闭仪表板编辑界面时清空画布缓存，修复过滤组件回显问题	2021-07-28 12:46:49 +08:00
XiaJunjie2020	4d0165f46a	Merge pull request #370 from dataease/pr@dev@fix_新建视图后权限问题 ... fix: 新建视图后权限问题	2021-07-28 12:18:15 +08:00
junjie	c6fd782d39	fix: 新建视图后权限问题	2021-07-28 12:16:59 +08:00
taojinlong	7ea80cd633	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-07-28 12:09:35 +08:00
taojinlong	67d66c5481	fix: 判断excel 第一行不为空并且不能有空单元格	2021-07-28 12:09:16 +08:00
XiaJunjie2020	ce1cd9131c	Merge pull request #368 from dataease/pr@dev@fix_过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题 ... fix: 过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题	2021-07-28 11:42:06 +08:00