github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-27 05:33:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,214 Commits 35 Branches 90 Tags 430 MiB
f758517863
Commit Graph

2369 Commits

Author SHA1 Message Date
王嘉豪
f13a464a2c
Merge pull request #2481 from dataease/pr@dev@refactor_theme 
refactor: 主题控制适配所有过滤组件
 2022-06-23 12:02:17 +08:00
wangjiahao
fbeb89fdf5 refactor: 主题控制适配所有过滤组件 2022-06-23 12:01:33 +08:00
junjun
96c501db0c feat: 视图支持计算字段 2022-06-23 10:41:13 +08:00
junjun
46f8cd634d refactor: 优化数据集数据预览tab请求数据策略 2022-06-23 10:05:58 +08:00
junjun
f91cbcf9a9 feat: 视图支持计算字段 2022-06-23 10:00:35 +08:00
wangjiahao
dcb1dab5ad Merge remote-tracking branch 'origin/dev' into dev 2022-06-22 21:38:15 +08:00
wangjiahao
f3eff66b21 refactor: 仪表板主题增加控制范围 2022-06-22 21:38:04 +08:00
junjun
499956a22c feat: 视图提示增加背景选项 2022-06-22 21:06:04 +08:00
wangjiahao
bc5d6f0b8a Merge remote-tracking branch 'origin/dev' into dev 2022-06-22 18:02:55 +08:00
wangjiahao
d2bd4f03cb refactor: 仪表板主题优化，支持主题色切换新建视图主题集成 2022-06-22 18:02:42 +08:00
fit2cloudrd
9998ae2bc9
Merge pull request #2473 from dataease/pr@dev_caculate_filed_save 
fix: 计算字段报错 name变id
 2022-06-22 16:47:11 +08:00
dataeaseShu
1fe36f5132 fix: 计算字段报错 name变id 2022-06-22 16:41:13 +08:00
taojinlong
1349431c63 feat: excel 替换数据显示'同步中' 2022-06-22 16:04:07 +08:00
fit2cloud-chenyw
559bcb1ebb
Merge pull request #2469 from dataease/pr@dev@fix_log_export 
fix: 日志导出文件使用excel无法打开
 2022-06-22 12:17:54 +08:00
fit2cloud-chenyw
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
junjun
7cccac6be6 fix: 恢复视图样式 2022-06-22 11:41:56 +08:00
dataeaseShu
1d63c2234e feat: 过滤组件自定义样式 2022-06-21 14:37:08 +08:00
fit2cloud-chenyw
0722b86673
Merge pull request #2458 from dataease/pr@dev@fix_plugin_upload_error 
fix: 安装插件错误提示简化
 2022-06-21 10:05:22 +08:00
fit2cloud-chenyw
4e256ce68f fix: 安装插件错误提示简化 2022-06-21 10:02:06 +08:00
junjun
78022a8244 fix: 视图计算字段权限问题 2022-06-20 17:40:13 +08:00
fit2cloud-chenyw
7cdc0600f6
Merge pull request #2453 from dataease/pr@dev@feat_filter_dataset_back 
feat: 过滤组件选择数据集时支持逐级返回
 2022-06-20 16:19:19 +08:00
fit2cloud-chenyw
5eb0a652e8 feat: 过滤组件选择数据集时支持逐级返回 2022-06-20 16:18:22 +08:00
junjun
ab7eb50165 feat: 视图仪表盘改造 2022-06-20 15:41:39 +08:00
junjun
b53392762b feat: 视图仪表盘改造 2022-06-20 14:52:38 +08:00
fit2cloud-chenyw
8f3bbc56c9
Merge pull request #2446 from dataease/pr@dev@fix_log_condition 
fix: 日志类型模糊搜索选择目标后词条消失
 2022-06-20 10:14:08 +08:00
