amis-editor 5.2.1-beta.15 → 5.2.1-beta.20

package/esm/renderer/BadgeControl.d.ts

@@ -72,8 +72,8 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
         } | undefined;
         text?: string | number | undefined;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
-        size?: any;
         mode?: "text" | "dot" | "ribbon" | undefined;
+        size?: any;
         level?: string | undefined;
         visibleOn?: string | undefined;
         animation?: boolean | undefined;
@@ -85,8 +85,8 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
         } | undefined;
         text?: string | number | undefined;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
-        size?: any;
         mode?: "text" | "dot" | "ribbon" | undefined;
+        size?: any;
         level?: string | undefined;
         visibleOn?: string | undefined;
         animation?: boolean | undefined;

package/esm/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 
@@ -8,7 +8,7 @@ import { PickerContainer, Spinner, InputBox, Icon, FormItem, SearchBox, Collapse
 import { generateIcon, Renderer } from 'amis-core';
 import { debounce } from 'lodash';
 import React__default from 'react';
-import { autobind, DSField } from 'amis-editor-core';
+import { autobind } from 'amis-editor-core';
 import { matchSorter } from 'match-sorter';
 import cx from 'classnames';
 import { i18n } from 'i18n-runtime';
@@ -156,8 +156,7 @@ var DataBindingControl = /** @class */function (_super) {
       });
     }
   });
-  var _a;
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [typeof (_a = typeof DSField !== "undefined" && DSField) === "function" ? _a : Object]), __metadata("design:returntype", void 0)], DataBindingControl.prototype, "handleConfirm", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], DataBindingControl.prototype, "handleConfirm", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], DataBindingControl.prototype, "handlePickerOpen", null);
   return DataBindingControl;
 }(React__default.Component);

package/esm/renderer/DataMappingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/DateShortCutControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/ExpressionFormulaControl.d.ts

@@ -19,7 +19,7 @@ interface ExpressionFormulaControlProps extends FormControlProps {
      */
     variableMode?: 'tabs' | 'tree';
     /**
-     * 表达式最外层是否使用 ${} 来包裹，默认 false
+     * 表达式最外层是否使用 ${} 来包裹，默认 true
      */
     evalMode: boolean;
 }

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 
@@ -97,9 +97,12 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function (value) {
-      var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
-        return p1;
-      })) || '';
+      var formulaPickerValue = value;
+      if (this.props.evalMode) {
+        formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+          return p1;
+        })) || '';
+      }
       this.setState({
         formulaPickerValue: formulaPickerValue
       });
@@ -222,7 +225,7 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     value: {
       variableMode: 'tabs',
       requiredDataPropsVariables: false,
-      evalMode: false
+      evalMode: true
     }
   });
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "initFormulaPickerValue", null);

