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

3974 Commits

Author SHA1 Message Date
fit2cloud-chenyw
896a89b813 fix(系统管理-系统参数): 登录限制表单验证允许1-100正整数 2022-09-26 10:41:39 +08:00
junjun
b7f97270cc Merge remote-tracking branch 'origin/dev' into dev 2022-09-26 10:36:02 +08:00
junjun
b1f7e833ca feat(视图): 堆叠项支持自定义排序 2022-09-26 10:35:46 +08:00
dataeaseShu
e40aba37a2 Merge branch 'dev' into pr@dev_dataset_source 2022-09-26 10:10:54 +08:00
dataeaseShu
8f90e9bfe2 fix: 数据集总条数 数据集加载loading 2022-09-26 10:09:52 +08:00
xuwei-fit2cloud
5c64231937
Merge pull request #3172 from dataease/pr@dev@refactor-i18n 
refactor: 修改国际化文案
 2022-09-26 10:02:56 +08:00
wangjiahao
4356d01c33 refactor: 修改国际化文案 2022-09-23 18:31:49 +08:00
王嘉豪
e14850e688
Merge pull request #3171 from dataease/pr@dev@fix_text-component 
fix(仪表板): 优化文字组件修改字号时数字变动异常 #3099
 2022-09-23 18:14:18 +08:00
wangjiahao
4b4e9f135f fix(仪表板): 优化文字组件修改字号时数字变动异常 #3099 2022-09-23 18:12:52 +08:00
wangjiahao
feb67dba6e fix(仪表板): 修复汇总表配置跳转字段后切换明细表跳转字段未清空 2022-09-23 18:10:03 +08:00
dataeaseShu
e39dd4fe8a fix: 字段管理国际化 2022-09-23 17:49:28 +08:00
dataeaseShu
e0fe611948 fix: 路由冲突 2022-09-23 16:27:12 +08:00
dataeaseShu
269c6334d8 Merge branch 'dev' into pr@dev_dataset_source 2022-09-23 15:00:15 +08:00
dataeaseShu
e656b04b24 fix: 视图过滤 边框色值问题 2022-09-23 14:59:29 +08:00
王嘉豪
24faf0c463
Merge branch 'dev' into pr@dev@fix_router-change 2022-09-23 14:28:03 +08:00
wangjiahao
7f0c749601 fix(系统配置): 修复外观配置菜单切换导致路由刷新问题 2022-09-23 14:14:32 +08:00
xuwei-fit2cloud
8717f51cf3
Merge pull request #3161 from dataease/pr@dev_dataset_source 
Pr@dev dataset source
 2022-09-23 13:08:59 +08:00
xuwei-fit2cloud
a503fe1937
Merge pull request #3162 from dataease/pr@dev@refactor-system-setting 
refactor(系统配置): 系统配置菜单拆分
 2022-09-23 13:06:23 +08:00
wangjiahao
ea17177c08 refactor(系统配置): 系统配置菜单拆分 2022-09-23 12:46:39 +08:00
dataeaseShu
ffc8271611 fix: 数据集创建 返回对应的数据集 数据源bug 路由切换bug 2022-09-23 11:17:18 +08:00
dataeaseShu
f7f8f0ab1b fix: 数据源类型 布局 2022-09-22 16:21:07 +08:00
dataeaseShu
962c1b8be9 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 14:58:07 +08:00
dataeaseShu
d90a49716c fix: 插件国际化 表格记忆select 2022-09-22 14:57:38 +08:00
王嘉豪
6fe510c93d
Merge pull request #3153 from dataease/pr@dev@feat_view_margin_setting 
feat(视图): echarts视图外边距设置
 2022-09-22 14:44:21 +08:00
fit2cloud-chenyw
fcba8662b4
Merge pull request #3150 from dataease/pr@dev_dataset_source 
Pr@dev dataset source
 2022-09-22 14:40:45 +08:00
fit2cloud-chenyw
aa2cb5eb77 feat(视图): echarts视图外边距设置 2022-09-22 14:20:24 +08:00
junjun
8859f4c017 refactor(视图): 阈值默认背景色调整 2022-09-22 11:46:26 +08:00
dataeaseShu
dd5ce34902 fix: 预览数据 滚动条问题修复 2022-09-22 11:25:31 +08:00
dataeaseShu
bfc6c323a7 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 09:50:43 +08:00
dataeaseShu
cf832dde75 fix: 删除注释 2022-09-22 09:48:14 +08:00
fit2cloud-chenyw
f342b8faf7 Merge pull request #3143 from dataease/pr@dev@style_wizard 
style(首页): 替换二维码，修改欢迎文案
 2022-09-22 08:55:58 +08:00