fit2cloud-chenyw
eb01ec59ea fix: 日志类型模糊搜索选择目标后词条消失 2022-06-20 10:12:30 +08:00
junjun
d9e967a0c3 fix: echarts辅助线删除后存在缓存 2022-06-17 20:08:12 +08:00
fit2cloud-chenyw
f15f3cc90c fix: 日志类型增加模糊搜索 2022-06-17 19:31:19 +08:00
fit2cloud-chenyw
016ef078c5 perf: 优化cas切换api提示 2022-06-17 11:40:04 +08:00
fit2cloud-chenyw
c59591515d
Merge pull request #2442 from dataease/pr@dev@perf_cas_reset_tips 
perf: 增加cas切换默认登录方式api提示
 2022-06-17 11:35:40 +08:00
fit2cloud-chenyw
9e84312073 perf: 增加cas切换默认登录方式api提示 2022-06-17 11:18:15 +08:00
wangjiahao
a3e607c5ac style: 弹框样式修改 2022-06-17 11:16:03 +08:00
wangjiahao
524e9abd79 refactor: 扫描问题优化 2022-06-17 10:55:44 +08:00
taojinlong
6c9191e9bd refactor: 解决冲突 2022-06-16 23:03:07 +08:00
taojinlong
3293f3a870 feat: 参数管理 2022-06-16 22:41:09 +08:00
fit2cloud-chenyw
a18964f0b7
Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas 
feat: 适配xpack-cas单点登录
 2022-06-16 18:42:06 +08:00
wangjiahao
3b64979625 refactor: 优化代码结构去掉无用的注释 2022-06-16 18:29:30 +08:00
fit2cloud-chenyw
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +08:00
junjun
e8b6615759 fix: 修复关联数据集中缺失api数据集图标 2022-06-16 15:22:54 +08:00
wangjiahao
2ce2f94113 fix: 插件操作加入权限控制，解决普通用户或者API能越权上传卸载插件问题 2022-06-16 15:09:52 +08:00
junjun
479b9a111c Merge remote-tracking branch 'origin/dev' into dev 2022-06-16 15:08:44 +08:00
junjun
c648196f1f feat: 视图支持计算字段 2022-06-16 15:08:32 +08:00
junjun
b4e917a6a6 feat: 视图支持计算字段 2022-06-16 14:18:10 +08:00
taojinlong
4b5788b63c feat: 参数管理 2022-06-16 14:16:47 +08:00
王嘉豪
64774ed73a
Merge branch 'dev' into pr@dev@refactor_reset-comfirm 2022-06-16 12:00:21 +08:00
wangjiahao
fd8197fc77 refactor: 视图重置增加提示 2022-06-16 11:58:23 +08:00
junjun
d3c3198035 feat: 视图支持计算字段 2022-06-16 11:49:39 +08:00
wangjiahao
a6744f7b9f fix: 修复模板管理中导入模板未存储静态文件的问题 2022-06-16 11:41:02 +08:00
junjun
404f119d75 feat: 视图支持计算字段 2022-06-15 17:34:51 +08:00
wangjiahao
24fca8004f style: pdf导出背景样式修改 2022-06-15 14:26:23 +08:00
wangjiahao
bbab167253 style: 画布工具栏样式修改 2022-06-15 11:23:56 +08:00
Ryan Wang
66dfb577b6 chore: cleanup unnecessary console log 
Signed-off-by: Ryan Wang <i@ryanc.cc>
 2022-06-14 14:06:55 +08:00
junjun
9753cc704d fix: 去掉地图样式中大小选项 2022-06-13 16:51:59 +08:00
王嘉豪
64ce697bcf
Merge pull request #2417 from dataease/pr@dev@refactor_panel-icon 
refactor: 优化图标和仪表板镜像记录
 2022-06-13 13:18:44 +08:00
