Merge pull request baidu#9431 from wibetter/master

fix(amis-editor): 布局容器相关配置细节优化
lhtuling · Jan 15, 2024 · b9e3718 · b9e3718
2 parents 2112f75 + 9056a9e
commit b9e3718
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/packages/amis-editor-core/src/util.ts b/packages/amis-editor-core/src/util.ts
@@ -14,6 +14,7 @@ import isPlainObject from 'lodash/isPlainObject';
 import isEqual from 'lodash/isEqual';
 import isNumber from 'lodash/isNumber';
 import debounce from 'lodash/debounce';
+import merge from 'lodash/merge';
 
 const {
   guid,
@@ -1224,10 +1225,10 @@ export function style2ThemeCss(data: any) {
       baseControlClassName
     };
   } else {
-    themeCss.baseControlClassName = {
-      ...data.themeCss.baseControlClassName,
-      ...baseControlClassName
-    };
+    themeCss.baseControlClassName = merge(
+      data.themeCss.baseControlClassName,
+      baseControlClassName
+    );
   }
   return {
     ...data,

diff --git a/packages/amis-editor/src/tpl/layout.tsx b/packages/amis-editor/src/tpl/layout.tsx
@@ -753,7 +753,7 @@ setSchemaTpl(
       name: config?.name || 'style.width',
       value: config?.value || '300px',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && data.isFixedWidth`
+        ? `(${config?.visibleOn}) && data.isFixedWidth`
         : 'data.isFixedWidth',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -826,7 +826,7 @@ setSchemaTpl(
       value: config?.value,
       min: '${style.minWidth | toInt}',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && !data.isFixedWidth`
+        ? `(${config?.visibleOn}) && !data.isFixedWidth`
         : '!data.isFixedWidth',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -865,7 +865,7 @@ setSchemaTpl(
       value: config?.value,
       max: '${style.maxWidth | toInt}',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && !data.isFixedWidth`
+        ? `(${config?.visibleOn}) && !data.isFixedWidth`
         : '!data.isFixedWidth',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -993,7 +993,7 @@ setSchemaTpl(
       name: config?.name || 'style.height',
       value: config?.value || '300px',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && data.isFixedHeight`
+        ? `(${config?.visibleOn}) && data.isFixedHeight`
         : 'data.isFixedHeight',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -1032,7 +1032,7 @@ setSchemaTpl(
       value: config?.value,
       min: '${style.minHeight | toInt}',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && !data.isFixedHeight`
+        ? `(${config?.visibleOn}) && !data.isFixedHeight`
         : '!data.isFixedHeight',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -1071,7 +1071,7 @@ setSchemaTpl(
       value: config?.value,
       max: '${style.maxHeight | toInt}',
       visibleOn: config?.visibleOn
-        ? `${config?.visibleOn} && !data.isFixedHeight`
+        ? `(${config?.visibleOn}) && !data.isFixedHeight`
         : '!data.isFixedHeight',
       clearable: true,
       unitOptions: config?.unitOptions ?? LayoutUnitOptions,
@@ -1132,7 +1132,7 @@ setSchemaTpl(
   }
 );
 
-// 居中显示
+// 对齐方式
 setSchemaTpl(
   'layout:margin-center',
   (config?: {
@@ -1153,7 +1153,7 @@ setSchemaTpl(
           '通过 margin 数值来设置对齐方式，其中 margin: 0 auto 用于设置居中对齐'
         ),
       name: config?.name || 'style.margin',
-      value: config?.value || '0',
+      value: config?.value,
       inputClassName: 'inline-flex justify-between',
       visibleOn:
         config?.visibleOn ??
@@ -1172,6 +1172,16 @@ setSchemaTpl(
           value: 'auto 0px auto auto'
         }
       ],
+      pipeIn: config?.pipeIn
+        ? config?.pipeIn
+        : (value: any, data: any) => {
+            let themeCssValue =
+              data.data?.themeCss?.baseControlClassName?.[
+                'padding-and-margin:default'
+              ]?.margin;
+            return value || themeCssValue;
+          },
+      pipeOut: config?.pipeOut,
       onChange: (value: string, oldValue: string, model: any, form: any) => {
         if (
           form?.data?.style?.position === 'fixed' ||