diff --git a/packages/editor/src/fields/StyleSetter/Index.vue b/packages/editor/src/fields/StyleSetter/Index.vue index e3fab9c2..13aa759a 100644 --- a/packages/editor/src/fields/StyleSetter/Index.vue +++ b/packages/editor/src/fields/StyleSetter/Index.vue @@ -7,9 +7,12 @@ v-if="item.component" :is="item.component" :values="model[name]" + :last-values="lastValues?.[name]" + :is-compare="isCompare" :size="size" :disabled="disabled" @change="change" + @add-diff-count="onAddDiffCount" > @@ -36,6 +39,7 @@ const props = defineProps>(); const emit = defineEmits<{ change: [v: any, eventData: ContainerChangeEventData]; + addDiffCount: []; }>(); const list = [ @@ -82,4 +86,6 @@ const change = (v: any, eventData: ContainerChangeEventData) => { }); emit('change', v, eventData); }; + +const onAddDiffCount = () => emit('addDiffCount'); diff --git a/packages/editor/src/fields/StyleSetter/components/Border.vue b/packages/editor/src/fields/StyleSetter/components/Border.vue index 6b7e4b52..85842a9b 100644 --- a/packages/editor/src/fields/StyleSetter/components/Border.vue +++ b/packages/editor/src/fields/StyleSetter/components/Border.vue @@ -30,7 +30,16 @@
- +
@@ -86,11 +95,14 @@ const selectDirection = (d?: string) => (direction.value = d || ''); const emit = defineEmits<{ change: [v: StyleSchema, eventData: ContainerChangeEventData]; + addDiffCount: []; }>(); withDefaults( defineProps<{ model: FormValue; + lastValues?: FormValue; + isCompare?: boolean; disabled?: boolean; size?: 'large' | 'default' | 'small'; }>(), @@ -104,4 +116,6 @@ const change = (value: StyleSchema, eventData: ContainerChangeEventData) => { }); }); }; + +const onAddDiffCount = () => emit('addDiffCount'); diff --git a/packages/editor/src/fields/StyleSetter/components/Box.vue b/packages/editor/src/fields/StyleSetter/components/Box.vue index 396fd591..c3c20bd3 100644 --- a/packages/editor/src/fields/StyleSetter/components/Box.vue +++ b/packages/editor/src/fields/StyleSetter/components/Box.vue @@ -64,6 +64,8 @@ withDefaults( disabled?: boolean; size?: 'large' | 'default' | 'small'; model: FormValue; + lastValues?: FormValue; + isCompare?: boolean; }>(), {}, ); diff --git a/packages/editor/src/fields/StyleSetter/pro/Background.vue b/packages/editor/src/fields/StyleSetter/pro/Background.vue index 51050221..601dfa6b 100644 --- a/packages/editor/src/fields/StyleSetter/pro/Background.vue +++ b/packages/editor/src/fields/StyleSetter/pro/Background.vue @@ -1,5 +1,14 @@ diff --git a/packages/editor/src/fields/StyleSetter/pro/Border.vue b/packages/editor/src/fields/StyleSetter/pro/Border.vue index cd336381..b7b7c17f 100644 --- a/packages/editor/src/fields/StyleSetter/pro/Border.vue +++ b/packages/editor/src/fields/StyleSetter/pro/Border.vue @@ -1,6 +1,23 @@ diff --git a/packages/editor/src/fields/StyleSetter/pro/Font.vue b/packages/editor/src/fields/StyleSetter/pro/Font.vue index d5d9e42e..d3174693 100644 --- a/packages/editor/src/fields/StyleSetter/pro/Font.vue +++ b/packages/editor/src/fields/StyleSetter/pro/Font.vue @@ -1,5 +1,14 @@ diff --git a/packages/editor/src/fields/StyleSetter/pro/Layout.vue b/packages/editor/src/fields/StyleSetter/pro/Layout.vue index 69d4de8c..7d97849e 100644 --- a/packages/editor/src/fields/StyleSetter/pro/Layout.vue +++ b/packages/editor/src/fields/StyleSetter/pro/Layout.vue @@ -1,8 +1,19 @@