center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,031 Commits 1 Branch 86 Tags 417 MiB
abf49f8ad3
Commit Graph

2708 Commits

Author SHA1 Message Date
taojinlong
7fdbe4082a refactor: 解决冲突 2022-02-18 18:03:21 +08:00
taojinlong
1bc642dd27 feat: 支持API數據機 2022-02-18 17:59:19 +08:00
fit2cloud-chenyw
7f2cc0e0da
Merge pull request #1789 from dataease/pr@dev@refactor_plugin_view 
refactor: 完善视图插件
 2022-02-18 17:45:15 +08:00
fit2cloud-chenyw
c1ec061127 refactor: 完善视图插件 2022-02-18 17:44:16 +08:00
junjun
cfc01bf46c feat: 视图权限跟随仪表板 2022-02-18 16:49:49 +08:00
junjun
4e19debe21 refactor: 视图结果展示 2022-02-18 10:45:02 +08:00
fit2cloud-chenyw
4671ea996e feat: 兼容插件视图样式设置 2022-02-17 18:39:44 +08:00
fit2cloud-chenyw
173d808371
Merge pull request #1783 from dataease/pr@dev@refactor_plugins_view_compatible 
refactor: 仪表板兼容插件视图
 2022-02-17 14:25:34 +08:00
fit2cloud-chenyw
e1ed447063 refactor: 仪表板兼容插件视图 2022-02-17 14:22:30 +08:00
junjun
bddb3bc605 feat: S2 pivot align 2022-02-16 16:55:00 +08:00
fit2cloud-chenyw
995fe08298 fix: nginx前后分离部署 2022-02-16 16:10:39 +08:00
wangjiahao
b0d2f33613 Merge remote-tracking branch 'origin/dev' into dev 2022-02-15 17:07:59 +08:00
wangjiahao
57c0f2d745 refactor: 更新视图列表图标，更正仪表板存量视图列表重复问题 2022-02-15 17:07:40 +08:00
fit2cloud-chenyw
aa76e3be46
Merge pull request #1775 from dataease/pr@dev@refactor_short_public_link 
refactor: 重构公共链接短链接
 2022-02-15 16:56:01 +08:00
fit2cloud-chenyw
c02de72a7e refactor: 重构公共链接短链接 2022-02-15 16:54:59 +08:00
junjun
f2978cb1e7 feat: S2 pivot 2022-02-15 15:56:51 +08:00
wangjiahao
1874aa4ea7 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V32__1.8.sql
 2022-02-15 11:59:38 +08:00
wangjiahao
b449734df5 refactor: 优化视图归属于仪表板功能，更新flyway和文案 2022-02-15 11:56:38 +08:00
fit2cloud-chenyw
954f68ec91 feat: 公共连接title展示当前仪表板名称 2022-02-15 10:47:01 +08:00
wangjiahao
a58f92ed03 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
 2022-02-14 18:58:33 +08:00
