amis-editor 5.4.0 → 5.5.0

package/lib/plugin/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -72,17 +72,23 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.responseData': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
-          },
-          'event.data.responseStatus': {
-            type: 'number',
-            title: i18nRuntime.i18n("23d861e4b6635508eb877a50a9333a9b")
-          },
-          'event.data.responseMsg': {
-            type: 'string',
-            title: i18nRuntime.i18n("a303669d47440ed05558efbf3d5d0592")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              responseData: {
+                type: 'object',
+                title: i18nRuntime.i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
+              },
+              responseStatus: {
+                type: 'number',
+                title: i18nRuntime.i18n("23d861e4b6635508eb877a50a9333a9b")
+              },
+              responseMsg: {
+                type: 'string',
+                title: i18nRuntime.i18n("a303669d47440ed05558efbf3d5d0592")
+              }
+            }
           }
         }
       }]
@@ -93,9 +99,10 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("335d6c56c43204f9efcefe36f097d35a")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            description: i18nRuntime.i18n("85f1708454f409855d552f702ac27b19")
           }
         }
       }]
@@ -106,9 +113,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.step': {
-            type: 'string',
-            title: i18nRuntime.i18n("02f706d7510e68c96aa073852d90ec20")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              step: {
+                type: 'string',
+                title: i18nRuntime.i18n("02f706d7510e68c96aa073852d90ec20")
+              }
+            }
           }
         }
       }]
@@ -119,9 +132,9 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("66f1115691b0a3e434dd3e8a6e733730")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3")
           }
         }
       }]
@@ -132,9 +145,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("18344d8a27aa678e401d5e575d4efe99")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              result: {
+                type: 'object',
+                title: i18nRuntime.i18n("18344d8a27aa678e401d5e575d4efe99")
+              }
+            }
           }
         }
       }]
@@ -145,9 +164,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.error': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("17aa713bc661f98e585ec3725d6d4f0d")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              error: {
+                type: 'object',
+                title: i18nRuntime.i18n("17aa713bc661f98e585ec3725d6d4f0d")
+              }
+            }
           }
         }
       }]
@@ -162,9 +187,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.error': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("357954d848a9e2f12208673b3906a972")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              error: {
+                type: 'object',
+                title: i18nRuntime.i18n("357954d848a9e2f12208673b3906a972")
+              }
+            }
           }
         }
       }]
@@ -204,21 +235,7 @@ var WizardPlugin = /** @class */function (_super) {
           className: "variable-left variable-right"
         }, (_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.step), "\u6B65");
       },
