diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 67e040e3f5..1bca4d1795 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -78,12 +78,12 @@ - + -
- +
+
@@ -268,7 +268,8 @@ export default { 'color', 'backgroundColor', 'date-format', - 'time_margin' + 'time_margin', + 'padding' /* 'margin' */ ], // 文本组件显示的属性 diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index 94d807f23b..b15f06e30b 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -307,8 +307,8 @@ const list = [ borderStyle: 'solid', borderColor: '#000000', borderRadius: 0, - /* margin: 10, */ - time_margin: 0 + time_margin: 0, + padding: 10 }, formatInfo: { openMode: '0', diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js index 92b7462833..0bc0e2145c 100644 --- a/frontend/src/components/canvas/utils/style.js +++ b/frontend/src/components/canvas/utils/style.js @@ -10,7 +10,8 @@ export function getStyle(style, filter = []) { 'borderWidth', 'letterSpacing', 'borderRadius', - 'margin' + 'margin', + 'padding' ] const result = {} @@ -75,7 +76,7 @@ export function colorRgb(color, opacity) { } // 处理六位的颜色值 var sColorChange = [] - for (var i = 1; i < 7; i += 2) { + for (let i = 1; i < 7; i += 2) { sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2))) } if (opacity || opacity === 0) {