wangjiahao
c91c403170 refactor: 优化图标和仪表板镜像记录 2022-06-13 13:17:52 +08:00
junjun
71cced80f9 fix: 恢复表格列宽设置项 2022-06-10 17:22:33 +08:00
wangjiahao
9dbe95ec03 refactor: 背景支持颜色图片同时选择 2022-06-10 15:38:25 +08:00
junjun
20c3de7be3 feat: 视图字段可调整高度 2022-06-09 20:21:02 +08:00
junjun
11bc090fdf feat: 视图字段可调整高度 2022-06-09 18:43:10 +08:00
junjun
41f8907926 feat: 视图字段可调整高度 2022-06-09 17:14:44 +08:00
王嘉豪
4f52252c8e
Merge pull request #2404 from dataease/pr@dev@panel_edit-layout 
refactor: 仪表板编辑页面操作布局优化
 2022-06-09 15:53:27 +08:00
wangjiahao
47a3a04aef refactor: 仪表板编辑页面操作布局优化 2022-06-09 15:51:22 +08:00
dataeaseShu
fd1919bbbc feat: 修复地图看板的按钮遮挡问题 2022-06-09 15:33:39 +08:00
junjun
cbb2e8e6c7 fix: 修复辅助线再次编辑确认会消失的问题 2022-06-08 15:43:04 +08:00
junjun
0b92f2cb8e fix: 恢复图例垂直位置选项 2022-06-08 14:59:15 +08:00
junjun
c68da406df feat: 轴值格式化 2022-06-08 12:03:52 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
王嘉豪
a7a37a5043
Merge pull request #2389 from dataease/pr@dev@feat_new-version 
fix: 修复部分类型视图无法自定义颜色的问题
 2022-06-07 18:15:19 +08:00
wangjiahao
35c175aacc fix: 修复部分类型视图无法自定义颜色的问题 2022-06-07 18:13:50 +08:00
taojinlong
9fa65bcc36 Merge branch 'main' into dev 2022-06-07 17:44:17 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main 
feat:提高请求超时时间的范围，创建关联数据集时保留原数据类型
 2022-06-07 17:43:16 +08:00
dataeaseShu
c45f68bd23 feat: 【数据集】新建计算字段时，将字段的ID显示替换成字段名 2022-06-07 16:39:14 +08:00
taojinlong
98727f00bc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-07 16:07:26 +08:00
taojinlong
b1a0acad22 fix: 驱动管理只对管理员可见 2022-06-07 16:07:09 +08:00
junjun
555de25308 feat: 轴值格式化 2022-06-07 15:24:49 +08:00
fit2cloud-chenyw
e51b0d766b
Merge pull request #2385 from dataease/pr@dev@feat_filter_sort 
feat: 过滤器枚举值排序
 2022-06-07 15:05:26 +08:00
fit2cloud-chenyw
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
junjun
3fc0098b65 feat: 增加图表配置默认值 2022-06-07 13:47:17 +08:00
wangjiahao
e4aa5cee21 fix: 修复仪表板不能创建最顶层目录问题 2022-06-02 17:32:14 +08:00
junjun
222e385ef4 fix: 恢复标题位置选项 2022-06-02 15:36:49 +08:00
wangjiahao
29024d4dd4 fix: 过滤跳转设置中联动视图字段部分数字图标未显示 2022-06-01 17:19:51 +08:00
wangjiahao
bf493362a9 fix: 符号地图标志在联动视图选项未显示 2022-06-01 12:15:43 +08:00
junjun
e5ad92ae91 fix: 恢复组合图副轴设置 2022-06-01 11:04:50 +08:00
taojinlong
6fc0afcfeb Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-06-01 00:50:37 +08:00
taojinlong
0c4735666b fix: 超时重复提示 2022-06-01 00:49:38 +08:00
taojinlong
2f8beea85b fix: 切换插件类型数据源不生效 2022-05-31 22:17:29 +08:00
junjun
01c1a50029 fix: 恢复饼图标签设置 2022-05-31 19:37:02 +08:00
taojinlong
5608e576cd fix: 数据源管理页面优化 2022-05-31 19:03:54 +08:00
wangjiahao
c3a3891578 style: 样式调整 2022-05-31 18:29:14 +08:00
wangjiahao
fe70f98b07 Merge remote-tracking branch 'origin/dev' into dev 2022-05-31 18:22:20 +08:00
wangjiahao
05acc8feee refactor: 新建的过滤组件增加默认跳转方式 2022-05-31 18:21:45 +08:00
junjun
d03245ddc3 fix: 恢复视图轴值设置 2022-05-31 17:07:55 +08:00
wangjiahao
24ad42cf7d Merge remote-tracking branch 'origin/dev' into dev 2022-05-31 16:55:45 +08:00
wangjiahao
d69ebb8ea7 refactor: 模板导入适配新的视图逻辑 2022-05-31 16:54:19 +08:00
junjun
9371b19e5e fix: 恢复视图轴值设置 2022-05-31 16:53:40 +08:00
junjun
6a381dd782 refactor: 数据集搜索优化 2022-05-31 16:52:42 +08:00
fit2cloud-chenyw
140d92b222 perf: 优化树形过滤器 2022-05-31 14:36:25 +08:00
fit2cloud-chenyw
9cd3da04a2
Merge pull request #2362 from dataease/pr@dev@perf_tree_filter 
perf: 优化树形过滤器
 2022-05-31 14:33:30 +08:00