wangjiahao
fc27e5bf83 style(首页): 替换二维码，修改欢迎文案 2022-09-21 18:26:01 +08:00
dataeaseShu
af84c4d6c5 Merge branch 'dev' into pr@dev_dataset_source 2022-09-21 17:33:09 +08:00
dataeaseShu
0d4d49ae05 fix: 数据集 主题页面返回保持状态 保存数据集 添加loading 修复部分bug 2022-09-21 17:32:03 +08:00
Junjun
1db2cf03e7
Merge pull request #3138 from dataease/pr@dev@feat_view_slider_style 
feat(视图): 缩略图增加样式配置
 2022-09-21 17:17:46 +08:00
fit2cloud-chenyw
f773a3109f feat(视图): 缩略图增加样式配置 2022-09-21 17:09:16 +08:00
fit2cloud-chenyw
b4793c7ab8
Merge pull request #3137 from dataease/pr@dev@refactor_title-change 
refactor: 优化标题修改，防止修改标题时切换视图出现修改标题与视图不对应情况
 2022-09-21 15:52:39 +08:00
wangjiahao
19128021f9 refactor: 优化标题修改，防止修改标题时切换视图出现修改标题与视图不对应情况 2022-09-21 15:44:53 +08:00
王嘉豪
221cc0c3e7
Merge pull request #3134 from dataease/pr@dev@feat_user_assist 
feat(系统管理-用户管理): 增加辅助信息包含第三方平台账号
 2022-09-21 14:49:24 +08:00
Junjun
8462368a2c
Merge pull request #3133 from dataease/pr@dev_dataset_source 
Pr@dev dataset source
 2022-09-21 14:46:20 +08:00
fit2cloud-chenyw
e568ef88ed
Merge pull request #3136 from dataease/pr@dev@feat_threshold_between 
feat(视图): 阈值支持介于
 2022-09-21 14:35:25 +08:00
fit2cloud-chenyw
6360b82430
Merge branch 'dev' into pr@dev@feat_user_assist 2022-09-21 14:28:06 +08:00
fit2cloud-chenyw
218fc8f879
Merge pull request #3132 from dataease/pr@dev@refactor_user-add 
refactor: 新建用户支持不设置用户角色
 2022-09-21 14:24:25 +08:00
junjun
c6c6d9accf feat(视图): 阈值支持介于 2022-09-21 14:12:09 +08:00
fit2cloud-chenyw
bf5bf82a30 feat(系统管理-用户管理): 增加辅助信息包含第三方平台账号 2022-09-21 14:01:02 +08:00
dataeaseShu
50826c672d Merge branch 'dev' into pr@dev_dataset_source 2022-09-21 11:57:33 +08:00
dataeaseShu
21a953eafb fix: 数据源页面刷新路由参数持久化 数据集保存跳转 bug修复 2022-09-21 11:55:39 +08:00
wangjiahao
cfd30ffa87 refactor: 新建用户支持不设置用户角色 2022-09-21 10:55:46 +08:00
taojinlong
d9d5c1cd08 refactor: 格式化 2022-09-20 17:41:45 +08:00
taojinlong
d522122fb2 fix: 数据源详情,数据集预览 2022-09-20 17:13:21 +08:00
fit2cloud-chenyw
32ad6c7613
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 16:49:07 +08:00
xuwei-fit2cloud
18f03ab7c6
Merge pull request #3124 from dataease/pr@dev@perf_view_bg_color 
style(视图): 下钻区域以及地图缩放文字跟随视图背景改变
 2022-09-20 16:28:28 +08:00
fit2cloud-chenyw
7eac3fa0a6 style(视图): 下钻区域以及地图缩放文字跟随视图背景改变 2022-09-20 16:24:50 +08:00
dataeaseShu
b19a20f2e7 Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 16:15:50 +08:00
dataeaseShu
9e5b36dc46 Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 16:15:09 +08:00
xuwei-fit2cloud
b5f70711e5
Merge pull request #3120 from dataease/pr@dev@perf_filter_placeholder 
perf(仪表板-过滤器): 过滤器提示文案
 2022-09-20 16:03:38 +08:00