-      schema: helper.getArgsWrapper([
-      /*
-      {
-        type: 'input-formula',
-        variables: '${variables}',
-        evalMode: false,
-        required: true,
-        variableMode: 'tabs',
-        label: '目标步骤',
-        size: 'lg',
-        name: 'step',
-        mode: 'horizontal'
-      }
-      */
-      amisEditorCore.getSchemaTpl('formulaControl', {
+      schema: helper.getArgsWrapper([amisEditorCore.getSchemaTpl('formulaControl', {
         name: 'step',
         label: i18nRuntime.i18n("78ada959bf5bdd6c70ee411c4cf23601"),
         variables: '${variables}',
@@ -746,6 +763,7 @@ var WizardPlugin = /** @class */function (_super) {
       scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
     }
   };
+  WizardPlugin.id = 'WizardPlugin';
   return WizardPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(WizardPlugin);

package/lib/plugin/Wrapper.d.ts

@@ -1,5 +1,6 @@
 import { LayoutBasePlugin, RegionConfig } from 'amis-editor-core';
 export declare class WrapperPlugin extends LayoutBasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;

package/lib/plugin/Wrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -122,6 +122,7 @@ var WrapperPlugin = /** @class */function (_super) {
     };
     return _this;
   }
+  WrapperPlugin.id = 'WrapperPlugin';
   WrapperPlugin.scene = ['layout'];
   return WrapperPlugin;
 }(amisEditorCore.LayoutBasePlugin);

package/lib/renderer/APIAdaptorControl.d.ts

@@ -84,7 +84,7 @@ export default class APIAdaptorControl extends React.Component<APIAdaptorControl
         tooltipBodyClassName?: string | undefined;
         filterHtml?: ((input: string) => string) | undefined;
     };
-    renderEditor(): any;
+    renderEditor(): JSX.Element | null;
     renderSwitch(): any;
     render(): JSX.Element;
 }

package/lib/renderer/APIAdaptorControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -66,13 +66,13 @@ var APIAdaptorControl = /** @class */function (_super) {
       _b = _a.params,
       params = _b === void 0 ? [] : _b,
       allowFullscreen = _a.allowFullscreen,
-      value = _a.value,
-      name = _a.name,
-      editorPlaceholder = _a.editorPlaceholder,
+      value = _a.value;
+      _a.name;
+      var editorPlaceholder = _a.editorPlaceholder,
       editorDesc = _a.editorDesc,
       mergeParams = _a.mergeParams;
     var lastParams = typeof mergeParams === 'function' ? mergeParams(params) : params;
-    return render('api-adaptor-control-editor', [{
+    return React__default["default"].createElement(React__default["default"].Fragment, null, render('api-adaptor-control-editor/0', {
       type: 'container',
       className: 'ae-AdaptorControl-func-header',
       body: tslib.__spreadArray(tslib.__spreadArray(['<span class="mtk6">function&nbsp;</span>', '<span class="mtk1 bracket-highlighting-0">(</span>'], tslib.__read(lastParams.map(function (_a, index) {
@@ -87,27 +87,26 @@ var APIAdaptorControl = /** @class */function (_super) {
           tooltip: _this.genTooltipProps(tip)
         } : {})], tslib.__read(index === lastParams.length - 1 ? [] : ['<span class="mtk1">,&nbsp;</span>']), false);
       }).flat()), false), ['<span class="mtk1 bracket-highlighting-0">)&nbsp;{</span>'], false)
-    }, {
+    }), render('api-adaptor-control-editor/1', {
       label: '',
+      name: '__whatever_name_adpator',
+      placeholder: editorPlaceholder || '',
       mode: 'normal',
-      name: '__editor_' + name,
       type: 'js-editor',
       className: 'ae-AdaptorControl-func-editor',
-      allowFullscreen: allowFullscreen,
-      value: value,
-      placeholder: editorPlaceholder || '',
-      onChange: function (value) {
-        _this.onChange(value);
-      }
+      allowFullscreen: allowFullscreen
     }, {
+      value: value,
+      onChange: this.onChange
+    }), render('api-adaptor-control-editor/2', {
       type: 'container',
       body: '<span class="mtk1 bracket-highlighting-0">}</span>',
       className: 'ae-AdaptorControl-func-footer'
-    }, {
+    }), render('api-adaptor-control-editor/3', {
       type: 'container',
       className: 'cxd-Form-description',
       body: editorDesc
-    }]);
+    }));
   };
   APIAdaptorControl.prototype.renderSwitch = function () {
     var _this = this;
@@ -267,7 +266,7 @@ var validateApiAdaptorEditorDescSchema = {
   }]
 };
 amisEditorCore.setSchemaTpl('apiRequestAdaptor', {
-  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("417125a06b1d2bfff025e83a4e067bf0"), "\u53EF\u57FA\u4E8E JavaScript \u8BED\u8A00\u76F4\u63A5\u5F55\u5165\u53D1\u9001\u9002\u914D\u5668\u7684\u51FD\u6570\u4F53\uFF0C\u5728\u8BE5\u51FD\u6570\u4F53\u5185\uFF0C\u60A8\u53EF\u4EE5\u5BF9 <span style=\"color: #108CEE\">api</span> \u8FDB\u884C\u5904\u7406\u6216\u8005\u8FD4\u56DE\u65B0\u7684\u5185\u5BB9\uFF0C\u6700\u540E\u9700\u8981 <span style=\"color: #108CEE\">return</span> <span style=\"color: #108CEE\">api</span>\u3002<br><br/>\n    \u51FD\u6570\u4F53\u5185\u53EF\u8BBF\u95EE\u7684\u53D8\u91CF\u5982\u4E0B\uFF1A<br/>\n    &nbsp;1. <span style=\"color: #108CEE\">api</span>\uFF1A\u63A5\u53E3\u7684schema\u914D\u7F6E\u5BF9\u8C61<br/>\n    &nbsp;2. <span style=\"color: #108CEE\">api.data</span>\uFF1A\u8BF7\u6C42\u6570\u636E<br/>\n    &nbsp;3. <span style=\"color: #108CEE\">api.query</span>\uFF1A\u8BF7\u6C42\u67E5\u8BE2\u53C2\u6570<br/>\n    &nbsp;4. <span style=\"color: #108CEE\">api.body</span>\uFF1A\u8BF7\u6C42\u4F53\uFF08\u9488\u5BF9POST/PUT/PATCH\uFF09<br/>\n    &nbsp;5. <span style=\"color: #108CEE\">api.headers</span>\uFF1A\u8BF7\u6C42\u5934<br/>\n    &nbsp;6. <span style=\"color: #108CEE\">api.url</span>\uFF1A\u8BF7\u6C42\u5730\u5740<br/>"),
+  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("417125a06b1d2bfff025e83a4e067bf0"), "\u53EF\u57FA\u4E8E JavaScript \u8BED\u8A00\u76F4\u63A5\u5F55\u5165\u53D1\u9001\u9002\u914D\u5668\u7684\u51FD\u6570\u4F53\uFF0C\u5728\u8BE5\u51FD\u6570\u4F53\u5185\uFF0C\u60A8\u53EF\u4EE5\u5BF9 <span style=\"color: #108CEE\">api</span> \u8FDB\u884C\u5904\u7406\u6216\u8005\u8FD4\u56DE\u65B0\u7684\u5185\u5BB9\uFF0C\u6700\u540E\u9700\u8981 <span style=\"color: #108CEE\">return</span> <span style=\"color: #108CEE\">api</span>\u3002<br><br/>\n    \u51FD\u6570\u4F53\u5185\u53EF\u8BBF\u95EE\u7684\u53D8\u91CF\u5982\u4E0B\uFF1A<br/>\n    &nbsp;1. <span style=\"color: #108CEE\">api</span>\uFF1A\u63A5\u53E3\u7684schema\u914D\u7F6E\u5BF9\u8C61<br/>\n    &nbsp;2. <span style=\"color: #108CEE\">api.data</span>\uFF1A\u8BF7\u6C42\u6570\u636E<br/>\n    &nbsp;3. <span style=\"color: #108CEE\">api.query</span>\uFF1A\u8BF7\u6C42\u67E5\u8BE2\u53C2\u6570<br/>\n    &nbsp;4. <span style=\"color: #108CEE\">api.headers</span>\uFF1A\u8BF7\u6C42\u5934<br/>\n    &nbsp;5. <span style=\"color: #108CEE\">api.url</span>\uFF1A\u8BF7\u6C42\u5730\u5740<br/>"),
   name: 'requestAdaptor',
   type: 'ae-apiAdaptorControl',
   editorDesc: i18nRuntime.i18n("a59c65bea7d5065f19eb9c918a716c33"),

