diff --git a/backend/src/main/resources/db/migration/V5__auth.sql b/backend/src/main/resources/db/migration/V5__auth.sql index 445ed36dd9..befd3499c9 100644 --- a/backend/src/main/resources/db/migration/V5__auth.sql +++ b/backend/src/main/resources/db/migration/V5__auth.sql @@ -333,7 +333,7 @@ DECLARE oTempChild VARCHAR(8000); SET oTemp = ''; -SET oTempChild = CAST(parentId AS CHAR); +SET oTempChild = CAST(parentId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; WHILE oTempChild IS NOT NULL @@ -366,7 +366,8 @@ DECLARE oTempChild VARCHAR(8000); SET oTemp = ''; -SET oTempChild = CAST(parentId AS CHAR); +SET oTempChild = CAST(parentId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; + WHILE oTempChild IS NOT NULL @@ -420,7 +421,7 @@ DECLARE oTempChild longtext; SET oTemp = ''; -SET oTempChild = CAST(parentId AS CHAR); +SET oTempChild = CAST(parentId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; WHILE oTempChild IS NOT NULL @@ -453,7 +454,7 @@ DECLARE oTempParent longtext; SET oTemp = ''; -SET oTempParent = CAST(childrenId AS CHAR); +SET oTempParent = CAST(childrenId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; WHILE oTempParent IS NOT NULL diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 07db29246d..2dbc6c18d3 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -108,7 +108,9 @@ export default { }, computed: { customStyle() { - let style = {} + let style = { + width: '100%' + } if (this.canvasStyleData.openCommonStyle) { if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) { style = { @@ -266,6 +268,7 @@ export default { .main-class { width: 100%; height: 100%; + background-size: 100% 100% !important; } .custom-position { diff --git a/frontend/src/views/panel/export/PDFPreExport.vue b/frontend/src/views/panel/export/PDFPreExport.vue index f5fcf1a382..99f410c3bf 100644 --- a/frontend/src/views/panel/export/PDFPreExport.vue +++ b/frontend/src/views/panel/export/PDFPreExport.vue @@ -97,7 +97,8 @@ export default { const contentWidth = canvas.width const contentHeight = canvas.height const pageData = canvas.toDataURL('image/jpeg', 1.0) - const PDF = new JsPDF('p', 'pt', [contentWidth, contentHeight]) + const lp = contentWidth > contentHeight ? 'l' : 'p' + const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight]) PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight) PDF.save(_this.panelName + '.pdf') _this.$emit('closePreExport')