@tmagic/editor 1.8.0-beta.2 → 1.8.0-beta.20

package/src/fields/StyleSetter/pro/Layout.vue

@@ -1,6 +1,9 @@
 <template>
   <MContainer
-    :config="config"
+    v-for="item in formConfig"
+    :prop="prop"
+    :key="item.name"
+    :config="item"
     :model="values"
     :last-values="lastValues"
     :is-compare="isCompare"
@@ -23,11 +26,19 @@
 <script lang="ts" setup>
 import { markRaw } from 'vue';
 
-import type { ChildConfig, ContainerChangeEventData } from '@tmagic/form';
-import { defineFormItem, MContainer } from '@tmagic/form';
+import { useTheme } from '@tmagic/design';
+import type { ContainerChangeEventData } from '@tmagic/form';
+import { defineFormConfig, MContainer } from '@tmagic/form';
 import type { StyleSchema } from '@tmagic/schema';
 
 import Box from '../components/Box.vue';
+import {
+  AlignItemsCenter,
+  AlignItemsFlexEnd,
+  AlignItemsFlexStart,
+  AlignItemsSpaceAround,
+  AlignItemsSpaceBetween,
+} from '../icons/align-items';
 import { DisplayBlock, DisplayFlex, DisplayInline, DisplayInlineBlock, DisplayNone } from '../icons/display';
 import {
   FlexDirectionColumn,
@@ -43,12 +54,14 @@ import {
   JustifyContentSpaceBetween,
 } from '../icons/justify-content';
 
-defineProps<{
+const props = defineProps<{
   values: Partial<StyleSchema>;
   lastValues?: Partial<StyleSchema>;
   isCompare?: boolean;
   disabled?: boolean;
   size?: 'large' | 'default' | 'small';
+  theme?: string;
+  prop?: string;
 }>();
 
 const emit = defineEmits<{
@@ -56,145 +69,204 @@ const emit = defineEmits<{
   addDiffCount: [];
 }>();
 
-const config = defineFormItem({
-  items: [
-    {
-      name: 'display',
-      text: '模式',
-      type: 'radioGroup',
-      childType: 'button',
-      labelWidth: '68px',
-      options: [
-        { value: 'inline', icon: markRaw(DisplayInline), tooltip: '内联布局 inline' },
-        { value: 'flex', icon: markRaw(DisplayFlex), tooltip: '弹性布局 flex' },
-        { value: 'block', icon: markRaw(DisplayBlock), tooltip: '块级布局 block' },
-        { value: 'inline-block', icon: markRaw(DisplayInlineBlock), tooltip: '内联块布局 inline-block' },
-        { value: 'none', icon: markRaw(DisplayNone), tooltip: '隐藏 none' },
-      ],
-    },
-    {
-      name: 'flexDirection',
-      text: '主轴方向',
-      type: 'radioGroup',
-      childType: 'button',
-      labelWidth: '68px',
-      options: [
-        { value: 'row', icon: markRaw(FlexDirectionRow), tooltip: '水平方向 起点在左侧 row' },
-        { value: 'row-reverse', icon: markRaw(FlexDirectionRowReverse), tooltip: '水平方向 起点在右侧 row-reverse' },
-        { value: 'column', icon: markRaw(FlexDirectionColumn), tooltip: '垂直方向 起点在上沿 column' },
-        {
-          value: 'column-reverse',
-          icon: markRaw(FlexDirectionColumnReverse),
-          tooltip: '垂直方向 起点在下沿 column-reverse',
-        },
-      ],
-      display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
-    },
-    {
-      name: 'justifyContent',
-      text: '主轴对齐',
-      type: 'radioGroup',
-      childType: 'button',
-      labelWidth: '68px',
-      options: [
-        { value: 'flex-start', icon: markRaw(JustifyContentFlexStart), tooltip: '左对齐 flex-start' },
-        { value: 'flex-end', icon: markRaw(JustifyContentFlexEnd), tooltip: '右对齐 flex-end' },
-        { value: 'center', icon: markRaw(JustifyContentCenter), tooltip: '居中 center' },
-        { value: 'space-between', icon: markRaw(JustifyContentSpaceBetween), tooltip: '两端对齐 space-between' },
-        { value: 'space-around', icon: markRaw(JustifyContentSpaceAround), tooltip: '横向平分 space-around' },
-      ],
-      display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
-    },
-    {
-      name: 'alignItems',
-      text: '辅轴对齐',
-      type: 'radioGroup',
-      childType: 'button',
-      labelWidth: '68px',
-      options: [
-        { value: 'flex-start', icon: markRaw(JustifyContentFlexStart), tooltip: '左对齐 flex-start' },
-        { value: 'flex-end', icon: markRaw(JustifyContentFlexEnd), tooltip: '右对齐 flex-end' },
-        { value: 'center', icon: markRaw(JustifyContentCenter), tooltip: '居中 center' },
-        { value: 'space-between', icon: markRaw(JustifyContentSpaceBetween), tooltip: '两端对齐 space-between' },
-        { value: 'space-around', icon: markRaw(JustifyContentSpaceAround), tooltip: '横向平分 space-around' },
-      ],
-      display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
-    },
-    {
-      name: 'flexWrap',
-      text: '换行',
-      type: 'radioGroup',
-      childType: 'button',
-      labelWidth: '68px',
-      options: [
-        { value: 'nowrap', text: '不换行', tooltip: '不换行 nowrap' },
-        { value: 'wrap', text: '正换行', tooltip: '第一行在上方 wrap' },
-        { value: 'wrap-reverse', text: '逆换行', tooltip: '第一行在下方 wrap-reverse' },
-      ],
-      display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
-    },
-    {
-      type: 'row',
-      items: [
-        {
-          name: 'width',
-          text: '宽度',
-          labelWidth: '68px',
-          type: 'data-source-field-select',
-          fieldConfig: {
-            type: 'text',
-          },
+const displayTheme = useTheme(props);
+
+const formConfig = defineFormConfig([
+  {
+    name: 'display',
+    text: '模式',
+    type: 'radioGroup',
+    childType: 'button',
+    labelWidth: '90px',
+    iconSize: '24px',
+    options: [
+      {
+        value: 'inline',
+        icon: markRaw(DisplayInline),
+        tooltip: '内联布局 inline',
+      },
+      {
+        value: 'flex',
+        icon: markRaw(DisplayFlex),
+        tooltip: '弹性布局 flex',
+      },
+      {
+        value: 'block',
+        icon: markRaw(DisplayBlock),
+        tooltip: '块级布局 block',
+      },
+      {
+        value: 'inline-block',
+        icon: markRaw(DisplayInlineBlock),
+        tooltip: '内联块布局 inline-block',
+      },
+      {
+        value: 'none',
+        icon: markRaw(DisplayNone),
+        tooltip: '隐藏 none',
+      },
+    ],
+  },
+  {
+    name: 'flexDirection',
+    text: '主轴方向',
+    type: 'radioGroup',
+    childType: 'button',
+    labelWidth: '90px',
+    iconSize: '24px',
+    options: [
+      { value: 'row', icon: markRaw(FlexDirectionRow), tooltip: '水平方向 起点在左侧 row' },
+      {
+        value: 'row-reverse',
+        icon: markRaw(FlexDirectionRowReverse),
+        tooltip: '水平方向 起点在右侧 row-reverse',
+      },
+      {
+        value: 'column',
+        icon: markRaw(FlexDirectionColumn),
+        tooltip: '垂直方向 起点在上沿 column',
+      },
+      {
+        value: 'column-reverse',
+        icon: markRaw(FlexDirectionColumnReverse),
+        tooltip: '垂直方向 起点在下沿 column-reverse',
+      },
+    ],
+    display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
+  },
+  {
+    name: 'justifyContent',
+    text: '主轴对齐',
+    type: 'radioGroup',
+    childType: 'button',
+    labelWidth: '90px',
+    iconSize: '24px',
+    options: [
+      { value: 'flex-start', icon: markRaw(JustifyContentFlexStart), tooltip: '左对齐 flex-start' },
+      { value: 'flex-end', icon: markRaw(JustifyContentFlexEnd), tooltip: '右对齐 flex-end' },
+      { value: 'center', icon: markRaw(JustifyContentCenter), tooltip: '居中 center' },
+      {
+        value: 'space-between',
+        icon: markRaw(JustifyContentSpaceBetween),
+        tooltip: '两端对齐 space-between',
+      },
+      {
+        value: 'space-around',
+        icon: markRaw(JustifyContentSpaceAround),
+        tooltip: '横向平分 space-around',
+      },
+    ],
+    display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
+  },
+  {
+    name: 'alignItems',
+    text: '辅轴对齐',
+    type: 'radioGroup',
+    childType: 'button',
+    labelWidth: '90px',
+    iconSize: '24px',
+    options: [
+      { value: 'flex-start', icon: markRaw(AlignItemsFlexStart), tooltip: '左对齐 flex-start' },
+      { value: 'flex-end', icon: markRaw(AlignItemsFlexEnd), tooltip: '右对齐 flex-end' },
+      { value: 'center', icon: markRaw(AlignItemsCenter), tooltip: '居中 center' },
+      {
+        value: 'space-between',
+        icon: markRaw(AlignItemsSpaceBetween),
+        tooltip: '两端对齐 space-between',
+      },
+      {
+        value: 'space-around',
+        icon: markRaw(AlignItemsSpaceAround),
+        tooltip: '横向平分 space-around',
+      },
+    ],
+    display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
+  },
+  {
+    name: 'flexWrap',
+    text: '换行',
+    type: 'radioGroup',
+    childType: displayTheme.value !== 'magic-admin' ? 'button' : 'default',
+    labelWidth: '90px',
+    iconSize: '24px',
+    options: [
+      { value: 'nowrap', text: '不换行', tooltip: '不换行 nowrap' },
+      { value: 'wrap', text: '正换行', tooltip: '第一行在上方 wrap' },
+      { value: 'wrap-reverse', text: '逆换行', tooltip: '第一行在下方 wrap-reverse' },
+    ],
+    display: (_mForm, { model }: { model: Record<any, any> }) => model.display === 'flex',
+  },
+  {
+    type: 'row',
+    items: [
+      {
+        name: 'width',
+        text: '宽度（px）',
+        labelWidth: '90px',
+        type: 'data-source-field-select',
+        fieldConfig: {
+          type: 'text',
         },
-        {
-          name: 'height',
-          text: '高度',
-          labelWidth: '68px',
-          type: 'data-source-field-select',
-          fieldConfig: {
-            type: 'text',
-          },
+      },
+    ],
+  },
+  {
+    type: 'row',
+    items: [
+      {
+        name: 'height',
+        text: '高度（px）',
+        labelWidth: '90px',
+        type: 'data-source-field-select',
+        fieldConfig: {
+          type: 'text',
         },
-      ],
-    },
-    {
-      type: 'row',
-      items: [
-        {
-          type: 'data-source-field-select',
-          text: 'overflow',
-          name: 'overflow',
-          labelWidth: '68px',
-          checkStrictly: false,
-          dataSourceFieldType: ['string'],
-          fieldConfig: {
-            type: 'select',
-            clearable: true,
-            allowCreate: true,
-            options: [
-              { text: 'visible', value: 'visible' },
-              { text: 'hidden', value: 'hidden' },
-              { text: 'clip', value: 'clip' },
-              { text: 'scroll', value: 'scroll' },
-              { text: 'auto', value: 'auto' },
-              { text: 'overlay', value: 'overlay' },
-              { text: 'initial', value: 'initial' },
-            ],
-          },
+      },
+    ],
+  },
+  {
+    type: 'row',
+    items: [
+      {
+        type: 'data-source-field-select',
+        text: 'overflow',
+        name: 'overflow',
+        labelWidth: '90px',
+        checkStrictly: false,
+        dataSourceFieldType: ['string'],
+        fieldConfig: {
+          type: 'select',
+          clearable: true,
+          allowCreate: true,
+          options: [
+            { text: 'visible', value: 'visible' },
+            { text: 'hidden', value: 'hidden' },
+            { text: 'clip', value: 'clip' },
+            { text: 'scroll', value: 'scroll' },
+            { text: 'auto', value: 'auto' },
+            { text: 'overlay', value: 'overlay' },
+            { text: 'initial', value: 'initial' },
+          ],
         },
-        {
-          type: 'data-source-field-select',
-          text: '透明度',
-          name: 'opacity',
-          labelWidth: '68px',
-          dataSourceFieldType: ['string', 'number'],
-          fieldConfig: {
-            type: 'text',
-          },
+      },
+    ],
+  },
+  {
+    type: 'row',
+    items: [
+      {
+        type: 'data-source-field-select',
+        text: '透明度（%）',
+        name: 'opacity',
+        labelWidth: '90px',
+        dataSourceFieldType: ['string', 'number'],
+        fieldConfig: {
+          type: 'text',
         },
-      ],
-    },
-  ],
-}) as ChildConfig;
+      },
+    ],
+  },
+]);
 
 const change = (value: string | StyleSchema, eventData: ContainerChangeEventData) => {
   emit('change', value, eventData);

package/src/fields/StyleSetter/pro/Position.vue

@@ -1,6 +1,9 @@
 <template>
   <MContainer
-    :config="config"
+    v-for="(item, index) in formConfig"
+    :prop="prop"
+    :key="index"
+    :config="item"
     :model="values"
     :last-values="lastValues"
     :is-compare="isCompare"
@@ -12,7 +15,7 @@
 </template>
 
 <script lang="ts" setup>
-import { type ContainerChangeEventData, defineFormItem, MContainer } from '@tmagic/form';
+import { type ContainerChangeEventData, defineFormConfig, MContainer } from '@tmagic/form';
 import type { StyleSchema } from '@tmagic/schema';
 
 const props = defineProps<{
@@ -21,6 +24,7 @@ const props = defineProps<{
   isCompare?: boolean;
   disabled?: boolean;
   size?: 'large' | 'default' | 'small';
+  prop?: string;
 }>();
 
 const emit = defineEmits<{
@@ -36,78 +40,76 @@ const positionText: Record<string, string> = {
   sticky: '粘性定位',
 };
 
-const config = defineFormItem({
-  items: [
-    {
-      name: 'position',
-      text: '定位',
-      labelWidth: '68px',
-      type: 'data-source-field-select',
-      fieldConfig: {
-        type: 'select',
-        options: Object.keys(positionText).map((item) => ({
-          value: item,
-          text: `${item}(${positionText[item]})`,
-        })),
-      },
+const formConfig = defineFormConfig([
+  {
+    name: 'position',
+    text: '定位',
+    labelWidth: '68px',
+    type: 'data-source-field-select',
+    fieldConfig: {
+      type: 'select',
+      options: Object.keys(positionText).map((item) => ({
+        value: item,
+        text: `${item}(${positionText[item]})`,
+      })),
     },
-    {
-      type: 'row',
-      labelWidth: '68px',
-      display: () => props.values.position !== 'static',
-      items: [
-        {
-          name: 'left',
-          type: 'data-source-field-select',
-          text: 'left',
-          fieldConfig: {
-            type: 'text',
-          },
+  },
+  {
+    type: 'row',
+    labelWidth: '68px',
+    display: () => props.values.position !== 'static',
+    items: [
+      {
+        name: 'left',
+        type: 'data-source-field-select',
+        text: 'left',
+        fieldConfig: {
+          type: 'text',
         },
-        {
-          name: 'top',
-          type: 'data-source-field-select',
-          text: 'top',
-          fieldConfig: {
-            type: 'text',
-          },
+      },
+      {
+        name: 'top',
+        type: 'data-source-field-select',
+        text: 'top',
+        fieldConfig: {
+          type: 'text',
         },
-      ],
-    },
-    {
-      type: 'row',
-      labelWidth: '68px',
-      display: () => props.values.position !== 'static',
-      items: [
-        {
-          name: 'right',
-          type: 'data-source-field-select',
-          text: 'right',
-          fieldConfig: {
-            type: 'text',
-          },
+      },
+    ],
+  },
+  {
+    type: 'row',
+    labelWidth: '68px',
+    display: () => props.values.position !== 'static',
+    items: [
+      {
+        name: 'right',
+        type: 'data-source-field-select',
+        text: 'right',
+        fieldConfig: {
+          type: 'text',
         },
-        {
-          name: 'bottom',
-          type: 'data-source-field-select',
-          text: 'bottom',
-          fieldConfig: {
-            type: 'text',
-          },
+      },
+      {
+        name: 'bottom',
+        type: 'data-source-field-select',
+        text: 'bottom',
+        fieldConfig: {
+          type: 'text',
         },
-      ],
-    },
-    {
-      labelWidth: '68px',
-      name: 'zIndex',
-      text: 'zIndex',
-      type: 'data-source-field-select',
-      fieldConfig: {
-        type: 'text',
       },
+    ],
+  },
+  {
+    labelWidth: '68px',
+    name: 'zIndex',
+    text: 'zIndex',
+    type: 'data-source-field-select',
+    fieldConfig: {
+      type: 'text',
     },
-  ],
-});
+  },
+]);
 
 const change = (value: string | StyleSchema, eventData: ContainerChangeEventData) => {
   emit('change', value, eventData);

package/src/fields/StyleSetter/pro/Transform.vue

@@ -1,5 +1,6 @@
 <template>
   <MContainer
+    :prop="prop"
     :config="config"
     :model="values"
     :last-values="lastValues"
@@ -21,6 +22,7 @@ defineProps<{
   isCompare?: boolean;
   disabled?: boolean;
   size?: 'large' | 'default' | 'small';
+  prop?: string;
 }>();
 
 const emit = defineEmits<{
@@ -29,33 +31,29 @@ const emit = defineEmits<{
 }>();
 
 const config = defineFormItem({
+  name: 'transform',
   items: [
     {
-      name: 'transform',
-      items: [
-        {
-          name: 'rotate',
-          text: '旋转角度',
-          labelWidth: '68px',
-          type: 'data-source-field-select',
-          checkStrictly: false,
-          dataSourceFieldType: ['string', 'number'],
-          fieldConfig: {
-            type: 'text',
-          },
-        },
-        {
-          name: 'scale',
-          text: '缩放',
-          labelWidth: '68px',
-          type: 'data-source-field-select',
-          checkStrictly: false,
-          dataSourceFieldType: ['string', 'number'],
-          fieldConfig: {
-            type: 'text',
-          },
-        },
-      ],
+      name: 'rotate',
+      text: '旋转角度',
+      labelWidth: '68px',
+      type: 'data-source-field-select',
+      checkStrictly: false,
+      dataSourceFieldType: ['string', 'number'],
+      fieldConfig: {
+        type: 'text',
+      },
+    },
+    {
+      name: 'scale',
+      text: '缩放',
+      labelWidth: '68px',
+      type: 'data-source-field-select',
+      checkStrictly: false,
+      dataSourceFieldType: ['string', 'number'],
+      fieldConfig: {
+        type: 'text',
+      },
     },
   ],
 });

package/src/fields/UISelect.vue

@@ -127,15 +127,3 @@ const unhighlight = () => {
   stageOverlayService.get('stage')?.clearHighlight();
 };
 </script>
-
-<style lang="scss">
-.m-fields-ui-select {
-  cursor: pointer;
-  i {
-    margin-right: 3px;
-  }
-  span {
-    color: #2882e0;
-  }
-}
-</style>

package/src/hooks/index.ts

@@ -17,6 +17,7 @@
  */
 
 export * from './use-code-block-edit';
+export * from './use-compare-form';
 export * from './use-stage';
 export * from './use-float-box';
 export * from './use-window-rect';