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

4084 Commits

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