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

525 Commits

Author SHA1 Message Date
taojinlong
a48249c8db fix: 预览 excel数据集时，给出提示信息：处理中/处理失败 2021-05-24 18:44:49 +08:00
wangjiahao
bf52d4ec03 fix: 1.用户添加多个角色 查询报错问题 2021-05-24 18:26:51 +08:00
wangjiahao
432459a062 fix: 1.视图 数据集 默认查询所有数据 2021-05-24 17:55:53 +08:00
wangjiahao
746e6c49c3 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/components/canvas/components/Toolbar.vue
 2021-05-24 17:30:13 +08:00
wangjiahao
b59c4967f7 fix: 1.普通仪表盘可转为默认仪表盘同时增加默认仪表盘全新 2.仪表盘，视图，数据集加载慢的问题 3.上传大图片不成功的问题，4.仪表盘页面整体加上loading 5.编辑仪表盘预览改为全屏弹框模式 2021-05-24 17:28:03 +08:00
taojinlong
44dcb71cf1 fix: 国际化 2021-05-24 17:15:32 +08:00
taojinlong
f9bb4b3142 fix: 抽取excel数据格式问题； 2021-05-24 17:06:35 +08:00
junjie
dcafd50b2b feat(i18n):后端国际化；cron 组件国际化 2021-05-24 11:03:57 +08:00
wangjiahao
f4b4dac8ef Merge remote-tracking branch 'origin/main' into main 2021-05-24 10:28:20 +08:00
wangjiahao
872067ce97 fix: 仪表盘列表中的仪表盘可转为默认仪表盘 2021-05-24 10:28:11 +08:00
taojinlong
49bb1f18d6 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 17:33:56 +08:00
taojinlong
20d9f5ef9c feat: 默认语言为中文 2021-05-21 17:33:47 +08:00
junjie
1833ca5399 feat(视图):视图增加 过滤器，直接对数据集字段进行过滤 2021-05-21 16:45:21 +08:00
junjie
0129af6652 feat(backend):仪表盘过滤组件 field fix 2021-05-21 13:47:19 +08:00
junjie
c5b7a766f3 feat(backend):仪表盘支持日期过滤；doris过滤 test 2021-05-21 12:35:24 +08:00
fit2cloud-chenyw
42b1599043 fix: 菜单权限标识错误 2021-05-21 12:30:07 +08:00
taojinlong
a6a427de18 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:25 +08:00
taojinlong
2f06a0178e Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 10:59:03 +08:00
taojinlong
14ea0f17a1 fix: 删除仪表盘时，同步删除相关的收藏，分享数据 2021-05-21 10:52:19 +08:00
fit2cloud-chenyw
834e6a7f48 fix: 菜单管理bug 2021-05-21 10:36:06 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
junjie
f9f384d030 feat(backend):fix 2021-05-20 18:11:32 +08:00
junjie
fef63c50ea feat(backend):数据源连接参数 2021-05-20 15:01:59 +08:00
taojinlong
a369122ce4 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:18 +08:00
taojinlong
514b41dd55 fix: 默认抽取 excel 第一个 sheet 页 2021-05-20 11:12:18 +08:00
taojinlong
bc5cbad7bd feat: 支持sqlserver 2021-05-19 23:28:08 +08:00
xiajunjie
1b3f739f26 feat(backend):获取数据源Mapper SQL bug fix 2021-05-19 22:31:26 +08:00
wangjiahao
f6f668cad7 fix: 修改权限查询效率问题等 2021-05-19 19:47:49 +08:00
wangjiahao
7ebb015bd6 Merge remote-tracking branch 'origin/main' into main 2021-05-19 19:16:49 +08:00
wangjiahao
50be91cc7e fix: 顶级目录权限错误问题 2021-05-19 19:16:34 +08:00
fit2cloud-chenyw
b55c065554 fix: 菜单管理搜索 2021-05-19 17:25:07 +08:00
junjie
f525d9154a feat:fontsize fix;仪表板视图过滤组件 2021-05-19 16:21:20 +08:00
wangjiahao
b176e4a14a fix: bug 视图设置跟随样式 2021-05-19 15:45:37 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
junjie
a5ebc48b99 feat(backend):分组 场景 sql fix 2021-05-19 14:13:14 +08:00
taojinlong
4399978965 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 11:56:09 +08:00
taojinlong
d1d9596624 fix: 国际化 2021-05-19 11:56:00 +08:00
fit2cloud-chenyw
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
junjie
7a4488bbcc feat(数据集):数据集通过授权给普通用户 2021-05-19 11:16:21 +08:00
fit2cloud-chenyw
851d8edb86 fix: 修复flyway中菜单配置 2021-05-19 10:47:38 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
wangjiahao
36d5a80190 feat: 授权flayway 2021-05-18 19:05:03 +08:00
wangjiahao
8a88c0bca9 Merge remote-tracking branch 'origin/main' into main 2021-05-18 18:39:32 +08:00
wangjiahao
1c48fc8848 feat: 授权国际化等 2021-05-18 18:39:18 +08:00
taojinlong
901710b9b1 fix: license 产品名称 2021-05-18 18:35:54 +08:00
taojinlong
97c879f94d fix: 更改初始密码 2021-05-18 18:10:53 +08:00
taojinlong
e9c6f43aa6 fix: sqlserver 2021-05-18 18:05:56 +08:00
taojinlong
41deddbbfa fix: excel 数据集 2021-05-18 17:28:12 +08:00
junjie
9124a9213d feat(backend):fix 2021-05-18 17:18:47 +08:00
taojinlong
f56889e957 fix: sql 2021-05-18 17:09:55 +08:00
taojinlong
aea71643dc Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:58:46 +08:00
taojinlong
e44081d1a6 fix: 证书产品名称 2021-05-18 16:58:35 +08:00
junjie
5884487e2e feat(backend):flyway 2021-05-18 16:44:26 +08:00
junjie
c0e0e617f4 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:38:38 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持，大小自适应；收藏取消bug fix 2021-05-18 16:38:24 +08:00
taojinlong
f024af48aa Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:35:37 +08:00
wangjiahao
533d466ca2 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:34:32 +08:00
wangjiahao
025feaa057 feat: 授权flayway 2021-05-18 16:34:16 +08:00
taojinlong
254444fccf fix: 保存 excel 数据集的字段出错 2021-05-18 16:33:41 +08:00
junjie
708752a6ac feat(backend):flyway 2021-05-18 16:31:59 +08:00
fit2cloud-chenyw
32ebc596a0 fix: 删除非必要代码 2021-05-18 16:19:27 +08:00
fit2cloud-chenyw
2d3eb9050c fix: lic错误信息翻译 2021-05-18 16:17:07 +08:00
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
taojinlong
19de8a5837 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 15:57:21 +08:00
taojinlong
314d886b2c fix: 保存 excel 数据集的字段出错 2021-05-18 15:56:15 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
c3092ca38e feat(数据集):sql数据集最后支持加1个分号结束 2021-05-18 15:32:12 +08:00
taojinlong
8893d06d49 fix: 保存 excel 数据集的字段出错 2021-05-18 15:17:57 +08:00
taojinlong
f07065b6f2 Merge branch 'main' of github.com:dataease/dataease into main 
# Conflicts:
#	backend/src/main/resources/db/migration/V8__system.sql
 2021-05-18 15:00:31 +08:00
