amis-editor 6.2.1 → 6.3.0

package/lib/plugin/Container.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -9,11 +9,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var React = require('react');
+var amis = require('amis');
 var amisEditorCore = require('amis-editor-core');
 require('../renderer/event-control/index.js');
+var FlexPluginBase = require('./Layout/FlexPluginBase.js');
 var i18nRuntime = require('i18n-runtime');
 var helper = require('../renderer/event-control/helper.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
 var ContainerPlugin = /** @class */function (_super) {
   tslib.__extends(ContainerPlugin, _super);
   function ContainerPlugin() {
@@ -34,8 +41,12 @@ var ContainerPlugin = /** @class */function (_super) {
       type: 'container',
       body: [],
       style: {
-        position: 'static',
-        display: 'block'
+        position: 'relative',
+        display: 'flex',
+        inset: 'auto',
+        flexWrap: 'nowrap',
+        flexDirection: 'column',
+        alignItems: 'flex-start'
       },
       size: 'none',
       wrapperBody: false
@@ -107,13 +118,18 @@ var ContainerPlugin = /** @class */function (_super) {
       }]
     }];
     _this.panelBodyCreator = function (context) {
-      var _a, _b;
+      var _a, _b, _c, _d;
       var curRendererSchema = context === null || context === void 0 ? void 0 : context.schema;
       (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.direction) === 'row' || (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.direction) === 'row-reverse';
       // const isFlexContainer = this.manager?.isFlexContainer(context?.id);
       var isFreeContainer = (curRendererSchema === null || curRendererSchema === void 0 ? void 0 : curRendererSchema.isFreeContainer) || false;
       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 node = context.node;
+      var parent = (_c = node.parent) === null || _c === void 0 ? void 0 : _c.schema;
+      var draggableContainer = _this.manager.draggableContainer(context === null || context === void 0 ? void 0 : context.id);
+      var canAppendSiblings = parent && isFlexItem && !draggableContainer && ((_d = _this.manager) === null || _d === void 0 ? void 0 : _d.canAppendSiblings());
+      var newItemSchema = isFlexColumnItem ? FlexPluginBase.defaultFlexColumnSchema('', false) : FlexPluginBase.defaultFlexColumnSchema();
       var displayTpl = [amisEditorCore.getSchemaTpl('layout:display'), amisEditorCore.getSchemaTpl('layout:flex-setting', {
         visibleOn: 'data.style && (data.style.display === "flex" || data.style.display === "inline-flex")',
         direction: curRendererSchema.direction,
@@ -124,31 +140,83 @@ var ContainerPlugin = /** @class */function (_super) {
       })];
       return amisEditorCore.getSchemaTpl('tabs', [{
         title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
-        body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+        body: amisEditorCore.getSchemaTpl('collapseGroup', [
+        // {
+        //   title: '基本',
+        //   body: [
+        //     {
+        //       name: 'wrapperComponent',
+        //       label: '容器标签',
+        //       type: 'select',
+        //       searchable: true,
+        //       options: [
+        //         'div',
+        //         'p',
+        //         'h1',
+        //         'h2',
+        //         'h3',
+        //         'h4',
+        //         'h5',
+        //         'h6',
+        //         'article',
+        //         'aside',
+        //         'code',
+        //         'footer',
+        //         'header',
+        //         'section'
+        //       ],
+        //       pipeIn: defaultValue('div'),
+        //       validations: {
+        //         isAlphanumeric: true,
+        //         matchRegexp: '/^(?!.*script).*$/' // 禁用一下script标签
+        //       },
+        //       validationErrors: {
+        //         isAlpha: 'HTML标签不合法，请重新输入',
+        //         matchRegexp: 'HTML标签不合法，请重新输入'
+        //       },
+        //       validateOnChange: false
+        //     },
+        //     getSchemaTpl('layout:padding')
+        //   ]
+        // },
+        {
           title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
-          body: [{
-            name: 'wrapperComponent',
-            label: i18nRuntime.i18n("a823cfa70cfa46c788e1eedae043f6e5"),
-            type: 'select',
-            searchable: true,
-            options: ['div', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'article', 'aside', 'code', 'footer', 'header', 'section'],
-            pipeIn: amisEditorCore.defaultValue('div'),
-            validations: {
-              isAlphanumeric: true,
-              matchRegexp: '/^(?!.*script).*$/' // 禁用一下script标签
-            },
-            validationErrors: {
-              isAlpha: i18nRuntime.i18n("f7d64e5e79994c3c8853f2608d7b2d25"),
-              matchRegexp: i18nRuntime.i18n("f7d64e5e79994c3c8853f2608d7b2d25")
-            },
-            validateOnChange: false
-          }, amisEditorCore.getSchemaTpl('layout:padding')]
-        }, {
-          title: i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825"),
-          body: tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([amisEditorCore.getSchemaTpl('layout:position', {
-            visibleOn: '!data.stickyStatus'
-          }), amisEditorCore.getSchemaTpl('layout:originPosition'), amisEditorCore.getSchemaTpl('layout:inset', {
-            mode: 'vertical'
+          body: tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([canAppendSiblings && {
+            type: 'wrapper',
+            size: 'none',
+            className: 'grid grid-cols-2 gap-4 mb-4',
+            body: [{
+              children: React__default["default"].createElement(amis.Button, {
+                size: "sm",
+                onClick: function () {
+                  return _this.manager.appendSiblingSchema(newItemSchema, true, true);
+                }
+              }, React__default["default"].createElement(amisEditorCore.Icon, {
+                className: "icon",
+                icon: isFlexColumnItem ? 'top-arrow-to-top' : 'left-arrow-to-left'
+              }), React__default["default"].createElement("span", null, isFlexColumnItem ? i18nRuntime.i18n("14c495b1248756310c75396cd41f4fe9") : i18nRuntime.i18n("39a2cb79c6d9762783e20522ea86dcff"), "\u63D2\u5165\u4E00", isFlexColumnItem ? '行' : i18nRuntime.i18n("cb2f68c9c24e85d21e6b090b6e5657d8")))
+            }, {
+              children: React__default["default"].createElement(amis.Button, {
+                size: "sm",
+                onClick: function () {
+                  return _this.manager.appendSiblingSchema(newItemSchema, false, true);
+                }
+              }, React__default["default"].createElement(amisEditorCore.Icon, {
+                className: "icon",
+                icon: isFlexColumnItem ? 'arrow-to-bottom' : 'arrow-to-right'
+              }), React__default["default"].createElement("span", null, isFlexColumnItem ? i18nRuntime.i18n("e33ac3a4c1a95a02a18f1555038804da") : i18nRuntime.i18n("de2a774bf98944b8f0ec8755d5f59d64"), "\u63D2\u5165\u4E00", isFlexColumnItem ? '行' : i18nRuntime.i18n("cb2f68c9c24e85d21e6b090b6e5657d8")))
+            }]
+          }, amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+            name: 'themeCss.baseControlClassName.padding-and-margin:default'
+          }), amisEditorCore.getSchemaTpl('theme:border', {
+            name: "themeCss.baseControlClassName.border:default"
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            name: 'themeCss.baseControlClassName.background:default',
+            label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+            needCustom: true,
+            needGradient: true,
+            needImage: true,
+            labelMode: 'input'
           })], tslib.__read(!isFreeContainer ? displayTpl : []), false), tslib.__read(isFlexItem ? [amisEditorCore.getSchemaTpl('layout:flex', {
             isFlexColumnItem: isFlexColumnItem,
             label: isFlexColumnItem ? i18nRuntime.i18n("f02f876ee64cc016d97fa4dc498d4857") : i18nRuntime.i18n("a170a375b264f7fe0c02a7ca8c268784"),
@@ -179,7 +247,10 @@ var ContainerPlugin = /** @class */function (_super) {
           }), amisEditorCore.getSchemaTpl('layout:isFixedWidth', {
             visibleOn: "".concat(!isFlexItem || isFlexColumnItem),
             onChange: function (value) {
-              context === null || context === void 0 ? void 0 : context.node.setWidthMutable(value);
+              var _a, _b;
+              if (!isFlexItem || ((_b = (_a = context.node.parent) === null || _a === void 0 ? void 0 : _a.children) === null || _b === void 0 ? void 0 : _b.length) > 1) {
+                context === null || context === void 0 ? void 0 : context.node.setWidthMutable(value);
+              }
             }
           }), amisEditorCore.getSchemaTpl('layout:width', {
             visibleOn: "".concat(!isFlexItem || isFlexColumnItem)
@@ -193,10 +264,17 @@ var ContainerPlugin = /** @class */function (_super) {
             name: 'style.textAlign',
             label: i18nRuntime.i18n("a3221d2d224767df4afa7a8653ded8fe"),
             visibleOn: 'data.style && data.style.display !== "flex" && data.style.display !== "inline-flex"'
-          }) : null, amisEditorCore.getSchemaTpl('layout:z-index'), amisEditorCore.getSchemaTpl('layout:sticky', {
+          }) : null, amisEditorCore.getSchemaTpl('layout:z-index')], false)
+        }, amisEditorCore.getSchemaTpl('status'), {
+          title: i18nRuntime.i18n("dfac151de712ab0b3618072c8a7f0a0f"),
+          body: [amisEditorCore.getSchemaTpl('layout:position', {
+            visibleOn: '!data.stickyStatus'
+          }), amisEditorCore.getSchemaTpl('layout:originPosition'), amisEditorCore.getSchemaTpl('layout:inset', {
+            mode: 'vertical'
+          }), amisEditorCore.getSchemaTpl('layout:sticky', {
             visibleOn: 'data.style && (data.style.position !== "fixed" && data.style.position !== "absolute")'
-          }), amisEditorCore.getSchemaTpl('layout:stickyPosition')], false)
-        }, amisEditorCore.getSchemaTpl('status')])
+          }), amisEditorCore.getSchemaTpl('layout:stickyPosition')]
+        }])
       }, {
         title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
         className: 'p-none',
@@ -213,6 +291,132 @@ var ContainerPlugin = /** @class */function (_super) {
     };
     return _this;
   }
+  ContainerPlugin.prototype.onActive = function (event) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var context = event.context;
+    if (((_a = context.info) === null || _a === void 0 ? void 0 : _a.plugin) !== this || !context.node) {
+      return;
+    }
+    var node = context.node;
+    var isFlexItem = (_b = this.manager) === null || _b === void 0 ? void 0 : _b.isFlexItem(node.id);
+    if (isFlexItem && ((_d = (_c = context.node.parent) === null || _c === void 0 ? void 0 : _c.children) === null || _d === void 0 ? void 0 : _d.length) > 1) {
+      var isColumnFlex = String((_f = (_e = node.schema) === null || _e === void 0 ? void 0 : _e.style) === null || _f === void 0 ? void 0 : _f.flexDirection).includes('column');
+      console.log('isColumnFlex', isColumnFlex, (_h = (_g = node.schema) === null || _g === void 0 ? void 0 : _g.style) === null || _h === void 0 ? void 0 : _h.flexDirection);
+      // context?.node.setHeightMutable(isColumnFlex);
+      context === null || context === void 0 ? void 0 : context.node.setWidthMutable(!isColumnFlex);
+    }
+  };
+  ContainerPlugin.prototype.afterUpdate = function (event) {
+    var _a;
+    (_a = event.context) === null || _a === void 0 ? void 0 : _a.node;
+  };
+  ContainerPlugin.prototype.onWidthChangeStart = function (event) {
+    var _a, _b, _c, _d;
+    var context = event.context;
+    var node = context.node;
+    var host = node.host;
+    var dom = context.dom;
+    var parent = dom.parentElement;
+    if (!parent) {
+      return;
+    }
+    console.log('on width change start');
+    var resizer = context.resizer;
+    var frameRect = parent.getBoundingClientRect();
+    var rect = dom.getBoundingClientRect();
+    var isFlexItem = (_a = this.manager) === null || _a === void 0 ? void 0 : _a.isFlexItem(node.id);
+    var schema = node.schema;
+    var index = node.index;
+    var isFlexSize = ((_b = schema.style) === null || _b === void 0 ? void 0 : _b.flex) === '1 1 auto' && (((_c = schema.style) === null || _c === void 0 ? void 0 : _c.position) === 'static' || ((_d = schema.style) === null || _d === void 0 ? void 0 : _d.position) === 'relative');
+    var flexGrow = 1;
+    var width = 0;
+    event.setData({
+      onMove: function (e) {
+        var _a;
+        var children = parent.children;
+        width = e.pageX - rect.left;
+        flexGrow = Math.max(1, Math.min(12, Math.round(12 * width / frameRect.width)));
+        resizer.setAttribute('data-value', isFlexSize ? "".concat(flexGrow) : width + 'px');
+        if (isFlexSize) {
+          // 需重新计算flex下各子组件占比，按照12等分计算
+          for (var i = 0; i < children.length; i++) {
+            if (i !== index) {
+              var width_1 = children[i].clientWidth;
+              if (width_1 > 0) {
+                var grow = Math.max(1, Math.min(12, Math.round(12 * width_1 / frameRect.width)));
+                (_a = host.children[i]) === null || _a === void 0 ? void 0 : _a.updateState({
+                  style: tslib.__assign(tslib.__assign({}, host.children[i].schema.style), {
+                    flexGrow: grow
+                  })
+                });
+              }
+            } else {
+              node.updateState({
+                style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                  flexGrow: +flexGrow
+                })
+              });
+            }
+          }
+        } else {
+          if (isFlexItem) {
+            node.updateState({
+              style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                flex: '0 0 150px',
+                flexBasis: "".concat(width, "px")
+              })
+            });
+          } else {
+            node.updateState({
+              style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                width: "".concat(width, "px")
+              })
+            });
+          }
+        }
+        requestAnimationFrame(function () {
+          node.calculateHighlightBox();
+        });
+      },
+      onEnd: function () {
+        resizer.removeAttribute('data-value');
+        if (isFlexSize) {
+          host === null || host === void 0 ? void 0 : host.children.forEach(function (item) {
+            var _a, _b;
+            item.updateSchema({
+              style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                flexGrow: (_b = (_a = item.state.style) === null || _a === void 0 ? void 0 : _a.flexGrow) !== null && _b !== void 0 ? _b : 1
+              })
+            });
+            item.updateState({}, true);
+          });
+        } else {
+          if (isFlexItem) {
+            node.updateSchema({
+              style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                flex: "0 0 150px",
+                flexBasis: "".concat(width, "px")
+              })
+            });
+          } else {
+            node.updateSchema({
+              style: tslib.__assign(tslib.__assign({}, node.schema.style), {
+                width: "".concat(width, "px")
+              })
+            });
+          }
+          node.updateState({}, true);
+        }
+        requestAnimationFrame(function () {
+          node.calculateHighlightBox();
+        });
+      }
+    });
+  };
+  ContainerPlugin.prototype.onHeightChangeStart = function (event) {
+    console.log('on height change start');
+    // return this.onSizeChangeStart(event, 'vertical');
+  };
   ContainerPlugin.id = 'ContainerPlugin';
   ContainerPlugin.scene = ['layout'];
   return ContainerPlugin;