fit2cloud-chenyw
86af8c3421 perf: 优化树形过滤器 2022-05-31 14:31:57 +08:00
wangjiahao
edc9878368 refactor: 仪表板保存优化 2022-05-31 13:31:01 +08:00
王嘉豪
23acb3c9c0
Merge pull request #2360 from dataease/pr@dev@refactor_panel-save 
refactor: 优化仪表板保存返回信息
 2022-05-31 12:14:19 +08:00
wangjiahao
38ad5a1922 refactor: 优化仪表板保存返回信息 2022-05-31 12:13:35 +08:00
王嘉豪
027303776e
Merge pull request #2357 from dataease/pr@dev@refactor_style-time 
fix: 修复文本卡，时间组件内边距设置失效问题
 2022-05-30 18:35:46 +08:00
wangjiahao
b9c265febb fix: 修复文本卡，时间组件内边距设置失效问题 2022-05-30 18:35:01 +08:00
王嘉豪
786a785c8a
Merge pull request #2355 from dataease/pr@dev@refactor_label-color 
fix: 复制仪表板，指标卡颜色丢失
 2022-05-30 18:04:47 +08:00
wangjiahao
57a7d491db fix: 复制仪表板，指标卡颜色丢失 2022-05-30 18:01:31 +08:00
junjun
fefa99da66 revert: 恢复误删 2022-05-30 17:54:21 +08:00
junjun
ea3fa03350 refactor: 视图字段快速删除样式优化 2022-05-30 17:53:55 +08:00
王嘉豪
2db9553acc
Merge pull request #2354 from dataease/pr@dev@refactor_self-color 
refactor: 自定义颜色设置优化
 2022-05-30 17:09:27 +08:00
wangjiahao
fa49b2763e refactor: 自定义颜色设置优化 2022-05-30 17:08:37 +08:00
taojinlong
987fd07403 feat: 调整驱动管理页面 2022-05-30 15:51:39 +08:00
junjun
fe2473241b refactor: 视图字段快速删除样式优化 2022-05-30 15:19:21 +08:00
wangjiahao
488044bde5 refactor: 批量操作样式优化 2022-05-30 14:42:00 +08:00
wangjiahao
c12dcb79bb fix: 仪表板样式优化，修复仪表板公共颜色不显示问题 2022-05-30 13:12:52 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
taojinlong
a4a665203d fix: 替换excel时，提示影响计算字段 2022-05-30 01:11:53 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +08:00
fit2cloud-chenyw
b63ffb4513 fix: 接受消息设置联动错误 2022-05-29 11:01:22 +08:00
fit2cloud-chenyw
f1be625f7f style: 禁止数据源中修改全局控件样式，恢复关联数据集form中样式属性 2022-05-29 10:00:46 +08:00
taojinlong
9572a0fb58 fix: API 数据集校验错误 2022-05-28 22:21:28 +08:00
fit2cloud-chenyw
6fd3ccf91b fix: 恢复因为增加日志修改的api 2022-05-28 21:35:06 +08:00
wangjiahao
ec9f4c59c6 fix: 网页组件编辑状态遮罩未显示问题 2022-05-28 12:13:59 +08:00
王嘉豪
78bfb0cc58
Merge pull request #2331 from dataease/pr@dev@fix-panel-unpublished 
refactor: 仪表板未发布状态显示优化
 2022-05-27 12:09:11 +08:00
