Commit Graph

2316 Commits

Author SHA1 Message Date
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