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

4211 Commits

Author SHA1 Message Date
taojinlong
286ddba437
fix(数据源): 展示表的字段类型 2022-10-06 14:07:22 +08:00
taojinlong
86e0fa35d3
fix(数据源): 展示表的字段类型 2022-10-06 13:51:00 +08:00
taojinlong
783839e02e
fix(数据源): 展示表的字段类型 2022-10-06 13:30:45 +08:00
xuwei-fit2cloud
2c4c5bd77f
Merge pull request #3285 from dataease/pr@dev@fix_panel-web-component 
fix(仪表板): 修复网页组件在画布左上角时过滤组件和其他组件拖入仪表板事件被覆盖问题
 2022-09-30 18:06:37 +08:00
taojinlong
7f2e9d942f fix(数据集): 新建增量更新任务后，sql不显示 2022-09-30 17:57:25 +08:00
wangjiahao
1e3350dab0 fix(仪表板): 修复网页组件在画布左上角时过滤组件和其他组件拖入仪表板事件被覆盖问题 2022-09-30 17:39:46 +08:00
xuwei-fit2cloud
10c822df10
Merge pull request #3283 from dataease/pr@dev@fix_component_button_menu 
fix(仪表板): 删除按钮组件的组件样式和超链接菜单
 2022-09-30 16:48:08 +08:00
fit2cloud-chenyw
437d251fa0 fix(仪表板): 删除按钮组件的组件样式和超链接菜单 2022-09-30 16:42:22 +08:00
xuwei-fit2cloud
7cac048585
Merge pull request #3281 from dataease/pr@dev@fix_tab-copy 
fix(仪表板): 修复部分仪表板复用tab组件时，复制的颜色边框值显示不正确问题
 2022-09-30 16:23:13 +08:00
junjun
b5cbed8cc3 refactor(视图): 辅助线聚合方式优化 2022-09-30 16:10:31 +08:00
wangjiahao
c57861c602 fix(仪表板): 修复部分仪表板复用tab组件时，复制的颜色边框值显示不正确问题 2022-09-30 16:09:36 +08:00
dataeaseShu
15c5e4ef65 Merge branch 'dev' into pr@dev_dataset_bugfix 2022-09-30 15:56:44 +08:00
dataeaseShu
00b097dde4 fix: 1.首次添加API数据源输入名称-点击添加时页面未正常跳转 2. api数据集，新建数据表的时候，提示会重叠 3.更换数据源图标 2022-09-30 15:52:10 +08:00
taojinlong
c84255181f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-30 12:10:15 +08:00
taojinlong
fe84c366d4 fix(数据更新): 【数据集】创建增量定时任务输入后定时任务语句就没了 2022-09-30 12:09:56 +08:00
dataeaseShu
c5d76247f0 fix: 创建数据集左侧列表可拉宽 保存数据集校验 数据请求添加loading 2022-09-30 11:26:37 +08:00
taojinlong
f279b673e1 fix: API 数据集名称校验 2022-09-30 11:18:19 +08:00
fit2cloud-chenyw
9192ef96b1 fix(视图): 设置tab背景对内部地图文字无效 2022-09-30 08:51:23 +08:00
Junjun
cfbce4f4bc
Merge pull request #3265 from dataease/pr@dev@refactor_dataset-info 
refactor(数据集): 数据集信息界面创建人显示为别名
 2022-09-29 17:40:29 +08:00
wangjiahao
6b885857ad refactor(数据集): 数据集信息界面创建人显示为别名 2022-09-29 17:33:30 +08:00
dataeaseShu
00e43659a2 Merge branch 'dev' into pr@dev_dataset_source 2022-09-29 16:50:52 +08:00
dataeaseShu
1df2a60691 fix: db api数据集不可选图标更换 数据源滚动条去除 2022-09-29 16:49:58 +08:00
taojinlong
dda88f9312 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-29 16:44:06 +08:00
taojinlong
42e5384fb5 fix: oracel sql 参数报错 2022-09-29 16:43:53 +08:00
xuwei-fit2cloud
c79e6916cc
Merge pull request #3259 from dataease/pr@dev@refactor_text 
refactor(视图): 轴值中刻度间隔文案优化
 2022-09-29 16:05:30 +08:00
