amis-editor 5.2.4-beta.31 → 5.2.5-beta.3

package/esm/plugin/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/InputRichText.d.ts

@@ -19,5 +19,7 @@ export declare class RichTextControlPlugin extends BasePlugin {
     };
     previewSchema: any;
     panelTitle: string;
-    panelBodyCreator: (context: BaseEventContext) => any[];
+    notRenderFormZone: boolean;
+    panelJustify: boolean;
+    panelBodyCreator: (context: BaseEventContext) => any;
 }

package/esm/plugin/Form/InputRichText.js

@@ -1,12 +1,24 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __assign } from 'tslib';
-import { getSchemaTpl, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import { __extends, __assign, __spreadArray } from 'tslib';
+import { getSchemaTpl, tipedLabel, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import { ValidatorTag } from '../../validator.js';
 import { i18n } from 'i18n-runtime';
 
+var tinymceToolbarsDelimiter = ' ';
+var tinymceOptions = ['advlist', 'autolink', 'link', 'image', 'lists', 'charmap', 'preview', 'anchor', 'pagebreak', 'searchreplace', 'wordcount', 'visualblocks', 'visualchars', 'code', 'fullscreen', 'insertdatetime', 'media', 'nonbreaking', 'table', 'emoticons', 'template', 'help'];
+var tinymceToolbars = ['undo', 'redo', 'bold', 'italic', 'backcolor', 'alignleft', 'aligncenter', 'alignright', 'alignjustify', 'bullist', 'numlist', 'outdent', 'indent', 'removeformat', 'help', 'charmap', 'anchor', 'pagebreak', 'searchreplace', 'wordcount', 'visualblocks', 'visualchars', 'code', 'fullscreen', 'insertdatetime', 'media', 'nonbreaking', 'table', 'tableprops', 'tabledelete', 'tablecellprops', 'tablemergecells', 'tablesplitcells', 'tableinsertrowbefore', 'tableinsertrowafter', 'tabledeleterow', 'tablerowprops', 'tableinsertcolbefore', 'tableinsertcolafter', 'tabledeletecol', 'tablecutrow', 'tablecopyrow', 'tablepasterowbefore', 'tablepasterowafter', 'tablecutcol', 'tablecopycol', 'tablepastecolbefore', 'tablepastecolafter', 'tableinsertdialog', 'tablecellvalign', 'tablecellborderwidth', 'tablecellborderstyle', 'tablecellbackgroundcolor', 'tablecellbordercolor', 'tablecaption', 'tablerowheader', 'tablecolheader', 'emoticons', 'template', 'link', 'openlink', 'unlink', 'image', 'preview', 'alignnone', 'underline', 'strikethrough', 'subscript', 'superscript', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'cut', 'copy', 'paste', 'selectall', 'newdocument', 'remove', 'print', 'hr', 'blockquote', 'forecolor', 'visualaid', 'lineheight', 'pastetext'];
+var froalaOptions = ['paragraphFormat', 'quote', 'bold', 'italic', 'underline', 'strikeThrough', 'formatOL', 'formatUL', 'align', 'insertLink', 'insertImage', 'insertTable', 'undo', 'redo', 'html'];
+var froalaOptionsPipeOut = function (arr) {
+  return froalaOptions.filter(function (item) {
+    return arr.find(function (a) {
+      return a === item;
+    });
+  });
+};
 var RichTextControlPlugin = /** @class */function (_super) {
   __extends(RichTextControlPlugin, _super);
   function RichTextControlPlugin() {
@@ -75,7 +87,7 @@ var RichTextControlPlugin = /** @class */function (_super) {
         type: 'input-rich-text',
         label: i18n("e2591e971f4c28db7c80a5f546084a1d"),
         name: 'rich-text',
-        receiver: '/api/upload/image',
+        receiver: '',
         vendor: 'tinymce'
       }
     });
@@ -97,6 +109,18 @@ var RichTextControlPlugin = /** @class */function (_super) {
       writable: true,
       value: i18n("e2591e971f4c28db7c80a5f546084a1d")
     });
+    Object.defineProperty(_this, "notRenderFormZone", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
+    Object.defineProperty(_this, "panelJustify", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
     Object.defineProperty(_this, "panelBodyCreator", {
       enumerable: true,
       configurable: true,
@@ -104,125 +128,198 @@ var RichTextControlPlugin = /** @class */function (_super) {
       value: function (context) {
         var _a;
         // 有设置这个就默认使用 froala
-        var hasRichTextToken = ((_a = _this.manager.env) === null || _a === void 0 ? void 0 : _a.richTextToken) ? true : false;
-        return [getSchemaTpl('layout:originPosition', {
-          value: 'left-top'
-        }), getSchemaTpl('switchDefaultValue'), {
-          type: 'textarea',
-          name: 'value',
-          label: i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-          visibleOn: 'typeof this.value !== "undefined"'
-        }, getSchemaTpl('api', {
-          name: 'receiver',
-          label: i18n("b582587147013afc52c58de5fe34d7d7"),
-          value: '/api/upload/image',
-          __isUpload: true
-        }), {
-          type: 'select',
-          name: 'vendor',
-          label: i18n("70209fc05c1a5b21f05b186a0f7ba2ee"),
-          value: hasRichTextToken ? 'froala' : 'tinymce',
-          options: ['tinymce', 'froala']
-        }, getSchemaTpl('fieldSet', {
-          title: i18n("eca97e97331bd76aab9f6160991e02bb"),
-          visibleOn: 'data.vendor === "froala"',
-          body: [{
-            type: 'combo',
-            name: 'options',
-            noBorder: true,
-            multiLine: true,
-            items: [{
+        var hasRichTextToken = !!((_a = _this.manager.env) === null || _a === void 0 ? void 0 : _a.richTextToken);
+        return getSchemaTpl('tabs', [{
+          title: i18n("24d67862f87f439db7ca957aecb77cce"),
+          body: getSchemaTpl('collapseGroup', [{
+            title: i18n("4092ed98e9035652d4c9ca9441701ed7"),
+            body: [getSchemaTpl('formItemName', {
+              required: true
+            }), getSchemaTpl('label'), getSchemaTpl('valueFormula', {
+              rendererSchema: __assign(__assign({}, context === null || context === void 0 ? void 0 : context.schema), {
+                type: 'textarea'
+              }),
+              label: i18n("225f3ed00750ae78ad1e6ea42c8f5087")
+            }), {
+              type: 'select',
+              name: 'vendor',
+              label: i18n("226b0912184333c81babf2f1894ec0c1"),
+              value: hasRichTextToken ? 'froala' : 'tinymce',
+              options: ['tinymce', 'froala'],
+              onChange: function (value, oldValue, model, form) {
+                if (value === 'tinymce') {
+                  form.changeValue('options', {
+                    height: 400,
+                    width: undefined,
+                    menubar: true,
+                    quickInsertEnabled: undefined,
+                    charCounterCount: undefined,
+                    toolbarButtons: undefined,
+                    toolbarButtonsMD: undefined,
+                    toolbarButtonsSM: undefined
+                  });
+                } else if (value === 'froala') {
+                  form.changeValue('options', {
+                    height: undefined,
+                    width: undefined,
+                    toolbar: undefined,
+                    menubar: undefined,
+                    quickInsertEnabled: true,
+                    charCounterCount: true
+                  });
+                }
+              }
+            },
+            // tinymce
+            {
               type: 'select',
-              name: 'language',
-              label: i18n("295bb704f5205801d57d672780b94117"),
-              labelRemark: i18n("39624e820b79bbd62561357f6179c8d7"),
-              defaultValue: 'zh_cn',
-              options: [{
-                label: i18n("a7bac2239fcdcb3a067903d8077c4a07"),
-                value: 'zh_cn'
-              }, {
-                label: i18n("f9fb6a063d1856da86a06def2dc6b921"),
-                value: 'en_us'
-              }]
+              multiple: true,
+              label: tipedLabel(i18n("236b0cdd2e18418fd17d3cdfcace239e"), i18n("defe851634125bb16e762f26dbb6555f")),
+              name: 'options.plugins',
+              visibleOn: 'data.vendor === "tinymce"',
+              value: __spreadArray([], tinymceOptions, true).join(','),
+              maxTagCount: 5,
+              overflowTagPopover: {
+                title: i18n("236b0cdd2e18418fd17d3cdfcace239e"),
+                offset: [0, 5]
+              },
+              options: tinymceOptions
             }, {
-              type: 'textarea',
-              name: 'toolbarButtons',
-              label: i18n("81fafee54baebeb9591b5e7840d7e650"),
-              labelRemark: i18n("0b6eee152cb2553ed4298ca2fe82d3f8"),
-              description: i18n("d85a80d177db696b29b7338af1501055"),
-              minRows: 5,
-              value: ['paragraphFormat', 'quote', 'color', '|', 'bold', 'italic', 'underline', 'strikeThrough', '|', 'formatOL', 'formatUL', 'align', '|', 'insertLink', 'insertImage', 'insertEmotion', 'insertTable', '|', 'undo', 'redo', 'html'],
-              pipeIn: function (value) {
-                return Array.isArray(value) ? value.join(' ') : '';
+              type: 'select',
+              name: 'options.toolbar',
+              multiple: true,
+              label: i18n("012f602372cd2dbd639cd966c63e1f90"),
+              maxTagCount: 5,
+              overflowTagPopover: {
+                title: i18n("236b0cdd2e18418fd17d3cdfcace239e"),
+                offset: [0, 5]
               },
+              visibleOn: 'data.vendor === "tinymce"',
+              delimiter: tinymceToolbarsDelimiter,
+              value: 'undo redo formatselect bold italic backcolor alignleft aligncenter alignright alignjustify bullist numlist outdent indent removeformat help',
               pipeOut: function (value) {
-                return value.replace(/\s+/g, ' ').split(' ');
-              }
+                var _a;
+                var arr = (_a = value === null || value === void 0 ? void 0 : value.split(tinymceToolbarsDelimiter)) !== null && _a !== void 0 ? _a : [];
+                return tinymceToolbars.filter(function (item) {
+                  return arr.find(function (a) {
+                    return a === item;
+                  });
+                }).join(' ');
+              },
+              options: tinymceToolbars
+            }, getSchemaTpl('switch', {
+              label: i18n("df025e01cbbae804f7d720e6b932e8e8"),
+              value: true,
+              name: 'options.menubar',
+              visibleOn: 'data.vendor === "tinymce"'
+            }),
+            // froala
+            {
+              type: 'select',
+              name: 'options.toolbarButtons',
+              multiple: true,
+              visibleOn: 'data.vendor === "froala"',
+              maxTagCount: 5,
+              overflowTagPopover: {
+                title: i18n("236b0cdd2e18418fd17d3cdfcace239e"),
+                offset: [0, 5]
+              },
+              label: tipedLabel(i18n("b74c3bbb8ec4f18896cd3b5a20ee9e2c"), i18n("e08c3505f9779bf919628166a77d0d77")),
+              value: __spreadArray([], froalaOptions, true),
+              joinValues: false,
+              extractValue: true,
+              options: __spreadArray([], froalaOptions, true),
+              pipeOut: froalaOptionsPipeOut
             }, {
-              type: 'textarea',
-              name: 'toolbarButtonsMD',
-              label: i18n("f126c4368fbf51cfd470684e7c3d31c9"),
-              labelRemark: i18n("3b8c320d14dba586c581ceb951917397"),
-              description: i18n("d85a80d177db696b29b7338af1501055"),
-              minRows: 5,
-              pipeIn: function (value) {
-                return Array.isArray(value) ? value.join(' ') : '';
+              type: 'select',
+              name: 'options.toolbarButtonsMD',
+              multiple: true,
+              visibleOn: 'data.vendor === "froala"',
+              maxTagCount: 5,
+              overflowTagPopover: {
+                title: i18n("236b0cdd2e18418fd17d3cdfcace239e"),
+                offset: [0, 5]
               },
-              pipeOut: function (value) {
-                return value.replace(/\s+/g, ' ').split(' ');
-              }
+              label: tipedLabel(i18n("04f91b84d48285162d3e29205a194143"), i18n("9ac0e46a361565f0b8be2228bef4b679")),
+              joinValues: false,
+              extractValue: true,
+              options: __spreadArray([], froalaOptions, true),
+              pipeOut: froalaOptionsPipeOut
             }, {
-              type: 'textarea',
-              name: 'toolbarButtonsSM',
-              label: i18n("89bc688b5b497e515ce3c026a1d92669"),
-              labelRemark: i18n("a849d8a0f59f3ae146b149b7b4fc7480"),
-              description: i18n("d85a80d177db696b29b7338af1501055"),
-              minRows: 5,
-              pipeIn: function (value) {
-                return Array.isArray(value) ? value.join(' ') : '';
+              type: 'select',
+              name: 'options.toolbarButtonsSM',
+              multiple: true,
+              visibleOn: 'data.vendor === "froala"',
+              maxTagCount: 5,
+              overflowTagPopover: {
+                title: i18n("236b0cdd2e18418fd17d3cdfcace239e"),
+                offset: [0, 5]
               },
-              pipeOut: function (value) {
-                return value.replace(/\s+/g, ' ').split(' ');
-              }
-            }]
-          }]
-        }), getSchemaTpl('fieldSet', {
-          title: i18n("b8c8f1c6a56e902bd837420da0f554b3"),
-          visibleOn: 'data.vendor === "tinymce"',
-          body: [{
-            type: 'combo',
-            name: 'options',
-            noBorder: true,
-            multiLine: true,
-            items: [getSchemaTpl('switch', {
-              label: i18n("e4d0e65de0018b63698ff22d683d6dd5"),
-              value: 'true',
-              name: 'menubar'
-            }), {
+              label: tipedLabel(i18n("70d3894aaed305d2fc67f91122d77759"), i18n("a3133ac3b34da77e612bcb1763adae1e")),
+              joinValues: false,
+              extractValue: true,
+              options: __spreadArray([], froalaOptions, true),
+              pipeOut: froalaOptionsPipeOut
+            }, getSchemaTpl('switch', {
+              label: i18n("194ab42ad1ca7fca9a6ef84fadf99490"),
+              value: true,
+              name: 'options.quickInsertEnabled',
+              visibleOn: 'data.vendor === "froala"'
+            }), getSchemaTpl('switch', {
+              label: i18n("94621f44f98c996e49d5b214aebefffc"),
+              value: true,
+              name: 'options.charCounterCount',
+              visibleOn: 'data.vendor === "froala"'
+            }),
+            // 公用部分
+            getSchemaTpl('apiControl', {
+              mode: 'row',
+              labelClassName: 'none',
+              name: 'receiver',
+              label: i18n("b720ed498f054a2539d496d0da68f85b"),
+              visibleOn: '${vendor === "tinymce" && CONTAINS(options.plugins, "image")}'
+            }), getSchemaTpl('apiControl', {
+              mode: 'row',
+              labelClassName: 'none',
+              name: 'receiver',
+              label: i18n("b720ed498f054a2539d496d0da68f85b"),
+              visibleOn: 'data.vendor === "froala"'
+            }), getSchemaTpl('apiControl', {
+              mode: 'row',
+              labelClassName: 'none',
+              name: 'videoReceiver',
+              label: i18n("376496a8918c57220159951e24d3b72d"),
+              visibleOn: 'data.vendor === "froala"'
+            }), getSchemaTpl('labelRemark'), getSchemaTpl('remark'), getSchemaTpl('placeholder', {
+              visibleOn: 'data.vendor !== "tinymce"'
+            }), getSchemaTpl('description')]
+          }, getSchemaTpl('status', {
+            isFormItem: true
+          }), getSchemaTpl('validation', {
+            tag: ValidatorTag.Code
+          })])
+        }, {
+          title: i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+          body: [getSchemaTpl('collapseGroup', [{
+            title: i18n("555a9859e2c34b015438bdfb59a57c5b"),
+            body: [{
               type: 'input-number',
               label: i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
               min: 0,
-              value: 400,
-              name: 'height'
-            }, {
-              name: 'plugins',
-              label: i18n("63068211669d69b4028eebe0052425e7"),
-              description: i18n("5e568c42a5ecb74db2dc3d8531079dd6"),
-              type: 'input-array',
-              inline: true,
-              items: {
-                type: 'input-text',
-                clearable: true
-              },
-              value: ['advlist', 'autolink', 'link', 'image', 'lists', 'charmap', 'preview', 'anchor', 'pagebreak', 'searchreplace', 'wordcount', 'visualblocks', 'visualchars', 'code', 'fullscreen', 'insertdatetime', 'media', 'nonbreaking', 'table', 'emoticons', 'template', 'help']
+              name: 'options.height',
+              visibleOn: 'data.vendor === "tinymce"'
             }, {
-              type: 'textarea',
-              name: 'toolbar',
-              label: i18n("012f602372cd2dbd639cd966c63e1f90"),
-              value: 'undo redo | formatselect | bold italic backcolor  | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | help'
+              type: 'input-number',
+              label: i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
+              min: 150,
+              max: 400,
+              name: 'options.height',
+              visibleOn: 'data.vendor === "froala"'
             }]
-          }]
-        })];
+          }, getSchemaTpl('style:formItem', {
+            renderer: context.info.renderer
+          }), getSchemaTpl('style:classNames')])]
+        }]);
       }
     });
     return _this;

package/esm/plugin/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/InputTable.d.ts

@@ -1,4 +1,4 @@
-import { BaseEventContext, BasePlugin, InsertEventContext, PluginEvent, ScaffoldForm, RegionConfig } from 'amis-editor-core';
+import { BaseEventContext, BasePlugin, InsertEventContext, PluginEvent, ScaffoldForm, RegionConfig, RendererPluginEvent, RendererPluginAction } from 'amis-editor-core';
 export declare class TableControlPlugin extends BasePlugin {
     rendererName: string;
     $schema: string;
@@ -18,7 +18,9 @@ export declare class TableControlPlugin extends BasePlugin {
             name: string;
             quickEdit: {
                 type: string;
+                name: string;
                 mode?: undefined;
+                options?: undefined;
             };
         } | {
             label: string;
@@ -26,14 +28,37 @@ export declare class TableControlPlugin extends BasePlugin {
             quickEdit: {
                 type: string;
                 mode: string;
+                name: string;
+                options?: undefined;
+            };
+        } | {
+            label: string;
+            name: string;
+            quickEdit: {
+                type: string;
+                name: string;
+                options: {
+                    label: string;
+                    value: string;
+                }[];
+                mode?: undefined;
             };
         })[];
+        addable: boolean;
+        footerAddBtn: {
+            label: string;
+            icon: string;
+        };
         strictMode: boolean;
     };
     regions: Array<RegionConfig>;
     previewSchema: any;
     get scaffoldForm(): ScaffoldForm;
+    notRenderFormZone: boolean;
+    panelJustify: boolean;
     panelTitle: string;
+    events: RendererPluginEvent[];
+    actions: RendererPluginAction[];
     panelBodyCreator: (context: BaseEventContext) => any;
     filterProps(props: any): any;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;