amis-editor 6.0.0 → 6.1.0

package/lib/plugin/HBox.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -599,4 +599,4 @@ var HBoxPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(HBoxPlugin);
 
 exports.HBoxPlugin = HBoxPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/IFrame.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -80,4 +80,4 @@ var IFramePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(IFramePlugin);
 
 exports.IFramePlugin = IFramePlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Icon.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -140,4 +140,4 @@ var IconPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(IconPlugin);
 
 exports.IconPlugin = IconPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Image.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -153,11 +153,29 @@ var ImagePlugin = /** @class */function (_super) {
           }, {
             name: 'width',
             label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
-            type: 'input-number'
+            type: 'input-number',
+            onChange: function (value) {
+              var node = context.node;
+              node.updateState({
+                width: value
+              });
+              requestAnimationFrame(function () {
+                node.calculateHighlightBox();
+              });
+            }
           }, {
             name: 'height',
             label: i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
-            type: 'input-number'
+            type: 'input-number',
+            onChange: function (value) {
+              var node = context.node;
+              node.updateState({
+                height: value
+              });
+              requestAnimationFrame(function () {
+                node.calculateHighlightBox();
+              });
+            }
           }, isUnderField ? null : amisEditorCore.getSchemaTpl('imageUrl', {
             name: 'src',
             label: i18nRuntime.i18n("582570bef8c57c5af7658c4a4eea45ff"),
@@ -381,4 +399,4 @@ var ImagePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ImagePlugin);
 
 exports.ImagePlugin = ImagePlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Images.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -202,4 +202,4 @@ var ImagesPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ImagesPlugin);
 
 exports.ImagesPlugin = ImagesPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Json.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -69,4 +69,4 @@ var JsonPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(JsonPlugin);
 
 exports.JsonPlugin = JsonPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

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