wangjiahao
c373863946 refactor: 仪表板未发布状态显示优化 2022-05-27 12:08:38 +08:00
王嘉豪
f7f73a9d16
Merge pull request #2327 from dataease/pr@dev@fix-panel-unpublished 
refactor: 仪表板未发布状态显示优化
 2022-05-27 10:54:14 +08:00
wangjiahao
ff7495d5f2 refactor: 仪表板未发布状态显示优化 2022-05-27 10:52:49 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
王嘉豪
dac21cfa13
Merge pull request #2322 from dataease/pr@dev@fix_panel-symbol 
fix: 移动端布局设置时符号地图显示问题
 2022-05-26 18:42:47 +08:00
wangjiahao
91ccc41c0b fix: 移动端布局设置时符号地图显示问题 2022-05-26 18:41:34 +08:00
junjun
e048d4cacd Merge remote-tracking branch 'origin/dev' into dev 2022-05-26 18:24:35 +08:00
junjun
57330d34df feat: 自定义颜色 2022-05-26 18:24:17 +08:00
fit2cloud-chenyw
d9772989b6 fix: 删除测试代码 2022-05-26 17:39:06 +08:00
junjun
db215743e8 fix: 批量操作配置 2022-05-26 17:12:50 +08:00
taojinlong
68fb4980a1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 15:17:52 +08:00
王嘉豪
7b29538822
Merge pull request #2315 from dataease/pr@dev@refactor_bat-opt 
refator: 批量样式设置显示优化
 2022-05-26 14:16:30 +08:00
wangjiahao
b0b46fd4c1 refator: 批量样式设置显示优化 2022-05-26 14:15:48 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select 
feat: 过滤条件增加下拉树
 2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +08:00
王嘉豪
653f539c28
Merge pull request #2312 from dataease/pr@dev@refactor_bat-opt 
fix: 批量设置视图样式时，若样式菜单过长，则无法滚动选择到底部的样式选项
 2022-05-26 12:09:31 +08:00
wangjiahao
ca41d05200 fix: 批量设置视图样式时，若样式菜单过长，则无法滚动选择到底部的样式选项 2022-05-26 12:08:40 +08:00
王嘉豪
4b74619a13
Merge pull request #2311 from dataease/pr@dev@refactor_rich-text 
fix: 复用视图，在预览视图时出现显示问题
 2022-05-26 11:47:38 +08:00
wangjiahao
72ad660a39 fix: 复用视图，在预览视图时出现显示问题 2022-05-26 11:47:04 +08:00
taojinlong
5490dd15bb Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 11:35:48 +08:00
taojinlong
f4b52c5489 fix: 国际化错误 2022-05-26 11:35:39 +08:00
王嘉豪
539a8993b5
Merge pull request #2308 from dataease/pr@dev@refactor_view-copy 
refactor: 复用存量视图自动勾选
 2022-05-26 09:59:04 +08:00
wangjiahao
27fe16fd0a refactor: 复用存量视图自动勾选 2022-05-26 09:58:00 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00
taojinlong
e0b380f1ca Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-25 20:24:59 +08:00
taojinlong
5582e7797a fix: 新建数据源时，驱动选项无法选择上 2022-05-25 20:24:51 +08:00