wangjiahao
769b7bc271 feat: 视图归属于仪表板，去掉视图菜单 2022-02-14 18:57:35 +08:00
junjun
64fce59957 feat: S2 pivot 2022-02-14 12:41:17 +08:00
junjun
24d9762b87 refactor: 视图字段增加校验提示 2022-02-14 12:27:33 +08:00
fit2cloud-chenyw
0aa2a69ff1 feat: 仪表板集成插件视图 2022-02-14 10:08:28 +08:00
wangjiahao
ecf1be4486 Merge remote-tracking branch 'origin/dev' into dev 2022-02-11 17:12:54 +08:00
junjun
8f39fbe3f5 feat: S2 pivot 2022-02-11 16:53:57 +08:00
wangjiahao
9eee9ed0f2 refactor: 文案修改 2022-02-11 16:47:01 +08:00
junjun
2c1f0533f2 feat: S2 pivot 2022-02-11 15:23:32 +08:00
fit2cloud-chenyw
756b056d99 refactor: 格式化代码 2022-02-11 14:22:17 +08:00
fit2cloud-chenyw
302fc5db74 refactor: 升级版本号1.8.0 2022-02-10 18:58:41 +08:00
fit2cloud-chenyw
60fa4e1cd4
Merge branch 'dev' into pr@dev@feat_view_plugin 2022-02-10 18:29:04 +08:00
fit2cloud-chenyw
417d869d46 feat: 新增气泡地图插件兼容 2022-02-10 18:17:41 +08:00
junjun
107635933e refactor: 数据集预览优化 2022-02-10 18:04:38 +08:00
wangjiahao
0d73961d86 Merge remote-tracking branch 'origin/dev' into dev 2022-02-10 17:11:16 +08:00
wangjiahao
330bd29232 fix: 修复新tab页预览无法打开的问题 2022-02-10 17:10:58 +08:00
junjun
05bd33b246 feat: S2 pivot 2022-02-10 14:19:59 +08:00
junjun
51412b6641 feat: S2 pivot 2022-02-10 10:22:45 +08:00
wangjiahao
757f9a5c21 Merge remote-tracking branch 'origin/dev' into dev 2022-02-09 18:02:10 +08:00
wangjiahao
064ca3b8c3 feat: 权限管理支持按照资源进行授权 2022-02-09 18:01:48 +08:00
junjie
69b1882085 fix: 修复地图范围不受权限控制的问题 2022-02-09 16:35:29 +08:00
junjie
ec45a82244 feat: S2 pivot 2022-02-08 14:27:40 +08:00
junjie
590fe30c16 feat: S2 pivot 2022-02-08 13:56:48 +08:00
junjie
95641feef7 feat: S2 pivot 2022-02-08 13:50:43 +08:00
fit2cloud-chenyw
a846a8fe74 fix: 日期过滤默认值兼容老版本 2022-02-08 10:58:40 +08:00
junjie
9fc6cedca3 feat: S2 Event 2022-02-07 13:13:50 +08:00
fit2cloud-chenyw
c370079b02 fix: 条件组件兼容老版本 2022-02-05 22:59:34 +08:00
fit2cloud-chenyw
2499f1c354 fix: 数字范围默认值导致仪表板空白 2022-02-05 22:32:59 +08:00
junjie
f4fb642c17 feat: S2 Event 2022-02-05 13:02:30 +08:00
junjie
4be52b9908 feat: S2 Event 2022-02-05 12:47:34 +08:00
junjie
85a6f1ae10 feat: S2 2022-02-02 13:29:46 +08:00
junjie
52a976c8a0 feat: S2 2022-02-01 15:30:09 +08:00
junjie
6c7d65fc77 feat: S2 2022-01-31 14:34:31 +08:00
junjie
66b75928b3 feat: S2明细表 2022-01-31 12:07:10 +08:00
wangjiahao
ea1649510f refactor: 首页文案修改 2022-01-30 12:48:28 +08:00
wangjiahao
473055f5f3 refactor: 当前过滤组件有默认值时无效触发保存 2022-01-30 10:02:16 +08:00
wangjiahao
e55c06e51b fix: 修复移动端一直加载问题 2022-01-30 09:44:17 +08:00
taojinlong
501d455e05 Merge branch 'v1.7' into dev 2022-01-28 20:01:36 +08:00
taojinlong
6f7345e859 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-28 19:58:14 +08:00
taojinlong
62525b0bb3 feat: 增量更新，优先显示设置的 2022-01-28 18:58:01 +08:00
wangjiahao
bc884e8718 fix: 仪表板背景由颜色切换为图片，未加图片时背景颜色依然存在问题 2022-01-28 14:10:09 +08:00
wangjiahao
44eb82eaf9 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时，页面未刷新问题 2022-01-28 13:41:41 +08:00
wangjiahao
6c9e34a1ee fix: 仪表板背景由颜色切换为图片，未加图片时背景颜色依然存在问题 2022-01-28 13:40:00 +08:00
wangjiahao
3274877f42 refactor: 更新首页教学视频链接 2022-01-28 13:36:28 +08:00
wangjiahao
de581d2214 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时，页面未刷新问题 2022-01-28 13:34:32 +08:00
wangjiahao
8d4519445c refactor: 更新首页教学视频链接 2022-01-28 13:14:43 +08:00
wangjiahao
83e1386cb0 Merge remote-tracking branch 'origin/v1.7' into v1.7 2022-01-28 13:10:02 +08:00
wangjiahao
496962a68e fix: 仪表板背景由颜色切换为图片，未加图片时背景颜色依然存在问题 2022-01-28 13:08:44 +08:00
fit2cloud-chenyw
ccbd5eccc6 fix: 文本过滤组件空默认值异常 2022-01-28 11:42:59 +08:00
fit2cloud-chenyw
6f5fec6928 fix: 文本过滤组件空默认值异常 2022-01-28 11:40:42 +08:00
fit2cloud-chenyw
ac3fa4eca6 fix: 日期范围动态时间季度错误 2022-01-28 11:03:32 +08:00
fit2cloud-chenyw
c8e15a2162 fix: 日期范围动态时间季度错误 2022-01-28 11:01:34 +08:00
fit2cloud-chenyw
d0c55751c7 fix: 数字区间组件不能正常显示 2022-01-27 18:00:43 +08:00
fit2cloud-chenyw
31f9735ab2 fix: 数字区间组件不能正常显示 2022-01-27 17:57:23 +08:00
fit2cloud-chenyw
8207b12e1b fix: 仪表板编辑显示空白 2022-01-27 16:23:57 +08:00
fit2cloud-chenyw
eb6fbc7b5c fix: 仪表板编辑显示空白 2022-01-27 16:20:34 +08:00
junjie
34f51e1487 refactor: 优化地图标签选项 2022-01-27 14:43:55 +08:00
junjie
44c6ec4f8c refactor: 优化地图标签选项 2022-01-27 14:42:37 +08:00
junjie
0236972b90 fix: 统一授权后，分组tree参数修正 2022-01-27 14:30:20 +08:00
junjie
116e2038eb fix: 统一授权后，分组tree参数修正 2022-01-27 14:27:21 +08:00
taojinlong
9b98736627 refactor: 冲突 2022-01-27 13:57:43 +08:00
taojinlong
095a66f225 refactor: 显示所有的重复数据源 2022-01-27 13:52:53 +08:00
taojinlong
f99e1488f5 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-27 13:47:15 +08:00
taojinlong
5fb8aba187 fix: 任务名称长度限制 2022-01-27 13:31:10 +08:00
fit2cloud-chenyw
0c8bdb20d2 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:09:38 +08:00
fit2cloud-chenyw
d8f211b34e
Merge pull request #1704 from dataease/pr@v1.7@fix_view_mult_request 
fix: 仪表板过滤组件首次加载失效
 2022-01-27 11:07:38 +08:00