wangjiahao
ead9940bf2 refactor(仪表板): 仪表板信息弹窗修改人显示别名 2022-09-29 15:08:57 +08:00
taojinlong
88abb0151d fix: 简单重复可编辑 2022-09-29 15:06:17 +08:00
taojinlong
6c6b7d0504 fix: 国际化 2022-09-29 15:06:12 +08:00
junjun
8ed84706a0 refactor(视图): 轴值中刻度间隔文案优化 2022-09-29 14:50:18 +08:00
xuwei-fit2cloud
4ed736ae2e
Merge pull request #3257 from dataease/pr@dev@refactor_view-field-copy 
fix(视图): 修复视图计算字段跟随视图复制后出现告警提示的问题
 2022-09-29 14:46:59 +08:00
wangjiahao
2ec92e32cf fix(视图): 修复视图计算字段跟随视图复制后出现告警提示的问题 2022-09-29 14:34:02 +08:00
dataeaseShu
15fb1516c8 Merge branch 'dev' into pr@dev_dataset_source 2022-09-29 14:15:43 +08:00
dataeaseShu
8349fccf43 fix: 数据源布局，编辑驱动bug 修复 2022-09-29 14:14:40 +08:00
fit2cloud-chenyw
091fd073af fix(视图): 编辑状态改变视图背景地图中文字没有及时变色 2022-09-29 13:54:22 +08:00
xuwei-fit2cloud
d139c7827f
Merge pull request #3250 from dataease/pr@dev@style_symbol_map_dialog 
style(视图): 符号地图弹出放大视图样式错位
 2022-09-29 10:22:06 +08:00
xuwei-fit2cloud
e7851f9f7d
Merge pull request #3249 from dataease/pr@dev@fix_filter_tree 
fix(过滤器): 树过滤器多选模式下选择部分节点再全选对目标视图无效
 2022-09-29 10:19:23 +08:00
fit2cloud-chenyw
f17bbbc20e style(视图): 符号地图弹出放大视图样式错位 2022-09-29 10:08:12 +08:00
fit2cloud-chenyw
0d9de24226 fix(过滤器): 树过滤器多选模式下选择部分节点再全选对目标视图无效 2022-09-29 09:47:36 +08:00
xuwei-fit2cloud
d5a6e82891
Merge pull request #3248 from dataease/pr@dev@fix_filter_title 
fix(过滤器): 标题设置后隐藏再开启被清空
 2022-09-29 09:36:22 +08:00
xuwei-fit2cloud
ff3d1bf8b0
Merge pull request #3247 from dataease/pr@dev@fix_filter_auth 
fix(过滤器): 非管理员删除过滤器字段报错无权限
 2022-09-29 09:35:51 +08:00
fit2cloud-chenyw
4157957f85 fix(过滤器): 标题设置后隐藏再开启被清空 2022-09-28 22:51:11 +08:00
fit2cloud-chenyw
27b2af4813 fix(过滤器): 非管理员删除过滤器字段报错无权限 2022-09-28 22:42:24 +08:00
fit2cloud-chenyw
81a8bba8fa fix(视图): echarts缩略图背景样式 2022-09-28 22:14:25 +08:00
xuwei-fit2cloud
72a9e12c55
Merge pull request #3241 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-09-28 17:55:28 +08:00
taojinlong
020b221435 fix: 国际化翻译 2022-09-28 17:54:41 +08:00
taojinlong
c752f9c889 fix: 校验数据源时间间隔 2022-09-28 17:50:35 +08:00
dataeaseShu
557b59f550 fix: 任务管理数据集更改 及联组件添加icon 2022-09-28 17:43:51 +08:00
taojinlong
575929f69a fix: 创建目录去除空格 2022-09-28 17:10:23 +08:00
taojinlong
480ab0e36b refactor: 修改 excel 提示信息 2022-09-28 16:51:40 +08:00
dataeaseShu
3fbfc1bdce Merge branch 'dev' into pr@dev_dataset_source 2022-09-28 16:42:01 +08:00
dataeaseShu
d902c7807d fix: 数据源 数据集 bugfix 2022-09-28 16:41:20 +08:00
taojinlong
d9462d4643 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-28 16:20:38 +08:00
taojinlong
c02ff7e1e6 fix: API 数据集预览 2022-09-28 16:20:29 +08:00
taojinlong
83c296b3f0
Merge branch 'dev' into pr@dev@dataset 2022-09-28 16:19:00 +08:00
taojinlong
a52e75b18c
Merge pull request #3237 from dataease/pr@dev@refactor_grid-button 
fix(仪表板): 修复辅助网格开启按钮状态显示问题
 2022-09-28 15:52:17 +08:00
