taojinlong
|
be1936c509
|
fix(数据源): 字段超出长度隐藏
|
2022-08-03 16:03:40 +08:00 |
|
王嘉豪
|
d6e6551677
|
Merge pull request #2776 from dataease/dev
dev
|
2022-08-03 15:49:34 +08:00 |
|
wangjiahao
|
5b53aeb514
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 15:46:56 +08:00 |
|
wangjiahao
|
6087dcd92c
|
style(模板市场): 模板实例可以保持宽高比伸缩
|
2022-08-03 15:46:43 +08:00 |
|
taojinlong
|
fef0881b51
|
fix(数据集): 数据集变量支持 between and
|
2022-08-03 15:28:09 +08:00 |
|
taojinlong
|
efa2c059dd
|
Merge branch 'v1.13' of github.com:dataease/dataease into v1.13
|
2022-08-03 15:27:06 +08:00 |
|
taojinlong
|
9bfeebea2f
|
fix(数据集): 数据集变量支持 between and
|
2022-08-03 15:26:57 +08:00 |
|
dataeaseShu
|
2ef57a33e3
|
Merge pull request #2775 from dataease/pr@dev_bag_clear
Pr@dev bag clear
|
2022-08-03 15:09:48 +08:00 |
|
dataeaseShu
|
ad1fc8f829
|
Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear
|
2022-08-03 15:06:06 +08:00 |
|
dataeaseShu
|
7b1be5836d
|
fix: input border色值统一替换为css变量
|
2022-08-03 15:05:57 +08:00 |
|
dataeaseShu
|
6db6419c12
|
fix: input border色值统一替换为css变量
|
2022-08-03 15:05:05 +08:00 |
|
wangjiahao
|
930ee86135
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 14:19:16 +08:00 |
|
wangjiahao
|
4662a2ea2e
|
refactor(仪表板): 仪表板中只允许一个按钮，复用的时候判断当前仪表板是否有按钮再进行选择
|
2022-08-03 14:19:05 +08:00 |
|
fit2cloud-chenyw
|
6fbbcabff1
|
fix(视图-地图): 区域映射翻页后搜索功能失效
|
2022-08-03 14:14:11 +08:00 |
|
fit2cloud-chenyw
|
7dbc0ffcc9
|
Merge pull request #2774 from dataease/pr@dev@fix_map_mapping
fix(视图-地图): 区域映射翻页后搜索功能失效
|
2022-08-03 14:13:39 +08:00 |
|
fit2cloud-chenyw
|
df0ac137a3
|
fix(视图-地图): 区域映射翻页后搜索功能失效
|
2022-08-03 14:12:51 +08:00 |
|
wangjiahao
|
f8da869ec1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 13:59:54 +08:00 |
|
wangjiahao
|
557b2f306f
|
fix(模板管理): 模板管理不能创建分类问题
|
2022-08-03 13:59:44 +08:00 |
|
fit2cloud-chenyw
|
cd0222ec68
|
style(系统管理-地图设置): 新增-上级区域下拉树样式错位
|
2022-08-03 13:54:11 +08:00 |
|
fit2cloud-chenyw
|
1b206fa81d
|
Merge pull request #2773 from dataease/pr@dev@style_map_setting
style(系统管理-地图设置): 新增-上级区域下拉树样式错位
|
2022-08-03 13:53:05 +08:00 |
|
fit2cloud-chenyw
|
d74e006cee
|
style(系统管理-地图设置): 新增-上级区域下拉树样式错位
|
2022-08-03 13:52:18 +08:00 |
|
王嘉豪
|
755177bf33
|
Merge pull request #2772 from dataease/dev
dev
|
2022-08-03 13:48:07 +08:00 |
|
wangjiahao
|
7b9a7a2aba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 13:47:11 +08:00 |
|
wangjiahao
|
491c21599e
|
style: 手机端隐藏视图明细按钮
|
2022-08-03 13:46:59 +08:00 |
|
fit2cloud-chenyw
|
1af13e9c2b
|
fix(系统管理-定时报告): 视图附件名称乱码
|
2022-08-03 13:32:33 +08:00 |
|
fit2cloud-chenyw
|
982e8b44ed
|
Merge pull request #2770 from dataease/pr@dev@fix_email_task
fix(系统管理-定时报告): 视图附件名称乱码
|
2022-08-03 13:31:03 +08:00 |
|
fit2cloud-chenyw
|
2ecd78a933
|
fix(系统管理-定时报告): 视图附件名称乱码
|
2022-08-03 13:30:18 +08:00 |
|
wangjiahao
|
b978b0602d
|
style: 模板市场样式优化
|
2022-08-03 11:40:49 +08:00 |
|
fit2cloud-chenyw
|
b104a2b985
|
fix(系统管理-定时报告): 定时报告不带视图数据发送报错
|
2022-08-02 21:57:29 +08:00 |
|
fit2cloud-chenyw
|
feae7153ef
|
Merge pull request #2769 from dataease/pr@dev@fix_email_task_without_view
fix(系统管理-定时报告): 定时报告不带视图数据发送报错
|
2022-08-02 21:56:24 +08:00 |
|
fit2cloud-chenyw
|
0bc9d2de78
|
fix(系统管理-定时报告): 定时报告不带视图数据发送报错
|
2022-08-02 21:53:39 +08:00 |
|
fit2cloud-chenyw
|
7ef5efe873
|
style(仪表板-下拉列表): 预览模式没有纵向滚动条
|
2022-08-02 21:30:38 +08:00 |
|
fit2cloud-chenyw
|
850543f5c2
|
Merge pull request #2768 from dataease/pr@dev@style_select_grid
style(仪表板-下拉列表): 预览模式没有纵向滚动条
|
2022-08-02 21:29:54 +08:00 |
|
fit2cloud-chenyw
|
8f2a3612e2
|
style(仪表板-下拉列表): 预览模式没有纵向滚动条
|
2022-08-02 21:28:48 +08:00 |
|
fit2cloud-chenyw
|
f384c36381
|
fix(视图-符号地图): diros数据源拖入标记大小字段报错
|
2022-08-02 17:54:18 +08:00 |
|
fit2cloud-chenyw
|
8ab50fa483
|
Merge pull request #2767 from dataease/pr@dev@fix_symbol_map
fix(视图-符号地图): diros数据源拖入标记大小字段报错
|
2022-08-02 17:53:02 +08:00 |
|
fit2cloud-chenyw
|
661ce85bc7
|
fix(视图-符号地图): diros数据源拖入标记大小字段报错
|
2022-08-02 17:52:20 +08:00 |
|
王嘉豪
|
725a0f6051
|
Merge pull request #2766 from dataease/dev
dev merge
|
2022-08-02 17:42:44 +08:00 |
|
wangjiahao
|
43369ea3c5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 17:20:16 +08:00 |
|
wangjiahao
|
88c5712233
|
refactor(仪表板): 仪表板画布手机端布局设计最小矩阵尺寸设置为1*1
|
2022-08-02 17:20:03 +08:00 |
|
taojinlong
|
9293955d72
|
fix(数据源): 抽取 api 数据集的字段
|
2022-08-02 17:18:58 +08:00 |
|
taojinlong
|
11309141ca
|
fix(数据源): 去除空格
|
2022-08-02 17:18:52 +08:00 |
|
taojinlong
|
6c6172fc3a
|
fix(数据源驱动): 驱动文件重名判断
|
2022-08-02 17:18:50 +08:00 |
|
taojinlong
|
3e1f92d212
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2022-08-02 17:17:54 +08:00 |
|
taojinlong
|
eabbf9a609
|
fix(数据源): 抽取 api 数据集的字段
|
2022-08-02 17:17:24 +08:00 |
|
fit2cloud-chenyw
|
356eb3357a
|
fix(系统管理-地图设置): 上传地图文件没有反应
|
2022-08-02 17:08:31 +08:00 |
|
fit2cloud-chenyw
|
1c5fb68461
|
Merge pull request #2765 from dataease/pr@dev@fix_map_setting
fix(系统管理-地图设置): 上传地图文件没有反应
|
2022-08-02 17:07:53 +08:00 |
|
fit2cloud-chenyw
|
809d2d8683
|
fix(系统管理-地图设置): 上传地图文件没有反应
|
2022-08-02 17:06:51 +08:00 |
|
wangjiahao
|
f859f10fb5
|
revert: 还原修改密码页面权限限制
|
2022-08-02 16:37:05 +08:00 |
|
wangjiahao
|
cc4b0465e5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 16:34:25 +08:00 |
|