package/esm/renderer/FeatureControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/GoConfigControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/OptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/RangePartsControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/StatusControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 
@@ -173,6 +173,7 @@ var StatusControl = /** @class */function (_super) {
           }]
         }, {
           type: 'ae-expressionFormulaControl',
+          evalMode: false,
           label: i18n("a9400c408441f1f7f6d6954deb05ae9a"),
           name: 'expression',
           placeholder: "\u8BF7\u8F93\u5165".concat(label, "\u6761\u4EF6"),

package/esm/renderer/SwitchMoreControl.d.ts

@@ -82,36 +82,37 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             tabs?: any;
             actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
             api?: string | import("amis").BaseApiObject | undefined;
+            mode: string;
             hidden?: boolean | undefined;
             static?: boolean | undefined;
             reload?: string | undefined;
-            mode: string;
             id?: string | undefined;
             target?: string | undefined;
-            feedback?: any;
             visibleOn?: string | undefined;
+            feedback?: any;
+            autoFocus: boolean | undefined;
             staticClassName?: import("amis").SchemaClassName | undefined;
-            hiddenOn?: string | undefined;
+            $ref?: string | undefined;
             disabledOn?: string | undefined;
-            staticOn?: string | undefined;
+            hiddenOn?: string | undefined;
             visible?: boolean | undefined;
+            staticOn?: string | undefined;
+            staticPlaceholder?: string | undefined;
+            staticLabelClassName?: import("amis").SchemaClassName | undefined;
+            staticInputClassName?: import("amis").SchemaClassName | undefined;
+            staticSchema?: any;
+            primaryField?: string | undefined;
+            messages?: {
+                validateFailed?: string | undefined;
+            } | undefined;
             persistData?: string | undefined;
             rules?: {
                 rule: string;
                 message: string;
                 name?: string | string[] | undefined;
             }[] | undefined;
-            messages?: {
-                validateFailed?: string | undefined;
-            } | undefined;
             labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
             labelWidth?: string | number | undefined;
-            $ref?: string | undefined;
-            staticPlaceholder?: string | undefined;
-            staticLabelClassName?: import("amis").SchemaClassName | undefined;
-            staticInputClassName?: import("amis").SchemaClassName | undefined;
-            staticSchema?: any;
-            primaryField?: string | undefined;
             fieldSet?: any;
             submitOnChange: boolean;
             initFetchOn?: string | undefined;
@@ -126,7 +127,7 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             debugConfig?: {
                 levelExpand?: number | undefined;
                 enableClipboard?: boolean | undefined;
-                iconStyle?: "circle" | "square" | "triangle" | undefined;
+                iconStyle?: "circle" | "triangle" | "square" | undefined;
                 quotesOnKeys?: boolean | undefined;
                 sortKeys?: boolean | undefined;
                 ellipsisThreshold?: number | false | undefined;
@@ -142,7 +143,6 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             resetAfterSubmit?: boolean | undefined;
             clearAfterSubmit?: boolean | undefined;
             columnCount?: number | undefined;
-            autoFocus: boolean | undefined;
             panelClassName: import("amis").ClassName;
             submitOnInit?: boolean | undefined;
             submitText?: string | undefined;
@@ -173,36 +173,37 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         tabs?: any;
         actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
         api?: string | import("amis").BaseApiObject | undefined;
+        mode: string;
         hidden?: boolean | undefined;
         static?: boolean | undefined;
         reload?: string | undefined;
-        mode: string;
         id?: string | undefined;
         target?: string | undefined;
-        feedback?: any;
         visibleOn?: string | undefined;
+        feedback?: any;
+        autoFocus: boolean | undefined;
         staticClassName?: import("amis").SchemaClassName | undefined;
-        hiddenOn?: string | undefined;
+        $ref?: string | undefined;
         disabledOn?: string | undefined;
-        staticOn?: string | undefined;
+        hiddenOn?: string | undefined;
         visible?: boolean | undefined;
+        staticOn?: string | undefined;
+        staticPlaceholder?: string | undefined;
+        staticLabelClassName?: import("amis").SchemaClassName | undefined;
+        staticInputClassName?: import("amis").SchemaClassName | undefined;
+        staticSchema?: any;
+        primaryField?: string | undefined;
+        messages?: {
+            validateFailed?: string | undefined;
+        } | undefined;
         persistData?: string | undefined;
         rules?: {
             rule: string;
             message: string;
             name?: string | string[] | undefined;
         }[] | undefined;
-        messages?: {
-            validateFailed?: string | undefined;
-        } | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
-        $ref?: string | undefined;
-        staticPlaceholder?: string | undefined;
-        staticLabelClassName?: import("amis").SchemaClassName | undefined;
-        staticInputClassName?: import("amis").SchemaClassName | undefined;
-        staticSchema?: any;
-        primaryField?: string | undefined;
         fieldSet?: any;
         submitOnChange: boolean;
         initFetchOn?: string | undefined;
@@ -217,7 +218,7 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         debugConfig?: {
             levelExpand?: number | undefined;
             enableClipboard?: boolean | undefined;
-            iconStyle?: "circle" | "square" | "triangle" | undefined;
+            iconStyle?: "circle" | "triangle" | "square" | undefined;
             quotesOnKeys?: boolean | undefined;
             sortKeys?: boolean | undefined;
             ellipsisThreshold?: number | false | undefined;
@@ -233,7 +234,6 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         resetAfterSubmit?: boolean | undefined;
         clearAfterSubmit?: boolean | undefined;
         columnCount?: number | undefined;
-        autoFocus: boolean | undefined;
         panelClassName: import("amis").ClassName;
         submitOnInit?: boolean | undefined;
         submitText?: string | undefined;

package/esm/renderer/SwitchMoreControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/TimelineItemControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/TransferTableControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/TreeOptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/ValidationItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/event-control/action-config-dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 
@@ -244,6 +244,7 @@ var ActionDialog = /** @class */function (_super) {
                   name: 'expression',
                   label: i18n("da1ed600ce65be863766444e60c2da05"),
                   type: 'ae-expressionFormulaControl',
+                  evalMode: true,
                   variables: '${variables}',
                   mode: 'horizontal',
                   size: 'lg',

package/esm/renderer/event-control/action-config-panel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/event-control/actions.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/event-control/comp-action-select.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/event-control/helper.d.ts

@@ -1,5 +1,6 @@
-import { RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
+import { BaseEventContext, EditorManager, PluginActions, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 import { ActionConfig, ComponentInfo, ContextVariables } from './types';
+import { DataSchema } from 'amis-core';
 import CmptActionSelect from './comp-action-select';
 export declare const DATA_CONTAINER: string[];
 export declare const SELECT_PROPS_CONTAINER: string[];
@@ -18,12 +19,12 @@ export declare const getArgsWrapper: (items: any, multiple?: boolean, patch?: {}
 export declare const COMMON_ACTION_SCHEMA_MAP: {
     [propName: string]: RendererPluginAction;
 };
-export declare const findActionNode: (actions: RendererPluginAction[], actionType: string) => any;
-export declare const findSubActionNode: (actions: RendererPluginAction[], actionType: string) => any;
-export declare const getActionType: (action: ActionConfig, hasSubActionNode: RendererPluginAction | null) => any;
-export declare const getEventLabel: (events: RendererPluginEvent[], name: string) => any;
-export declare const getEventDesc: (events: RendererPluginEvent[], name: string) => any;
-export declare const getEventStrongDesc: (events: RendererPluginEvent[], name: string) => any;
+export declare const findActionNode: (actions: RendererPluginAction[], actionType: string) => RendererPluginAction | null;
+export declare const findSubActionNode: (actions: RendererPluginAction[], actionType: string) => RendererPluginAction | null;
+export declare const getActionType: (action: ActionConfig, hasSubActionNode: RendererPluginAction | null) => string | undefined;
+export declare const getEventLabel: (events: RendererPluginEvent[], name: string) => string | undefined;
+export declare const getEventDesc: (events: RendererPluginEvent[], name: string) => string | undefined;
+export declare const getEventStrongDesc: (events: RendererPluginEvent[], name: string) => string | undefined;
 export declare const hasActionType: (actionType: string, actions?: RendererPluginAction[]) => boolean;
 export declare const getPropOfAcion: (action: ActionConfig, propName: string, actionTree: RendererPluginAction[], pluginActions: PluginActions, commonActions?: {
     [propName: string]: RendererPluginAction;
@@ -101,21 +102,23 @@ export declare const getOldActionSchema: (manager: EditorManager, context: BaseE
  */
 export declare const getEventControlConfig: (manager: EditorManager, context: BaseEventContext) => {
     showOldEntry: boolean;
-    actions: any;
-    events: any;
-    actionTree: any;
-    commonActions: any;
+    actions: PluginActions;
+    events: import("amis-editor-core").PluginEvents;
+    actionTree: RendererPluginAction[];
+    commonActions: {
+        [propName: string]: RendererPluginAction;
+    } | undefined;
     owner: string;
-    addBroadcast: any;
-    removeBroadcast: any;
+    addBroadcast: (event: RendererPluginEvent) => void;
+    removeBroadcast: (id: string) => void;
     allComponents: any[];
-    getContextSchemas: (id?: string, withoutSuper?: boolean) => Promise<any>;
+    getContextSchemas: (id?: string, withoutSuper?: boolean) => Promise<DataSchema | import("json-schema").JSONSchema7[]>;
     getComponents: (action: RendererPluginAction) => any[];
     actionConfigInitFormatter: (action: ActionConfig, variables: {
         eventVariables: ContextVariables[];
         rawVariables: ContextVariables[];
     }) => Promise<{
-        actionType: any;
+        actionType: string | undefined;
         args: {
             __dataContainerVariables: ContextVariables[];
         };

package/esm/renderer/event-control/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/event-control/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/Background.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/Border.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/BoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/BoxShadow.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/Display.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/Font.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/InsetBoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/font-family.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/style-control/transformation.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/textarea-formula/FormulaPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/textarea-formula/TextareaFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/textarea-formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/renderer/textarea-formula/utils.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */
 

package/esm/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.15
+ * amis-editor v5.2.1-beta.20
  * Copyright 2018-2022 @fex
  */