From ec4e8f7de3148b88cce709875b5f59092674dc67 Mon Sep 17 00:00:00 2001 From: chilingling <26962197+chilingling@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:02:37 +0800 Subject: [PATCH] fix: reset spacing cannot generate correct source code (#657) --- .../styles/src/components/spacing/SpacingGroup.vue | 2 +- .../styles/src/components/spacing/SpacingSetting.vue | 10 +++++----- packages/settings/styles/src/js/parser.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/settings/styles/src/components/spacing/SpacingGroup.vue b/packages/settings/styles/src/components/spacing/SpacingGroup.vue index 9379bcee4..aee7a1792 100644 --- a/packages/settings/styles/src/components/spacing/SpacingGroup.vue +++ b/packages/settings/styles/src/components/spacing/SpacingGroup.vue @@ -429,7 +429,7 @@ export default { properties[name] = { value, - text: value === 'auto' ? 'auto' : String(Number.parseInt(value || 0)), // 界面 box 中显示的数值 + text: value === 'auto' ? 'auto' : String(Number.parseInt(value) || 0), // 界面 box 中显示的数值 setting: Boolean(value) // 属性是否已设置值 } }) diff --git a/packages/settings/styles/src/components/spacing/SpacingSetting.vue b/packages/settings/styles/src/components/spacing/SpacingSetting.vue index af11937bd..1e950ae87 100644 --- a/packages/settings/styles/src/components/spacing/SpacingSetting.vue +++ b/packages/settings/styles/src/components/spacing/SpacingSetting.vue @@ -61,6 +61,10 @@ export default { props.property.value?.indexOf('px') > -1 ? Number.parseInt(props.property.value) : props.property.value ) + const updateStyle = (value) => { + emit('update', { [props.property.name]: value }) + } + const sliderChange = () => { if (sliderFlag) { updateStyle(`${sliderValue.value}px`) @@ -83,11 +87,7 @@ export default { const reset = () => { sliderFlag = false - updateStyle('') - } - - const updateStyle = (value) => { - emit('update', { [props.property.name]: value }) + updateStyle(null) } const inputChange = (property) => { diff --git a/packages/settings/styles/src/js/parser.js b/packages/settings/styles/src/js/parser.js index b56a9f668..ee54e7d82 100644 --- a/packages/settings/styles/src/js/parser.js +++ b/packages/settings/styles/src/js/parser.js @@ -231,7 +231,7 @@ export const stringify = (originParseList, styleObject, config = {}) => { if (key.includes('comment')) { str += `${value.value}\n` } else { - str += `${key}: ${value.value};\n` + str += `${key}: ${value.value === '' ? "''" : value.value};\n` } } } else { @@ -249,7 +249,7 @@ export const stringify = (originParseList, styleObject, config = {}) => { // 在 styleObject 的,可能有改动,所以需要用 styleObject 拼接 for (const [key, value] of Object.entries(styleObject[item.selectors].rules)) { if (![null, undefined].includes(value)) { - str += `${key}: ${value};\n` + str += `${key}: ${value === '' ? "''" : value};\n` } } } @@ -266,7 +266,7 @@ export const stringify = (originParseList, styleObject, config = {}) => { str += `${selector} {\n` for (const [declKey, declValue] of Object.entries(value.rules)) { - str += `${declKey}: ${declValue};\n` + str += `${declKey}: ${declValue === '' ? "''" : declValue};\n` } str += '}\n'