taojinlong
14f206493a refactor: nikeName -> nickName 2022-09-28 15:45:36 +08:00
wangjiahao
36ad92d06b fix(仪表板): 修复辅助网格开启按钮状态显示问题 2022-09-28 15:42:55 +08:00
junjun
101c5952c4 fix(视图): echarts辅助线报错 2022-09-28 15:26:46 +08:00
wangjiahao
d74cd5ba63 refactor: 优化字体大小限制，防止过滤组件标题被隐藏 2022-09-28 15:23:50 +08:00
wangjiahao
bd38da01db refactor: 优化字体大小限制，防止过滤组件标题被隐藏 2022-09-28 15:18:43 +08:00
xuwei-fit2cloud
81beaaccbd
Merge pull request #3232 from dataease/pr@dev@fix_user_bind_error 
fix(个人信息): 扫码绑定第三方平台错误信息提示
 2022-09-28 15:09:15 +08:00
junjun
e5a60ac653 fix(视图): 修复没有指标时编辑辅助线报错 2022-09-28 15:02:09 +08:00
taojinlong
bf118ffb7a fix: 系统参数页面调整间隔 2022-09-28 14:47:36 +08:00
fit2cloud-chenyw
94bfe751ad fix(个人信息): 扫码绑定第三方平台错误信息提示 2022-09-28 14:44:31 +08:00
junjun
5a4b2aea1f refactor(数据集): 计算字段UI调整 2022-09-28 14:39:00 +08:00
taojinlong
3255cfb449 fix: API 数据集字段类型展示 2022-09-28 13:36:27 +08:00
xuwei-fit2cloud
75f0617402
Merge pull request #3230 from dataease/pr@dev_dataset_source 
Pr@dev dataset source
 2022-09-28 13:34:00 +08:00
xuwei-fit2cloud
ba33092c8c
Merge pull request #3229 from dataease/pr@dev@refactor_dataset-icon 
refactor: 优化数据集字段类型图标
 2022-09-28 13:31:55 +08:00
dataeaseShu
c6cbc5c666 Merge branch 'dev' into pr@dev_dataset_source 2022-09-28 13:05:24 +08:00
dataeaseShu
be33456b17 fix: 数据集 数据源bugfix 2022-09-28 13:04:06 +08:00
wangjiahao
7a58d274a7 refactor: 优化数据集字段类型图标 2022-09-28 11:56:33 +08:00
xuwei-fit2cloud
efd06148f2
Merge pull request #3228 from dataease/pr@dev@perf_user_bind 
perf(个人信息): 第三方平台绑定DE用户
 2022-09-28 11:53:54 +08:00
fit2cloud-chenyw
0891e0aff0 perf(个人信息): 第三方平台绑定DE用户 2022-09-28 11:50:35 +08:00
xuwei-fit2cloud
ce30b34e5c
Merge pull request #3227 from dataease/pr@dev@refactor_dataset 
refactor: 优化国际化文案
 2022-09-28 11:38:56 +08:00
xuwei-fit2cloud
fdc5d8dcd8
Merge pull request #3224 from dataease/pr@dev@dataset 
fix: 不同的sql 数据集参数同名
 2022-09-28 11:37:35 +08:00
xuwei-fit2cloud
742ba72996
Merge pull request #3225 from dataease/pr@dev@refactor_echarts-table 
refactor: 屏蔽echarts表格联动和跳转设置入口
 2022-09-28 11:36:30 +08:00
wangjiahao
9367a535c5 refactor: 优化国际化文案 2022-09-28 11:21:07 +08:00
wangjiahao
f4cb7e8533 refactor: 屏蔽echarts表格联动和跳转设置入口 2022-09-28 10:48:17 +08:00
taojinlong
9546d512cf fix: 不同的sql 数据集参数同名 2022-09-28 10:26:34 +08:00
Junjun
b662480244
Merge pull request #3222 from dataease/pr@dev@perf_user_editor 
perf(用户管理): 删除第三方平台信息
 2022-09-27 18:33:30 +08:00
fit2cloud-chenyw
a107d1d432 perf(用户管理): 删除第三方平台信息 2022-09-27 18:24:44 +08:00
Junjun
d01105cbd7
Merge pull request #3221 from dataease/pr@dev@revert_app-export 
revert: 屏蔽应用导出按钮
 2022-09-27 18:23:39 +08:00
wangjiahao
3a09b072f1 revert: 屏蔽应用导出按钮 2022-09-27 18:18:59 +08:00
taojinlong
5b2af3bba3
Merge branch 'dev' into pr@dev_dataset_source 2022-09-27 18:16:24 +08:00
王嘉豪
20f55de450
Merge pull request #3212 from dataease/pr@dev@datasource 
fix(数据集): sql数据集修改字段先后顺序后，预览不起作用 #3062
 2022-09-27 18:13:43 +08:00