taojinlong
b28e2494fb refactor: 整理sql 2021-05-18 14:44:41 +08:00
fit2cloud-chenyw
9a768d9e8d feat: 菜单增加关于 2021-05-18 14:09:42 +08:00
fit2cloud-chenyw
f988c74beb feat : 删除非必要代码 2021-05-18 12:23:50 +08:00
fit2cloud-chenyw
5fc32d6bba feat: 新增关于页面 以及 lic更新功能 2021-05-18 12:23:21 +08:00
junjie
afc6563a32 feat:非直连数据集做校验；前端登陆样式fix 测试；不同用户创建db类型数据集可以选择相同表 2021-05-18 11:24:52 +08:00
taojinlong
29d275f2f7 feat: 国际化 2021-05-18 09:57:57 +08:00
taojinlong
dcf8fe751b Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 09:39:13 +08:00
taojinlong
21e38a0ffd feat: 国际化 2021-05-18 09:39:00 +08:00
junjie
e8e8a9c3af feat(backend):jdbc add doris 2021-05-17 17:54:38 +08:00
junjie
e98f95604e feat(backend):数据集 视图，sql重新整理 2021-05-17 16:43:02 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
junjie
2e0a4e2ee7 feat(视图):时间条件过滤做处理 2021-05-14 17:47:34 +08:00
junjie
69fa5d838d feat(视图):doris sql 2021-05-13 16:31:16 +08:00
junjie
dd79f663e3 feat(视图):doris sql 2021-05-13 16:25:31 +08:00
fit2cloud-chenyw
8b0ac926f8 feat: 右上角功能菜单数据 2021-05-13 16:03:35 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
junjie
2f4842d410 feat(视图):过滤fix 2021-05-13 15:48:26 +08:00
junjie
d6f4d43b0e feat(数据集):时间转换 2021-05-13 15:17:27 +08:00
taojinlong
e963e586f5 feat: 数据集字段类型：type(原始类型)，de_type(dataease 计算使用)、de_extract_type(往 doris 抽取数据使用) 2021-05-13 14:45:01 +08:00
junjie
9e5bde6df3 feat(数据集):时间转换 2021-05-13 13:55:14 +08:00
taojinlong
695d22a288 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-13 13:46:40 +08:00
taojinlong
479e4aea29 fix: kettle 抽取布尔类型数据 2021-05-13 13:46:17 +08:00
junjie
3c1241d765 feat(数据集):数据集优化 2021-05-12 17:19:33 +08:00
junjie
75337adf7c feat(数据集):数据集优化 2021-05-12 16:39:53 +08:00
fit2cloud-chenyw
469aa684fc feat: xpack功能初版 2021-05-12 16:19:41 +08:00
taojinlong
53b1e6a600 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 16:13:22 +08:00
taojinlong
a77fb3c7ae fix: 同步日志按时间排序；修复添加定时任务失败 2021-05-12 16:13:13 +08:00
junjie
ef36e73948 feat(数据集):编辑自助数据集 2021-05-12 15:53:53 +08:00
taojinlong
5c26b5986d Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 15:18:06 +08:00
taojinlong
e89c8ac439 feat: 删掉数据集时，同步删掉 doris 里的表 2021-05-12 15:17:51 +08:00
junjie
dae257bedf feat(backend):fix 2021-05-12 13:17:06 +08:00
taojinlong
20daae2b61 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 12:22:36 +08:00
taojinlong
e28a8fadd0 fix: 去掉 excel 空行 2021-05-12 12:15:42 +08:00
junjie
5a772101f0 feat(视图):数据聚合 fix 2021-05-12 12:02:19 +08:00
junjie
c4991f63af fix(backend):add log 2021-05-12 11:22:30 +08:00
junjie
c88f79026f fix(backend):视图fix 2021-05-12 10:48:12 +08:00
taojinlong
defdc1123c Merge branch 'main' of github.com:dataease/dataease into main 2021-05-11 19:10:03 +08:00
taojinlong
0404536a20 fix: Kettle 状态 2021-05-11 19:09:32 +08:00
junjie
137ad1ab32 feat(backend):数据集 字段编辑支持修改字段类型 2021-05-11 18:54:05 +08:00
fit2cloud-chenyw
0bda4eb062 feat: 插件管理v0.01 2021-05-11 16:30:37 +08:00
fit2cloud-chenyw
2703e881eb feat: 插件管理v0.01 2021-05-11 16:30:21 +08:00
junjie
9102d56332 feat(数据集):数据集 优化 2021-05-11 12:27:42 +08:00
junjie
df09ffd789 feat(数据集):数据集 优化 2021-05-11 12:21:08 +08:00
junjie
1e17c78565 feat(数据集):记录数 字段 fix 2021-05-11 12:11:07 +08:00
junjie
2938c229ad feat(数据集):sql fix 2021-05-11 11:46:55 +08:00
junjie
3f7a797713 feat(视图):doris视图fix 2021-05-11 11:36:28 +08:00
junjie
de549dbc73 feat(数据集):增加log 2021-05-11 11:20:53 +08:00
junjie
2cd8111047 fix(数据集):sql数据集优化 2021-05-11 11:11:42 +08:00
junjie
7a5037068e feat(数据集):自助数据集 优化 2021-05-11 10:48:59 +08:00
junjie
6d1110bb1b Merge remote-tracking branch 'origin/main' into main 2021-05-10 18:42:06 +08:00
junjie
20ca335a4a feat(数据集):自助数据集 2021-05-10 18:41:49 +08:00
taojinlong
e46644534d fix: 处理doris 字段长度 2021-05-10 18:19:29 +08:00
taojinlong
26b6bddee7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-10 18:06:28 +08:00
taojinlong
224902d222 fix: 校验 kettle状态 2021-05-10 18:06:16 +08:00
taojinlong
bf638f1d95 fix: 校验kettle状态 2021-05-10 18:04:51 +08:00
junjie
ad71308564 feat(数据集):自助数据集 2021-05-10 17:57:31 +08:00
taojinlong
4891c38a8e Merge branch 'main' of github.com:dataease/dataease into main 
# Conflicts:
#	frontend/src/lang/zh.js
#	frontend/src/views/dataset/common/DatasetGroupSelector.vue
 2021-05-10 16:07:54 +08:00
