wangjiahao
|
8e7fe632d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-08-17 14:40:24 +08:00 |
|
wangjiahao
|
81a84a54e3
|
refactor:去除无用代码
|
2021-08-17 14:40:01 +08:00 |
|
XiaJunjie2020
|
abd1294ec2
|
Merge pull request #645 from dataease/pr@dev@feat_field_edit
feat: 字段编辑
|
2021-08-17 14:10:16 +08:00 |
|
junjie
|
b490c47feb
|
feat: 字段编辑
|
2021-08-17 14:09:17 +08:00 |
|
fit2cloud-chenyw
|
24ed0baeb2
|
Merge pull request #644 from dataease/pr@dev@fix_msg_timer_error
fix: 定时查询未读消息条数错误
|
2021-08-17 12:26:32 +08:00 |
|
fit2cloud-chenyw
|
2fbed9fdec
|
fix: 定时查询未读消息条数错误
|
2021-08-17 12:25:22 +08:00 |
|
taojinlong
|
238bc186fb
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2021-08-17 12:21:13 +08:00 |
|
taojinlong
|
d4d7261df9
|
feat: sqlserver、pg内置函数
|
2021-08-17 12:20:47 +08:00 |
|
XiaJunjie2020
|
b49c1ee3e9
|
Merge pull request #643 from dataease/pr@dev@fix_doris_func
fix: doris函数
|
2021-08-17 12:17:58 +08:00 |
|
junjie
|
1dc681216a
|
fix: doris函数
|
2021-08-17 12:17:09 +08:00 |
|
fit2cloud-chenyw
|
d2b6fe4356
|
Merge pull request #642 from dataease/pr@dev@refactor_system_style
refactor: 优化分享组织树
|
2021-08-17 11:09:23 +08:00 |
|
fit2cloud-chenyw
|
d99229dd44
|
refactor: 优化分享组织树
|
2021-08-17 11:08:11 +08:00 |
|
XiaJunjie2020
|
cd8065a839
|
Merge pull request #641 from dataease/pr@dev@feat_color
feat: 视图支持简单颜色修改
|
2021-08-17 10:30:13 +08:00 |
|
junjie
|
9439bcef01
|
feat: 视图支持简单颜色修改
|
2021-08-17 10:29:06 +08:00 |
|
taojinlong
|
f7bc4106a9
|
feat: 更改基础镜像
|
2021-08-16 19:01:32 +08:00 |
|
taojinlong
|
948db7b6dd
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2021-08-16 18:43:49 +08:00 |
|
王嘉豪
|
7441be315c
|
Merge pull request #639 from dataease/pr@dev@refactor_panel-edit-return
refactor:仪表板编辑视图样式优化
|
2021-08-16 18:33:49 +08:00 |
|
taojinlong
|
3a5fbf66ec
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2021-08-16 18:32:28 +08:00 |
|
wangjiahao
|
6db0747009
|
refactor:仪表板编辑视图样式优化
|
2021-08-16 18:31:32 +08:00 |
|
taojinlong
|
7c391ed8cf
|
refactor: 代码格式化
|
2021-08-16 18:27:20 +08:00 |
|
XiaJunjie2020
|
3b9ae87f86
|
Merge pull request #638 from dataease/pr@dev@feat_color
feat: 视图支持简单颜色修改
|
2021-08-16 18:20:46 +08:00 |
|
junjie
|
c7f5ebbd98
|
feat: 视图支持简单颜色修改
|
2021-08-16 18:16:55 +08:00 |
|
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 |
|
fit2cloud-chenyw
|
a065ffda76
|
refactor: 优化用户列表样式
|
2021-08-16 17:36:21 +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 |
|