xuwei-fit2cloud
17cb5285ba
Merge pull request #3213 from dataease/pr@dev@fix_view_margin_limit 
fix(视图): 外边距可以输入限制以外的数字
 2022-09-27 18:07:11 +08:00
xuwei-fit2cloud
d22a2a1e2e
Merge pull request #3214 from dataease/pr@dev@perf_view_margin_inherit 
perf(视图): 新建视图外边距继承了之前编辑的视图
 2022-09-27 18:05:59 +08:00
fit2cloud-chenyw
f5ca282259 fix(仪表板): 过滤器标题隐藏后再开启被清空 2022-09-27 17:53:45 +08:00
dataeaseShu
e5f4656a91 Merge branch 'dev' into pr@dev_dataset_source 2022-09-27 17:47:54 +08:00
dataeaseShu
5f026e7533 fix: 数据源 数据集 bug修复 2022-09-27 17:46:51 +08:00
fit2cloud-chenyw
d7d576d021 perf(视图): 新建视图外边距继承了之前编辑的视图 2022-09-27 17:41:04 +08:00
fit2cloud-chenyw
85b6529fde fix(视图): 外边距可以输入限制以外的数字 2022-09-27 17:28:43 +08:00
taojinlong
88cf3bc4eb fix(数据集): sql数据集修改字段先后顺序后，预览不起作用 #3062 2022-09-27 17:25:35 +08:00
taojinlong
106958327e fix(API数据源): 没有子项的字段置灰 2022-09-27 17:25:31 +08:00
taojinlong
888ca2307b fix(API数据源): 请求体没有更新 #3067 2022-09-27 17:25:28 +08:00
xuwei-fit2cloud
2532483a85
Merge pull request #3208 from dataease/pr@dev@perf_view_margin 
perf(视图): 删除echarts分布式视图以及漏斗图外边距设置
 2022-09-27 17:15:30 +08:00
fit2cloud-chenyw
31dc2e48e8 fix(登录限制): 限制登录次数填写保存后再次编辑出现验证逻辑错误 2022-09-27 17:12:04 +08:00
fit2cloud-chenyw
ca479a4a6f perf(视图): 删除echarts分布式视图以及漏斗图外边距设置 2022-09-27 16:43:33 +08:00
wisonic-s
3669b2d25d feat(视图): 百分比堆叠柱状图 
【视图】增加百分比堆叠柱形图 https://www.tapd.cn/55578866/prong/stories/view/1155578866001004505
 2022-09-27 15:58:01 +08:00
xuwei-fit2cloud
5969ded4a9
Merge pull request #3202 from dataease/pr@dev@fix_template-manage 
fix(模板管理): 修复删除模板分类列表未刷新问题
 2022-09-27 15:45:34 +08:00
fit2cloud-chenyw
3ef3216530 fix(视图): echarts指标类型以及空间类型视图删除外边距设置 2022-09-27 15:18:22 +08:00
wangjiahao
87306c41be fix(模板管理): 修复删除模板分类列表未刷新问题 2022-09-27 15:12:22 +08:00
fit2cloud-chenyw
ebf36f8464 fix(视图): echarts外边距设置 2022-09-27 14:38:52 +08:00
王嘉豪
4b8b1aaf5d
Merge pull request #3197 from dataease/pr@dev@fix_display_i18n 
fix(外观配置): 首页链接格式错误提示国际化
 2022-09-27 14:07:03 +08:00
fit2cloud-chenyw
d64ecf8bc5 fix(外观配置): 首页链接格式错误提示国际化 2022-09-27 11:31:40 +08:00
xuwei-fit2cloud
2c42e436b8
Merge pull request #3191 from dataease/pr@dev@excel 
Pr@dev@excel
 2022-09-27 10:20:48 +08:00
taojinlong
a900d71849 refactor: 代码格式调整 2022-09-27 10:17:52 +08:00
fit2cloud-chenyw
ad07f3d113 fix(个人信息): 绑定二维码无法显示 2022-09-26 21:28:56 +08:00
xuwei-fit2cloud
553584b6e5
Merge pull request #3190 from dataease/pr@dev@perf_user_bind_auth 
perf(个人信息): 扫码绑定第三方平台
 2022-09-26 17:49:54 +08:00