junjun
558d328c52 style(视图): 样式调整 2022-09-20 15:59:15 +08:00
dataeaseShu
aba68be35b feat: 数据参考 excel 同名校验 国际化 2022-09-20 15:56:02 +08:00
fit2cloud-chenyw
70f423a6fc perf(仪表板-过滤器): 过滤器提示文案 2022-09-20 15:11:53 +08:00
fit2cloud-chenyw
dd7c3d12ac
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 14:45:37 +08:00
Junjun
e9e9d27456
Merge pull request #3118 from dataease/pr@dev@refactor_panel-copy-style 
refactor(仪表板): 复用视图支持适配当前仪表板样式
 2022-09-20 14:44:10 +08:00
wangjiahao
0b3d3257ea refactor(仪表板): 复用视图支持适配当前仪表板样式 2022-09-20 14:29:21 +08:00
fit2cloud-chenyw
f2c238798d feat(系统管理-用户管理): 登录限制以及解锁用户 2022-09-20 14:26:15 +08:00
xuwei-fit2cloud
f38b0023ca
Merge pull request #3114 from dataease/refactor@dev@refactor_panel-details 
refactor(仪表板): 仪表板详情弹框显示用户别名
 2022-09-20 13:42:44 +08:00
dataeaseShu
59a605c0c9
feat: 数据集 数据源优化 
* feat: 数据集 数据源优化

* feat: 国际化

* feat: 格式化

* feat: 国际化修正 合并代码
 2022-09-20 11:53:57 +08:00
wangjiahao
4602c25fef refactor(仪表板): 优化仪表板为空的提示显示 2022-09-20 11:26:49 +08:00
dataeaseShu
80d7f2927a feat: 国际化修正 合并代码 2022-09-20 11:19:28 +08:00
dataeaseShu
f88d771dec Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 10:45:16 +08:00
xuwei-fit2cloud
f4e1a28b40
Merge pull request #3110 from dataease/pr@dev@csv 
feat: 支持 csv 文件
 2022-09-20 10:00:29 +08:00
xuwei-fit2cloud
4906dcceef
Merge pull request #3111 from dataease/pr@dev@feat_app-template 
feat: 支持应用市场，支持应用导入导出
 2022-09-20 09:59:20 +08:00
wangjiahao
2217d46a8d refactor(仪表板): 仪表板详情弹框显示用户别名 2022-09-19 18:47:15 +08:00
wangjiahao
47a290b258 fix(应用市场): 应用市场格式化等问题修复 2022-09-19 18:16:54 +08:00
wangjiahao
9da3990f25 fix(应用市场): 应用市场格式化等问题修复 2022-09-19 18:13:23 +08:00
taojinlong
66933da1e9 fix: 数据源检测时间超出范围后，置为初始值 2022-09-19 17:52:49 +08:00
dataeaseShu
3c00869a82 Merge branch 'dev' into pr@dev_dataset_source 2022-09-19 17:51:46 +08:00
dataeaseShu
d15df05326 feat: 格式化 2022-09-19 17:51:06 +08:00
wangjiahao
d634950272 feat: 支持应用市场，支持应用导入导出 2022-09-19 17:07:50 +08:00
dataeaseShu
bb4577a235 feat: 国际化 2022-09-19 16:18:38 +08:00
dataeaseShu
eb367e1c09 Merge branch 'dev' into pr@dev_dataset_source 2022-09-19 16:14:37 +08:00
dataeaseShu
12450afa56 feat: 数据集 数据源优化 2022-09-19 16:13:39 +08:00
taojinlong
23a4bb200f feat: 支持 csv 文件 2022-09-19 16:11:14 +08:00
junjun
f885bcd4e2 feat(视图): 堆叠项支持自定义排序 2022-09-19 15:08:06 +08:00
fit2cloud-chenyw
8624131415 style(登录): 登录页面二维码样式 2022-09-16 17:02:34 +08:00
fit2cloud-chenyw
9df4f4f2fd fix(登录): 扫码登录失败错误提示 2022-09-16 11:18:34 +08:00
fit2cloud-chenyw
36016f16dc style(登录): 登录页面样式 2022-09-16 10:59:23 +08:00
junjun
048e18d319 feat(视图): 辅助线支持动态值 2022-09-16 10:56:06 +08:00
fit2cloud-chenyw
5fc7ac3ae6 style(登录): 登录页二维码切换回密码登录按钮样式 2022-09-15 18:39:00 +08:00
junjun
efac2b381a feat(视图): 辅助线支持动态值 2022-09-15 17:22:02 +08:00
junjun
15f6ccde14 feat(视图): 辅助线支持动态值 2022-09-15 17:19:07 +08:00
junjun
f61c196dec feat(视图): 表头表格字体颜色分开设置 2022-09-15 11:07:11 +08:00
junjun
9554e06767 perf(i18n): 国际化 2022-09-14 18:17:56 +08:00
fit2cloud-chenyw
c93dd1c59d
Merge pull request #3078 from dataease/pr@dev@perf_email_task_channel 
perf(系统管理-定时报告): 增加消息渠道
 2022-09-14 17:13:06 +08:00