@@ -1,6 +1,3 @@
-/**
- * @file Flex 常见布局 1:3
- */
 import { LayoutBasePlugin, PluginEvent } from 'amis-editor-core';
 import type { BaseEventContext, RegionConfig, RendererJSONSchemaResolveEventContext, BasicToolbarItem } from 'amis-editor-core';
 export declare const defaultFlexColumnSchema: (title?: string) => {
@@ -12,7 +9,7 @@ export declare const defaultFlexColumnSchema: (title?: string) => {
         display: string;
         flex: string;
         flexGrow: number;
-        flexBasis: string;
+        flexBasis: number;
     };
     wrapperBody: boolean;
     isFixedHeight: boolean;
@@ -34,14 +31,16 @@ export declare class FlexPluginBase extends LayoutBasePlugin {
     scaffold: any;
     previewSchema: {
         type: string;
-        className: string;
         items: any[];
         style: {
             position: string;
+            rowGap: string;
+            columnGap: string;
         };
     };
     panelTitle: string;
     panelJustify: boolean;
+    resetFlexBasis: (node: EditorNodeType, flexSetting?: PlainObject) => void;
     panelBodyCreator: (context: BaseEventContext) => any[];
     regions: Array<RegionConfig>;
     buildEditorToolbar({ id, info, schema, node }: BaseEventContext, toolbars: Array<BasicToolbarItem>): void;

package/lib/plugin/Layout/FlexPluginBase.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -16,13 +16,13 @@ var defaultFlexColumnSchema = function (title) {
   return {
     type: 'container',
     body: [],
-    size: 'xs',
+    size: 'none',
     style: {
       position: 'static',
       display: 'block',
       flex: '1 1 auto',
       flexGrow: 1,
-      flexBasis: 'auto'
+      flexBasis: 0
     },
     wrapperBody: false,
     isFixedHeight: false,
@@ -38,7 +38,7 @@ var defaultFlexPreviewSchema = function (title) {
     style: {
       display: 'block',
       flex: '1 1 auto',
-      flexBasis: 'auto',
+      flexBasis: 0,
       textAlign: 'center',
       marginRight: 10
     },
@@ -52,10 +52,11 @@ var defaultFlexContainerSchema = function (flexItemSchema) {
   }
   return {
     type: 'flex',
-    className: 'p-1',
     items: [flexItemSchema(i18nRuntime.i18n("ef5abdfc944546ddcbe10e9884cf5832")), flexItemSchema(i18nRuntime.i18n("874fdb7b3a5730910a4de1c58220c337")), flexItemSchema(i18nRuntime.i18n("3a76596e73fa265257ce90b7bed684c7"))],
     style: {
-      position: 'relative'
+      position: 'relative',
+      rowGap: '10px',
+      columnGap: '10px'
     }
   };
 };
@@ -78,6 +79,23 @@ var FlexPluginBase = /** @class */function (_super) {
     _this.previewSchema = defaultFlexContainerSchema(defaultFlexPreviewSchema);
     _this.panelTitle = i18nRuntime.i18n("b1b98c19058af70d8bd499e1899e93bc");
     _this.panelJustify = true; // 右侧配置项默认左右展示
+    _this.resetFlexBasis = function (node, flexSetting) {
+      var _a;
+      if (flexSetting === void 0) {
+        flexSetting = {};
+      }
+      var schema = node.schema;
+      if (String(flexSetting.flexDirection).includes('column') && !((_a = schema === null || schema === void 0 ? void 0 : schema.style) === null || _a === void 0 ? void 0 : _a.height)) {
+        (node.children || []).forEach(function (child) {
+          var _a, _b, _c, _d;
+          if (!((_b = (_a = child.schema) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.height) || /^0/.test((_d = (_c = child.schema) === null || _c === void 0 ? void 0 : _c.style) === null || _d === void 0 ? void 0 : _d.flexBasis)) {
+            child.updateSchemaStyle({
+              flexBasis: undefined
+            });
+          }
+        });
+      }
+    };
     _this.panelBodyCreator = function (context) {
       var _a, _b, _c;
       var curRendererSchema = (context === null || context === void 0 ? void 0 : context.schema) || {};
@@ -101,8 +119,19 @@ var FlexPluginBase = /** @class */function (_super) {
             label: i18nRuntime.i18n("98204720c30a843a9234bdf22dc05d51"),
             direction: curRendererSchema.direction,
             justify: curRendererSchema.justify || 'center',
-            alignItems: curRendererSchema.alignItems
-          }), amisEditorCore.getSchemaTpl('layout:flex-wrap')], false), tslib.__read(isFlexItem ? [amisEditorCore.getSchemaTpl('layout:flex', {
+            alignItems: curRendererSchema.alignItems,
+            pipeOut: function (value) {
+              // 纵向排列的非固定高度flex容器子元素去掉为0的flexBasis
+              _this.resetFlexBasis(context.node, value);
+              return value;
+            }
+          }), amisEditorCore.getSchemaTpl('layout:flex-wrap'), amisEditorCore.getSchemaTpl('layout:flex-basis', {
+            label: '行间隔',
+            name: 'style.rowGap'
+          }), amisEditorCore.getSchemaTpl('layout:flex-basis', {
+            label: '列间隔',
+            name: 'style.columnGap'
+          })], false), tslib.__read(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")'
@@ -259,4 +288,4 @@ var FlexPluginBase = /** @class */function (_super) {
 
 exports.FlexPluginBase = FlexPluginBase;
 exports.defaultFlexColumnSchema = defaultFlexColumnSchema;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Layout/Layout_fixed.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -57,4 +57,4 @@ var Layout_fixed = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(Layout_fixed);
 
 exports["default"] = Layout_fixed;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Layout/Layout_free_container.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -43,4 +43,4 @@ var Layout_free_container = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(Layout_free_container);
 
 exports["default"] = Layout_free_container;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Layout/Layout_sorption_container.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -51,4 +51,4 @@ var Layout_fixed_top = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(Layout_fixed_top);
 
 exports["default"] = Layout_fixed_top;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Link.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -99,4 +99,4 @@ var LinkPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(LinkPlugin);
 
 exports.LinkPlugin = LinkPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/List.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -347,4 +347,4 @@ var ListPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ListPlugin);
 
 exports.ListPlugin = ListPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/List2.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -445,4 +445,4 @@ var List2Plugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(List2Plugin);
 
 exports.List2Plugin = List2Plugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/ListItem.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -172,4 +172,4 @@ var ListItemPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ListItemPlugin);
 
 exports.ListItemPlugin = ListItemPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Log.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -126,4 +126,4 @@ var LogPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(LogPlugin);
 
 exports.LogPlugin = LogPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Mapping.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -177,4 +177,4 @@ var MappingPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(MappingPlugin);
 
 exports.MappingPlugin = MappingPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Markdown.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -57,4 +57,4 @@ var MarkdownPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(MarkdownPlugin);
 
 exports.MarkdownPlugin = MarkdownPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Nav.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -354,4 +354,4 @@ var NavPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(NavPlugin);
 
 exports.NavPlugin = NavPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/OfficeViewer.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -160,4 +160,4 @@ var OfficeViewerPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(OfficeViewerPlugin);
 
 exports.OfficeViewerPlugin = OfficeViewerPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Operation.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -66,4 +66,4 @@ var OperationPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(OperationPlugin);
 
 exports.OperationPlugin = OperationPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Others/Action.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -354,4 +354,4 @@ var ActionPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ActionPlugin);
 
 exports.ActionPlugin = ActionPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Others/TableCell.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -88,7 +88,9 @@ var TableCellPlugin = /** @class */function (_super) {
             label: i18nRuntime.i18n("c6e1b91d329a61b691d0d5d2eb343ddd"),
             value: 'inline'
           }]
-        }, amisEditorCore.getSchemaTpl('switch', {
+        }, amisEditorCore.getSchemaTpl('icon', {
+          name: 'quickEdit.icon'
+        }), amisEditorCore.getSchemaTpl('switch', {
           name: 'quickEdit.saveImmediately',
           label: i18nRuntime.i18n("15c3796e07e33afc7252df751f610c5d"),
           visibleOn: 'data.quickEdit',
@@ -367,4 +369,4 @@ var TableCellPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(TableCellPlugin);
 
 exports.TableCellPlugin = TableCellPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Page.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -326,29 +326,30 @@ var PagePlugin = /** @class */function (_super) {
   PagePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
     var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var jsonschema, pool, current, schema, _e, _f;
-      return tslib.__generator(this, function (_g) {
-        switch (_g.label) {
+      var jsonschema, pool, current, schema, tmpSchema;
+      return tslib.__generator(this, function (_e) {
+        switch (_e.label) {
           case 0:
             jsonschema = tslib.__assign({}, amisEditorCore.jsonToJsonSchema(amisEditorCore.JSONPipeOut(node.schema.data)));
             pool = node.children.concat();
-            _g.label = 1;
+            _e.label = 1;
           case 1:
             if (!pool.length) return [3 /*break*/, 5];
             current = pool.shift();
             schema = current.schema;
             if (!(((_a = current.rendererConfig) === null || _a === void 0 ? void 0 : _a.isFormItem) && (schema === null || schema === void 0 ? void 0 : schema.name))) return [3 /*break*/, 3];
-            _e = jsonschema.properties;
-            _f = schema.name;
             return [4 /*yield*/, (_c = (_b = current.info.plugin).buildDataSchemas) === null || _c === void 0 ? void 0 : _c.call(_b, current, undefined, trigger, node)];
           case 2:
-            _e[_f] = _g.sent();
+            tmpSchema = _e.sent();
+            jsonschema.properties[schema.name] = tslib.__assign(tslib.__assign({}, tmpSchema), (tmpSchema === null || tmpSchema === void 0 ? void 0 : tmpSchema.$id) ? {} : {
+              $id: "".concat(current.id, "-").concat(current.type)
+            });
             return [3 /*break*/, 4];
           case 3:
             if (!((_d = current.rendererConfig) === null || _d === void 0 ? void 0 : _d.storeType)) {
               pool.push.apply(pool, tslib.__spreadArray([], tslib.__read(current.children), false));
             }
-            _g.label = 4;
+            _e.label = 4;
           case 4:
             return [3 /*break*/, 1];
           case 5:
@@ -373,4 +374,4 @@ var PagePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(PagePlugin);
 
 exports.PagePlugin = PagePlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Pagination.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -308,4 +308,4 @@ var PaginationPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(PaginationPlugin);
 
 exports.PaginationPlugin = PaginationPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/plugin/Panel.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -205,4 +205,4 @@ var PanelPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(PanelPlugin);
 
 exports.PanelPlugin = PanelPlugin;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};