center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
6,627 Commits 1 Branch 86 Tags 417 MiB
8869ec0176
Commit Graph

6627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fit2cloud-chenyw
88c0442cfc
Merge pull request #2797 from dataease/pr@dev@perf_global_map 
fix(视图-地图): 优化世界地图布局
 2022-08-04 18:26:21 +08:00
fit2cloud-chenyw
bf8f2761df fix(视图-地图): 优化世界地图布局 2022-08-04 18:25:21 +08:00
fit2cloud-chenyw
c1f75dc2c6
Merge pull request #2794 from dataease/pr@dev@feat_date_range_filter 
feat(仪表板-日期范围过滤器): 增加时分秒精度设置
 2022-08-04 16:53:18 +08:00
fit2cloud-chenyw
cd253983bb feat(仪表板-日期范围过滤器): 增加时分秒精度设置 2022-08-04 04:52:15 -04:00
taojinlong
843dbc6f02 refactor: 升级版本号 2022-08-04 15:30:18 +08:00
dataeaseShu
75e38914d5
Merge pull request #2785 from dataease/pr@dev_bag_clear 
Pr@dev bag clear
 2022-08-04 00:25:55 +08:00
dataeaseShu
4ef3070916 Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-04 00:25:28 +08:00
dataeaseShu
b81c2fcbe2 fix: 用户管理插件用户bug修复 2022-08-04 00:25:20 +08:00
dataeaseShu
d0ae80c5db fix: 用户管理插件用户bug修复 2022-08-04 00:24:38 +08:00
taojinlong
18c4961f63 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-04 00:09:42 +08:00
taojinlong
89989e29c0 fix(数据源): 判断数据源是否修改 2022-08-04 00:09:05 +08:00
fit2cloud-chenyw
9104a89a90
Merge pull request #2784 from dataease/pr@dev@fix_symbol_map 
fix(视图-符号地图): 同时添加标签字段和提示字段报错
 2022-08-03 21:38:43 +08:00
fit2cloud-chenyw
8fc62ab079 fix(视图-符号地图): 同时添加标签字段和提示字段报错 2022-08-03 21:37:57 +08:00
fit2cloud-chenyw
7a2b6dd8dc
Merge pull request #2783 from dataease/pr@dev@fix_map_setting_search 
fix(系统管理-地图设置): 地图设置搜索功能失效
 2022-08-03 20:29:26 +08:00
fit2cloud-chenyw
b74970bbf6 fix(系统管理-地图设置): 地图设置搜索功能失效 2022-08-03 20:28:39 +08:00
dataeaseShu
acf9e42371
Merge pull request #2782 from dataease/pr@dev_bag_clear 
Pr@dev bag clear
 2022-08-03 19:51:27 +08:00
dataeaseShu
07e93339cb Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-03 19:47:32 +08:00
dataeaseShu
df1272d120 fix: 用户管理筛选框背景色 2022-08-03 19:47:24 +08:00
dataeaseShu
14b1a2994f fix: 用户管理筛选框背景色 2022-08-03 19:46:11 +08:00
wangjiahao
a61253ec4e Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 18:34:35 +08:00
wangjiahao
15dd9fce18 style: 主题适配 2022-08-03 18:34:22 +08:00
dataeaseShu
ae88e70870
Merge pull request #2780 from dataease/pr@dev_bag_clear 
Pr@dev bag clear
 2022-08-03 17:22:57 +08:00
dataeaseShu
bfd9c165a5 Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-03 17:19:28 +08:00
dataeaseShu
3b0db41b7e fix: 过滤组件样式兼容清空条件 2022-08-03 17:19:23 +08:00
dataeaseShu
5a86c2d9dd fix: 过滤组件样式兼容清空条件 2022-08-03 17:18:28 +08:00
dataeaseShu
f2c0d5082f
Merge pull request #2778 from dataease/pr@dev_bag_clear 
Pr@dev bag clear
 2022-08-03 17:06:47 +08:00
dataeaseShu
8aa39c3470 Merge branch 'pr@dev_bag_clear' of https://github.com/dataease/dataease into pr@dev_bag_clear 2022-08-03 17:06:01 +08:00
dataeaseShu
18d33c9561 fix: 过滤器背景色透明 2022-08-03 17:05:54 +08:00
dataeaseShu
cd1817119a fix: 过滤器背景色透明 2022-08-03 17:04:55 +08:00
taojinlong
a4af92aa58 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-03 16:02:33 +08:00
taojinlong
1d6e6ec22d fix(数据源): 字段超出长度隐藏 2022-08-03 16:02:24 +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
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
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
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
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
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