taojinlong
08f0cd24cb feat: kettle 未运行时，禁用抽取数据 2021-05-10 16:03:56 +08:00
junjie
00850c5dd9 feat(数据集):自助数据集 测试 2021-05-10 15:22:36 +08:00
taojinlong
f34262b2f6 fix: 数据集更新 2021-05-10 10:13:38 +08:00
taojinlong
568288001a fix: 数据集更新 2021-05-10 10:13:00 +08:00
junjie
a1f210ac91 feat:flyway 菜单名称fix 2021-05-08 14:12:07 +08:00
fit2cloud-chenyw
aaf19048f4 feat: 增加权限管理 模版管理菜单 2021-05-08 12:27:19 +08:00
wangjiahao
175f5510c4 feat: 增加flyway 调增模板导入等 2021-05-08 11:49:21 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
wangjiahao
7a27491b53 feat:修改仪表盘编辑侧边弹框样式 2021-05-08 00:04:24 +08:00
wangjiahao
dd17ebe2c5 Merge remote-tracking branch 'origin/main' into main 2021-05-07 19:21:09 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
taojinlong
4e797ff89e feat: excel 数据预览 2021-05-07 19:01:11 +08:00
taojinlong
9bd7de1934 feat: 抽取 excel 数据 2021-05-07 18:08:45 +08:00
taojinlong
260d09a1a0 feat: 抽取 excel 数据 2021-05-07 16:01:04 +08:00
junjie
ac938c281b feat(数据集):草稿，数据集 关联视图 功能。自助数据集需要关联视图做支撑，先简单做个 数据集 关联视图 的功能，后边再优化 2021-05-07 14:51:40 +08:00
junjie
5a2a5bb368 feat(dialog):dialog 支持拖动位置 2021-05-07 11:04:50 +08:00
junjie
893b56244e fix:线上数据库名称是dataease，flyway remove database名称 2021-05-07 10:26:33 +08:00
wangjiahao
9a6890d6e1 feat:flay_way 2021-05-07 10:22:46 +08:00
wangjiahao
20ce5bbb39 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
 2021-05-06 23:42:18 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
