amis-editor 5.2.1-beta.15 → 5.2.1-beta.19

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 
@@ -138,12 +138,29 @@ amisEditorCore.setSchemaTpl('layout:z-index', function (config) {
 });
 // 显示类型
 amisEditorCore.setSchemaTpl('layout:display', function (config) {
+  var configOptions = [{
+    label: i18nRuntime.i18n("cb048b2d8426afd464dc01b72c446342"),
+    value: 'block'
+  }, {
+    label: i18nRuntime.i18n("b5f55e5c7101d9be5218d63850e1ad8b"),
+    value: 'flex'
+  }, {
+    label: i18nRuntime.i18n("4180e30c34190007ffaa654e0959b8a3"),
+    value: 'inline-flex'
+  }, {
+    label: i18nRuntime.i18n("ebe7bde5c9094813e2924473488d281a"),
+    value: 'inline-block'
+  }, {
+    label: i18nRuntime.i18n("70d457cd36de1acefe7d9587f3f862c9"),
+    value: 'inline'
+  }];
   var configSchema = {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("a5d833839a610994dc4752e2d91f4192"), i18nRuntime.i18n("a8489cf57d7f44e889aff79434776f47")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.display',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'block',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
+    options: configOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
     onChange: function (value, oldValue, model, form) {
@@ -152,23 +169,7 @@ amisEditorCore.setSchemaTpl('layout:display', function (config) {
         form.setValueByName('style.justifyContent', undefined);
         form.setValueByName('style.alignItems', undefined);
       }
-    },
-    options: [{
-      label: i18nRuntime.i18n("cb048b2d8426afd464dc01b72c446342"),
-      value: 'block'
-    }, {
-      label: i18nRuntime.i18n("b5f55e5c7101d9be5218d63850e1ad8b"),
-      value: 'flex'
-    }, {
-      label: i18nRuntime.i18n("4180e30c34190007ffaa654e0959b8a3"),
-      value: 'inline-flex'
-    }, {
-      label: i18nRuntime.i18n("ebe7bde5c9094813e2924473488d281a"),
-      value: 'inline-block'
-    }, {
-      label: i18nRuntime.i18n("70d457cd36de1acefe7d9587f3f862c9"),
-      value: 'inline'
-    }]
+    }
   };
   if ((config === null || config === void 0 ? void 0 : config.mode) === 'vertical') {
     // 上下展示，可避免 自定义渲染器 出现挤压
@@ -335,8 +336,8 @@ amisEditorCore.setSchemaTpl('layout:flex', function (config) {
     value: (config === null || config === void 0 ? void 0 : config.value) || '0 0 auto',
     trueValue: '1 1 auto',
     falseValue: '0 0 auto',
-    onText: i18nRuntime.i18n("cc42dd3170fdf36bdc2b0f58ab23eb84"),
-    offText: i18nRuntime.i18n("b15d91274e9fc68608c609999e0413fa"),
+    onText: (config === null || config === void 0 ? void 0 : config.onText) || i18nRuntime.i18n("cc42dd3170fdf36bdc2b0f58ab23eb84"),
+    offText: (config === null || config === void 0 ? void 0 : config.offText) || i18nRuntime.i18n("b15d91274e9fc68608c609999e0413fa"),
     inputClassName: 'inline-flex justify-between',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     onChange: function (value, oldValue, model, form) {
@@ -369,7 +370,7 @@ amisEditorCore.setSchemaTpl('layout:flex-basis', function (config) {
     // pipeOut: config?.pipeOut,
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -377,13 +378,13 @@ amisEditorCore.setSchemaTpl('layout:flex-basis', function (config) {
     }
   };
 });
-// flex-grow 占比设置
+// flex-grow 弹性比例
 amisEditorCore.setSchemaTpl('layout:flex-grow', function (config) {
   return {
     type: 'input-range',
     max: 12,
     step: 1,
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("0ad8b3b736ae5b9e23cf16ac13e1e283"), i18nRuntime.i18n("fa6bb048a2f73975a40789b30c5b8a06")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("9e7c8d1554f6449121a83f951cf21ca1"), i18nRuntime.i18n("fa6bb048a2f73975a40789b30c5b8a06")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.flexGrow',
     value: (config === null || config === void 0 ? void 0 : config.value) || 1,
     visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) || 'data.style && data.style.flex !== "0 0 auto"',
@@ -429,7 +430,7 @@ amisEditorCore.setSchemaTpl('layout:width', function (config) {
     // pipeOut: config?.pipeOut,
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -453,7 +454,7 @@ amisEditorCore.setSchemaTpl('layout:max-width', function (config) {
     // pipeOut: config?.pipeOut
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -477,7 +478,7 @@ amisEditorCore.setSchemaTpl('layout:min-width', function (config) {
     // pipeOut: config?.pipeOut
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -548,7 +549,7 @@ amisEditorCore.setSchemaTpl('layout:height', function (config) {
     // pipeOut: config?.pipeOut
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -572,7 +573,7 @@ amisEditorCore.setSchemaTpl('layout:max-height', function (config) {
     // pipeOut: config?.pipeOut
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;
@@ -596,7 +597,7 @@ amisEditorCore.setSchemaTpl('layout:min-height', function (config) {
     // pipeOut: config?.pipeOut
     pipeOut: function (value) {
       var curValue = parseInt(value);
-      if (curValue || curValue === 0) {
+      if (value === 'auto' || curValue || curValue === 0) {
         return value;
       } else {
         return undefined;

package/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.19
  * Copyright 2018-2022 @fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.1-beta.15",
+  "version": "5.2.1-beta.19",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",