amis-editor 5.2.1-beta.33 → 5.2.3-beta.12

package/lib/plugin/HBox.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -121,7 +121,9 @@ var HBoxPlugin = /** @class */function (_super) {
       value: function (context) {
         return [amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
-          body: [amisEditorCore.getSchemaTpl('fieldSet', {
+          body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), amisEditorCore.getSchemaTpl('fieldSet', {
             title: i18nRuntime.i18n("9bdb07e72d3a9a6084201a7398523f5a"),
             collapsable: false,
             body: [{

package/lib/plugin/IFrame.d.ts

@@ -23,6 +23,7 @@ export declare class IFramePlugin extends BasePlugin {
     renderRenderer(props: any): import("react").DetailedReactHTMLElement<{
         key: any;
         className: string;
+        style: any;
         children: import("react").DetailedReactHTMLElement<{
             className: string;
             children: string;

package/lib/plugin/IFrame.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -104,7 +104,9 @@ var IFramePlugin = /** @class */function (_super) {
           title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
           body: amisEditorCore.getSchemaTpl('collapseGroup', [{
             title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
-            body: [{
+            body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+              value: 'left-top'
+            }), {
               type: 'ae-textareaFormulaControl',
               name: 'src',
               mode: 'normal',
@@ -138,7 +140,7 @@ var IFramePlugin = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function (props) {
-      return this.renderPlaceholder("IFrame \u9875\u9762\uFF08".concat(props.src, "\uFF09"));
+      return this.renderPlaceholder("IFrame \u9875\u9762\uFF08".concat(props.src, "\uFF09"), props.key, props.style);
     }
   });
   return IFramePlugin;

package/lib/plugin/Image.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -98,7 +98,9 @@ var ImagePlugin = /** @class */function (_super) {
         var isUnderField = /\/field\/\w+$/.test(context.path);
         return [amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
-          body: [{
+          body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), {
             name: 'imageMode',
             label: i18nRuntime.i18n("1fdadb49bcabfdc36a4a9e020f597f4d"),
             type: 'select',

package/lib/plugin/Images.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -113,7 +113,11 @@ var ImagesPlugin = /** @class */function (_super) {
         var isUnderField = /\/field\/\w+$/.test(context.path);
         return [amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
-          body: (isUnderField ? [] : [{
+          body: (isUnderField ? [amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          })] : [amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), {
             type: 'formula',
             name: '__mode',
             autoSet: false,

package/lib/plugin/Json.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -117,7 +117,9 @@ var JsonPlugin = /** @class */function (_super) {
             inline: false,
             className: 'text-info text-sm',
             tpl: i18nRuntime.i18n("37b12f2666b9e4e37f33eb5e83533d5e")
-          } : null, {
+          } : null, amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), {
             name: 'levelExpand',
             type: 'input-number',
             label: i18nRuntime.i18n("f891291cbfaec7ba3754520e2a5227d8"),

package/lib/plugin/Layout/FlexPluginBase.d.ts

@@ -14,6 +14,7 @@ export declare const defaultFlexColumnSchema: (title?: string) => {
         flexGrow: number;
         flexBasis: string;
     };
+    wrapperBody: boolean;
     isFixedHeight: boolean;
     isFixedWidth: boolean;
 };

package/lib/plugin/Layout/FlexPluginBase.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -13,7 +13,7 @@ var i18nRuntime = require('i18n-runtime');
 
 var defaultFlexColumnSchema = function (title) {
   return {
-    type: 'wrapper',
+    type: 'container',
     body: [],
     size: 'xs',
     style: {
@@ -23,6 +23,7 @@ var defaultFlexColumnSchema = function (title) {
       flexGrow: 1,
       flexBasis: 'auto'
     },
+    wrapperBody: false,
     isFixedHeight: false,
     isFixedWidth: false
   };
@@ -107,7 +108,7 @@ var FlexPluginBase = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: [i18nRuntime.i18n("e731c52010266b8ade1e7e78e25cdccc")]
+      value: [i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825")]
     });
     Object.defineProperty(_this, "scaffold", {
       enumerable: true,
@@ -125,7 +126,7 @@ var FlexPluginBase = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: 'Flex'
+      value: i18nRuntime.i18n("b1b98c19058af70d8bd499e1899e93bc")
     });
     Object.defineProperty(_this, "panelJustify", {
       enumerable: true,
@@ -143,47 +144,117 @@ var FlexPluginBase = /** @class */function (_super) {
         (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.direction) === 'row' || (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.direction) === 'row-reverse';
         var isFlexItem = (_a = _this.manager) === null || _a === void 0 ? void 0 : _a.isFlexItem(context === null || context === void 0 ? void 0 : context.id);
         var isFlexColumnItem = (_b = _this.manager) === null || _b === void 0 ? void 0 : _b.isFlexColumnItem(context === null || context === void 0 ? void 0 : context.id);
+        // 判断是否为吸附容器
+        var isSorptionContainer = (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.isSorptionContainer) || false;
+        var positionTpl = [amisEditorCore.getSchemaTpl('layout:position', {
+          visibleOn: '!data.stickyStatus'
+        }), amisEditorCore.getSchemaTpl('layout:originPosition'), amisEditorCore.getSchemaTpl('layout:inset', {
+          mode: 'vertical'
+        })];
         return [amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
           className: 'p-none',
           body: [amisEditorCore.getSchemaTpl('collapseGroup', [{
             title: i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825"),
-            body: [isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex', {
-              isFlexColumnItem: isFlexColumnItem,
-              onText: isFlexColumnItem ? i18nRuntime.i18n("183f00df0922a6be371fea58cd46a60a") : i18nRuntime.i18n("f92626f9e56b3e2d0c47495a446acf71"),
-              offText: isFlexColumnItem ? i18nRuntime.i18n("c19b79073b676b9bade80613aba2dbfa") : i18nRuntime.i18n("b591aed69defa2abf0486da6a58dfb5e"),
-              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative")'
-            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-grow', {
-              visibleOn: 'data.style && data.style.flex !== "0 0 auto" && (data.style.position === "static" || data.style.position === "relative")'
-            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-basis', {
-              label: isFlexColumnItem ? i18nRuntime.i18n("183f00df0922a6be371fea58cd46a60a") : i18nRuntime.i18n("f92626f9e56b3e2d0c47495a446acf71"),
-              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "1 1 auto"'
-            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-basis', {
-              label: isFlexColumnItem ? i18nRuntime.i18n("c19b79073b676b9bade80613aba2dbfa") : i18nRuntime.i18n("b591aed69defa2abf0486da6a58dfb5e"),
-              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "0 0 auto"'
-            }) : null, amisEditorCore.getSchemaTpl('layout:position'), amisEditorCore.getSchemaTpl('layout:originPosition'), amisEditorCore.getSchemaTpl('layout:inset', {
-              mode: 'vertical'
-            }), amisEditorCore.getSchemaTpl('layout:z-index'), amisEditorCore.getSchemaTpl('layout:flexDirection', {
+            body: tslib.__spreadArray(tslib.__spreadArray([isSorptionContainer ? amisEditorCore.getSchemaTpl('layout:sorption') : null], isSorptionContainer ? [] : positionTpl, true), [amisEditorCore.getSchemaTpl('layout:flexDirection', {
               name: 'direction'
             }), amisEditorCore.getSchemaTpl('layout:justifyContent', {
               name: 'justify',
               label: i18nRuntime.i18n("dde193342b8c350ae29795117c0c5b9a"),
+              options: [{
+                label: i18nRuntime.i18n("413f48cc71f71083ce532a86e3efdc21"),
+                value: 'flex-start'
+              }, {
+                label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+                value: 'center'
+              }, {
+                label: i18nRuntime.i18n("fd8e9572cc6bf87653c4d8f8b8dd0db9"),
+                value: 'flex-end'
+              }, {
+                label: i18nRuntime.i18n("da1b972efb29f850b50e219ad4d98ba5"),
+                value: 'space-between'
+              }, {
+                label: i18nRuntime.i18n("28968f372fe88c0ef855c7f79f42bbad"),
+                value: 'space-evenly'
+              }],
               visibleOn: 'data.direction === "row" || data.direction === "row-reverse"'
             }),
             // 备注: 重复一个是为了能实时联动，后续需要amis优化，支持label使用公式表达式
             amisEditorCore.getSchemaTpl('layout:justifyContent', {
               name: 'justify',
               label: i18nRuntime.i18n("5b15af1f73b4f2d5bb152410863602f4"),
+              options: [{
+                label: i18nRuntime.i18n("2a6ad292447e6354ca39ee7f40d2fcc8"),
+                value: 'flex-start'
+              }, {
+                label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+                value: 'center'
+              }, {
+                label: i18nRuntime.i18n("d68c21b6b65e7a2e361762b65b8a5032"),
+                value: 'flex-end'
+              }, {
+                label: i18nRuntime.i18n("da1b972efb29f850b50e219ad4d98ba5"),
+                value: 'space-between'
+              }, {
+                label: i18nRuntime.i18n("28968f372fe88c0ef855c7f79f42bbad"),
+                value: 'space-evenly'
+              }],
               visibleOn: 'data.direction === "column" || data.direction === "column-reverse"'
             }), amisEditorCore.getSchemaTpl('layout:alignItems', {
               name: 'alignItems',
               label: i18nRuntime.i18n("dde193342b8c350ae29795117c0c5b9a"),
+              options: [{
+                label: i18nRuntime.i18n("413f48cc71f71083ce532a86e3efdc21"),
+                value: 'flex-start'
+              }, {
+                label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+                value: 'center'
+              }, {
+                label: i18nRuntime.i18n("fd8e9572cc6bf87653c4d8f8b8dd0db9"),
+                value: 'flex-end'
+              }, {
+                label: i18nRuntime.i18n("ed97c73866617b40a7b1215867e0f489"),
+                value: 'baseline'
+              }, {
+                label: i18nRuntime.i18n("7ac1519928de413cfe36f5d2e0610430"),
+                value: 'stretch'
+              }],
               visibleOn: 'data.direction === "column" || data.direction === "column-reverse"'
             }), amisEditorCore.getSchemaTpl('layout:alignItems', {
               name: 'alignItems',
               label: i18nRuntime.i18n("5b15af1f73b4f2d5bb152410863602f4"),
+              options: [{
+                label: i18nRuntime.i18n("2a6ad292447e6354ca39ee7f40d2fcc8"),
+                value: 'flex-start'
+              }, {
+                label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+                value: 'center'
+              }, {
+                label: i18nRuntime.i18n("d68c21b6b65e7a2e361762b65b8a5032"),
+                value: 'flex-end'
+              }, {
+                label: i18nRuntime.i18n("ed97c73866617b40a7b1215867e0f489"),
+                value: 'baseline'
+              }, {
+                label: i18nRuntime.i18n("cbac406a3f51abad691702015b0784ba"),
+                value: 'stretch'
+              }],
               visibleOn: 'data.direction === "row" || data.direction === "row-reverse"'
-            }), amisEditorCore.getSchemaTpl('layout:flex-wrap'), amisEditorCore.getSchemaTpl('layout:isFixedHeight', {
+            }), amisEditorCore.getSchemaTpl('layout:flex-wrap'), isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex', {
+              isFlexColumnItem: isFlexColumnItem,
+              label: isFlexColumnItem ? i18nRuntime.i18n("f02f876ee64cc016d97fa4dc498d4857") : i18nRuntime.i18n("a170a375b264f7fe0c02a7ca8c268784"),
+              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative")'
+            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-grow', {
+              visibleOn: 'data.style && data.style.flex === "1 1 auto" && (data.style.position === "static" || data.style.position === "relative")'
+            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-basis', {
+              label: isFlexColumnItem ? i18nRuntime.i18n("183f00df0922a6be371fea58cd46a60a") : i18nRuntime.i18n("f92626f9e56b3e2d0c47495a446acf71"),
+              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "1 1 auto"'
+            }) : null, isFlexItem ? amisEditorCore.getSchemaTpl('layout:flex-basis', {
+              label: isFlexColumnItem ? i18nRuntime.i18n("c19b79073b676b9bade80613aba2dbfa") : i18nRuntime.i18n("b591aed69defa2abf0486da6a58dfb5e"),
+              visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "0 0 150px"'
+            }) : null, amisEditorCore.getSchemaTpl('layout:overflow-x', {
+              visibleOn: "".concat(isFlexItem && !isFlexColumnItem, " && data.style.flex === '0 0 150px'")
+            }), amisEditorCore.getSchemaTpl('layout:isFixedHeight', {
               visibleOn: "".concat(!isFlexItem || !isFlexColumnItem)
             }), amisEditorCore.getSchemaTpl('layout:height', {
               visibleOn: "".concat(!isFlexItem || !isFlexColumnItem)
@@ -192,7 +263,7 @@ var FlexPluginBase = /** @class */function (_super) {
             }), amisEditorCore.getSchemaTpl('layout:min-height', {
               visibleOn: "".concat(!isFlexItem || !isFlexColumnItem)
             }), amisEditorCore.getSchemaTpl('layout:overflow-y', {
-              visibleOn: "".concat(!isFlexItem || !isFlexColumnItem, " && (data.isFixedHeight || data.style && data.style.maxHeight) || (").concat(isFlexItem && isFlexColumnItem, " && data.style.flex === '0 0 auto')")
+              visibleOn: "".concat(!isFlexItem || !isFlexColumnItem, " && (data.isFixedHeight || data.style && data.style.maxHeight) || (").concat(isFlexItem && isFlexColumnItem, " && data.style.flex === '0 0 150px')")
             }), amisEditorCore.getSchemaTpl('layout:isFixedWidth', {
               visibleOn: "".concat(!isFlexItem || isFlexColumnItem)
             }), amisEditorCore.getSchemaTpl('layout:width', {
@@ -202,13 +273,13 @@ var FlexPluginBase = /** @class */function (_super) {
             }), amisEditorCore.getSchemaTpl('layout:min-width', {
               visibleOn: "".concat(!isFlexItem || isFlexColumnItem)
             }), amisEditorCore.getSchemaTpl('layout:overflow-x', {
-              visibleOn: "".concat(!isFlexItem || isFlexColumnItem, " && (data.isFixedWidth || data.style && data.style.maxWidth) || (").concat(isFlexItem && !isFlexColumnItem, " && data.style.flex === '0 0 auto')")
-            }), !isFlexItem ? amisEditorCore.getSchemaTpl('layout:margin-center') : null]
+              visibleOn: "".concat(!isFlexItem || isFlexColumnItem, " && (data.isFixedWidth || data.style && data.style.maxWidth)")
+            }), !isFlexItem ? amisEditorCore.getSchemaTpl('layout:margin-center') : null, amisEditorCore.getSchemaTpl('layout:z-index'), !isSorptionContainer && amisEditorCore.getSchemaTpl('layout:sticky'), amisEditorCore.getSchemaTpl('layout:stickyPosition')], false)
           }, amisEditorCore.getSchemaTpl('status')])]
         }, {
           title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
           className: 'p-none',
-          body: amisEditorCore.getSchemaTpl('collapseGroup', tslib.__spreadArray(tslib.__spreadArray([], amisEditorCore.getSchemaTpl('style:common', ['display']), true), [{
+          body: amisEditorCore.getSchemaTpl('collapseGroup', tslib.__spreadArray(tslib.__spreadArray([], amisEditorCore.getSchemaTpl('style:common', []), true), [{
             title: i18nRuntime.i18n("4434b33a8731a73613ba5fa1eb984efb"),
             body: [amisEditorCore.getSchemaTpl('className', {
               label: i18nRuntime.i18n("023c4bfc60545a2668c2d5111171b5d8")

package/lib/plugin/Layout/Layout1_2_v4.d.ts

@@ -4,7 +4,6 @@ export default class Layout1_2_v4 extends FlexPluginBase {
     isBaseComponent: boolean;
     pluginIcon: string;
     description: string;
-    tags: string[];
     order: number;
     scaffold: any;
 }

package/lib/plugin/Layout/Layout1_2_v4.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -40,12 +40,6 @@ var Layout1_2_v4 = /** @class */function (_super) {
       writable: true,
       value: i18nRuntime.i18n("230d65546ea0d299907943403608233c")
     });
-    Object.defineProperty(_this, "tags", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: [i18nRuntime.i18n("e731c52010266b8ade1e7e78e25cdccc")]
-    });
     Object.defineProperty(_this, "order", {
       enumerable: true,
       configurable: true,
@@ -60,9 +54,10 @@ var Layout1_2_v4 = /** @class */function (_super) {
         type: 'flex',
         className: 'p-1',
         items: [{
-          type: 'wrapper',
+          type: 'container',
           size: 'xs',
           body: [],
+          wrapperBody: false,
           style: {
             flex: '0 0 auto',
             display: 'block'
@@ -70,9 +65,10 @@ var Layout1_2_v4 = /** @class */function (_super) {
         }, {
           type: 'flex',
           items: [{
-            type: 'wrapper',
+            type: 'container',
             size: 'xs',
             body: [],
+            wrapperBody: false,
             style: {
               flex: '0 0 auto',
               flexBasis: '250px',
@@ -81,9 +77,10 @@ var Layout1_2_v4 = /** @class */function (_super) {
           }, {
             type: 'flex',
             items: [{
-              type: 'wrapper',
+              type: 'container',
               size: 'xs',
               body: [],
+              wrapperBody: false,
               style: {
                 flex: '1 1 auto',
                 flexBasis: 'auto',
@@ -91,9 +88,10 @@ var Layout1_2_v4 = /** @class */function (_super) {
                 display: 'block'
               }
             }, {
-              type: 'wrapper',
+              type: 'container',
               size: 'xs',
               body: [],
+              wrapperBody: false,
               style: {
                 flex: '1 1 auto',
                 flexBasis: 'auto',

package/lib/plugin/Layout/Layout_fixed.d.ts

@@ -4,7 +4,7 @@ export default class Layout_fixed extends FlexPluginBase {
     isBaseComponent: boolean;
     pluginIcon: string;
     description: string;
-    tags: string[];
     order: number;
     scaffold: any;
+    panelTitle: string;
 }

package/lib/plugin/Layout/Layout_fixed.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -38,13 +38,7 @@ var Layout_fixed = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: i18nRuntime.i18n("a3e91631c1a3a43e09526ea7f6b8595c")
-    });
-    Object.defineProperty(_this, "tags", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: [i18nRuntime.i18n("e731c52010266b8ade1e7e78e25cdccc")]
+      value: i18nRuntime.i18n("72c32b47c5e4dcd58ddabdb8fde761a0")
     });
     Object.defineProperty(_this, "order", {
       enumerable: true,
@@ -68,9 +62,16 @@ var Layout_fixed = /** @class */function (_super) {
           minHeight: '80px',
           display: 'block'
         },
+        wrapperBody: false,
         originPosition: 'right-bottom'
       }
     });
+    Object.defineProperty(_this, "panelTitle", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: i18nRuntime.i18n("9bbb7cfaeb34a2b5c095ac253355f028")
+    });
     return _this;
   }
   return Layout_fixed;

package/{esm/plugin/Layout/Layout_scroll_x.d.ts → lib/plugin/Layout/Layout_free_container.d.ts}

@@ -1,10 +1,11 @@
-import { FlexPluginBase } from './FlexPluginBase';
-export default class Layout_scroll_x extends FlexPluginBase {
+import { ContainerPlugin } from '../Container';
+export default class Layout_free_container extends ContainerPlugin {
     name: string;
     isBaseComponent: boolean;
     pluginIcon: string;
     description: string;
-    tags: string[];
     order: number;
+    tags: string[];
     scaffold: any;
+    panelTitle: string;
 }

package/lib/plugin/Layout/{Layout_fixed_bottom.js → Layout_free_container.js}

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -9,18 +9,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
-var FlexPluginBase = require('./FlexPluginBase.js');
+var Container = require('../Container.js');
 var i18nRuntime = require('i18n-runtime');
 
-var Layout_fixed_bottom = /** @class */function (_super) {
-  tslib.__extends(Layout_fixed_bottom, _super);
-  function Layout_fixed_bottom() {
+var Layout_free_container = /** @class */function (_super) {
+  tslib.__extends(Layout_free_container, _super);
+  function Layout_free_container() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
     Object.defineProperty(_this, "name", {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: i18nRuntime.i18n("d423930b823fc45f08c18922b19e4e9e")
+      value: i18nRuntime.i18n("db805d4e361ac2d3fc6047eaea1a7c69")
     });
     Object.defineProperty(_this, "isBaseComponent", {
       enumerable: true,
@@ -32,56 +32,52 @@ var Layout_fixed_bottom = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: 'flex-container-plugin'
+      value: 'layout-fixed-plugin'
     });
     Object.defineProperty(_this, "description", {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: i18nRuntime.i18n("b8b4eb373d8ba6f98271b681fba2511d")
+      value: i18nRuntime.i18n("9ccbfde404798593fa6fdeac9dbef200")
     });
-    Object.defineProperty(_this, "tags", {
+    Object.defineProperty(_this, "order", {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: [i18nRuntime.i18n("e731c52010266b8ade1e7e78e25cdccc")]
+      value: -1
     });
-    Object.defineProperty(_this, "order", {
+    Object.defineProperty(_this, "tags", {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: 501
+      value: [i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825")]
     });
     Object.defineProperty(_this, "scaffold", {
       enumerable: true,
       configurable: true,
       writable: true,
       value: {
-        type: 'flex',
-        className: 'p-1',
-        items: [FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema()],
+        type: 'container',
+        isFreeContainer: true,
+        size: 'xs',
+        body: [],
+        wrapperBody: false,
         style: {
-          position: 'fixed',
-          inset: 'auto auto 0 0',
-          zIndex: 2,
-          width: '100%',
-          overflowX: 'auto',
-          margin: '0',
-          overflowY: 'auto',
-          height: 'auto'
-        },
-        isFixedWidth: true,
-        direction: 'row',
-        justify: 'center',
-        alignItems: 'stretch',
-        isFixedHeight: false,
-        originPosition: 'right-bottom'
+          position: 'relative',
+          minHeight: '200px'
+        }
       }
     });
+    Object.defineProperty(_this, "panelTitle", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: i18nRuntime.i18n("db805d4e361ac2d3fc6047eaea1a7c69")
+    });
     return _this;
   }
-  return Layout_fixed_bottom;
-}(FlexPluginBase.FlexPluginBase);
-amisEditorCore.registerEditorPlugin(Layout_fixed_bottom);
+  return Layout_free_container;
+}(Container.ContainerPlugin);
+amisEditorCore.registerEditorPlugin(Layout_free_container);
 
-exports["default"] = Layout_fixed_bottom;
+exports["default"] = Layout_free_container;

package/{esm/plugin/Layout/Layout_fixed_top.d.ts → lib/plugin/Layout/Layout_sorption_container.d.ts}

@@ -4,7 +4,7 @@ export default class Layout_fixed_top extends FlexPluginBase {
     isBaseComponent: boolean;
     pluginIcon: string;
     description: string;
-    tags: string[];
     order: number;
     scaffold: any;
+    panelTitle: string;
 }

package/lib/plugin/Layout/{Layout_fixed_top.js → Layout_sorption_container.js}

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.33
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.12
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -20,7 +20,7 @@ var Layout_fixed_top = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: i18nRuntime.i18n("faaa6444a709917ff33e0d58948504dc")
+      value: i18nRuntime.i18n("969e9e56b3812abffa3994f35ea31835")
     });
     Object.defineProperty(_this, "isBaseComponent", {
       enumerable: true,
@@ -38,13 +38,7 @@ var Layout_fixed_top = /** @class */function (_super) {
       enumerable: true,
       configurable: true,
       writable: true,
-      value: i18nRuntime.i18n("1facf0bd0f56c66759857345e7434443")
-    });
-    Object.defineProperty(_this, "tags", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: [i18nRuntime.i18n("e731c52010266b8ade1e7e78e25cdccc")]
+      value: i18nRuntime.i18n("bb0e1fea25aafbe731886295fcef9a2e")
     });
     Object.defineProperty(_this, "order", {
       enumerable: true,
@@ -58,8 +52,10 @@ var Layout_fixed_top = /** @class */function (_super) {
       writable: true,
       value: {
         type: 'flex',
+        isSorptionContainer: true,
+        sorptionPosition: 'top',
         className: 'p-1',
-        items: [FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema()],
+        items: [FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema(), FlexPluginBase.defaultFlexColumnSchema()],
         style: {
           position: 'fixed',
           inset: '0 auto auto 0',
@@ -77,6 +73,12 @@ var Layout_fixed_top = /** @class */function (_super) {
         originPosition: 'right-bottom'
       }
     });
+    Object.defineProperty(_this, "panelTitle", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: i18nRuntime.i18n("969e9e56b3812abffa3994f35ea31835")
+    });
     return _this;
   }
   return Layout_fixed_top;