fit2cloud-chenyw
484d931fd6 feat: 初始密码和登录超时时间设置在dataease.properties里 2021-05-06 15:43:57 +08:00
fit2cloud-chenyw
33320f6f14 feat: 一级菜单只有一级 表结构 2021-05-06 15:06:19 +08:00
fit2cloud-chenyw
d1f3d3a7f0 feat: 一级菜单只存一级 2021-05-06 14:43:57 +08:00
fit2cloud-chenyw
22a9cc9b21 feat: 系统管理按钮样式 2021-05-06 10:40:08 +08:00
fit2cloud-chenyw
54d775de0b feat: 数据源表单隐藏菜添加 2021-04-30 15:48:39 +08:00
junjie
5fd3554a1d feat(数据集): 数据库表不能重复添加到数据集 2021-04-30 12:08:39 +08:00
fit2cloud-chenyw
ec9cde55b6 feat: 角色表删除code字段 2021-04-30 11:21:11 +08:00
fit2cloud-chenyw
e0a6ae7962 feat: 角色删除code字段 表单增加重复验证 2021-04-30 11:05:59 +08:00
junjie
54f43559bf fix(数据集): 数据预览分页bug fix 2021-04-30 10:32:58 +08:00
fit2cloud-chenyw
9ed610802c feat: 数据源弹框改为隐藏路由 2021-04-29 15:38:03 +08:00
taojinlong
639246dfd5 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-29 14:05:49 +08:00
taojinlong
883eb91a8b fix: 删除数据 2021-04-29 14:05:10 +08:00
fit2cloud-chenyw
f35c4477a5 feat: 增加隐藏路由菜单数据 2021-04-29 14:02:29 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
junjie
3526d39e01 feat(数据集): 数据集fix 2021-04-29 12:12:12 +08:00
taojinlong
57c5551549 fix: 恢复 2021-04-29 10:54:08 +08:00
taojinlong
bde937f97a Merge branch 'main' of github.com:dataease/dataease into main 2021-04-29 10:47:25 +08:00
taojinlong
9c3ca09973 feat: 抽取数据到doris 2021-04-29 10:47:11 +08:00
junjie
f5b3923681 fix(数据集): 预览样式优化；分页展示fix 2021-04-28 18:39:01 +08:00
junjie
794e4651b0 fix: 视图表格样式合计fix；数据集数据预览表格各项优化 2021-04-28 17:30:18 +08:00
fit2cloud-chenyw
082844537d feat: 增加隐藏路由 2021-04-28 17:22:30 +08:00
fit2cloud-chenyw
1ed42b1fa5 fix: 登录超时时间可配置 2021-04-28 12:16:37 +08:00
fit2cloud-chenyw
65d1808488 fix: 用户停用还可以登录 2021-04-28 12:16:07 +08:00
taojinlong
1f12b90b23 feat: 抽取数据到doris 2021-04-27 18:12:13 +08:00
taojinlong
89ff614e17 feat: 抽取数据到doris 2021-04-27 17:50:43 +08:00
taojinlong
35d50d9f4d feat: 抽取数据到doris 2021-04-27 17:39:07 +08:00
junjie
d861a4f816 feat(视图):维度过滤与排序 2021-04-27 13:58:25 +08:00
junjie
75f22d0ff1 feat(backend):fix filter 2021-04-26 19:12:41 +08:00
junjie
ab9129f468 feat(backend):fix 2021-04-26 18:39:03 +08:00
junjie
90c406d108 feat(视图):视图增加表格 2021-04-25 18:03:13 +08:00
junjie
e3099e9cb2 feat(视图):视图指标增加数量字段 2021-04-25 15:10:49 +08:00
junjie
9302d0f092 feat(backend):数据抽取，切换Doris 2021-04-23 15:09:43 +08:00
fit2cloud-chenyw
92c0a47668 feat: 更新初始化菜单sql 2021-04-22 18:25:20 +08:00
fit2cloud-chenyw
89370df958 feat: 登录页面增加用户名验证 2021-04-22 14:53:23 +08:00
fit2cloud-chenyw
acf8ecbdeb feat: 创建仪表板必须带上creator 2021-04-22 14:27:08 +08:00
fit2cloud-chenyw
ca59ce0485 feat: 公共链接分享 白名单 2021-04-22 14:04:24 +08:00
fit2cloud-chenyw
12f2148030 feat: 完善登录过期功能 2021-04-22 12:43:56 +08:00
wangjiahao
079f42b27b feat:增加表结构 2021-04-22 10:19:46 +08:00
wangjiahao
d6ca7a8b8f Merge remote-tracking branch 'origin/main' into main 2021-04-21 18:49:13 +08:00
wangjiahao
290502b35b feat:新建仪表盘修改 同时支持自建 复用 导入 2021-04-21 18:48:57 +08:00
taojinlong
b8521fd87d Merge branch 'main' of github.com:dataease/dataease into main 2021-04-21 11:08:25 +08:00
taojinlong
f3fad450c8 feat: 测试性能 2021-04-21 11:08:10 +08:00
junjie
4784c1078f feat(数据集):上传excel，保存第一行作为字段 2021-04-20 16:23:47 +08:00
fit2cloud-chenyw
6b285d7391 feat: 分享收藏完善 2021-04-20 14:19:10 +08:00
junjie
5f402b35df feat(数据集):flyway fix；excel数据集创建 2021-04-20 11:48:38 +08:00
junjie
109ce64fdd feat(数据集):上传excel并解析预览 2021-04-19 18:33:53 +08:00
wangjiahao
7cdc0c220f Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/custom-component/UserView.vue
 2021-04-19 18:21:07 +08:00
wangjiahao
5405332dc2 feat:仪表盘模板导入导出 2021-04-19 18:20:15 +08:00
fit2cloud-chenyw
5af4158dc4 feat:设置条件绑定视图 2021-04-19 15:31:03 +08:00
junjie
153ac35701 feat(backend):chart fix 2021-04-19 12:45:41 +08:00
wangjiahao
f4f43a47aa Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-04-19 11:51:43 +08:00
wangjiahao
11e7eb2a88 feat:仪表盘模板导入导出 2021-04-19 11:51:22 +08:00
junjie
afca57c459 feat(backend):chart 支持 dashboard传入过滤组件条件 2021-04-19 11:44:21 +08:00