Commit Graph

3572 Commits

Author SHA1 Message Date
fit2cloud-chenyw
d6ba096353 feat(系统管理-ui优化): 适配新版UI新增系统管理路由页面 2022-08-04 23:32:32 -04:00
junjun
f30509a93c refactor(视图): 视图计算字段UI调整 2022-08-05 11:06:41 +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
b81c2fcbe2 fix: 用户管理插件用户bug修复 2022-08-04 00:25:20 +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
b74970bbf6 fix(系统管理-地图设置): 地图设置搜索功能失效 2022-08-03 20:28:39 +08:00
dataeaseShu
df1272d120 fix: 用户管理筛选框背景色 2022-08-03 19:47:24 +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
3b0db41b7e fix: 过滤组件样式兼容清空条件 2022-08-03 17:19:23 +08:00
dataeaseShu
18d33c9561 fix: 过滤器背景色透明 2022-08-03 17:05:54 +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
dataeaseShu
7b1be5836d fix: input border色值统一替换为css变量 2022-08-03 15:05:57 +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
df0ac137a3 fix(视图-地图): 区域映射翻页后搜索功能失效 2022-08-03 14:12:51 +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
wangjiahao
b978b0602d style: 模板市场样式优化 2022-08-03 11:40:49 +08:00
fit2cloud-chenyw
8f2a3612e2 style(仪表板-下拉列表): 预览模式没有纵向滚动条 2022-08-02 21:28:48 +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
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
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
cc4b0465e5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 16:34:25 +08:00
wangjiahao
045f7e14bd style: 编辑按钮区修改排列方式和背景色 2022-08-02 16:34:15 +08:00
dataeaseShu
587e932928 fix: 组织部门为空bug修复 2022-08-02 16:29:35 +08:00
wangjiahao
d18d96478a Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 15:08:22 +08:00
wangjiahao
f44f43e2d5 refactor(模板市场): 模板市场显示由基础设置页面控制 2022-08-02 15:08:11 +08:00
dataeaseShu
a609ec7941 feat: 清除没有用到的依赖 2022-08-02 14:46:15 +08:00
wangjiahao
e78cd47933 fix(仪表板): 修复预览页面可能出现复选框的情况 2022-08-02 14:37:56 +08:00
wangjiahao
f6ba0642ea Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 13:41:18 +08:00
wangjiahao
24ea04821e style: 去掉视图明细文本 2022-08-02 13:41:07 +08:00
Dovahkinn
4fb548ada2
前端项目运行时的部分警告处理 (#2759)
* fix: 执行 eslint 命令, 修复代码

* fix(frontend): justify-content 不支持的值 start, end 改为 flex-start, flex-end

* Update format-utils.js

去掉注释

Co-authored-by: 王嘉豪 <42510293+ziyujiahao@users.noreply.github.com>
2022-08-02 13:22:28 +08:00
wangjiahao
74a6ec51a2 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 11:54:43 +08:00
wangjiahao
53313b5ddd fix(仪表板): 修复矩形组件复用部分样式丢失问题 2022-08-02 11:53:59 +08:00
fit2cloud-chenyw
955977ab13 fix(仪表板-时间过滤器): 精确到小时但是没有隐藏分钟选择器 2022-08-01 20:59:14 +08:00
fit2cloudrd
ae5cc25d8a
style(仪表板): 批量设置、联动设置选择按钮位置变更 (#2755)
* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换,过滤组件默认颜色设置

* refator(仪表板): 主题色切换,适配tab组件

* refactor(仪表板): 符号地图适配主题变化

* style(仪表板): 批量设置、联动设置选择按钮位置变更

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-08-01 18:39:05 +08:00
taojinlong
0bdbb72253 fix(数据源): api 数据集预览错误 2022-08-01 18:03:39 +08:00
fit2cloudrd
bcfaf4d4e1
refactor(仪表板): 组件适配主题色变化 (#2752)
* refactor(仪表板): 主题色更换保留原标题显示方式

* refator(仪表板): 主题色切换,过滤组件默认颜色设置

* refator(仪表板): 主题色切换,适配tab组件

* refactor(仪表板): 符号地图适配主题变化

Co-authored-by: wangjiahao <1522128093@qq.com>
2022-08-01 17:53:58 +08:00
junjun
73cb6b3f46 fix(视图): 瀑布图移除轴值数值格式化功能,防止与指标数值格式化冲突 2022-08-01 17:32:48 +08:00
fit2cloud-chenyw
6ea655f36d fix(仪表板-过滤组件): 复制视图后过滤组件对原视图和目标视图作用效果不一致 2022-08-01 13:37:52 +08:00
fit2cloud-chenyw
174c3cde4f
Merge pull request #2748 from dataease/pr@dev@fix_tree_select_full_screen_hide
fix(仪表板-树过滤器): 全屏模式下无法显示
2022-08-01 11:51:06 +08:00
fit2cloud-chenyw
276069b541 fix(仪表板-树过滤器): 全屏模式下无法显示 2022-08-01 11:49:28 +08:00
王嘉豪
df8c4aaea7
Merge pull request #2747 from dataease/pr@dev@fix_panel-batch
fix(仪表板): 修复批量设置时,当出现组件叠加时底层视图的选择按钮被覆盖问题
2022-08-01 11:20:01 +08:00
wangjiahao
e4ec1338ab fix(仪表板): 修复批量设置时,当出现组件叠加时底层视图的选择按钮被覆盖问题 2022-08-01 11:18:45 +08:00
fit2cloud-chenyw
755f3986fb fix(视图-地图): 格式化地图区域映射代码 2022-08-01 11:00:08 +08:00
fit2cloud-chenyw
ed98a93e89
Merge pull request #2745 from dataease/pr@dev@fix_selector_all
fix(仪表板-下拉选择器): 全选无效
2022-08-01 10:58:03 +08:00
fit2cloud-chenyw
727bbd9649 fix(仪表板-下拉选择器): 全选无效 2022-08-01 10:54:56 +08:00
wangjiahao
d9616a22ab fix(仪表板): 修复部分组件在内嵌在tab组件中内容被遮挡问题 2022-08-01 10:15:38 +08:00
fit2cloud-chenyw
c1cbd88597
Merge pull request #2743 from dataease/pr@dev@feat_map_mapping
feat(视图-地图): 地图增加区域名称映射配置
2022-07-31 19:59:34 +08:00
fit2cloud-chenyw
ff8409883c feat(视图-地图): 地图增加区域名称映射配置 2022-07-31 19:58:29 +08:00
taojinlong
a8e816588a fix(数据源): api 数据源校验问题 2022-07-31 15:44:25 +08:00
fit2cloud-chenyw
b7f8514930
Merge pull request #2741 from dataease/pr@dev@fix_global_map_mapping
fix(视图): 地图地名映射配置以解决世界地图无法下钻
2022-07-29 18:29:36 +08:00
fit2cloud-chenyw
6d64044bbe fix(视图): 地图地名映射配置以解决世界地图无法下钻 2022-07-29 18:28:41 +08:00
wangjiahao
4b2db13671 pref: 移除未使用的npm包 2022-07-29 18:15:04 +08:00
dataeaseShu
3ae8198a66 fix: API字段校验 导航栏展开bug修复 2022-07-29 15:22:50 +08:00
wangjiahao
75a373c222 style: 跳转系统管理边距等 2022-07-29 13:19:24 +08:00
wangjiahao
d5d91b0d73 style: 替换菜单为新主题色 2022-07-29 12:05:53 +08:00
wangjiahao
d69b5756f5 fix(仪表板): 修复目录也可以通过预览编辑按钮进入仪表板编辑页面的问题 2022-07-29 11:54:29 +08:00
wangjiahao
d934726036 Merge remote-tracking branch 'origin/dev' into dev 2022-07-29 11:28:23 +08:00
wangjiahao
226d70a2ee style(仪表板): 删除仪表板增加loading效果 2022-07-29 11:28:12 +08:00
dataeaseShu
bf5de1b5ea
Merge pull request #2733 from dataease/pr@dev_user_manage
fix: 表格翻页样式统一
2022-07-29 10:35:54 +08:00
wangjiahao
81ac688970 Merge remote-tracking branch 'origin/dev' into dev 2022-07-29 10:35:06 +08:00
wangjiahao
611ffb9ccb refactor(仪表板): 下钻区域的维度也可以设置跳转 2022-07-29 10:34:53 +08:00
dataeaseShu
769ae00303 fix: 表格翻页样式统一 2022-07-29 10:34:00 +08:00
junjun
e83687c9e7 refactor(视图): 表格阈值null与空字符串合并成一个条件 2022-07-28 22:16:37 +08:00
junjun
c07b4326e3 refactor(视图): 视图计算字段限制过滤 2022-07-28 22:15:26 +08:00
fit2cloud-chenyw
a703eb3cd5 fix(仪表板-过滤器): 日期范围过滤器失效 2022-07-28 20:32:28 +08:00
dataeaseShu
2de5f85393 fix: 用户管理筛选bug修复 过滤组件添加全选 清除功能 2022-07-28 17:48:42 +08:00
wangjiahao
39f01c2ba6 Merge remote-tracking branch 'origin/dev' into dev 2022-07-28 17:37:20 +08:00
wangjiahao
9104c1e0bd refactor(仪表板): 调整设置增加维度排序,按钮样式优化 2022-07-28 17:37:09 +08:00
junjun
5ce82e474a refactor(视图): 记录数字段不应有去重计数聚合方式 2022-07-28 17:24:18 +08:00
junjun
ad93321cb0 fix(视图): 修复阈值小数类型字段图标不显示的问题 2022-07-28 16:50:29 +08:00
wangjiahao
bd956d4333 style: 更换favicon.ico图标 2022-07-28 16:15:19 +08:00
wangjiahao
1a4a3f6898 refactor(仪表板): 修改仪表板跳转设置拼接http逻辑,改为跳转时刻再进行检查拼接 2022-07-28 15:19:10 +08:00
wangjiahao
45730d47fb style(模板市场): 模板市场交互优化 2022-07-28 14:33:38 +08:00
王嘉豪
e863221a6f
Merge pull request #2723 from dataease/fix_panel-jump
refactor(xpack): 权限管理交互优化
2022-07-28 11:09:38 +08:00
wangjiahao
c14c0a9cba refactor(xpack): 权限管理交互优化 2022-07-28 11:09:05 +08:00
dataeaseShu
8ec64258b3 fix: 按钮hover修改 国际化 2022-07-27 12:25:08 +08:00
junjun
24e8c300f5 fix(视图): 修复计算字段下钻异常 2022-07-27 10:47:44 +08:00
fit2cloud-chenyw
f1cead9943
Merge pull request #2711 from dataease/pr@dev@fix_filter_select_search
fix(仪表板): 下拉框模糊搜索逻辑错误
2022-07-26 23:00:11 +08:00
fit2cloud-chenyw
d51cf1d55e fix(仪表板): 下拉框模糊搜索逻辑错误 2022-07-26 22:58:21 +08:00
王嘉豪
de9e0cef90
Merge pull request #2709 from dataease/fix_panel-jump
style(权限管理): 交互优化
2022-07-26 20:38:44 +08:00
wangjiahao
c96c84e0c4 style(权限管理): 交互优化 2022-07-26 20:36:46 +08:00
fit2cloud-chenyw
886fd3703c fix(系统管理): 系统参数基础设置消息保留时间正则验证规则错误 2022-07-26 20:21:02 +08:00
fit2cloud-chenyw
2d1a657977 fix(视图): 禁用echarts地图提示触发位置 2022-07-26 19:52:12 +08:00
taojinlong
a2a201f561 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-26 18:23:32 +08:00