taojinlong
87d7b56a8e refactor: 整理国际化 2022-09-26 17:47:32 +08:00
fit2cloud-chenyw
4ec767ab95 perf(个人信息): 扫码绑定第三方平台 2022-09-26 17:38:01 +08:00
王嘉豪
da2e634376
Merge pull request #3189 from dataease/pr@dev@excel 
fix(数据集): 更新excel 数据不需要校验数据集名称
 2022-09-26 17:34:21 +08:00
xuwei-fit2cloud
7f8333edea
Merge pull request #3188 from dataease/pr@dev@fix_view-style-revert 
fix(仪表板): 表格颜色样设置跟随仪表板主题变化后，设置视图属性后又恢复的问题
 2022-09-26 17:23:37 +08:00
wangjiahao
dc3ac270ef fix(仪表板): 表格颜色样设置跟随仪表板主题变化后，设置视图属性后又恢复的问题 2022-09-26 17:20:10 +08:00
taojinlong
a843a01b77 fix(数据集): 更新excel 数据不需要校验数据集名称 2022-09-26 17:11:11 +08:00
taojinlong
044471c3ac Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-26 17:09:56 +08:00
taojinlong
53173bc739 refactor(数据源): 更新数据源图标 2022-09-26 17:09:40 +08:00
xuwei-fit2cloud
eec95afd0f
Merge pull request #3177 from dataease/pr@dev@fix_login_limit_form_limit 
fix(系统管理-系统参数): 登录限制表单验证允许1-100正整数
 2022-09-26 17:03:10 +08:00
fit2cloud-chenyw
5b19ed90c4
Update en.js 
fix(国际化): range拼写错误
 2022-09-26 17:01:48 +08:00
Junjun
ff5f8eb08c
Merge pull request #3186 from dataease/pr@dev@refactor_component-drage 
refactor: 优化仪表板组件拖拽判断，防止出现控制台异常打印
 2022-09-26 17:00:30 +08:00
Junjun
1322dd9ab7
Merge pull request #3185 from dataease/pr@dev@fix_rich-text-delete 
fix(仪表板): 修复富文本视图部分情况下字段要删两次的情况
 2022-09-26 17:00:04 +08:00
dataeaseShu
f0ea548a03 Merge branch 'dev' into pr@dev_dataset_source 2022-09-26 16:36:40 +08:00
dataeaseShu
25a113b69b fix: 更新sql数据集数据参考中统计表和字段为0 数据集进入更新页面后回退定位 修复 2022-09-26 16:36:06 +08:00
taojinlong
82c0ce9a10 refactor(数据源): 更新数据源图标 2022-09-26 16:20:31 +08:00
wangjiahao
3dae4b9868 refactor: 优化仪表板组件拖拽判断，防止出现控制台异常打印 2022-09-26 16:14:29 +08:00
wangjiahao
b2f752fde0 fix(仪表板): 修复富文本视图部分情况下字段要删两次的情况 2022-09-26 16:12:47 +08:00
taojinlong
353d20dd3f refactor(数据源): 更新数据源图标 2022-09-26 16:01:38 +08:00
taojinlong
7fbfad2bac Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-26 16:01:04 +08:00
taojinlong
6537504116 refactor(数据源): 更新数据源图标 2022-09-26 16:00:29 +08:00
Junjun
43c08f95c2
Merge pull request #3184 from dataease/pr@dev@fix_tabel-style 
fix: 修复表格数字格式化不兼容导致表格样式显示异常问题
 2022-09-26 15:26:41 +08:00
Junjun
f2c359af38
Merge pull request #3183 from dataease/pr@dev@fix_rich-text-view-select 
fix: 修复富文本视图待选字段超出显示范围问题
 2022-09-26 15:26:11 +08:00
wangjiahao
65ff44a85f fix: 修复表格数字格式化不兼容导致表格样式显示异常问题 2022-09-26 15:22:12 +08:00
taojinlong
1e3d51840a feat(数据源): 增加数据源图标 2022-09-26 15:10:31 +08:00
wangjiahao
881e84c95b fix: 修复富文本视图待选字段超出显示范围问题 2022-09-26 15:10:02 +08:00
wangjiahao
76fd018286 fix: 个人信息修改界面角色改为非必填 2022-09-26 14:14:45 +08:00
wangjiahao
8ac8329a22 fix(仪表板): 修复富文本视图指标格式化未生效问题 2022-09-26 13:32:28 +08:00
wangjiahao
db61cce94b fix(仪表板): 修复富文本视图动态值被固定问题 2022-09-26 11:49:28 +08:00
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