fit2cloud-chenyw
ddfd392858 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:06:29 +08:00
junjie
d1980bb2a6 fix: 指标拖拽问题 2022-01-26 17:59:45 +08:00
junjie
0eb0407e4f fix: 指标拖拽问题 2022-01-26 17:57:20 +08:00
wangjiahao
227e82969c fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:15:26 +08:00
wangjiahao
e47443adef fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:05:56 +08:00
wangjiahao
e20e236391 refactor: 首页优化 2022-01-26 16:18:16 +08:00
wangjiahao
17c9b3eac9 refactor: 首页优化 2022-01-26 15:30:01 +08:00
wangjiahao
58a76eca08 refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:17:21 +08:00
wangjiahao
0b4581fd98 Merge remote-tracking branch 'origin/v1.7' into v1.7 2022-01-26 14:15:53 +08:00
wangjiahao
6f7a8c56da refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:15:34 +08:00
fit2cloud-chenyw
565d288b1d fix: 下拉列表组件逻辑错误 2022-01-26 13:27:58 +08:00
fit2cloud-chenyw
7b290dc643 fix: 下拉列表组件逻辑错误 2022-01-26 13:26:04 +08:00
fit2cloud-chenyw
5d9e2b246b fix: 列表新增按钮迷之消失 2022-01-26 11:51:09 +08:00
fit2cloud-chenyw
12491b730d fix: 列表新增按钮迷之消失 2022-01-26 11:49:28 +08:00
junjie
3fd3099d51 fix: AntV线宽 2022-01-26 10:52:12 +08:00
junjie
92900f09b4 fix: AntV线宽 2022-01-26 10:50:18 +08:00
taojinlong
7fa3ec1ca9 fix: 校验重复数据源 2022-01-26 10:40:20 +08:00
taojinlong
3d75e9920c fix: 校验重复数据源 2022-01-26 10:37:14 +08:00
junjie
5800befa50 fix(table): 明细表默认分页数适配旧版本创建的视图 2022-01-25 16:49:20 +08:00
junjie
24c5bd0c80 fix(table): 明细表默认分页数适配旧版本创建的视图 2022-01-25 16:47:45 +08:00
wangjiahao
564116704a Merge remote-tracking branch 'origin/dev' into dev 2022-01-25 16:39:03 +08:00
wangjiahao
9885b9cc4a feat: 仪表板预览界面支持刷新，仪表板加载代码优化 2022-01-25 16:38:19 +08:00
taojinlong
ece60e75fa build: 升级版本号 2022-01-25 16:13:09 +08:00
taojinlong
a73139e2b4 build: 升级版本号 2022-01-25 16:12:51 +08:00
taojinlong
a912baa7d7 build: 升级版本号 2022-01-25 16:08:00 +08:00
taojinlong
d9604a2744 build: 升级版本号 2022-01-25 16:06:23 +08:00
taojinlong
07e600b727 fix: 行权限枚举值校验 2022-01-25 14:48:40 +08:00
taojinlong
03ba9e43f4 fix: 行权限枚举值校验 2022-01-25 14:40:20 +08:00
taojinlong
a639ba1374 refactor: 冲突 2022-01-25 13:58:51 +08:00
taojinlong
27027ecf1c Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-25 13:53:24 +08:00
taojinlong
f33e4b93c6 fix: 列权限校验 2022-01-25 13:52:57 +08:00
fit2cloudrd
6dcf172546
refactor: 移动端样式修改 (#1685) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-25 12:11:47 +08:00
fit2cloudrd
8f2539cbdc
refactor: 移动端样式修改 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-25 12:02:51 +08:00
wangjiahao
178c91e692 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:35:44 +08:00
wangjiahao
3f232a36a6 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:34:12 +08:00
wangjiahao
65139d788a fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:50:29 +08:00
wangjiahao
5c511339c8 fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:48:53 +08:00
junjie
3c11c3084a feat: 增加s2依赖 2022-01-24 16:00:47 +08:00
junjie
a854d0c9d2 refactor: 视图过滤字段值优化 2022-01-24 13:21:59 +08:00
junjie
b7d4b56a39 fix: 矩形树图属性 2022-01-24 13:21:59 +08:00
junjie
e3fdf9a4a5 refactor: 视图过滤字段值优化 2022-01-24 13:19:12 +08:00
junjie
3e8568079c fix: 矩形树图属性 2022-01-24 12:05:31 +08:00
taojinlong
f15caf7330 fix: 校验数据源重复 2022-01-23 15:08:42 +08:00
fit2cloud-chenyw
9b89184be5 refactor: 优化年份组件文案 2022-01-21 17:40:11 +08:00
fit2cloud-chenyw
67068aa416 refactor: 优化空仪表板收藏状态 2022-01-21 11:04:41 +08:00
wangjiahao
29080e0b89 fix: 分享仪表板联动信息失效问题 2022-01-20 18:31:40 +08:00
wangjiahao
57d948b613 Merge remote-tracking branch 'origin/dev' into dev 2022-01-20 17:03:53 +08:00
wangjiahao
bc998c9d79 fix: 移动端布局自动滚动移动到顶部组件高度变大问题 2022-01-20 17:03:38 +08:00
fit2cloud-chenyw
d02d10c48c refactor: 优化设计缺陷,增加展示字段 2022-01-20 16:38:11 +08:00
wangjiahao
372685035e refactor: 移动端布局拖动组件接近上下边界画布可以自动滚动 2022-01-20 11:33:41 +08:00
junjie
1846b282d6 refactor: 交互调整 2022-01-19 17:46:08 +08:00
zyyfit
e69bfb6ddc
fix: 修改英文翻译 2022-01-19 16:39:46 +08:00
taojinlong
7b478beae3 feat: 数据集列权限 2022-01-19 11:54:00 +08:00
taojinlong
d5a3276a1c feat: 数据集列权限 2022-01-19 11:49:13 +08:00
junjie
9ca2c3a2ee refactor: 国际化 2022-01-18 18:39:38 +08:00
wangjiahao
3fae87ba15 Merge remote-tracking branch 'origin/dev' into dev 2022-01-18 16:52:44 +08:00
wangjiahao
c0f0a6fa3d fix: 防止新建视图一直loading 2022-01-18 16:52:28 +08:00
taojinlong
5c351ea5e4 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:21:03 +08:00
taojinlong
aa2a44da0e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-18 16:10:08 +08:00
taojinlong
b3f5426e91 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:09:54 +08:00
taojinlong
18c957cee1 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:06:28 +08:00
fit2cloudrd
5e32cd9dde
refactor: 首页修改 (#1651) 
* refactor:首页修改

* refactor: 首页修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-18 12:38:33 +08:00
taojinlong
d64f0050a3
Merge pull request #1615 from rc452860/dev 
feat: 添加数据库数据集时显示表注释
 2022-01-17 18:16:45 +08:00
taojinlong
be5b1b07c2 refactor: 修复冲突 2022-01-17 18:05:26 +08:00
taojinlong
7d90a503c9 feat: 数据集列权限 2022-01-17 18:00:53 +08:00
fit2cloud-chenyw
93d749f573 fix: 动态年月逻辑错误 2022-01-14 17:34:35 +08:00
wangjiahao
7a61f375fa Merge remote-tracking branch 'origin/dev' into dev 2022-01-14 14:30:16 +08:00
wangjiahao
411db74fe4 refactor: 样式修改 2022-01-14 14:30:00 +08:00
fit2cloud-chenyw
9280b2983e
Merge pull request #1643 from dataease/pr@dev@fix_panel_filter 
fix: 过滤组件默认值不能覆盖编辑的预览值
 2022-01-14 14:24:20 +08:00
fit2cloud-chenyw
8700045786 fix: 过滤组件默认值不能覆盖编辑的预览值 2022-01-14 14:21:34 +08:00
wangjiahao
c287b41afb refactor: 组件间隙在有背景颜色时也保持一致 2022-01-14 10:57:36 +08:00
wangjiahao
6cfd2a9a13 feat: 仪表板允许对原有图片组件直接更换 2022-01-13 16:22:53 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
9419196993 fix: 修改密码向导被首页遮盖 2022-01-12 18:07:50 +08:00
fit2cloud-chenyw
a23e2601d7
Merge pull request #1634 from dataease/pr@dev@feat_default_pwd 
feat: 默认密码
 2022-01-12 17:47:26 +08:00
fit2cloud-chenyw
1714b7b017 feat: 默认密码 2022-01-12 17:46:14 +08:00
wangjiahao
7527d6561b refactor: 样式修改 2022-01-12 17:25:47 +08:00
wangjiahao
0e4f0d4259 refactor: 首页导航样式适配 2022-01-12 16:58:55 +08:00
wangjiahao
659899e31c Merge remote-tracking branch 'origin/dev' into dev 2022-01-12 16:57:57 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
fit2cloud-chenyw
7becaac8c1 style: 主题切换样式 2022-01-12 14:43:19 +08:00
fit2cloud-chenyw
977c520ab4 fix: 地图复位中心点错误 2022-01-12 12:25:01 +08:00
fit2cloud-chenyw
abf0a4a5d1
Merge pull request #1628 from dataease/pr@dev@refactor_dynamic_filter_year_month 
refactor: 优化年月过滤组件动态时间
 2022-01-12 11:28:29 +08:00
fit2cloud-chenyw
2170371b02 refactor: 优化年月过滤组件动态时间 2022-01-12 11:27:34 +08:00
junjie
ee917eeab3 fix: 修复左侧tree重命名右侧更新不及时的问题 2022-01-12 11:26:29 +08:00
wangjiahao
95186bd330 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2022-01-12 11:17:01 +08:00
wangjiahao
9c1a055b3f feat: 新增首页导航 2022-01-12 11:14:51 +08:00
fit2cloud-chenyw
96f4c999d0
Merge pull request #1626 from dataease/pr@dev@refactor_switch_theme 
refactor: 优化主题切换
 2022-01-12 11:08:11 +08:00
fit2cloud-chenyw
0a3580ddae refactor: 优化主题切换 2022-01-12 11:07:03 +08:00
junjie
76523b5787 refactor: 视图样式配置项调整 2022-01-12 11:01:14 +08:00
junjie
3f028ce0b0 refactor: 视图样式配置项调整 2022-01-11 17:26:07 +08:00
Junjie
6bcd70444b
Merge pull request #1624 from dataease/pr@dev@refactor_chart_style 
refactor: 视图样式配置项调整
 2022-01-11 17:17:53 +08:00
junjie
5cff660cea refactor: 视图样式配置项调整 2022-01-11 17:16:22 +08:00
fit2cloud-chenyw
7d9214c203 feat: 年份、年月组件增加动态时间 2022-01-11 16:30:47 +08:00
junjie
b59c33ddd6 refactor: 视图样式配置项调整 2022-01-11 15:57:29 +08:00
junjie
792ad211c7 refactor: 视图样式配置项调整 2022-01-11 15:34:13 +08:00
junjie
36bf4206a9 refactor: 视图样式配置项调整 2022-01-11 15:29:28 +08:00
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
fit2cloud-chenyw
2de66cf8d7
Merge pull request #1610 from dataease/pr@dev@fix_dynamic_filter_date 
fix: 动态日期过滤组件月份逻辑
 2022-01-10 12:07:52 +08:00
fit2cloud-chenyw
44ba1f8db6 fix: 动态日期过滤组件月份逻辑 2022-01-10 12:06:42 +08:00
junjie
1bf4cc1c74 fix(视图): 修复视图保存后未刷新详情的问题 2022-01-10 11:37:33 +08:00
fit2cloud-chenyw
dc4c9ca3ac fix: 动态时间组件 2022-01-07 14:14:22 +08:00
wangjiahao
009cdaaab9 fix: 公共链接移动端跳转被拦截问题 2022-01-06 23:53:45 +08:00
taojinlong
7092dce543 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-06 15:18:03 +08:00
taojinlong
93ff28704d fix: 兼容以前的公共链接 2022-01-06 15:16:50 +08:00
junjie
65dd6bc1e9 fix: 直连SQL数据集不支持制作关联数据集 2022-01-06 12:54:37 +08:00
taojinlong
e8c6762c1f fix: 处理数据源校验错误信息太长的问题 2022-01-05 21:30:03 +08:00
taojinlong
d35c03d828 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
f0cad41560 build: v1.6 2021-12-31 17:46:06 +08:00
wangjiahao
abf8d04569 style: 样式修改 2021-12-31 16:16:30 +08:00
wangjiahao
69d53f0bb6 fix: 过滤组件标题不同仪表板大小时显示位置不同问题 2021-12-31 15:34:05 +08:00
wangjiahao
239b649bca refactor: 优化文字组件FontSize值范围设置 2021-12-31 11:27:36 +08:00
taojinlong
55459dd8aa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:42:52 +08:00
taojinlong
a8885c31f5 fix: 限制行权限 2021-12-31 10:37:05 +08:00
fit2cloud-chenyw
5701437698 fix: 下拉列表逻辑 2021-12-31 10:29:26 +08:00
xiajunjie
a17e55c2d7 fix: 字段重名 2021-12-30 20:55:53 +08:00
xiajunjie
0c8d930ee5 fix: 视图加载大数据 2021-12-30 20:30:31 +08:00
fit2cloud-chenyw
c43fd82ba1 fix: 我的分享多个焦点 2021-12-30 19:31:28 +08:00
王嘉豪
6b7c0671bd
Merge pull request #1575 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 19:05:29 +08:00
wangjiahao
34455d7ef2 refactor: 过滤组件初始化优化，适配历史过滤组件 2021-12-30 19:04:23 +08:00
王嘉豪
80a502e989
Merge pull request #1574 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 18:32:54 +08:00
wangjiahao
678581d484 refactor: 过滤组件初始化优化，适配历史过滤组件 2021-12-30 18:31:57 +08:00
王嘉豪
f582cb3d83
Merge pull request #1570 from dataease/pr@dev@feat-mobile-reset 
refactor: 过滤组件初始化优化，适配历史过滤组件
 2021-12-30 17:17:48 +08:00
wangjiahao
5f31ed7ed9 refactor: 过滤组件初始化优化，视频历史过滤组件 2021-12-30 17:14:17 +08:00
王嘉豪
79f82c274d
Merge pull request #1569 from dataease/pr@dev@feat-mobile-reset 
refactor: 国际化
 2021-12-30 15:59:27 +08:00
wangjiahao
4d8bb2d7d5 refactor: 国际化 2021-12-30 15:58:37 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
fit2cloudrd
2dfe2e3cc0
style: 样式修改 (#1563) 
* style: 样式修改

* style: 样式修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-30 14:30:37 +08:00
wangjiahao
f20b58df80 style: 样式修改 2021-12-30 14:29:51 +08:00
junjie
613731700e fix: 弹框回车事件 2021-12-30 13:29:16 +08:00
wangjiahao
b011aaab98 style: 样式修改 2021-12-30 12:32:23 +08:00
wangjiahao
f29b660819 refactor: 仪表板间隙设置优化 2021-12-30 11:47:26 +08:00
fit2cloud-chenyw
1b174f589a fix: 公共链接有效期 2021-12-30 10:39:53 +08:00
junjie
9fa458a704 fix: 删除分组后，右侧界面关闭 2021-12-30 10:18:54 +08:00
fit2cloudrd
a386b6f2c7
style: 样式修改 
style: 样式修改
 2021-12-29 18:52:48 +08:00
taojinlong
55a08f61d2 fix: db2 分页问题 2021-12-29 18:32:23 +08:00
wangjiahao
97d78aca86 style: 移动端布局样式优化 2021-12-29 18:05:36 +08:00
王嘉豪
daa03411b2
Merge pull request #1555 from dataease/feat-mobile-reset 
refactor: 移动端禁用跳转
 2021-12-29 16:43:47 +08:00
wangjiahao
be94b177a0 refactor: 移动端禁用跳转 2021-12-29 16:41:01 +08:00
fit2cloud-chenyw
dae80f9bfc fix: 移动端仪表板访问异常 2021-12-29 14:36:52 +08:00
wangjiahao
1740e4901d feat: 移动端布局增加重置功能 2021-12-29 12:22:10 +08:00
fit2cloud-chenyw
12ab1999a4
Merge pull request #1551 from dataease/pr@dev@fix_filter_decimal 
fix: 过滤组件对小数不支持
 2021-12-29 12:09:12 +08:00
fit2cloud-chenyw
ed63b1d8b0 fix: 过滤组件对小数不支持 2021-12-29 12:08:07 +08:00
wangjiahao
944c160e99 Merge remote-tracking branch 'origin/dev' into dev 2021-12-29 11:54:31 +08:00
wangjiahao
83134fe15e fix: 修复视图分组图标可能被修改的问题 2021-12-29 11:54:17 +08:00
wangjiahao
4ad858d5dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 11:53:02 +08:00
fit2cloud-chenyw
cfcf7c9513 fix: 动态时间组件无效 2021-12-29 11:47:31 +08:00
wangjiahao
9fa671d166 style: tab组件样式修改 2021-12-29 11:39:21 +08:00
wangjiahao
e051792bde refactor: 仪表板新建视图关闭取消按钮 2021-12-29 11:25:27 +08:00
fit2cloud-chenyw
c7c0b5b1c3
Merge pull request #1548 from dataease/pr@dev@fix_eqp_type 
fix: BS/MS多端统一入口
 2021-12-29 10:58:38 +08:00
fit2cloud-chenyw
644f5e59ba fix: BS/MS多端统一入口 2021-12-29 10:57:46 +08:00
wangjiahao
60814ebc5f style: 仪表板树样式修改 2021-12-29 10:52:46 +08:00
junjie
34a048d07a fix: 表格分页问题 2021-12-29 10:28:31 +08:00
taojinlong
8bb5d5b427 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 10:04:48 +08:00
wangjiahao
398d40520c Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 18:45:16 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00
taojinlong
6bb37f0d4e fix: 公共链接行权限 2021-12-28 18:44:11 +08:00
wangjiahao
63f87ad59d refactor: 未获取地图数据，控制台不用报错 2021-12-28 18:44:03 +08:00
wangjiahao
dfe1fd4859 refactor: 代码回退 2021-12-28 18:23:47 +08:00
fit2cloud-chenyw
6f9eb29ca7
Merge pull request #1544 from dataease/pr@dev@fix_preview_filter_valid 
fix: 仪表板预览过滤条件失效
 2021-12-28 18:11:36 +08:00
fit2cloud-chenyw
a39ed6a8c0 fix: 仪表板预览过滤条件失效 2021-12-28 18:09:54 +08:00
wangjiahao
56ebd857cc Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 17:53:02 +08:00
wangjiahao
892a967d24 refactor: 仪表板命名，相同目录下的仪表板和目录允许重名 2021-12-28 17:52:31 +08:00
taojinlong
96a830ebaf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 17:18:00 +08:00
wangjiahao
4cb9e722a5 fix: 新建仪表板刷新浏览器第一次不出现问题 2021-12-28 17:03:48 +08:00
fit2cloud-chenyw
7ebb9b3be4 fix: 下拉列表单选框不能取消 2021-12-28 17:00:34 +08:00
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f47609fce5 refactor: 移动端布局等待区域排列优化 2021-12-28 16:35:30 +08:00
wangjiahao
f90466bc23 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 15:16:51 +08:00
wangjiahao
a725f0fa5d refactor: 移动端视图明细背景优化 2021-12-28 15:15:55 +08:00
taojinlong
ec29826365 fix: token 过期时，上传 excel 跳转登陆页 2021-12-28 15:14:17 +08:00
王嘉豪
f3225713a1
Merge pull request #1538 from dataease/pr@dev@fix_panel-filter 
fix: 修复编辑文本过滤组件后，显示错位问题
 2021-12-28 12:26:33 +08:00
wangjiahao
40081b3c09 fix: 修复编辑文本过滤组件后，显示错位问题 2021-12-28 12:26:01 +08:00
王嘉豪
e5da7bb582
Merge pull request #1537 from dataease/pr@dev@fix_panel-filter 
fix: 修复编辑文本过滤组件后，显示错位问题
 2021-12-28 12:13:41 +08:00
wangjiahao
4a0e577ad1 fix: 修复编辑文本过滤组件后，显示错位问题 2021-12-28 12:12:46 +08:00
fit2cloud-chenyw
d6a91f1fda
Merge pull request #1536 from dataease/pr@dev@refactor_axios_timeout 
refactor: 去除所有前端api自定义超时时间
 2021-12-28 11:47:37 +08:00
fit2cloud-chenyw
87d3ec69f2 refactor: 去除所有前端api自定义超时时间 2021-12-28 11:46:10 +08:00
wangjiahao
8d0a667092 refactor: 去掉代码中固定的超时时间 2021-12-28 11:40:19 +08:00
fit2cloud-chenyw
aa0cb3d725 fix: 时间范围动态时间限制 2021-12-28 11:32:48 +08:00
fit2cloud-chenyw
62a9a50899 fix: 时间范围动态时间兼容老版本 2021-12-27 18:28:55 +08:00
fit2cloud-chenyw
f678ae96ef
Merge pull request #1532 from dataease/pr@dev@feat_date_range_dynamic 
feat: 日期范围动态时间
 2021-12-27 18:09:13 +08:00
fit2cloud-chenyw
8b0c98e9cd feat: 日期范围动态时间 2021-12-27 18:04:59 +08:00
fit2cloudrd
c8814f9daa
fix: 文本搜索组件在预览和编辑时显示不一致 (#1529) 
fix: 文本搜索组件在预览和编辑时显示不一致
 2021-12-27 16:34:27 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
fit2cloud-chenyw
4cab403cb5
Merge branch 'dev' into pr@dev@style_panel_filter 2021-12-27 15:18:52 +08:00
fit2cloud-chenyw
d672f0ef49 style: 过滤组件样式 2021-12-27 15:15:09 +08:00
wangjiahao
215b4936c1 refactor: 地图组件移动端适配调整 2021-12-27 14:33:31 +08:00
wangjiahao
4f8ea205d3 refactor: 移动端布局等待区域优化地图，时间组件排列方式 2021-12-27 14:21:00 +08:00
wangjiahao
0c8454323a refactor: 移动端布局组件等待区域靠左排列 2021-12-27 12:06:42 +08:00
wangjiahao
9485610a77 fix: 仪表板下拉列表组件选择未靠左排列 2021-12-27 11:16:11 +08:00
fit2cloud-chenyw
55d8022b5b fix: 空地图试图切换错误 2021-12-27 11:12:21 +08:00
fit2cloud-chenyw
8409f1dd65 style: 解决仪表板中缩放按钮遮盖 2021-12-25 14:54:46 +08:00
fit2cloud-chenyw
73ceca7477 feat: 地图增加缩放重置按钮 2021-12-25 14:42:07 +08:00
fit2cloud-chenyw
30564208ce fix: 兼容老版本日期控件 2021-12-24 19:04:05 +08:00
fit2cloud-chenyw
a7be631244
Merge pull request #1517 from dataease/pr@dev@fix_filters_logic 
fix: 过滤组件逻辑
 2021-12-24 18:44:33 +08:00
fit2cloud-chenyw
26047142ea fix: 过滤组件逻辑 2021-12-24 18:43:29 +08:00
fit2cloudrd
787ef75b06
refactor: 优化PC移动端布局切换，防止出现错误仪表板布局 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-24 17:54:28 +08:00
wangjiahao
71ae929234 Merge remote-tracking branch 'origin/dev' into dev 2021-12-24 17:29:21 +08:00
wangjiahao
db09c658e3 fix: 仪表板文字组件编辑文字可能保存不上问题 2021-12-24 17:29:08 +08:00
junjie
a5bc88859f feat(视图): 过滤器支持and、or逻辑 2021-12-24 17:27:13 +08:00
fit2cloud-chenyw
d5071d99bd fix: 动态日期逻辑 2021-12-24 17:10:01 +08:00
fit2cloud-chenyw
2acecb6709 style: 移动端适配布局 2021-12-24 14:37:22 +08:00
fit2cloud-chenyw
60e1e7cea9
Merge pull request #1510 from dataease/pr@dev@style_panel_left 
style: 仪表板组件样式
 2021-12-24 13:30:36 +08:00
fit2cloud-chenyw
7c37cccf79 style: 仪表板组件样式 2021-12-24 13:29:24 +08:00
junjie
d714866f74 feat(视图): 地图值不存在时，显示空 2021-12-24 13:29:23 +08:00
junjie
4527e02448 feat(视图): 地图值不存在时，显示空 2021-12-24 13:27:59 +08:00
junjie
ba09b4ebe1 feat: 视图tab样式调整 2021-12-23 18:50:58 +08:00
wangjiahao
77db760939 fix: 修复移动端部分组件无法选中问题 2021-12-23 18:15:49 +08:00
fit2cloud-chenyw
4afe0f8fe1
Merge pull request #1508 from dataease/pr@dev@fix_i18n 
fix: 翻译优化
 2021-12-23 16:05:46 +08:00
fit2cloud-chenyw
5abf7b5278 fix: 翻译优化 2021-12-23 16:04:31 +08:00
wangjiahao
a2a9b51090 fix: 进行了移动设计后，仪表板没有改动，可连续保存 2021-12-23 15:46:43 +08:00
wangjiahao
5236b5ba21 feat: 图片支持超链接设置 2021-12-23 14:44:04 +08:00
wangjiahao
c3608e5ec2 refactor: 仪表板滚动时可以使过滤组件失去焦点隐藏弹框 2021-12-23 12:02:14 +08:00
wangjiahao
100e00e5a6 fix: 新加过滤组件，移动端布局无法保存问题 2021-12-22 18:31:46 +08:00
wangjiahao
30d392b219 fix: 编辑仪表板边界位置工具栏不完整问题 2021-12-22 18:02:30 +08:00
wangjiahao
d1d156c4dd refactor: 移动端加入新组件默认放到最底端 2021-12-22 16:36:33 +08:00
wangjiahao
59101ae774 Merge remote-tracking branch 'origin/dev' into dev 2021-12-22 12:20:15 +08:00
wangjiahao
fa02c8cca2 fix: 部分组件移动端样式消失问题 2021-12-22 12:19:40 +08:00
junjie
b3352c07c9 feat: 数据集入口适配 2021-12-22 11:42:44 +08:00
wangjiahao
ed8e1ee248 fix: 仪表板复制的组件，有可能默认进入移动端布局 2021-12-22 10:42:32 +08:00
junjie
2e09954407 feat(视图): 文本类型过滤组件支持枚举 2021-12-21 16:49:55 +08:00
junjie
c0be638c5a feat(视图): 地图值不存在时，显示空 2021-12-21 16:24:45 +08:00
wangjiahao
cda6b7513f refactor: 仪表板适配后端长屏截图 2021-12-21 16:05:14 +08:00
wangjiahao
b191c845a4 refactor: 移动端布局适配 2021-12-21 12:41:06 +08:00
fit2cloud-chenyw
ca0401f115 fix: 多字段过滤器 2021-12-21 12:35:45 +08:00
fit2cloud-chenyw
3089a502a3 fix: 文字搜索组件报错 2021-12-21 11:56:03 +08:00
fit2cloud-chenyw
4287a78ecb fix: 完善定时报告分辨率提示 2021-12-21 11:31:19 +08:00
fit2cloud-chenyw
3a8f5ca1af fix: 搜索过滤组件兼容老版本 2021-12-21 11:21:22 +08:00
fit2cloud-chenyw
342b797871
Merge pull request #1483 from dataease/pr@dev@feat_时间组件增加时间格式 
feat: 时间组件增加时间格式'无'
 2021-12-21 11:13:47 +08:00
fit2cloud-chenyw
d890222d0a feat: 时间组件增加时间格式'无' 2021-12-21 11:12:48 +08:00
wangjiahao
3222f645a1 feat: 根据设备信息自动识别终端类型 2021-12-21 10:57:37 +08:00
fit2cloud-chenyw
db242ba72b
Merge pull request #1482 from dataease/pr@dev@fix_compatible_filter 
fix: 兼容老版本过滤组件
 2021-12-21 10:37:46 +08:00
fit2cloud-chenyw
c44cb8bf02 fix: 兼容老版本过滤组件 2021-12-21 10:36:41 +08:00
王嘉豪
804ff0db21
Merge pull request #1480 from dataease/pr@dev@refactor_panel-scale 
refactor: 仪表板支持高清PDF导出
 2021-12-20 18:51:26 +08:00
wangjiahao
03cb1f0630 refactor: 仪表板支持高清PDF导出 2021-12-20 18:50:20 +08:00
fit2cloud-chenyw
0f8137ec6d fix: 自定义控制范围失效 2021-12-20 18:20:28 +08:00
fit2cloud-chenyw
b781e8e83a fix: tabs组件新增多个 2021-12-20 17:34:27 +08:00
taojinlong
940147a687 fix: 增加或删除数据源，只有一条数据时操作完需要刷新页面才会更新 2021-12-20 16:46:40 +08:00
junjie
dc36a06cb6 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 14:06:44 +08:00
junjie
721b2774fd feat(视图): 过滤器支持and、or逻辑 2021-12-20 12:39:17 +08:00
王嘉豪
ffe3d8b9ef
Merge pull request #1474 from dataease/pr@dev@refactor_panel-scale 
refactor: 移动端仪表板展示适配
 2021-12-20 12:16:05 +08:00
wangjiahao
e59d5b803d refactor: 移动端仪表板展示适配 2021-12-20 12:14:57 +08:00
junjie
3de3b877d7 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 11:36:56 +08:00
taojinlong
50d3a1c37f refactor: 解决冲突 2021-12-19 14:50:02 +08:00
taojinlong
a79a96f452 feat: 公共链接支持行权限 2021-12-19 14:46:33 +08:00
fit2cloud-chenyw
90bac42dc7
Merge pull request #1468 from dataease/pr@dev@feat_mobile_panel_url 
feat: 新增移动端仪表板api
 2021-12-18 22:37:04 +08:00
fit2cloud-chenyw
2365d3f24e feat: 新增移动端仪表板api 2021-12-18 22:35:59 +08:00
junjie
fe37d09a9e feat(视图): 文本类型过滤组件支持枚举 2021-12-17 18:16:18 +08:00
wangjiahao
9a4469d7a5 refactor: 移动端，web端视图内部属性可以根据屏幕缩放比例自动缩放 2021-12-17 18:11:39 +08:00
fit2cloud-chenyw
5217a52c5b fix: 老版本过滤组件导致死循环 2021-12-17 11:05:20 +08:00
wangjiahao
8ed4024bd6 refactor: 代码冲突回退 2021-12-16 18:24:50 +08:00
fit2cloud-chenyw
21e5624c22
Merge branch 'dev' into pr@dev@refactor_filter_default_value 2021-12-16 18:19:51 +08:00
fit2cloud-chenyw
3a3055280f feat: 新增时间控件动态默认值 2021-12-16 18:16:24 +08:00
wangjiahao
1fba59cc5b refactor: 兼容移动端，下拉类型组件去掉输入事件，防止再调用键盘事件 2021-12-16 17:59:16 +08:00
wangjiahao
732cb32abf refactor: 过滤组件可以跟随仪表板缩放 2021-12-16 17:08:54 +08:00
wangjiahao
0a16c91158 refactor: 代码回退 2021-12-16 12:02:37 +08:00
wangjiahao
01b4924707 refactor: 移动端仪表板视图明细优化，手机端明细展开改为全屏模式 2021-12-16 11:10:50 +08:00
wangjiahao
40d1df6074 fix: 移动端布局重新打开编辑可能出现错位问题 2021-12-15 17:26:23 +08:00
wangjiahao
1eedfb7ad4 refactor: 调整仪表板其他组件图标大小 2021-12-15 13:47:11 +08:00
wangjiahao
fe35463a4a fix: 设置联动信息是，目标视图选项存在uuid问题 2021-12-15 11:34:32 +08:00
wangjiahao
bbb082371d fix: 仪表板Tab组件预览模式图层不明确问题 2021-12-15 11:26:50 +08:00
wangjiahao
76cce15c53 fix: 修复仪表板内组件移动时没有对齐标线问题 2021-12-14 17:52:28 +08:00
wangjiahao
2ea9678dd8 feat: 仪表板处于公共链接模式，跳转的目标仪表板也以公共链接跳转，同时支持传参数 2021-12-14 15:22:03 +08:00