@@ -220,4 +424,4 @@ var ContainerPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ContainerPlugin);
 
 exports.ContainerPlugin = ContainerPlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Custom.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -100,4 +100,4 @@ var CustomPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(CustomPlugin);
 
 exports.CustomPlugin = CustomPlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/CustomRegion.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -138,4 +138,4 @@ var CustomPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(CustomPlugin);
 
 exports.CustomPlugin = CustomPlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Date.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -97,4 +97,4 @@ var DatePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(DatePlugin);
 
 exports.DatePlugin = DatePlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Datetime.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -147,4 +147,4 @@ var DatetimePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(DatetimePlugin);
 
 exports.DatetimePlugin = DatetimePlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Dialog.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BasePlugin, RegionConfig, EditorNodeType } from 'amis-editor-core';
+import { BasePlugin, RegionConfig, EditorNodeType, BuildPanelEventContext, BasicPanelItem, PluginEvent, ChangeEventContext } from 'amis-editor-core';
 import type { RendererConfig, Schema } from 'amis-core';
 import { ModalProps } from 'amis-ui/src/components/Modal';
 interface InlineModalProps extends ModalProps {
@@ -47,17 +47,14 @@ export declare class DialogPlugin extends BasePlugin {
     panelTitle: string;
     panelJustify: boolean;
     panelBodyCreator: (context: BaseEventContext) => any;
+    afterUpdate(event: PluginEvent<ChangeEventContext>): void;
     buildSubRenderers(): void;
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<{
-        $id: string;
-        type: string;
-        title: any;
-        properties: any;
-    }>;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
     /**
      * 为了让 dialog 的按钮可以点击编辑
      */
     patchSchema(schema: Schema, info: RendererConfig, props?: any): any;
+    buildEditorPanel(context: BuildPanelEventContext, panels: Array<BasicPanelItem>): void;
 }
 export declare class InlineModal extends React.Component<InlineModalProps, any> {
     componentDidMount(): void;

package/lib/plugin/Dialog.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -14,12 +14,15 @@ var amisUi = require('amis-ui');
 var amisEditorCore = require('amis-editor-core');
 var helper = require('../renderer/event-control/helper.js');
 var omit = require('lodash/omit');
+var ModalSettingPanel = require('../component/ModalSettingPanel.js');
+var find = require('lodash/find');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
 var DialogPlugin = /** @class */function (_super) {
   tslib.__extends(DialogPlugin, _super);
@@ -116,21 +119,37 @@ var DialogPlugin = /** @class */function (_super) {
           title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
           body: amisEditorCore.getSchemaTpl('collapseGroup', [{
             title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
-            body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
-              value: 'left-top'
-            }), {
+            body: [{
+              type: 'input-text',
+              label: i18nRuntime.i18n("3791ba5c2962a42a251489872342b7d6"),
+              name: 'editorSetting.displayName'
+            }, {
+              type: 'radios',
+              label: '弹出方式',
+              name: 'actionType',
+              pipeIn: function (value, store, data) {
+                return value !== null && value !== void 0 ? value : data.type;
+              },
+              inline: false,
+              options: [{
+                label: i18nRuntime.i18n("6cff4b6d794cc17f5d24dbe0d21e5732"),
+                value: 'dialog'
+              }, {
+                label: i18nRuntime.i18n("2a2924380dfcaea998bd8a49703545a9"),
+                value: 'drawer'
+              }, {
+                label: i18nRuntime.i18n("fa6b01f51cc2b8e16bfbb914b6c08ace"),
+                value: 'confirmDialog'
+              }]
+            }, {
               label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab"),
               type: 'input-text',
               name: 'title'
-            }, amisEditorCore.getSchemaTpl('layout:originPosition', {
-              value: 'left-top'
-            }), {
+            }, {
               label: i18nRuntime.i18n("e406488d1b9545168eb1896e35139bf2"),
               type: 'input-text',
               name: 'confirmText'
-            }, amisEditorCore.getSchemaTpl('layout:originPosition', {
-              value: 'left-top'
-            }), {
+            }, {
               label: i18nRuntime.i18n("d919d62d7e5ec5cb63ad47e5dc347a7e"),
               type: 'input-text',
               name: 'cancelText'
@@ -183,7 +202,29 @@ var DialogPlugin = /** @class */function (_super) {
         title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
         body: amisEditorCore.getSchemaTpl('collapseGroup', [{
           title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
-          body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+          body: [{
+            type: 'input-text',
+            label: i18nRuntime.i18n("3791ba5c2962a42a251489872342b7d6"),
+            name: 'editorSetting.displayName'
+          }, {
+            type: 'radios',
+            label: '弹出方式',
+            name: 'actionType',
+            pipeIn: function (value, store, data) {
+              return value !== null && value !== void 0 ? value : data.type;
+            },
+            inline: false,
+            options: [{
+              label: i18nRuntime.i18n("6cff4b6d794cc17f5d24dbe0d21e5732"),
+              value: 'dialog'
+            }, {
+              label: i18nRuntime.i18n("2a2924380dfcaea998bd8a49703545a9"),
+              value: 'drawer'
+            }, {
+              label: i18nRuntime.i18n("fa6b01f51cc2b8e16bfbb914b6c08ace"),
+              value: 'confirmDialog'
+            }]
+          }, amisEditorCore.getSchemaTpl('layout:originPosition', {
             value: 'left-top'
           }), {
             label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab"),
@@ -382,15 +423,40 @@ var DialogPlugin = /** @class */function (_super) {
     };
     return _this;
   }
+  DialogPlugin.prototype.afterUpdate = function (event) {
+    var _this = this;
+    var _a;
+    var context = event.context;
+    // 当弹出方式改变的时候，切换渲染器类型
+    if (context.info.renderer.type && ['dialog', 'drawer'].includes(context.info.renderer.type) && ((_a = context.diff) === null || _a === void 0 ? void 0 : _a.some(function (change) {
+      var _a;
+      return ((_a = change.path) === null || _a === void 0 ? void 0 : _a.join('.')) === 'actionType';
+    }))) {
+      var change = find__default["default"](context.diff, function (change) {
+        var _a;
+        return ((_a = change.path) === null || _a === void 0 ? void 0 : _a.join('.')) === 'actionType';
+      });
+      var value = change === null || change === void 0 ? void 0 : change.rhs;
+      var newType = value === 'drawer' ? 'drawer' : 'dialog';
+      if (newType !== context.schema.type && this.manager.replaceChild(context.id, tslib.__assign(tslib.__assign({}, context.schema), {
+        type: value === 'drawer' ? 'drawer' : 'dialog'
+      }))) {
+        setTimeout(function () {
+          _this.manager.rebuild();
+        }, 4);
+      }
+    }
+  };
   DialogPlugin.prototype.buildSubRenderers = function () {};
   DialogPlugin.prototype.buildDataSchemas = function (node, region, trigger) {
     var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var renderer, data, dataSchema, key;
+      var renderer, data, inputParams, dataSchema, key;
       return tslib.__generator(this, function (_e) {
         renderer = (_a = this.manager.store.getNodeById(node.id)) === null || _a === void 0 ? void 0 : _a.getComponent();
         data = omit__default["default"](renderer.props.$schema.data, '$$id');
-        dataSchema = {};
+        inputParams = amisEditorCore.JSONPipeOut(renderer.props.$schema.inputParams);
+        dataSchema = tslib.__assign({}, inputParams === null || inputParams === void 0 ? void 0 : inputParams.properties);
         if (renderer.props.$schema.data === undefined || !amisEditorCore.isEmpty(data)) {
           // 静态数据
           for (key in data) {
@@ -416,12 +482,13 @@ var DialogPlugin = /** @class */function (_super) {
           //     };
           //   });
         }
-        return [2 /*return*/, {
+        return [2 /*return*/, tslib.__assign(tslib.__assign({
           $id: 'dialog',
-          type: 'object',
+          type: 'object'
+        }, inputParams), {
           title: ((_c = node.schema) === null || _c === void 0 ? void 0 : _c.label) || ((_d = node.schema) === null || _d === void 0 ? void 0 : _d.name),
           properties: dataSchema
-        }];
+        })];
       });
     });
   };
@@ -447,6 +514,25 @@ var DialogPlugin = /** @class */function (_super) {
       })
     });
   };
+  DialogPlugin.prototype.buildEditorPanel = function (context, panels) {
+    var _a;
+    if (this.manager.store.isSubEditor && ['dialog', 'drawer'].includes((_a = this.manager.store.schema) === null || _a === void 0 ? void 0 : _a.type)) {
+      panels.push({
+        key: 'modal-setting',
+        icon: '',
+        title: React__default["default"].createElement("span", {
+          className: "editor-tab-icon editor-tab-s-icon",
+          "editor-tooltip": "\u5F39\u7A97\u53C2\u6570"
+        }, React__default["default"].createElement(amisUi.Icon, {
+          icon: "modal-setting"
+        })),
+        position: 'left',
+        component: ModalSettingPanel["default"],
+        order: -99999
+      });
+    }
+    _super.prototype.buildEditorPanel.call(this, context, panels);
+  };
   DialogPlugin.id = 'DialogPlugin';
   return DialogPlugin;
 }(amisEditorCore.BasePlugin);
@@ -495,4 +581,4 @@ var InlineModal = /** @class */function (_super) {
 
 exports.DialogPlugin = DialogPlugin;
 exports.InlineModal = InlineModal;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Divider.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -194,4 +194,4 @@ var DividerPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(DividerPlugin);
 
 exports.DividerPlugin = DividerPlugin;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/plugin/Drawer.d.ts

@@ -37,10 +37,5 @@ export declare class DrawerPlugin extends BasePlugin {
     panelJustify: boolean;
     panelBodyCreator: (context: BaseEventContext) => any;
     buildSubRenderers(): void;
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<{
-        $id: string;
-        type: string;
-        title: any;
-        properties: any;
-    }>;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
 }