amis-editor 5.6.0-beta.0 → 5.6.1

package/lib/plugin/Dialog.d.ts

@@ -1,6 +1,17 @@
 import React from 'react';
 import { BasePlugin, RegionConfig, EditorNodeType } from 'amis-editor-core';
 import type { RendererConfig, Schema } from 'amis-core';
+import { ModalProps } from 'amis-ui/src/components/Modal';
+interface InlineModalProps extends ModalProps {
+    type: string;
+    children: any;
+    dialogType?: string;
+    cancelText?: string;
+    confirmText?: string;
+    cancelBtnLevel?: string;
+    confirmBtnLevel?: string;
+    editorDialogMountNode?: HTMLDivElement;
+}
 export declare class DialogPlugin extends BasePlugin {
     static id: string;
     rendererName: string;
@@ -48,7 +59,8 @@ export declare class DialogPlugin extends BasePlugin {
      */
     patchSchema(schema: Schema, info: RendererConfig, props?: any): any;
 }
-export declare class InlineModal extends React.Component<any, any> {
+export declare class InlineModal extends React.Component<InlineModalProps, any> {
     componentDidMount(): void;
     render(): React.JSX.Element;
 }
+export {};

package/lib/plugin/Dialog.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -28,7 +29,7 @@ var DialogPlugin = /** @class */function (_super) {
     _this.rendererName = 'dialog';
     _this.$schema = '/schemas/DialogSchema.json';
     // 组件名称
-    _this.name = i18nRuntime.i18n("ab3aec075a09d055b2a28c8b61925ee0");
+    _this.name = i18nRuntime.i18n("6cff4b6d794cc17f5d24dbe0d21e5732");
     _this.isBaseComponent = true;
     _this.wrapperProps = {
       wrapperComponent: InlineModal,
@@ -108,6 +109,7 @@ var DialogPlugin = /** @class */function (_super) {
     _this.panelJustify = true;
     _this.panelBodyCreator = function (context) {
       var _a;
+      var i18nEnabled = amisEditorCore.getI18nEnabled();
       // 确认对话框的配置面板
       if (((_a = context.schema) === null || _a === void 0 ? void 0 : _a.dialogType) === 'confirm') {
         return amisEditorCore.getSchemaTpl('tabs', [{
@@ -185,17 +187,27 @@ var DialogPlugin = /** @class */function (_super) {
             value: 'left-top'
           }), {
             label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab"),
-            type: 'input-text',
+            type: i18nEnabled ? 'input-text-i18n' : 'input-text',
             name: 'title'
           }, amisEditorCore.getSchemaTpl('switch', {
             label: i18nRuntime.i18n("8c8fbec263e20f087555c9abcb6dd07a"),
             name: 'showCloseButton',
             value: true
+          }), amisEditorCore.getSchemaTpl('switch', {
+            label: i18nRuntime.i18n("67a2d9746956b631dd3ae9d13b6ae9ff"),
+            name: 'closeOnOutside',
+            value: false
           }), amisEditorCore.getSchemaTpl('switch', {
             label: i18nRuntime.i18n("f29ab26877ed22ffa59636d747d824b9"),
             name: 'closeOnEsc',
             value: false
-          }), amisEditorCore.getSchemaTpl('switch', {
+          }), {
+            type: 'ae-StatusControl',
+            label: i18nRuntime.i18n("36f5b682310bd52f19c63b077ec054d1"),
+            mode: 'normal',
+            name: 'hideActions',
+            expressionName: 'hideActionsOn'
+          }, amisEditorCore.getSchemaTpl('switch', {
             label: i18nRuntime.i18n("dcba76890a534e1fe94421be2a17b484"),
             name: 'showErrorMsg',
             value: true
@@ -208,12 +220,12 @@ var DialogPlugin = /** @class */function (_super) {
       }, {
         title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
         body: amisEditorCore.getSchemaTpl('collapseGroup', [{
-          title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+          title: i18nRuntime.i18n("39003734d1d700d5bd97bf1e7a2fcf73"),
           body: [{
             label: i18nRuntime.i18n("c8339fd2a85af4ba66084d28df808de4"),
             type: 'button-group-select',
             name: 'size',
-            size: 'sm',
+            size: 'xs',
             options: [{
               label: i18nRuntime.i18n("544fac400db790f57ea8ee4207cbeb6b"),
               value: ''
@@ -229,20 +241,130 @@ var DialogPlugin = /** @class */function (_super) {
             }, {
               label: i18nRuntime.i18n("949934d97c42801151673a51d3adc421"),
               value: 'xl'
+            }, {
+              label: i18nRuntime.i18n("f1d4ff50f3828f9b73412e7d94e6dd6e"),
+              value: 'custom'
             }],
             pipeIn: amisEditorCore.defaultValue(''),
             pipeOut: function (value) {
               return value ? value : undefined;
+            },
+            onChange: function (value, oldValue, model, form) {
+              if (value !== 'custom') {
+                form.setValueByName('style', undefined);
+              }
+            }
+          }, {
+            type: 'input-number',
+            label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
+            name: 'style.width',
+            disabled: true,
+            clearable: true,
+            unitOptions: ['px', '%', 'em', 'vh', 'vw'],
+            visibleOn: 'this.size !== "custom"',
+            pipeIn: function (value, form) {
+              if (!form.data.size) {
+                return '500px';
+              } else if (form.data.size === 'sm') {
+                return '350px';
+              } else if (form.data.size === 'md') {
+                return '800px';
+              } else if (form.data.size === 'lg') {
+                return '1100px';
+              } else if (form.data.size === 'xl') {
+                return '90%';
+              }
+              return '';
+            }
+          }, {
+            type: 'input-number',
+            label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
+            name: 'style.width',
+            clearable: true,
+            unitOptions: ['px', '%', 'em', 'vh', 'vw'],
+            visibleOn: 'this.size === "custom"',
+            pipeOut: function (value) {
+              var curValue = parseInt(value);
+              if (value === 'auto' || curValue || curValue === 0) {
+                return value;
+              } else {
+                return undefined;
+              }
+            }
+          }, {
+            type: 'input-number',
+            label: i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
+            name: 'style.height',
+            disabled: true,
+            visibleOn: 'this.size !== "custom"',
+            clearable: true,
+            unitOptions: ['px', '%', 'em', 'vh', 'vw']
+          }, {
+            type: 'input-number',
+            label: i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
+            name: 'style.height',
+            visibleOn: 'this.size === "custom"',
+            clearable: true,
+            unitOptions: ['px', '%', 'em', 'vh', 'vw'],
+            pipeOut: function (value) {
+              var curValue = parseInt(value);
+              if (value === 'auto' || curValue || curValue === 0) {
+                return value;
+              } else {
+                return undefined;
+              }
             }
-          }]
+          }, amisEditorCore.getSchemaTpl('theme:border', {
+            name: 'themeCss.dialogClassName.border'
+          }), amisEditorCore.getSchemaTpl('theme:radius', {
+            name: 'themeCss.dialogClassName.radius'
+          }), amisEditorCore.getSchemaTpl('theme:shadow', {
+            name: 'themeCss.dialogClassName.box-shadow'
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+            name: 'themeCss.dialogClassName.background',
+            labelMode: 'input'
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            label: i18nRuntime.i18n("6bdc97671296112658e3a1cd369c0686"),
+            name: 'themeCss.dialogMaskClassName.background',
+            labelMode: 'input'
+          })]
+        }, {
+          title: i18nRuntime.i18n("030c8cb75e9707285b28c4931bfeddc5"),
+          body: [amisEditorCore.getSchemaTpl('theme:font', {
+            label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
+            name: 'themeCss.dialogTitleClassName.font'
+          }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+            name: 'themeCss.dialogHeaderClassName.padding-and-margin',
+            label: i18nRuntime.i18n("60bac4c0a381a42b320a703227be59eb")
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+            name: 'themeCss.dialogHeaderClassName.background',
+            labelMode: 'input'
+          })]
+        }, {
+          title: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+          body: [amisEditorCore.getSchemaTpl('theme:border', {
+            name: 'themeCss.dialogBodyClassName.border'
+          }), amisEditorCore.getSchemaTpl('theme:radius', {
+            name: 'themeCss.dialogBodyClassName.radius'
+          }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+            name: 'themeCss.dialogBodyClassName.padding-and-margin',
+            label: i18nRuntime.i18n("60bac4c0a381a42b320a703227be59eb")
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+            name: 'themeCss.dialogBodyClassName.background',
+            labelMode: 'input'
+          })]
         }, {
-          title: i18nRuntime.i18n("261bba7ad82914e477f4b37f6a83874e"),
-          body: [amisEditorCore.getSchemaTpl('className', {
-            name: 'className',
-            label: i18nRuntime.i18n("5e5d3f13111593b2710673006d4c8297")
-          }), amisEditorCore.getSchemaTpl('className', {
-            name: 'bodyClassName',
-            label: i18nRuntime.i18n("33be689a0f0de129ce37f7a96052002e")
+          title: i18nRuntime.i18n("b3b287010ea79586507a77e0580d9cad"),
+          body: [amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+            name: 'themeCss.dialogFooterClassName.padding-and-margin',
+            label: i18nRuntime.i18n("60bac4c0a381a42b320a703227be59eb")
+          }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+            name: 'themeCss.dialogFooterClassName.background',
+            labelMode: 'input'
           })]
         }])
       }, {
@@ -257,42 +379,45 @@ var DialogPlugin = /** @class */function (_super) {
   }
   DialogPlugin.prototype.buildSubRenderers = function () {};
   DialogPlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var renderer, data, dataSchema, key, hostNodeDataSchema;
-      return tslib.__generator(this, function (_h) {
-        switch (_h.label) {
-          case 0:
-            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 = {};
-            if (!(renderer.props.$schema.data === undefined || !amisEditorCore.isEmpty(data))) return [3 /*break*/, 2];
-            // 静态数据
-            for (key in data) {
-              if (!['&'].includes(key)) {
-                dataSchema[key] = {
-                  type: (_b = typeof data[key]) !== null && _b !== void 0 ? _b : 'string',
-                  title: key
-                };
-              }
+      var renderer, data, 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 = {};
+        if (renderer.props.$schema.data === undefined || !amisEditorCore.isEmpty(data)) {
+          // 静态数据
+          for (key in data) {
+            if (!['&'].includes(key)) {
+              dataSchema[key] = {
+                type: (_b = typeof data[key]) !== null && _b !== void 0 ? _b : 'string',
+                title: key
+              };
             }
-            return [4 /*yield*/, (_d = (_c = this.manager.config).getHostNodeDataSchema) === null || _d === void 0 ? void 0 : _d.call(_c)];
-          case 1:
-            hostNodeDataSchema = _h.sent();
-            (_e = hostNodeDataSchema.filter(function (item) {
-              return !['system-variable', 'page-global'].includes(item.$id);
-            })) === null || _e === void 0 ? void 0 : _e.forEach(function (item) {
-              dataSchema = tslib.__assign(tslib.__assign({}, dataSchema), item.properties);
-            });
-            _h.label = 2;
-          case 2:
-            return [2 /*return*/, {
-              $id: 'dialog',
-              type: 'object',
-              title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
-              properties: dataSchema
-            }];
+          }
+          // 弹窗改版可能会有多个按钮触发一个弹窗，无法确定按钮的上下文
+          // TODO 数据链
+          // const hostNodeDataSchema =
+          //   await this.manager.config.getHostNodeDataSchema?.();
+          // hostNodeDataSchema
+          //   ?.filter(
+          //     (item: any) => !['system-variable', 'page-global'].includes(item.$id)
+          //   )
+          //   ?.forEach((item: any) => {
+          //     dataSchema = {
+          //       ...dataSchema,
+          //       ...item.properties
+          //     };
+          //   });
         }
+
+        return [2 /*return*/, {
+          $id: 'dialog',
+          type: 'object',
+          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
+        }];
       });
     });
   };
@@ -330,17 +455,22 @@ var InlineModal = /** @class */function (_super) {
   InlineModal.prototype.componentDidMount = function () {};
   InlineModal.prototype.render = function () {
     var _a = this.props,
+      type = _a.type,
       children = _a.children,
       dialogType = _a.dialogType,
       cancelText = _a.cancelText,
       confirmText = _a.confirmText,
       cancelBtnLevel = _a.cancelBtnLevel,
-      confirmBtnLevel = _a.confirmBtnLevel;
+      confirmBtnLevel = _a.confirmBtnLevel,
+      editorDialogMountNode = _a.editorDialogMountNode;
+    var Container = type === 'drawer' ? amisUi.Drawer : amisUi.Modal;
     if (dialogType === 'confirm') {
       children = children.filter(function (item) {
         return (item === null || item === void 0 ? void 0 : item.key) !== 'actions';
       });
-      return React__default["default"].createElement("div", {
+      return React__default["default"].createElement(amisUi.Modal, tslib.__assign({}, this.props, {
+        container: editorDialogMountNode
+      }), React__default["default"].createElement("div", {
         className: "ae-InlineModal"
       }, children, React__default["default"].createElement("div", {
         className: "ae-InlineModal-footer"
@@ -350,14 +480,15 @@ var InlineModal = /** @class */function (_super) {
       }, cancelText || i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c")), React__default["default"].createElement(amisUi.Button, {
         className: "ae-InlineModal-footer-btn",
         level: confirmBtnLevel
-      }, confirmText || i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"))));
+      }, confirmText || i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a")))));
     }
-    return React__default["default"].createElement("div", {
-      className: "ae-InlineModal"
-    }, children);
+    return React__default["default"].createElement(Container, tslib.__assign({}, this.props, {
+      container: editorDialogMountNode
+    }), children);
   };
   return InlineModal;
 }(React__default["default"].Component);
 
 exports.DialogPlugin = DialogPlugin;
 exports.InlineModal = InlineModal;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Divider.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -36,11 +37,75 @@ var DividerPlugin = /** @class */function (_super) {
     _this.tags = [i18nRuntime.i18n("027446c2f9070b0f5b16a18208bf5fc7")];
     _this.panelBody = amisEditorCore.getSchemaTpl('tabs', [{
       title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
-      body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
-        value: 'left-top'
-      }), amisEditorCore.getSchemaTpl('layout:width:v2', {
-        visibleOn: 'data.style && data.style.position && (data.style.position === "fixed" || data.style.position === "absolute")'
-      }), amisEditorCore.getSchemaTpl('className')]
+      body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+        title: i18nRuntime.i18n("6f99b6eed37795cb97d5f6370c32113b"),
+        body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+          value: 'left-top'
+        }), amisEditorCore.getSchemaTpl('layout:width:v2', {
+          visibleOn: 'data.style && data.style.position && (data.style.position === "fixed" || data.style.position === "absolute")'
+        }), {
+          mode: 'horizontal',
+          type: 'button-group-select',
+          label: i18nRuntime.i18n("226b0912184333c81babf2f1894ec0c1"),
+          name: 'lineStyle',
+          value: 'dashed',
+          options: [{
+            value: 'dashed',
+            label: i18nRuntime.i18n("61f6f4fc0b806ac9d41ad0792e6155f6")
+          }, {
+            value: 'solid',
+            label: i18nRuntime.i18n("cc4c575642609fbf059a5df81eb86bfc")
+          }]
+        }, {
+          mode: 'horizontal',
+          type: 'button-group-select',
+          label: i18nRuntime.i18n("a465db53b8c98f42caa15ca5662f9c90"),
+          name: 'direction',
+          value: 'horizontal',
+          options: [{
+            value: 'horizontal',
+            label: i18nRuntime.i18n("4cde06e6162ed66720e3133cb83bc059")
+          }, {
+            value: 'vertical',
+            label: i18nRuntime.i18n("75ac842f8e77305846f1d776f97dfaf8")
+          }]
+        }, amisEditorCore.getSchemaTpl('theme:select', {
+          mode: 'horizontal',
+          label: i18nRuntime.i18n("dfd0cd7f2cba96917484569a646bdc8d"),
+          name: 'style.width',
+          placeholder: '100%',
+          visibleOn: 'direction !== "vertical"',
+          clearValueOnHidden: true
+        }), amisEditorCore.getSchemaTpl('theme:select', {
+          mode: 'horizontal',
+          label: i18nRuntime.i18n("dfd0cd7f2cba96917484569a646bdc8d"),
+          name: 'style.height',
+          placeholder: 'var(--sizes-base-15)',
+          visibleOn: 'direction === "vertical"',
+          clearValueOnHidden: true
+        }), amisEditorCore.getSchemaTpl('theme:select', {
+          mode: 'horizontal',
+          label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
+          name: 'style.borderWidth',
+          placeholder: '1px'
+        }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+          mode: 'horizontal',
+          label: i18nRuntime.i18n("6b36c6f7ec834692ec6c8e3816349fdd"),
+          name: 'color',
+          placeholder: 'var(--colors-neutral-line-8)',
+          labelMode: 'input',
+          needGradient: true
+        }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+          name: 'style',
+          hidePadding: true
+        }), {
+          mode: 'horizontal',
+          type: 'input-number',
+          label: i18nRuntime.i18n("40d39c3bc7bebced7d63eace0191a0a8"),
+          name: 'rotate',
+          value: 0
+        }]
+      }])
     }, {
       title: i18nRuntime.i18n("33bf801796fd255b5f6147e33146669b"),
       body: [amisEditorCore.getSchemaTpl('ref'), amisEditorCore.getSchemaTpl('visible')]
@@ -54,3 +119,4 @@ var DividerPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(DividerPlugin);
 
 exports.DividerPlugin = DividerPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};