fit2cloud-chenyw
3ac50f7d39 perf(系统管理-定时报告): 增加消息渠道 2022-09-14 17:12:23 +08:00
taojinlong
6132e129e3 feat: 自定义数据源检测间隔 2022-09-14 16:37:32 +08:00
taojinlong
674abcb203 feat: 自定义数据源检测时间 2022-09-14 16:33:47 +08:00
junjun
f03eaffa9e feat(视图): 辅助线支持动态值 2022-09-14 13:59:56 +08:00
junjun
f0041ac649 fix(视图): 指标卡没有数值时显示横线 2022-09-13 13:37:18 +08:00
fit2cloud-chenyw
aeb7d3ab91 fix(系统管理-用户管理): 用户来源错误 2022-09-09 13:41:37 +08:00
fit2cloud-chenyw
3c74bf97c0 feat(系统管理-消息中心): 增加第三方消息平台 2022-09-09 12:32:51 +08:00
wangjiahao
b0720c1c6f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V40__1.15.sql
 2022-09-08 18:30:14 +08:00
wangjiahao
522d33b2db feat: 仪表板支持应用导出 2022-09-08 18:29:34 +08:00
fit2cloud-chenyw
faef8ffda5 feat(数据集): 增加数据集表单路由页面 2022-09-08 18:02:12 +08:00
taojinlong
ea2be9a003 fix: API数据源数据结构优化 2022-09-08 11:01:42 +08:00
taojinlong
1599b9f231 refactor: 去掉打印信息 2022-09-07 21:54:03 +08:00
junjun
ad07ea00a1 feat(视图): 透视表合计小计支持多种聚合方式 2022-09-07 16:09:59 +08:00
taojinlong
a30c66a752 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-07 14:49:39 +08:00
fit2cloud-chenyw
0269eabcfe feat(系统管理-系统参数): 飞书配置 2022-09-07 14:46:06 +08:00
taojinlong
570156d5f6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-07 10:28:10 +08:00
taojinlong
7cc270c2c0 feat: sql变量 支持 时间类型 2022-09-07 10:21:45 +08:00
fit2cloud-chenyw
02ffc08b47 style(登录): 二维码容器高度固定 2022-09-06 18:31:01 +08:00
fit2cloud-chenyw
6da72042c5 feat(系统管理-系统参数): 钉钉配置 2022-09-06 15:42:55 +08:00
fit2cloud-chenyw
f6dbf5ffb3
Merge pull request #3040 from dataease/pr@dev@feat_ds_form_router 
feat(数据源): 新增数据源表单路由
 2022-09-05 11:38:04 +08:00
