From c3fce400381fb18f5863cc3fa69bbf5dc0cd9ac7 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 2 Jun 2021 11:03:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(frontend):logo=E7=AD=89=E5=B0=BA?= =?UTF-8?q?=E5=AF=B8=E8=B0=83=E6=95=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- frontend/src/styles/topbar.scss | 4 ++++ frontend/src/views/login/index.vue | 8 ++++++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 2c9e49c281..b2749a9168 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -985,7 +985,8 @@ export default { loginLogo: 'Login page header logo', loginImage: 'Picture on the right side of the login page', loginTitle: 'Login page title', - title: 'System name' + title: 'System name', + advice_size: 'Advice picture size' }, auth: { authConfig: 'Auth Config', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index cede5bd3a4..f65bcc240f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -985,7 +985,8 @@ export default { loginLogo: '登陸頁面頭部 Logo', loginImage: '登陸頁面右側圖片', loginTitle: '登陸頁面標題', - title: '系統名稱' + title: '系統名稱', + advice_size: '建議圖片大小' }, auth: { authConfig: '權限配置', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 37f3874bdf..04b6c9c927 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -985,7 +985,8 @@ export default { loginLogo: '登录页面头部logo', loginImage: '登录页面右侧图片', loginTitle: '登录页面标题', - title: '系统名称' + title: '系统名称', + advice_size: '建议图片大小' }, auth: { authConfig: '权限配置', diff --git a/frontend/src/styles/topbar.scss b/frontend/src/styles/topbar.scss index c52d51d01d..2403e9733b 100644 --- a/frontend/src/styles/topbar.scss +++ b/frontend/src/styles/topbar.scss @@ -19,6 +19,10 @@ // color: rgb(191, 203, 217); color: rgba(255,255,255,0.87); float: left; + img{ + width: auto; + max-height: 45px; + } } .el-menu { float: left; diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index cbf50f8a8a..02a47191ce 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -180,9 +180,13 @@ export default { margin-top: 20px; } img{ - width: 240px; + /*width: 240px;*/ + width: auto; + max-height: 60px; @media only screen and (max-width: 1280px) { - width: 200px; + /*width: 200px;*/ + width: auto; + max-height: 50px; } } } From 3825be261cf4be028f7c5ff1f6e2a803e6df7b24 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 2 Jun 2021 11:06:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(backend):=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/service/DatasourceService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java index 66bf1189f9..8a2eee16a5 100644 --- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java +++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java @@ -91,11 +91,7 @@ public class DatasourceService { DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); - try { - datasourceProvider.test(datasourceRequest); - } catch (Exception e) { - throw new RuntimeException(Translator.get("i18n_datasource_check_fail")); - } + datasourceProvider.test(datasourceRequest); } public List getTables(Datasource datasource) throws Exception { From cf62ecefbd96aa116d2e7535dd19a999f603fcb5 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 2 Jun 2021 11:31:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(frontend):icon=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/PanelList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index a6915fa836..de9b7c46da 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -115,7 +115,7 @@ {{ $t('panel.create_public_links') }} - + {{ $t('panel.to_default_panel') }} From f837c0edf433a4d5b5eb4f23f9054e241f888382 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 2 Jun 2021 11:35:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E3=80=90ID1004028=E3=80=91=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E6=80=BB=E6=98=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=95=88=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/panel/PanelLinkService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java index 4048fe7fb5..d5a8abca72 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java @@ -119,7 +119,7 @@ public class PanelLinkService { public Boolean validateHeads(PanelLink panelLink) throws Exception{ HttpServletRequest request = ServletUtils.request(); String token = request.getHeader("LINK-PWD-TOKEN"); - if (StringUtils.isEmpty(token)) return false; + if (StringUtils.isEmpty(token) || StringUtils.equals("undefined", token) || StringUtils.equals("null", token)) return false; boolean verify = JWTUtils.verifyLink(token, panelLink.getResourceId(), decryptParam(panelLink.getPwd())); return verify; } From c2cb12c73b33bb35d09d8239dfb14c434a5565a9 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 2 Jun 2021 11:59:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(fix):=E6=B7=BB=E5=8A=A0db=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/DataSetTableService.java | 4 ---- frontend/src/views/dataset/add/AddDB.vue | 11 +++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 36b1e343f2..71fd2a9f7b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -102,10 +102,6 @@ public class DataSetTableService { datasetTable.setCreateBy(AuthUtils.getUser().getUsername()); datasetTable.setCreateTime(System.currentTimeMillis()); DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO(); - if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { - dataTableInfoDTO.setTable(datasetTable.getName()); - datasetTable.setInfo(new Gson().toJson(dataTableInfoDTO)); - } int insert = datasetTableMapper.insert(datasetTable); // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库 if (insert == 1) { diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index be014f8dcf..44bf4daa1c 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -120,17 +120,24 @@ export default { save() { // console.log(this.checkTableList); // console.log(this.scene); + let ds = {} + this.options.forEach(ele => { + if (ele.id === this.dataSource) { + ds = ele + } + }) const sceneId = this.param.id const dataSourceId = this.dataSource const tables = [] const mode = this.mode this.checkTableList.forEach(function(name) { tables.push({ - name: name, + name: ds.name + '_' + name, sceneId: sceneId, dataSourceId: dataSourceId, type: 'db', - mode: parseInt(mode) + mode: parseInt(mode), + info: JSON.stringify({ table: name }) }) }) post('/dataset/table/batchAdd', tables).then(response => {