From 6995cfddc3e439fd6e148279d8f7cf7de7e5e9e1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 2 Aug 2022 11:07:57 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8):=20=E9=A9=B1=E5=8A=A8=E6=96=87=E4=BB=B6=E9=87=8D?= =?UTF-8?q?=E5=90=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/datasource/DriverService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/datasource/DriverService.java b/backend/src/main/java/io/dataease/service/datasource/DriverService.java index 69be3ad455..a0fd534fdd 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DriverService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DriverService.java @@ -135,6 +135,13 @@ public class DriverService { deDriverDetails.setVersion(version); deDriverDetails.setFileName(filename); deDriverDetails.setDriverClass(String.join(",", jdbcList)); + + DeDriverDetailsExample deDriverDetailsExample = new DeDriverDetailsExample(); + deDriverDetailsExample.createCriteria().andDeDriverIdEqualTo(driverId).andFileNameEqualTo(filename); + if(CollectionUtil.isNotEmpty(deDriverDetailsMapper.selectByExample(deDriverDetailsExample))){ + throw new Exception("A file with the same name already exists：" + filename); + } + deDriverDetailsMapper.insert(deDriverDetails); SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.UPLOADFILE, SysLogConstants.SOURCE_TYPE.DRIVER_FILE, deDriverDetails.getId(), driverId, null, null); DeLogUtils.save(sysLogDTO); From d2b481c00205fb1897dfc4b4a761042b6012f940 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 2 Aug 2022 11:41:24 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/ApiProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index e09e82f343..cc99027538 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -142,7 +142,7 @@ public class ApiProvider extends Provider { switch (apiDefinition.getMethod()) { case "GET": - response = HttpClientUtil.get(apiDefinition.getUrl(), httpClientConfig); + response = HttpClientUtil.get(apiDefinition.getUrl().trim(), httpClientConfig); break; case "POST": if (apiDefinitionRequest.getBody().get("type") == null) { From 67bf1c6cd426f82ef3d9ee31327a7654191d4e5e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Aug 2022 15:52:52 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E6=88=AA=E5=9B=BE=E4=B8=8E=E6=8C=87=E5=AE=9A=E5=88=86?= =?UTF-8?q?=E8=BE=A8=E7=8E=87=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/backend/pom.xml b/backend/pom.xml index c8c9f5cbc0..148b4fd392 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -23,6 +23,7 @@ + junit junit @@ -147,6 +148,10 @@ org.slf4j slf4j-api + + guava + com.google.guava + @@ -215,6 +220,12 @@ io.dataease dataease-plugin-interface 1.13.0 + + + guava + com.google.guava + + io.dataease @@ -236,6 +247,14 @@ org.slf4j slf4j-api + + guava + com.google.guava + + + commons-io + commons-io + @@ -251,12 +270,30 @@ org.springframework.security spring-security-core + + guava + com.google.guava + + + commons-io + commons-io + pentaho metastore 8.3.0.18-1112 + + + guava + com.google.guava + + + commons-io + commons-io + + org.pentaho.di.plugins @@ -302,10 +339,19 @@ org.springframework.boot spring-boot-starter-data-redis + org.apache.commons commons-pool2 + + + ru.yandex.qatools.ashot + ashot + 1.5.4 + + + From e5501010e38b6b604ba94ee905d704366a017caa Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Aug 2022 16:15:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8=E5=AE=9A=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AF=BC=E8=87=B4=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index f0a33fc4f8..6b11e42c69 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -517,6 +517,7 @@ public class ChartViewService { // 仪表板有参数不使用缓存 if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter()) || CollectionUtils.isNotEmpty(requestList.getLinkageFilters()) + || CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters()) || CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) { data = datasourceProvider.getData(datasourceRequest); } else { @@ -911,6 +912,7 @@ public class ChartViewService { // 仪表板有参数不使用缓存 if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter()) || CollectionUtils.isNotEmpty(requestList.getLinkageFilters()) + || CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters()) || CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) { data = datasourceProvider.getData(datasourceRequest); } else { From 006936b7eb727cd6e36eaa6edf96c5bf84a84b0e Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:28:44 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=BA=E7=A9=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/userEditer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/user/userEditer.vue b/frontend/src/views/system/user/userEditer.vue index ec066391ff..596cf9926c 100644 --- a/frontend/src/views/system/user/userEditer.vue +++ b/frontend/src/views/system/user/userEditer.vue @@ -361,7 +361,7 @@ export default { this.create(); return; } - const { deptId:id, deptName:label } = row.dept; + const { deptId:id, deptName:label } = (row.dept || {}); this.selectDepts = [{id, label}] this.formType = "modify"; this.dialogVisible = true; From 587e93292828401be9d52fb48098336385909268 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:28:44 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=BA=E7=A9=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/userEditer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/user/userEditer.vue b/frontend/src/views/system/user/userEditer.vue index ec066391ff..596cf9926c 100644 --- a/frontend/src/views/system/user/userEditer.vue +++ b/frontend/src/views/system/user/userEditer.vue @@ -361,7 +361,7 @@ export default { this.create(); return; } - const { deptId:id, deptName:label } = row.dept; + const { deptId:id, deptName:label } = (row.dept || {}); this.selectDepts = [{id, label}] this.formType = "modify"; this.dialogVisible = true; From 045f7e14bd2dc725bb089d1d96446a582cb582eb Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Aug 2022 16:34:15 +0800 Subject: [PATCH 07/11] =?UTF-8?q?style:=20=E7=BC=96=E8=BE=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8C=BA=E4=BF=AE=E6=94=B9=E6=8E=92=E5=88=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/CloseBar.vue | 2 +- .../canvas/components/Editor/EditBar.vue | 18 +++++++++--------- .../canvas/components/Editor/EditBarView.vue | 2 +- .../components/Editor/MobileCheckBar.vue | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/CloseBar.vue b/frontend/src/components/canvas/components/Editor/CloseBar.vue index ab4ce0f1bd..497c7edd97 100644 --- a/frontend/src/components/canvas/components/Editor/CloseBar.vue +++ b/frontend/src/components/canvas/components/Editor/CloseBar.vue @@ -48,7 +48,7 @@ export default { padding-left: 3px; padding-right: 0px; cursor:pointer!important; - background-color: #0a7be0; + background-color: #3370ff; } .bar-main i{ color: white; diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 84408c7dc2..747f8dd7fb 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -12,11 +12,6 @@
- - - - - @@ -26,12 +21,17 @@ - - - + + + + + + + + @@ -315,7 +315,7 @@ export default { padding-left: 3px; padding-right: 0px; cursor:pointer!important; - background-color: rgba(10,123,224, 1); + background-color: #3370ff; } .bar-main i{ color: white; diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue index 9253fa932e..b9526d9bde 100644 --- a/frontend/src/components/canvas/components/Editor/EditBarView.vue +++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue @@ -149,7 +149,7 @@ export default { padding-left: 3px!important; padding-right: 0px!important; cursor:pointer!important; - background-color: #0a7be0; + background-color: #3370ff; } .bar-main i{ color: white; diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue index 9dcb0779c2..974ed5a6d6 100644 --- a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue +++ b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue @@ -76,7 +76,7 @@ export default { padding-right: 1px; cursor:pointer!important; text-align: center; - background-color: #0a7be0; + background-color: #3370ff; } .bar-main i{ color: white; From f859f10fb54f38964229c209e42cfc8719621f2f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Aug 2022 16:37:05 +0800 Subject: [PATCH 08/11] =?UTF-8?q?revert:=20=E8=BF=98=E5=8E=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V38__1.13.sql | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/src/main/resources/db/migration/V38__1.13.sql b/backend/src/main/resources/db/migration/V38__1.13.sql index c956d40244..04be3aff2e 100644 --- a/backend/src/main/resources/db/migration/V38__1.13.sql +++ b/backend/src/main/resources/db/migration/V38__1.13.sql @@ -92,11 +92,6 @@ SET `permission` = 'datasource:read' WHERE `menu_id` = 39; -UPDATE `sys_menu` -SET - `permission` = 'user:editPwd' -WHERE - `menu_id` = 51; INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openMarketPage', 'true', 'boolean', 14); From 809d2d8683cf06a37745db5a4777f7e44069e754 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Aug 2022 17:06:51 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE):=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=96=87=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=8F=8D?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/SysParam/MapSetting/MapSettingLeft.vue | 9 +++++++-- .../views/system/SysParam/MapSetting/MapSettingRight.vue | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue index a98d018b98..203da13b9b 100644 --- a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue +++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue @@ -149,8 +149,13 @@ export default { type: 'warning' }).then(() => { removeMap(param).then(res => { - this.$emit('refresh-tree') - this.$success(this.$t('commons.delete_success')) + this.$store.dispatch('map/setGeo', { + key: param.code, + value: null + }).then(() => { + this.$emit('refresh-tree') + this.$success(this.$t('commons.delete_success')) + }) }) }).catch(() => { this.$info(this.$t('commons.delete_cancel')) diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue index ae6a8613bd..ad024cf0f5 100644 --- a/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue +++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue @@ -131,7 +131,7 @@ export default { }, data() { return { - formInline: { pCode: '' }, + formInline: { pCode: '', fileName: '' }, loading: false, rules: { pCode: [ @@ -227,7 +227,7 @@ export default { return true }, uploadMapFile(file) { - this.formInline.fileName = file.file.name + this.$set(this.formInline, 'fileName', file.file.name) this.formInline.file = file.file }, removeFile() { From eabbf9a609334e9c555f1a10585dde3e6100f0c4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 2 Aug 2022 17:17:24 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E6=8A=BD=E5=8F=96=20api=20=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/ApiProvider.java | 20 +++++++++++-------- .../system/datasource/DsConfiguration.vue | 1 - .../src/views/system/datasource/DsForm.vue | 6 +++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index cc99027538..cf7c55f97d 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -318,27 +318,31 @@ public class ApiProvider extends Provider { } static void mergeValue(JSONObject field, ApiDefinition apiDefinition, JSONObject item) { - JSONArray array = field.getJSONArray("value"); if (array != null && item.getString("value") != null && array.size() < apiDefinition.getPreviewNum()) { array.add(item.getJSONArray("value").get(0).toString()); field.put("value", array); } if(CollectionUtils.isNotEmpty(field.getJSONArray("children"))&& CollectionUtils.isNotEmpty(item.getJSONArray("children"))){ - JSONArray objectChildren = field.getJSONArray("children"); - JSONArray jsonArrayChildren = new JSONArray(); + JSONArray fieldChildren = field.getJSONArray("children"); JSONArray itemChildren = item.getJSONArray("children"); - for (Object objectChild : objectChildren) { - JSONObject jsonObject = JSONObject.parseObject(objectChild.toString()); + + JSONArray fieldArrayChildren = new JSONArray(); + for (Object fieldChild : fieldChildren) { + JSONObject jsonObject = JSONObject.parseObject(fieldChild.toString()); + JSONObject find = null; for (Object itemChild : itemChildren) { JSONObject itemObject = JSONObject.parseObject(itemChild.toString()); if(jsonObject.getString("jsonPath").equals(itemObject.getString("jsonPath"))){ - mergeValue(jsonObject, apiDefinition, itemObject); - jsonArrayChildren.add(jsonObject); + find = itemObject; } } + if(find != null){ + mergeValue(jsonObject, apiDefinition, find); + } + fieldArrayChildren.add(jsonObject); } - field.put("children", jsonArrayChildren); + field.put("children", fieldArrayChildren); } } diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue index 016b6fea30..c1c0b02a60 100644 --- a/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/frontend/src/views/system/datasource/DsConfiguration.vue @@ -932,7 +932,6 @@ export default { return; } this.$refs.apiItem.validate((valid) => { - console.log(valid) if (valid) { const data = JSON.parse(JSON.stringify(this.apiItem)); this.loading = true; diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue index fb22d33b04..0a7db4318d 100644 --- a/frontend/src/views/system/datasource/DsForm.vue +++ b/frontend/src/views/system/datasource/DsForm.vue @@ -316,7 +316,11 @@ export default { this.form = JSON.parse(JSON.stringify(row)) this.originConfiguration = this.form.configuration if (row.type === 'api') { - + this.originConfiguration = JSON.parse(JSON.stringify(this.form.apiConfiguration)) + this.originConfiguration.forEach(item => { + delete item.status + }) + this.originConfiguration = JSON.stringify(this.originConfiguration) } else { this.form.configuration = JSON.parse(this.form.configuration) } From 88c571223391dcf7f355c0c683ea4f9760d5bc22 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Aug 2022 17:20:03 +0800 Subject: [PATCH 11/11] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=94=BB=E5=B8=83=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E5=B8=83=E5=B1=80=E8=AE=BE=E8=AE=A1=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=B0=BA=E5=AF=B8=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?1*1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/index.vue | 6 +++--- .../components/canvas/components/Editor/EditBar.vue | 9 +++------ .../components/canvas/components/Editor/Preview.vue | 12 ++++++------ .../canvas/components/Editor/PreviewMobile.vue | 8 ++++---- .../components/canvas/components/Editor/index.vue | 8 ++++---- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 825ad531a2..8ada2505de 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -595,14 +595,14 @@ export default { return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0 }, miniWidth() { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 4) : 0 }, miniHeight() { if (this.element.auxiliaryMatrix) { if (this.element.component === 'de-number-range') { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 } else { - return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 } } else { return 0 diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 747f8dd7fb..c9db10aaf4 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -151,14 +151,10 @@ export default { return this.targetLinkageInfo[this.element.propValue.viewId] }, miniHeight() { - let miniHeight = 4 - if (this.element.component === 'de-number-range') { - miniHeight = 4 - } - return miniHeight + return this.mobileLayoutStatus ? 1 : 4 }, miniWidth() { - return 4 + return this.mobileLayoutStatus ? 1 : 4 }, ...mapState([ 'menuTop', @@ -172,6 +168,7 @@ export default { 'curLinkageView', 'curCanvasScale', 'batchOptStatus', + 'mobileLayoutStatus', 'curBatchOptComponents' ]) }, diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 9017d3415c..f3eeea879a 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -561,23 +561,23 @@ export default { color: #9ea6b2; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; } - .mobile-dialog-css > > > .el-dialog__headerbtn { + .mobile-dialog-css ::v-deep .el-dialog__headerbtn { top: 7px } - .mobile-dialog-css > > > .el-dialog__body { + .mobile-dialog-css ::v-deep .el-dialog__body { padding: 0px; } ::-webkit-scrollbar { diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue index 9d0f22024b..5e3195d1e8 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue @@ -285,15 +285,15 @@ export default { padding: 5px; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; } diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 037c82ccb9..430c5cc8b5 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -1843,15 +1843,15 @@ export default { height: 1px; } - .dialog-css > > > .el-dialog__title { + .dialog-css ::v-deep .el-dialog__title { font-size: 14px; } - .dialog-css > > > .el-dialog__header { - padding: 20px 20px 0; + .dialog-css ::v-deep .el-dialog__header { + padding: 40px 20px 0; } - .dialog-css > > > .el-dialog__body { + .dialog-css ::v-deep .el-dialog__body { padding: 10px 20px 20px; }