fit2cloud-chenyw
39b619a6ad feat(数据源): 新增数据源表单路由 2022-09-05 11:37:20 +08:00
taojinlong
833ff72132 refactor: 升级版本号 2022-09-05 10:47:49 +08:00
fit2cloud-chenyw
588d69db39 perf(系统管理-系统参数): 优化企业微信设置 2022-09-02 17:11:06 +08:00
fit2cloud-chenyw
de12b94158 feat(系统管理-系统参数): 企业微信设置 2022-09-01 17:13:38 +08:00
dataeaseShu
460cf72080 fix: 执行记录数据集筛选 2022-09-01 07:59:42 +08:00
dataeaseShu
6b593682a0 fix: api数据源 展开错行 2022-09-01 07:59:08 +08:00
dataeaseShu
ee1283326e Merge branch 'dev' into pr@dev_station_msg 2022-08-31 23:56:22 +08:00
dataeaseShu
eb6ec58cfb fix: 用户筛选国际化 2022-08-31 23:55:04 +08:00
dataeaseShu
bc36300c06 fix: 执行记录信息提示 2022-08-31 23:54:37 +08:00
dataeaseShu
fc0934d240 fix: 操作日志筛选 2022-08-31 23:53:53 +08:00
dataeaseShu
950024225c fix: 未读信息按钮状态 2022-08-31 23:53:31 +08:00
dataeaseShu
9b260f53ac fix: 管理员不可删除 2022-08-31 23:51:35 +08:00
fit2cloud-chenyw
004054f3ba fix(视图-s2表格): 预览s2表格后切换到空仪表板拖动浏览器控制台报错 2022-08-31 22:33:48 +08:00
fit2cloud-chenyw
72d1c316e3
Merge pull request #3024 from dataease/pr@dev@fix_map_init_style 
fix(视图-地图): 深色主题新建地图缩放按钮依然是浅色
 2022-08-31 21:41:08 +08:00
fit2cloud-chenyw
c9f72476ab fix(视图-地图): 深色主题新建地图缩放按钮依然是浅色 2022-08-31 21:40:14 +08:00
dataeaseShu
e0b4c668d6 fix: 任务管理 筛选bug 2022-08-31 21:31:48 +08:00
dataeaseShu
841eaf1489 fix: 默认系统主题优化 2022-08-31 21:31:01 +08:00
dataeaseShu
f5bdc4aa29 fix: 模版管理 删除bug 2022-08-31 21:30:18 +08:00
dataeaseShu
807a78bec0 fix: 添加用户 背景色添加 2022-08-31 21:29:42 +08:00
dataeaseShu
d4ed421955 fix: 定时任务样式统一 2022-08-31 21:28:42 +08:00
dataeaseShu
1ba1c30355 Merge branch 'dev' into pr@dev_station_msg 2022-08-31 18:41:38 +08:00
dataeaseShu
52497a0aeb fix: 任务管理优化 2022-08-31 18:39:25 +08:00
fit2cloud-chenyw
6c8e3594c3
Merge branch 'dev' into pr@dev@fix_import_user_error_tip 2022-08-31 18:14:12 +08:00
fit2cloud-chenyw
41169bf62e fix(系统管理-用户管理): 导入用户错误提示 2022-08-31 18:07:40 +08:00
wangjiahao
630087dc91 style: Tab组件中富文本视图不需显示明显放大按钮 2022-08-31 17:23:39 +08:00
wangjiahao
f32663b298 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 16:56:45 +08:00
wangjiahao
193423bb98 refactor: 样式设置缩略图增加分类部署读取方式 2022-08-31 16:56:34 +08:00
taojinlong
549ee2a4ad refactor(数据集): 国际化 2022-08-31 16:39:46 +08:00
wangjiahao
d86a9b46f1 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 16:23:34 +08:00
wangjiahao
742fdf422a style(仪表板): 辅助网格按钮样式修改 2022-08-31 16:23:21 +08:00
dataeaseShu
6871a6b005 Merge branch 'dev' into pr@dev_station_msg 2022-08-31 16:16:06 +08:00
dataeaseShu
0ba75bb98c fix: 筛选组件 国际化优化 2022-08-31 16:13:59 +08:00
taojinlong
7d2b885764 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-31 15:59:24 +08:00
taojinlong
13b87ea796 refactor(国际化): 梳理国际化 2022-08-31 15:59:12 +08:00
fit2cloud-chenyw
13987e32a6 fix(仪表板-下拉列表过滤器): 清空按钮触发不能重置下拉列表的全选框 2022-08-31 15:19:09 +08:00
fit2cloud-chenyw
222ba6565d fix(仪表板-过滤器): 仪表板编辑状态下切换移动布局再切回来过滤器逻辑错误 2022-08-31 14:47:44 +08:00
王嘉豪
21c1402907
Merge pull request #3012 from dataease/pr@dev@style_view 
style(视图): 富文本视图编辑区去掉维度指标前斜杠
 2022-08-31 14:28:51 +08:00
wangjiahao
32b5c935c3 style(视图): 富文本视图编辑区去掉维度指标前斜杠 2022-08-31 14:24:55 +08:00