diff --git a/core/core-frontend/flushbonading/index.js b/core/core-frontend/flushbonading/index.js index 0ed1ec21ef..f53b354c67 100644 --- a/core/core-frontend/flushbonading/index.js +++ b/core/core-frontend/flushbonading/index.js @@ -114,7 +114,8 @@ htmlStream.pipe(parserStream).on('finish', () => { let element = document.createElement(name) Object.entries(obj).forEach(([key, value]) => { if (['href', 'src'].includes(key)) { - element[key] = \`\${preUrl}\${value}\` + const relativeVal = value.startsWith('./') ? value.substr(1) : value + element[key] = \`\${preUrl}\${relativeVal}\` } else { element.setAttribute(key, value || '') } diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index cade1db975..349dcd2bcd 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -24,7 +24,7 @@ "axios": "^1.3.3", "crypto-js": "^4.1.1", "dayjs": "^1.11.9", - "element-plus-secondary": "^0.4.12", + "element-plus-secondary": "^0.4.15", "element-resize-detector": "^1.2.4", "file-saver": "^2.0.5", "html-to-image": "^1.11.11", diff --git a/core/core-frontend/src/custom-component/group/GroupPreview.vue b/core/core-frontend/src/custom-component/group/GroupPreview.vue index e60ae2e4f9..818da933b5 100644 --- a/core/core-frontend/src/custom-component/group/GroupPreview.vue +++ b/core/core-frontend/src/custom-component/group/GroupPreview.vue @@ -3,6 +3,7 @@ import { toRefs } from 'vue' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { storeToRefs } from 'pinia' import ComponentWrapper from '@/components/data-visualization/canvas/ComponentWrapper.vue' +import { toPercent } from '@/utils/translate' const dvMainStore = dvMainStoreWithOut() const { canvasViewInfo } = storeToRefs(dvMainStore) @@ -37,6 +38,15 @@ const props = defineProps({ }) const { propValue, dvInfo, searchCount } = toRefs(props) + +const customGroupStyle = item => { + return { + width: toPercent(item.groupStyle.width), + height: toPercent(item.groupStyle.height), + top: toPercent(item.groupStyle.top), + left: toPercent(item.groupStyle.left) + } +}