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
7,630 Commits 35 Branches 90 Tags 430 MiB
234fd70131
Commit Graph

2899 Commits

Author SHA1 Message Date
fit2cloud-chenyw
32687f4db8
Merge pull request #2816 from dataease/pr@dev@feat_filter_reset_button 
feat(仪表板-清空按钮): 一键清空查询按钮绑定的过滤条件
 2022-08-09 14:48:26 +08:00
fit2cloud-chenyw
97db370221 feat(仪表板-清空按钮): 一键清空查询按钮绑定的过滤条件 2022-08-09 02:40:13 -04:00
junjun
4e4a75f6a7 fix(视图): 堆叠图label，tooltip偶尔不显示的问题 2022-08-08 18:20:11 +08:00
junjun
adf1d1b7c6 fix(视图): 堆叠图label，tooltip偶尔不显示的问题 2022-08-08 11:57:49 +08:00
junjun
9ffd195f16 fix(视图): 堆叠图label，tooltip偶尔不显示的问题 2022-08-08 11:32:39 +08:00
Dovahkinn
5e61a8f30a
fix(frontend): 修复 css 中不再支持的样式深度选择符号 >>> 导致命令行报错的问题 (#2806) 
* fix: 执行 eslint 命令, 修复代码

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

* Update format-utils.js

去掉注释

* fix(frontend): 修复 css 中不再支持的样式深度选择符号 >>> 导致命令行报错的问题， 替换为 ::v-deep

* Update DateFormat.vue

* Update FrameLinks.vue

* Update Hyperlinks.vue

* Update HyperlinksDialog.vue

* Update LinkageField.vue

* Update VideoLinks.vue

* Update DeNumberRange.vue

* Update DeSelectGrid.vue

* Update index.scss

* Update index.vue

* Update BackgroundColorSelector.vue

* Update LegendSelector.vue

* Update LegendSelectorAntV.vue

* Update SplitSelector.vue

* Update SplitSelectorAntV.vue

* Update TitleSelector.vue

* Update TitleSelectorAntV.vue

* Update XAxisSelector.vue

* Update XAxisSelectorAntV.vue

* Update YAxisExtSelector.vue

* Update YAxisExtSelectorAntV.vue

* Update YAxisSelector.vue

* Update YAxisSelectorAntV.vue

* Update QuotaFilterEditor.vue

* Update ResultFilterEditor.vue

* Update LabelNormal.vue

* Update LabelNormalText.vue

* Update AssistLine.vue

* Update FunctionCfg.vue

* Update ScrollCfg.vue

* Update Threshold.vue

* Update ColorSelector.vue

* Update LabelSelector.vue

* Update SizeSelector.vue

* Update TooltipSelector.vue

* Update TooltipSelectorAntV.vue

* Update TotalCfg.vue

* Update TableNormal.vue

* Update ChartStyle.vue

* Update AddCustom.vue

* Update AddExcel.vue

* Update DatasetChartDetail.vue

* Update DatasetGroupSelector.vue

* Update DatasetGroupSelectorTree.vue

* Update CalcFieldEdit.vue

* Update FieldEdit.vue

* Update TabDataPreview.vue

* Update UnionView.vue

* Update UpdateInfo.vue

* Update Group.vue

* Update all.vue

* Update readed.vue

* Update unread.vue

* Update index.vue

* Update index.vue

* Update index.vue

* Update PanelBackgroundColorSelector.vue

* Update PanelColorSelector.vue

* Update ViewAttribute.vue

* Update SubjectTemplateItem.vue

* Update multiplexing.vue

* Update filterDialog.vue

* Update PanelList.vue

* Update PanelMain.vue

* Update PanelDetailInfo.vue

* Update MapSettingLeft.vue

* Update index.vue

* Update DatasetTaskList.vue

* Update TaskRecord.vue

* Update dataset.vue

* Update personPwd.vue

* Update privateForm.vue

Co-authored-by: 王嘉豪 <42510293+ziyujiahao@users.noreply.github.com>
 2022-08-05 18:24:27 +08:00
fit2cloud-chenyw
fc38bef5d1 perf(仪表板-日期范围过滤器): 允许选择同一天 2022-08-05 04:33:13 -04:00
fit2cloud-chenyw
8b616deb94 perf(仪表板-日期范围过滤器): 优化时分秒精度设置 2022-08-05 03:05:56 -04:00
fit2cloud-chenyw
77e587bcd0
Merge pull request #2800 from dataease/pr@dev@feat_ui_perf_page 
feat(系统管理-ui优化): 适配新版UI新增系统管理路由页面
 2022-08-05 11:33:17 +08:00
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
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
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
fit2cloud-chenyw
df0ac137a3 fix(视图-地图): 区域映射翻页后搜索功能失效 2022-08-03 14:12:51 +08:00
fit2cloud-chenyw
d74e006cee style(系统管理-地图设置): 新增-上级区域下拉树样式错位 2022-08-03 13:52:18 +08:00
wangjiahao
b978b0602d style: 模板市场样式优化 2022-08-03 11:40:49 +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
dataeaseShu
587e932928 fix: 组织部门为空bug修复 2022-08-02 16:29:35 +08:00
wangjiahao
f44f43e2d5 refactor(模板市场): 模板市场显示由基础设置页面控制 2022-08-02 15:08:11 +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
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
755f3986fb fix(视图-地图): 格式化地图区域映射代码 2022-08-01 11:00:08 +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
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
d69b5756f5 fix(仪表板): 修复目录也可以通过预览编辑按钮进入仪表板编辑页面的问题 2022-07-29 11:54:29 +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
junjun
e83687c9e7 refactor(视图): 表格阈值null与空字符串合并成一个条件 2022-07-28 22:16:37 +08:00
junjun
c07b4326e3 refactor(视图): 视图计算字段限制过滤 2022-07-28 22:15:26 +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
1a4a3f6898 refactor(仪表板): 修改仪表板跳转设置拼接http逻辑，改为跳转时刻再进行检查拼接 2022-07-28 15:19:10 +08:00
wangjiahao
45730d47fb style(模板市场): 模板市场交互优化 2022-07-28 14:33:38 +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
王嘉豪
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
taojinlong
f08a0b9b62 fix(数据源): 校验 API 数据源字段重复 2022-07-26 18:22:59 +08:00
dataeaseShu
249ed7f257 fix: 用户管理样式优化 2022-07-26 18:05:06 +08:00
taojinlong
052bf58292 fix(数据源): 校验 API 数据源字段重复 2022-07-26 18:03:15 +08:00
taojinlong
59b393f506 fix(数据源): 校验 API 数据源字段重复 2022-07-26 17:35:48 +08:00
taojinlong
7d1c7ba93f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-26 17:27:00 +08:00
taojinlong
798b1ba778 fix(数据源): API 数据源超时设置 2022-07-26 17:26:50 +08:00
fit2cloud-chenyw
2620a87b69
Merge pull request #2705 from dataease/pr@dev@feat_map_label_style 
feat(视图): echarts地图丰富标签样式属性设置
 2022-07-26 17:13:30 +08:00
fit2cloud-chenyw
2b51cc9f3f feat(视图): echarts地图丰富标签样式属性设置 2022-07-26 17:12:11 +08:00
taojinlong
d0906e6f6c Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-26 16:37:56 +08:00
taojinlong
b55ba54f36 feat(数据源): 2022-07-26 16:37:47 +08:00
fit2cloud-chenyw
fe86549e32
Merge pull request #2699 from dataease/pr@dev@perf_filter_search_button 
perf(仪表板): 优化仪表板查询按钮
 2022-07-26 15:36:12 +08:00
fit2cloud-chenyw
14df491fcd perf(仪表板): 优化仪表板查询按钮 2022-07-26 15:35:24 +08:00
junjun
53805c8aa7 feat(视图): 数值格式化 2022-07-26 12:22:41 +08:00
junjun
0c73ae6cd3 feat(视图): 表格支持阈值设置 2022-07-26 12:01:19 +08:00
junjun
078f726b85 feat(视图): 支持字体、间距、阴影 2022-07-26 11:01:05 +08:00
王嘉豪
9d7bec3b91
Merge pull request #2694 from dataease/pr@dev@fix_panel-view-jump 
refactor(仪表板): 视图调整启用字段去掉无效的字段
 2022-07-26 10:35:42 +08:00
wangjiahao
553c46c583 refactor(仪表板): 视图调整启用字段去掉无效的字段 2022-07-26 10:35:07 +08:00
junjun
0b6a14d7f7 feat(视图): 支持字体、间距、阴影 2022-07-26 10:34:23 +08:00
王嘉豪
caf018d582
Merge pull request #2692 from dataease/pr@dev@fix_panel-jump 
refactor(仪表板): 优化仪表板外部链接跳转参数替换逻辑，防止出现未替换情况
 2022-07-26 10:02:54 +08:00
wangjiahao
0de2cadbff refactor(仪表板): 优化仪表板外部链接跳转参数替换逻辑，防止出现未替换情况 2022-07-26 09:59:43 +08:00
fit2cloud-chenyw
b9adddc669
Merge pull request #2687 from dataease/pr@dev@perf_filter_button 
perf(仪表板): 优化仪表板查询按钮
 2022-07-25 19:38:02 +08:00
dataeaseShu
68b56270ba fix: 修复导航栏收放 用户管理筛选逻辑 api数据源优化 2022-07-25 18:33:32 +08:00
junjun
16da8f4a7e feat(视图): 标题支持备注 2022-07-25 17:47:33 +08:00
fit2cloud-chenyw
1e32501653 perf(仪表板): 优化仪表板查询按钮 2022-07-25 17:21:56 +08:00
wangjiahao
0795635378 refactor(仪表板): 仪表板背景支持直接重新上传 2022-07-25 16:10:33 +08:00
junjun
ef41583187 feat(视图): 支持标题备注 2022-07-25 10:07:33 +08:00
fit2cloud-chenyw
051f61400a
Merge pull request #2676 from dataease/pr@dev@feat_panel_filter_button 
feat(仪表板): 仪表板新增查询按钮
 2022-07-25 09:06:15 +08:00
fit2cloud-chenyw
32aad19c60 feat(仪表板): 仪表板新增查询按钮 2022-07-24 23:00:36 +08:00
junjun
35f99a2cbe feat(视图): 支持标题备注 2022-07-24 10:23:38 +08:00
junjun
9e69155606 feat(视图): 数值格式化 2022-07-22 17:59:12 +08:00
junjun
b96e7f8b7b fix(视图): 修复echarts仪表盘标签内容格式编辑项目重复的问题 2022-07-22 16:07:23 +08:00
junjun
2a87efe84d fix(视图): 修复echarts仪表盘标签内容格式编辑项目重复的问题 2022-07-22 15:59:47 +08:00
junjun
d4595ac702 fix(视图): 修复透视表指标类表头字体大小不改变的问题 2022-07-22 15:47:26 +08:00
fit2cloud-chenyw
d032f6ffce
Merge pull request #2669 from dataease/pr@dev@perf_email_task_view 
perf(系统管理): 定时报告发送视图数据页面优化
 2022-07-22 15:01:02 +08:00
fit2cloud-chenyw
1272119cbb perf(系统管理): 定时报告发送视图数据页面优化 2022-07-22 15:00:13 +08:00
dataeaseShu
0c4ff91903 feat: API数据源页面优化 2022-07-22 13:40:07 +08:00
wangjiahao
b8727f9b5a refactor(仪表板): 仪表板预览界面增加仪表板信息弹出提示 2022-07-22 13:20:13 +08:00
王嘉豪
22b7e2f661
Merge pull request #2663 from dataease/pr@dev@feat_panel-jump 
style(仪表板): 仪表版跳转设置页面样式调整
 2022-07-22 11:05:39 +08:00
wangjiahao
40743be47a style(仪表板): 仪表版跳转设置页面样式调整 2022-07-22 11:04:59 +08:00
王嘉豪
45a72fb89d
Merge pull request #2660 from dataease/pr@dev@feat_panel-jump 
feat(仪表板): 仪表板跳转外部链接时支持自定义参数设置，优化S2表格跳转逻辑支持点击时获取整行数据信息
 2022-07-22 10:41:36 +08:00
wangjiahao
44b56f759f feat(仪表板): 仪表板跳转外部链接时支持自定义参数设置，优化S2表格跳转逻辑支持点击时获取整行数据信息 2022-07-22 10:40:36 +08:00
taojinlong
e64d401025 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-21 17:34:57 +08:00
taojinlong
43cb0b854e feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-21 17:34:42 +08:00
fit2cloud-chenyw
46eb021bfa
Merge pull request #2657 from dataease/pr@dev@perf_map_setting 
perf(仪表板): 自定义地图文件与系统地图文件解耦
 2022-07-21 17:23:16 +08:00
fit2cloud-chenyw
01250ad621 perf(仪表板): 自定义地图文件与系统地图文件解耦 2022-07-21 17:22:30 +08:00
dataeaseShu
c3326875d1 feat: 用户管理优化 侧边导航栏优化 添加babel可选链支持 2022-07-21 16:02:25 +08:00
junjun
0866cbfdc0 Merge remote-tracking branch 'origin/dev' into dev 2022-07-21 14:43:05 +08:00
junjun
654b986ba5 feat(视图): 数值格式化 2022-07-21 14:42:45 +08:00
fit2cloud-chenyw
28b1724f6b
Merge pull request #2652 from dataease/pr@dev@fix_global_image 
fix(仪表板): 世界地图配置禁止删除中国地图文件
 2022-07-21 14:41:42 +08:00
fit2cloud-chenyw
e2d30a5234 fix(仪表板): 世界地图配置禁止删除中国地图文件 2022-07-21 14:40:53 +08:00
junjun
5b8adc357d feat(视图): 数值格式化 2022-07-21 14:13:07 +08:00
fit2cloud-chenyw
0d44ec8b74
Merge branch 'dev' into pr@dev@feat_global_map_setting 2022-07-21 13:43:01 +08:00
fit2cloud-chenyw
7f7cdeb0dd feat(仪表板): 增加世界地图及相关配置 2022-07-21 13:41:03 +08:00
王嘉豪
daebb5c79f
Merge pull request #2650 from dataease/pr@dev@feat_panel-market 
feat: 模板市场增加预览功能并可以直接应用模板
 2022-07-21 11:17:25 +08:00
wangjiahao
07d3ca07af feat: 模板市场增加预览功能并可以直接应用模板 2022-07-21 11:16:34 +08:00
taojinlong
fc9ca1e392 Merge branch 'dev' into pre@dev@api 2022-07-20 17:26:47 +08:00
taojinlong
dafb95c887 feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-20 17:25:33 +08:00
junjun
dfa4522bcf feat(视图): 表格支持阈值设置 2022-07-19 16:12:59 +08:00
junjun
133d23d70c feat(视图): 表格支持阈值设置 2022-07-19 16:02:51 +08:00
王嘉豪
2af01a0667
Merge pull request #2644 from dataease/pr@dev@feat_panel-template-market 
feat(仪表板) :支持在DataEase中查看模板市场模板并且直接应用模板创建仪表板
 2022-07-19 11:59:03 +08:00
wangjiahao
e925dc2364 feat(仪表板) :支持在DataEase中查看模板市场模板并且直接应用模板创建仪表板 2022-07-19 11:57:21 +08:00
junjun
dad55e3862 feat(视图): 表格支持阈值设置 2022-07-19 11:24:25 +08:00
junjun
12d8e572ba feat(视图): 表格支持阈值设置 2022-07-18 12:57:00 +08:00
junjun
ae7ec67161 feat(视图): 表格支持阈值设置 2022-07-18 10:42:27 +08:00
fit2cloud-chenyw
c8f1a479a3 perf(仪表板): 日期过滤组件增加时间精度配置 2022-07-13 16:17:56 +08:00
wangjiahao
c5edb219c6 Merge remote-tracking branch 'origin/dev' into dev 2022-07-08 10:29:46 +08:00
wangjiahao
f758517863 fix(视图): 修复批量设置Echarts提示背景未生效 2022-07-08 10:29:32 +08:00
fit2cloud-chenyw
db1147caf0 fix(仪表板): 下拉过滤器交换多字段顺序后排序逻辑错乱 2022-07-07 01:56:55 -04:00
taojinlong
0b586c71cc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-06 23:41:35 +08:00
fit2cloud-chenyw
5a601c9808 fix(仪表板): 树形过滤器不能添加多字段 2022-07-06 04:14:08 -04:00
fit2cloud-chenyw
f69332267f fix(仪表板): 删除分享仪表板报错 2022-07-06 03:42:10 -04:00
fit2cloud-chenyw
1cd74930a1 fix(仪表板): 取消收藏成功没有提示 2022-07-06 02:16:51 -04:00
taojinlong
c18dcd7ab8 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-06 13:50:14 +08:00
taojinlong
8b38303a08 fix(数据源): 校验数据源重复 2022-07-06 13:47:41 +08:00
wangjiahao
11781f72f2 fix(视图): 批量操作中饼图标签位置未翻译问题 2022-07-06 13:45:57 +08:00
wangjiahao
ea254eb196 sytle(仪表板): 更换仪表板编辑页面图标样式 2022-07-06 12:54:40 +08:00
wangjiahao
ab8763d3fd refactor(视图): 优化符号地图对公共组件样式的适配 2022-07-05 18:19:36 +08:00
fit2cloudrd
bb51c676d8
refactor(视图): 优化符号地图对公共组件样式的适配 (#2588) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-07-05 17:23:11 +08:00
junjun
94fecaafa1 refactor(视图): 轴值间隔与刻度数增加说明 2022-07-05 16:55:02 +08:00
wangjiahao
0625fe4954 fix(仪表板): 修复编辑过滤组件确定后组件样式会使用仪表板样式问题 2022-07-05 16:12:10 +08:00
wangjiahao
7b663e7676 refactor: 联动高亮样式优化，优化一些不太明显的高亮 2022-07-05 14:24:59 +08:00
wangjiahao
8f58270388 refactor: 仪表板、数据集列表节点操作后如果有过滤条件可以再进行自动过滤 2022-07-05 12:14:08 +08:00
wangjiahao
0edfe4171d refactor(视图): 坐标轴格式化支持批量样式设置 2022-07-05 11:39:00 +08:00
wangjiahao
32857ec4f9 fix(视图): 批量设置视图属性时表格列宽、提示背景、折点大小未生效问题 2022-07-05 11:22:20 +08:00
wangjiahao
6c138bd2d7 fix(仪表板): 修复部分情况下批量设置视图属性再单独编辑视图原来批量设置的属性被恢复问题 2022-07-05 11:00:42 +08:00
dataeaseShu
d5f630cfea fix: 修复safari由于不支持对js中正则表达式的 几个新增的断言验证不支持导致的白屏 2022-07-05 10:09:07 +08:00
wangjiahao
60b2532c62 fix(视图): 仪表板自动刷新时水波图动画消失问题 2022-07-04 18:35:59 +08:00
fit2cloudrd
84559e2a3f
fix(视图): 修复矩形树图在全屏时可能覆盖边框的问题 (#2573) 
* fix: 修复移动端编辑后列表移动端标志没有及时显示

* fix: 修复矩形树图在全屏时可能覆盖边框的问题

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-07-04 18:02:28 +08:00
fit2cloudrd
a516e958ad
fix(仪表板): 修复移动端编辑后列表移动端标志没有及时显示 (#2571) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-07-04 17:29:12 +08:00
taojinlong
6599619aa2 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-04 15:30:41 +08:00
taojinlong
e74c3883f0 fix(数据源): 校验数据源配置的有效性 2022-07-04 15:29:40 +08:00
王嘉豪
663b323124
Merge pull request #2568 from dataease/pr@dev@fix_view-select-icon 
fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题
 2022-07-04 15:02:35 +08:00
wangjiahao
d72f5432f2 fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题 2022-07-04 15:01:53 +08:00
王嘉豪
982d3568d0
Merge pull request #2566 from dataease/pr@dev@fix_line-style 
fix(视图): 基础折线图/堆叠折线图-大小设置缺少实线/虚线设置、折点大小设置项
 2022-07-04 13:48:51 +08:00
wangjiahao
cfad9319ea fix(视图): 基础折线图/堆叠折线图-大小设置缺少实线/虚线设置、折点大小设置项 2022-07-04 13:47:56 +08:00
fit2cloud-chenyw
b9ef373f5d fix(仪表板): 下拉过滤器添加同数据集多字段虽然有提示但还是能添加成功 2022-07-04 11:53:26 +08:00
wangjiahao
86efdf6e7c fix(仪表板): 仪表板编辑设置视图自定义颜色时，关闭视图设置面板重新打开自定义颜色值显示还是最初的值 2022-07-04 11:33:40 +08:00
wangjiahao
044c07d09e fix(视图): 仪表板全屏时雷达图有时会出现缩小问题 2022-07-04 11:03:46 +08:00
taojinlong
4474970b2d fix(数据源): 超时时间无法修改 2022-07-03 22:02:01 +08:00
taojinlong
c100179997 refactor(数据集): 解决冲突 2022-07-01 18:19:14 +08:00
taojinlong
99866c8df4 fix(数据集): sql 变量管理按钮丢失 2022-07-01 18:16:02 +08:00
王嘉豪
4b74acc128
Merge pull request #2554 from dataease/pr@dev@fix_edit-unpublished 
fix(仪表板): 修复下架有权限的仪表板，编辑预览时提示已下架问题
 2022-07-01 17:48:45 +08:00
wangjiahao
6f7dd7dd7a fix(仪表板): 修复下架有权限的仪表板，编辑预览时提示已下架问题 2022-07-01 17:47:52 +08:00
taojinlong
77592e9a01 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 17:11:16 +08:00
王嘉豪
400b1c7878
Merge pull request #2553 from dataease/pr@dev@fix_bar-max-show 
fix(视图): 横向柱状图最大值输入不了数据问题
 2022-07-01 17:10:33 +08:00
wangjiahao
38d832448f fix(视图): 横向柱状图最大值输入不了数据问题 2022-07-01 17:07:26 +08:00
taojinlong
c4afe835dd fix(数据集): SQL 变量管理的按钮挤占到下一行 2022-07-01 16:39:06 +08:00
fit2cloud-chenyw
b5e7e27275
Merge pull request #2549 from dataease/pr@dev@fix_number_select_param 
fix: 数字下拉参数无法显示
 2022-07-01 13:58:44 +08:00
fit2cloud-chenyw
947328063e fix: 数字下拉参数无法显示 2022-07-01 13:57:57 +08:00
王嘉豪
da03efd1ec
Merge pull request #2545 from dataease/pr@dev@refactor_template-static 
refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储
 2022-07-01 12:24:37 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
taojinlong
dc89c6935b Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 11:31:29 +08:00
taojinlong
84bfda9332 fix: sql 变量 2022-07-01 11:31:18 +08:00
王嘉豪
94d686f1f1
Merge pull request #2544 from dataease/pr@dev@fix_echarts-rader 
fix: echarts雷达图没有指标
 2022-07-01 11:15:59 +08:00
wangjiahao
397b9da6db fix: echarts雷达图没有指标 2022-07-01 11:14:03 +08:00
taojinlong
b6fa97383a fix: sql 变量 2022-06-30 22:18:25 +08:00
fit2cloud-chenyw
39a229b6d9
Merge pull request #2540 from dataease/pr@dev@perf_filter_select_visual 
perf: 去除虚拟化选项
 2022-06-30 19:42:55 +08:00
fit2cloud-chenyw
4eefd8a203 perf: 去除虚拟化选项 2022-06-30 19:41:04 +08:00
wangjiahao
b1f8d11aab refactor:优化主题色切换颜色适配 2022-06-30 18:43:16 +08:00
王嘉豪
a30955fae9
Merge pull request #2537 from dataease/pr@dev@refactor_memory 
refactor: 主动销毁监听事件，防止重复监听，改善内存使用
 2022-06-30 17:03:51 +08:00
wangjiahao
43724c930b refactor: 主动销毁监听事件，防止重复监听，改善内存使用 2022-06-30 17:03:01 +08:00
fit2cloud-chenyw
87cd232cb1 fix: 过滤器编辑面板参数第一次不能显示 2022-06-30 12:23:33 +08:00
fit2cloud-chenyw
c66d24437b fix: 过滤条件选择空数据集给出提示 2022-06-30 12:07:02 +08:00
wangjiahao
2de5c6ab76 refactor: 代码结构优化 2022-06-30 10:33:30 +08:00
wangjiahao
303056bf95 style: 样式调整 2022-06-30 09:57:23 +08:00
fit2cloudrd
1ea1e79a76
refator: 调整仪表板样式面板 (#2527) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-06-29 18:04:00 +08:00
junjun
d7143d1bc7 fix: 视图明细滚动 2022-06-29 10:43:18 +08:00
fit2cloudrd
0b654f84b5
fix: 移动端画布重置功能不能完全重置数据问题 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-06-28 18:11:34 +08:00
taojinlong
27aa14b6ca Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-28 12:45:29 +08:00
王嘉豪
5d5e0fef67
Merge pull request #2519 from dataease/pr@dev@feat_echart-highlight 
feat: echarts支持联动点击高亮
 2022-06-28 12:04:26 +08:00
wangjiahao
95ec3b1c70 feat: echarts支持联动点击高亮 2022-06-28 12:03:40 +08:00
taojinlong
d3a295508d fix: 设置超时时间 2022-06-28 11:46:00 +08:00
junjun
45c2f724da fix: 水波图大小配置 2022-06-28 10:42:47 +08:00
junjun
af5b86d967 feat: 表格滚动 2022-06-28 10:27:16 +08:00
taojinlong
c89dc628fd fix: MySql数据库表名称含有小数点 2022-06-27 18:23:52 +08:00
taojinlong
313942b26e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 17:16:53 +08:00
taojinlong
5366fd1a3b feat: 支持查询超时 2022-06-27 17:16:43 +08:00
wangjiahao
2af5895a31 refactor: antv玫瑰图支持联动高亮 2022-06-27 17:07:40 +08:00
王嘉豪
c9d1434a7c
Merge pull request #2514 from dataease/refactor_dateset 
feat: antV图支持联动高亮
 2022-06-27 16:51:29 +08:00
wangjiahao
03f83d82d5 feat: antV图支持联动高亮 2022-06-27 16:49:22 +08:00
junjun
cd4ba8d830 feat: 表格滚动 2022-06-27 16:06:42 +08:00
fit2cloud-chenyw
6deecb4569 fix: 下拉过滤器数据量大卡顿 2022-06-27 15:39:41 +08:00
junjun
3c87e6b917 feat: 表格滚动 2022-06-27 14:15:10 +08:00
taojinlong
fb5f713d62 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 12:42:30 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
fit2cloud-chenyw
77e20462df fix: 过滤组件禁止同数据集多字段 2022-06-27 11:20:17 +08:00
fit2cloud-chenyw
4f8948c020
Merge pull request #2507 from dataease/pr@dev@fix_filter_dialog_text 
fix: 过滤器弹框文字精简
 2022-06-27 10:10:51 +08:00
fit2cloud-chenyw
912c73bdab fix: 过滤器弹框文字精简 2022-06-27 10:09:35 +08:00
junjun
a3e8f31e71 feat: 表格滚动 2022-06-26 15:56:21 +08:00
taojinlong
a5d31401e4 fix: 尝试修复支持数据库字符集 2022-06-25 23:31:20 +08:00
taojinlong
aa690ff8cc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 22:42:41 +08:00
junjun
43ac027de6 feat: 指标卡支持数值格式化 2022-06-25 20:46:05 +08:00
taojinlong
91491eb1ab fix: 尝试修复支持数据库字符集 2022-06-25 17:24:23 +08:00
taojinlong
be11424539 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 15:33:56 +08:00
taojinlong
dc7b06bca5 fix: 参数默认值的時間格式化 2022-06-25 15:33:39 +08:00
junjun
c39ae62062 refactor: 仪表盘极值设置优化 2022-06-25 10:54:25 +08:00
wangjiahao
028c03733c feat: 图片组件增加尺寸适应方式 2022-06-24 17:59:20 +08:00
wangjiahao
c7a1b7cf26 style: 仪表板编辑滚动条显示优化 2022-06-24 11:40:40 +08:00
王嘉豪
8873b8f64c
Merge pull request #2489 from dataease/pr@dev@style_panel 
style: 主题样式适配调整
 2022-06-23 18:35:15 +08:00
wangjiahao
02821413ca style: 主题样式适配调整 2022-06-23 18:34:44 +08:00
taojinlong
5b780e8b85 fix: uuid 2022-06-23 17:28:40 +08:00
fit2cloud-chenyw
31675de749
Merge branch 'dev' into pr@dev@perf_visual_select 2022-06-23 16:56:26 +08:00
fit2cloud-chenyw
e365d3d3cd perf: 优化下拉框过滤组件数据量大卡顿 使用虚拟dom 2022-06-23 16:52:32 +08:00
王嘉豪
b0b5a69012
Merge pull request #2487 from dataease/pr@dev@style_panel 
style: 仪表板图标字体布局等样式调整
 2022-06-23 16:21:52 +08:00
wangjiahao
af1a678edb style: 仪表板图标字体布局等样式调整 2022-06-23 16:20:01 +08:00
fit2cloud-chenyw
dd07c62fc5
Merge pull request #2483 from dataease/pr@dev@perf_map 
perf: 地图调色手柄文字跟随仪表板主题色
 2022-06-23 12:50:08 +08:00
fit2cloud-chenyw
f36a81d06e perf: 地图调色手柄文字跟随仪表板主题色 2022-06-23 12:44:10 +08:00
王嘉豪
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
taojinlong
8f33d3779e fix: 新建同步任务时数据集无数据无需提示“请先完成数据同步” 2022-05-25 20:24:29 +08:00
wangjiahao
e176d364c6 fix: 修复复用存量视图未清理历史选择框的问题 2022-05-25 14:51:15 +08:00
wangjiahao
929d1f64e2 fix: 修复批量设置标题颜色改变未生效问题 2022-05-25 14:09:24 +08:00
wangjiahao
46c00aa3f4 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 13:41:30 +08:00
wangjiahao
19d344f4df refactor: 视图编辑工具栏宽度扩大适配 2022-05-25 13:36:26 +08:00
taojinlong
8d517f450d fix: 替换excel数据集时提示信息显示不正确 2022-05-25 12:55:03 +08:00
wangjiahao
73a9a0bd05 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 10:54:16 +08:00
wangjiahao
d8c73873a2 feat: 仪表板复用时支持选择存量视图 2022-05-25 10:53:50 +08:00
taojinlong
a346a7718d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-24 23:05:35 +08:00
taojinlong
c29875ffa9 feat: 替换excel时，提示信息 2022-05-24 23:05:25 +08:00
wangjiahao
1a75c3ed33 Merge remote-tracking branch 'origin/dev' into dev 2022-05-24 22:32:31 +08:00
wangjiahao
da26a5b40f feat: 仪表板编辑时可以按照仪表板复用视图 2022-05-24 22:32:11 +08:00
fit2cloud-chenyw
43eaf4809c
Merge pull request #2299 from dataease/pr@dev@perf_de_log 
perf: 优化审计日志
 2022-05-24 17:56:50 +08:00
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +08:00
junjun
e94cd85d17 refactor: 视图样式配置项优化 2022-05-24 17:37:16 +08:00
junjun
b84e9aabb0 feat: 自定义颜色 2022-05-24 10:01:47 +08:00
taojinlong
540d1f1620 refactor: 调整顺序 2022-05-23 23:19:03 +08:00
taojinlong
71dc641459 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 22:24:47 +08:00
taojinlong
45140eb362 refactor: 调整顺序 2022-05-23 22:24:22 +08:00
wangjiahao
b279dd9660 Merge remote-tracking branch 'origin/dev' into dev 2022-05-23 20:44:39 +08:00
junjun
7fa3c0ac53 feat: 自定义颜色 2022-05-23 18:48:45 +08:00
junjun
df759a6ae8 feat: 自定义颜色 2022-05-23 18:27:57 +08:00
wangjiahao
6930dda995 style: 样式修改 2022-05-23 18:19:52 +08:00
wangjiahao
6b8dbf5093 refactor: 下架显示优化 2022-05-23 16:36:27 +08:00
wangjiahao
8ee057aac3 refactor: 批量修改样式优化 2022-05-23 15:06:07 +08:00
wangjiahao
544ea07e57 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/views/chart/chart/util.js
#	frontend/src/views/chart/view/ChartEdit.vue
#	frontend/src/views/chart/view/ChartStyle.vue
 2022-05-23 13:31:03 +08:00
wangjiahao
9041866e9c refactor: 批量修改样式优化 2022-05-23 13:23:39 +08:00
junjun
3889eff052 feat: 自定义颜色 2022-05-23 11:15:44 +08:00
fit2cloud-chenyw
b72955204d fix: 仪表板浏览器console报错 2022-05-23 11:08:02 +08:00
fit2cloud-chenyw
5a78aa0599
Merge pull request #2291 from dataease/pr@dev@feat_marker_map_label 
feat: 气泡地图增加标签字段设置
 2022-05-23 10:40:28 +08:00
fit2cloud-chenyw
0c25b5f553 feat: 气泡地图增加标签字段设置 2022-05-23 10:38:16 +08:00
junjun
4fe718bb45 feat: 自定义颜色 2022-05-23 10:23:36 +08:00
taojinlong
13aff751f8 feat: 驱动管理的日志记录 2022-05-22 11:39:10 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00
wangjiahao
a3767831f6 refactor: 丰富富文本插件 2022-05-20 20:16:29 +08:00
wangjiahao
9f01bc4ee0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/views/chart/view/ChartStyle.vue
#	frontend/src/views/panel/list/PanelMain.vue
 2022-05-20 13:08:51 +08:00
wangjiahao
fec7a67787 refactor: 批量修改样式优化 2022-05-20 13:08:26 +08:00
wangjiahao
0066fe6000 Merge remote-tracking branch 'origin/dev' into dev 2022-05-20 12:35:16 +08:00
wangjiahao
704cb29d19 refactor: 批量修改样式优化 2022-05-20 12:34:47 +08:00
junjun
fef7dd1e22 feat: 自定义颜色 2022-05-20 10:30:13 +08:00
taojinlong
ad01a695b4 feat: 支持数据源驱动管理 2022-05-20 00:31:17 +08:00
wangjiahao
0d7e913ad3 refactor: 插件样式设置兼容 2022-05-19 21:14:27 +08:00
wangjiahao
7db5e73125 Merge remote-tracking branch 'origin/dev' into dev 2022-05-19 18:17:37 +08:00
wangjiahao
9ae6b82113 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 18:16:33 +08:00
王嘉豪
cb9f427782
Merge pull request #2282 from dataease/pr@dev@refactor_panel-unpublished 
refactor: 优化仪表板下架逻辑，下架禁止查看
 2022-05-19 17:59:12 +08:00
wangjiahao
f0b9d02603 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 17:58:19 +08:00
王嘉豪
1cab504402
Merge pull request #2275 from dataease/pr@dev@feat_fulltext 
feat: 新增富文本编辑器
 2022-05-19 14:01:12 +08:00
wangjiahao
66925df6f9 feat: 新增富文本编辑器 2022-05-19 14:00:00 +08:00
fit2cloud-chenyw
bac23c3c4a
Merge pull request #2274 from dataease/pr@dev@fix_plugin_view_miss 
fix: 插件视图属性和样式无法显示
 2022-05-19 10:51:35 +08:00
fit2cloud-chenyw
2398e685fb fix: 插件视图属性和样式无法显示 2022-05-19 10:49:57 +08:00
junjun
50233116f6 feat: 视图编辑块字段增加快速删除按钮 2022-05-19 10:23:05 +08:00
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
6ca15ce455
Merge pull request #2271 from dataease/pr@dev@feat_log 
feat: 操作日志
 2022-05-18 18:17:31 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +08:00
wangjiahao
aee2fd9bcf refactor: 模版管理优化,系统模板的管理需要授权 2022-05-17 14:42:03 +08:00
wangjiahao
57961f6ca9 refactor: 代码结构优化 2022-05-16 19:54:28 +08:00
王嘉豪
b400d42513
Merge pull request #2262 from dataease/pr@dev@refactor_button-style 
refactor: 画布内存使用优化
 2022-05-16 19:27:01 +08:00
wangjiahao
7f1712f898 refactor: 画布内存使用优化 2022-05-16 19:26:16 +08:00
junjun
1c0c09acc7 feat: 维度自定义排序 2022-05-16 15:43:03 +08:00
junjun
f46191784b feat: 维度自定义排序 2022-05-16 15:23:55 +08:00
wangjiahao
202539a6bf refactor: 画布区域按钮样式优化 2022-05-16 14:57:39 +08:00
王嘉豪
3d0c8b3b56
Merge pull request #2254 from dataease/pr@dev@feat_panel-publish 
refactor: 仪表板列表增加发布标识
 2022-05-16 14:33:59 +08:00
wangjiahao
f58f270f41 refactor: 仪表板列表增加发布标识 2022-05-16 14:33:17 +08:00
王嘉豪
3932264403
Merge pull request #2253 from dataease/pr@dev@feat_panel-publish 
feat: 仪表板支持发布功能
 2022-05-16 13:35:33 +08:00
wangjiahao
bd5409b8d4 feat: 仪表板支持发布功能 2022-05-16 13:34:38 +08:00
junjun
620ff4af58 feat: 维度自定义排序 2022-05-16 13:25:56 +08:00
fit2cloudrd
866a840dc5
feat: 仪表板编辑视图支持批量设置样式 (#2238) 
* feat: 仪表板编辑视图支持多选

* feat: 仪表板编辑视图支持批量设置样式

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-05-15 22:22:54 +08:00
junjun
a9a2832932 feat: 维度自定义排序 2022-05-15 11:09:39 +08:00
fit2cloud-chenyw
3ad6dd6f28 fix: 异步加载默认登录方式 2022-05-12 16:28:50 +08:00
fit2cloud-chenyw
0f015c764e fix: 默认登录方式无效 2022-05-12 15:52:09 +08:00