package/lib/renderer/APIControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/ButtonGroupControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/DataMappingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -39,7 +39,7 @@ var DataPickerControl = /** @class */ (function (_super) {
                         _c.label = 2;
                     case 2: return [2 /*return*/, {
                             variables: variables.map(function (item) { return (tslib.__assign(tslib.__assign({}, item), { selectMode: 'tree' })); }),
-                            variableMode: 'tabs'
+                            variableMode: 'tree'
                         }];
                 }
             });

package/lib/renderer/DateShortCutControl.d.ts

@@ -3,40 +3,68 @@
  */
 import React from 'react';
 import Sortable from 'sortablejs';
-import type { FormControlProps } from 'amis-core';
-import type { BaseEventContext } from 'amis-editor-core';
-import type { Option } from 'amis';
-type $Object = {
-    [key: string]: string;
+import { FormControlProps, Option } from 'amis-core';
+import { BaseEventContext } from 'amis-editor-core';
+declare const CertainPresetShorcut: {
+    today: string;
+    yesterday: string;
+    thisweek: string;
+    prevweek: string;
+    thismonth: string;
+    prevmonth: string;
+    thisquarter: string;
+    prevquarter: string;
+    thisyear: string;
+};
+declare const ModifyPresetShorcut: {
+    $daysago: string;
+    $dayslater: string;
+    $weeksago: string;
+    $weekslater: string;
+    $monthsago: string;
+    $monthslater: string;
+    $quartersago: string;
+    $quarterslater: string;
+    $yearsago: string;
+    $yearslater: string;
 };
-declare enum RangeType {
-    Normal = "Normal",
-    Custom = "Custom"
-}
 export interface DateShortCutControlProps extends FormControlProps {
     className?: string;
     /**
      * 编辑器上下文数据，用于获取字段所在Form的其他字段
      */
     context: BaseEventContext;
-    normalDropDownOption: $Object;
-    customDropDownOption: $Object;
+    certainOptions: Array<keyof typeof CertainPresetShorcut>;
+    modifyOptions: Array<keyof typeof ModifyPresetShorcut>;
 }
-interface OptionsType {
-    label?: string;
+type PresetShorCutType = string;
+type CustomShortCutType = {
+    label: string;
+    startDate: string;
+    endDate: string;
+};
+type ModifyOptionType = {
+    key: keyof typeof ModifyPresetShorcut;
     value: string;
-    type: RangeType;
-    inputType?: string;
+};
+declare enum OptionType {
+    Custom = 1,
+    Certain = 2,
+    Modify = 3
+}
+interface OptionDataType {
+    data: PresetShorCutType | CustomShortCutType | ModifyOptionType;
+    type?: OptionType;
 }
 interface DateShortCutControlState {
-    options: Array<OptionsType>;
+    options: Array<OptionDataType>;
 }
 export declare class DateShortCutControl extends React.PureComponent<DateShortCutControlProps, DateShortCutControlState> {
     sortable?: Sortable;
     drag?: HTMLElement | null;
     target: HTMLElement | null;
-    normalDropDownOptionArr: Array<Option>;
-    customDropDownOptionArr: Array<Option>;
+    certainDropDownOptions: Array<Option>;
+    modifyDropDownOptions: Array<Option>;
     static defaultProps: Partial<DateShortCutControlProps>;
     constructor(props: DateShortCutControlProps);
     dragRef(ref: any): void;
@@ -50,25 +78,21 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
      */
     destroyDragging(): void;
     /**
-     * 生成内容体
+     * 生成快捷键项的配置
      */
-    renderContent(): JSX.Element;
-    /**
-     * 生成固定跨度选项
-     */
-    renderNormalOption(option: OptionsType, index: number): JSX.Element;
+    renderOption(option: OptionDataType, index: number): any;
     /**
-     * 生成自定义跨度选项
+     * 生成内容体
      */
-    renderCustomOption(option: OptionsType, index: number): JSX.Element;
+    renderContent(): JSX.Element;
     /**
      * 自定义跨度变化
      */
-    handleCustomItemChange(value: string, index: number): void;
+    handleOptionChange(data: string | CustomShortCutType | ModifyOptionType, index: number): void;
     /**
      * option添加
      */
-    addItem(item: Option, type: RangeType): void;
+    addItem(item: Option, type: OptionType): void;
     /**
      * 删除选项
      */