amis-editor 5.4.1 → 5.5.0

package/esm/renderer/FeatureControl.d.ts

@@ -55,9 +55,9 @@ export default class FeatureControl extends React.Component<FeatureControlProps,
      * 拖动的销毁
      */
     destroyDragging(): void;
-    renderItem(item: FeatureOption, index: number): React.JSX.Element;
+    renderItem(item: FeatureOption, index: number): JSX.Element;
     renderAction(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class FeatureControlRenderer extends FeatureControl {
 }

package/esm/renderer/FeatureControl.js

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

package/esm/renderer/FlexSettingControl.d.ts

@@ -13,7 +13,7 @@ interface FlexSettingControlProps extends FormControlProps {
 export default class FlexSettingControl extends React.Component<FlexSettingControlProps> {
     constructor(props: any);
     setField(field: string): (val: string) => void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class FlexSettingControlRenderer extends FlexSettingControl {
 }

package/esm/renderer/FlexSettingControl.js

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

package/esm/renderer/FormulaControl.d.ts

@@ -12,7 +12,7 @@ export declare enum FormulaDateType {
     IsDate = 1,
     IsRange = 2
 }
-export declare function renderFormulaValue(item: any): React.JSX.Element;
+export declare function renderFormulaValue(item: any): JSX.Element;
 export interface FormulaControlProps extends FormControlProps {
     manager?: EditorManager;
     /**
@@ -104,7 +104,6 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     appCorpusData: any;
     constructor(props: FormulaControlProps);
     componentDidMount(): Promise<void>;
-    componentDidUpdate(prevProps: FormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
     /**
      * 将 ${xx}（非 \${xx}）替换成 \${xx}
@@ -129,7 +128,7 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     handleInputChange: (value: any) => void;
     filterCustomRendererProps(rendererSchema: any): any;
     getContextData(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class FormulaControlRenderer extends FormulaControl {
 }

package/esm/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -15,9 +15,8 @@ import cx from 'classnames';
 import { isExpression, FormulaExec, InputBox, TooltipWrapper, ResultBox, Icon, Button, FormItem } from 'amis';
 import { FormulaEditor } from 'amis-ui';
 import FormulaPicker from './textarea-formula/FormulaPicker.js';
-import { translateSchema, autobind } from 'amis-editor-core';
+import { getVariables, translateSchema, autobind } from 'amis-editor-core';
 import { reaction } from 'mobx';
-import { getVariables } from './textarea-formula/utils.js';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -53,7 +52,7 @@ var FormulaControl = /** @class */function (_super) {
     };
     _this.state = {
       variables: [],
-      variableMode: 'tabs',
+      variableMode: 'tree',
       formulaPickerOpen: false,
       loading: false
     };
@@ -61,65 +60,25 @@ var FormulaControl = /** @class */function (_super) {
   }
   FormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore, variablesArr;
+      var editorStore;
       var _this = this;
       return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            editorStore = window.editorStore;
-            this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-            this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-            this.unReaction = reaction(function () {
-              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-            }, function () {
-              return __awaiter(_this, void 0, void 0, function () {
-                var variablesArr;
-                return __generator(this, function (_a) {
-                  switch (_a.label) {
-                    case 0:
-                      this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-                      this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-                      return [4 /*yield*/, getVariables(this)];
-                    case 1:
-                      variablesArr = _a.sent();
-                      this.setState({
-                        variables: variablesArr
-                      });
-                      return [2 /*return*/];
-                  }
-                });
-              });
+        editorStore = window.editorStore;
+        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+        this.unReaction = reaction(function () {
+          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+        }, function () {
+          return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+              return [2 /*return*/];
             });
+          });
+        });
 
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            return [2 /*return*/];
-        }
-      });
-    });
-  };
-
-  FormulaControl.prototype.componentDidUpdate = function (prevProps) {
-    return __awaiter(this, void 0, void 0, function () {
-      var variablesArr;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            _a.label = 2;
-          case 2:
-            return [2 /*return*/];
-        }
+        return [2 /*return*/];
       });
     });
   };
@@ -248,7 +207,7 @@ var FormulaControl = /** @class */function (_super) {
   FormulaControl.prototype.beforeFormulaEditorOpen = function () {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-      var _b, node, manager, data, onFormulaEditorOpen, res, variables, error_1;
+      var _b, node, manager, data, onFormulaEditorOpen, res, variables, variables, error_1;
       return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
@@ -259,8 +218,8 @@ var FormulaControl = /** @class */function (_super) {
             });
             _c.label = 1;
           case 1:
-            _c.trys.push([1, 5,, 6]);
-            if (!(manager && onFormulaEditorOpen && typeof onFormulaEditorOpen === 'function')) return [3 /*break*/, 4];
+            _c.trys.push([1, 8,, 9]);
+            if (!(manager && onFormulaEditorOpen && typeof onFormulaEditorOpen === 'function')) return [3 /*break*/, 5];
             return [4 /*yield*/, onFormulaEditorOpen(node, manager, data)];
           case 2:
             res = _c.sent();
@@ -273,12 +232,22 @@ var FormulaControl = /** @class */function (_super) {
             });
             _c.label = 4;
           case 4:
-            return [3 /*break*/, 6];
+            return [3 /*break*/, 7];
           case 5:
+            return [4 /*yield*/, getVariables(this)];
+          case 6:
+            variables = _c.sent();
+            this.setState({
+              variables: variables
+            });
+            _c.label = 7;
+          case 7:
+            return [3 /*break*/, 9];
+          case 8:
             error_1 = _c.sent();
             console.error('[amis-editor] onFormulaEditorOpen failed: ', error_1 === null || error_1 === void 0 ? void 0 : error_1.stack);
-            return [3 /*break*/, 6];
-          case 6:
+            return [3 /*break*/, 9];
+          case 9:
             this.setState({
               loading: false
             });

package/esm/renderer/GoConfigControl.d.ts

@@ -11,7 +11,7 @@ export interface GoCongigControlProps extends FormControlProps {
 }
 export declare class GoConfigControl extends React.PureComponent<GoCongigControlProps, any> {
     onClick(): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class GoConfigControlRenderer extends GoConfigControl {
 }

package/esm/renderer/GoConfigControl.js

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

package/esm/renderer/MapSourceControl.d.ts

@@ -32,7 +32,7 @@ export default class MapSourceControl extends React.Component<MapSourceControlPr
      * 切换选项类型
      */
     handleMapTypeChange(mapType: MapType): void;
-    renderHeader(): React.JSX.Element;
+    renderHeader(): JSX.Element;
     handleMapChange(map: any): void;
     handleAPIChange(source: SchemaApi): void;
     handleLabelFieldChange(labelField: string): void;
@@ -55,10 +55,10 @@ export default class MapSourceControl extends React.Component<MapSourceControlPr
     renderApiPanel(): any;
     renderObjectMap(): any;
     handleMapItemChange(index: number, item: any): void;
-    renderArrayMap(): React.JSX.Element;
+    renderArrayMap(): JSX.Element;
     debounceMapChange: import("lodash").DebouncedFunc<(map: any) => void>;
     renderMap(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class MapSourceControlRenderer extends MapSourceControl {
 }

package/esm/renderer/MapSourceControl.js

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

package/esm/renderer/NavBadgeControl.d.ts

@@ -71,7 +71,7 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
     handleSwitchChange(checked: boolean): void;
     handleSubmit(form: BadgeForm, action: any): void;
     renderBody(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class BadgeControlRenderer extends BadgeControl {
 }

package/esm/renderer/NavBadgeControl.js

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

package/esm/renderer/NavDefaultActive.js

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

package/esm/renderer/NavSourceControl.d.ts

@@ -54,14 +54,14 @@ export default class NavSourceControl extends React.Component<NavControlProps, O
      */
     handleDelete(index: string): void;
     handleAdd(): void;
-    renderHeader(): React.JSX.Element;
+    renderHeader(): JSX.Element;
     handleEditLabel(index: string, value: string | boolean | IconType, key: string): void;
     handleAddChildren(index: string, value: boolean): void;
-    renderNav(props: any): React.JSX.Element;
-    renderOption(props: any): React.JSX.Element;
+    renderNav(props: any): JSX.Element;
+    renderOption(props: any): JSX.Element;
     handleAPIChange(source: SchemaApi): void;
     renderApiPanel(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class NavSourceControlRenderer extends NavSourceControl {
 }

package/esm/renderer/NavSourceControl.js

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

package/esm/renderer/OptionControl.d.ts

@@ -98,8 +98,8 @@ export default class OptionControl extends React.Component<OptionControlProps, O
     handleBatchAdd(values: {
         batchOption: string;
     }[], action: any): void;
-    renderHeader(): React.JSX.Element;
-    renderOption(props: any): React.JSX.Element;
+    renderHeader(): JSX.Element;
+    renderOption(props: any): JSX.Element;
     buildBatchAddSchema(): {
         type: string;
         actionType: string;
@@ -161,7 +161,7 @@ export default class OptionControl extends React.Component<OptionControlProps, O
     handleLableFieldChange(labelField: string): void;
     handleValueFieldChange(valueField: string): void;
     renderApiPanel(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class OptionControlRenderer extends OptionControl {
 }

package/esm/renderer/OptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -575,8 +575,7 @@ var OptionControl = /** @class */function (_super) {
             value: false
           }]
         }]
-      }, {
-        type: 'ae-expressionFormulaControl',
+      }, getSchemaTpl('expressionFormulaControl', {
         name: 'optionHiddenOn',
         label: i18n("dce5379cb978a8259ecfca8f08f00817"),
         labelClassName: 'ae-OptionControlItem-EditLabel',
@@ -584,7 +583,7 @@ var OptionControl = /** @class */function (_super) {
         onChange: function (v) {
           return _this.handleHiddenValueChange(index, v);
         }
-      }, {
+      }), {
         type: i18nEnabled ? 'input-text-i18n' : 'input-text',
         placeholder: i18n("7f05bea37729325a6cc84eb26bb9f8c8"),
         label: i18n("b8c467fce096a649583c0bc9d9281a5c"),

package/esm/renderer/RangePartsControl.d.ts

@@ -49,10 +49,10 @@ export declare class PartsControl extends React.Component<PartsControlProps, Par
     handleOptionsChange(value?: {
         number: number;
     }[]): void;
-    renderHeader(): React.JSX.Element;
-    renderContent(source: string): React.JSX.Element;
+    renderHeader(): JSX.Element;
+    renderContent(source: string): JSX.Element;
     handlePartsChange(value: number): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 /**
  * 下标
@@ -82,8 +82,8 @@ export declare class MarksControl extends React.Component<MarksControlProps, Mar
      * @param source
      */
     handleSourceChange(source: any): void;
-    renderHeader(): React.JSX.Element;
-    render(): React.JSX.Element;
+    renderHeader(): JSX.Element;
+    render(): JSX.Element;
 }
 export declare class PartsControlRenderer extends PartsControl {
 }

package/esm/renderer/RangePartsControl.js

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

package/esm/renderer/StatusControl.d.ts

@@ -39,8 +39,8 @@ export declare class StatusControl extends React.Component<StatusControlProps, S
     shouldComponentUpdate(nextProps: StatusControlProps, nextState: StatusControlState): boolean;
     handleSwitch(value: boolean): void;
     handleFormSubmit(values: StatusFormData): void;
-    render(): React.JSX.Element;
-    renderContent(): React.JSX.Element;
+    render(): JSX.Element;
+    renderContent(): JSX.Element;
 }
 export declare class StatusControlRenderer extends StatusControl {
 }

package/esm/renderer/StatusControl.js

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

package/esm/renderer/SwitchMoreControl.d.ts

@@ -57,8 +57,8 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
     handleSubmit(values: any): void;
     handleAction(e: React.UIEvent<any> | void, action: Action, data: object, throwErrors?: boolean, delegate?: IScopedContext): void;
     renderActions(): any[] | null;
-    renderPopover(): React.JSX.Element;
-    renderExtend(): React.JSX.Element | null;
+    renderPopover(): JSX.Element;
+    renderExtend(): JSX.Element | null;
     renderDialogMore(): {
         type: string;
         btnLabel: string;
@@ -101,8 +101,8 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         submitOnChange: boolean;
         data: any;
     };
-    renderMoreSection(): React.JSX.Element | null;
-    render(): React.JSX.Element | null;
+    renderMoreSection(): JSX.Element | null;
+    render(): JSX.Element | null;
 }
 export declare class SwitchMoreRenderer extends SwitchMore {
 }

package/esm/renderer/SwitchMoreControl.js

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

package/esm/renderer/TimelineItemControl.d.ts

@@ -127,14 +127,14 @@ export default class TimelineItemControl extends React.Component<TimelineItemPro
     dragRef(ref: any): void;
     initDragging(): void;
     destroyDragging(): void;
-    renderHeader(): React.JSX.Element;
+    renderHeader(): JSX.Element;
     renderOption(props: TimelineItem & {
         index: number;
-    }): React.JSX.Element;
+    }): JSX.Element;
     renderApiPanel(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class TimelineItemControlRenderer extends React.Component<TimelineItemProps> {
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export {};

package/esm/renderer/TimelineItemControl.js

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

package/esm/renderer/TplFormulaControl.d.ts

@@ -42,6 +42,7 @@ interface TplFormulaControlState {
     tooltipStyle: {
         [key: string]: string;
     };
+    loading: boolean;
 }
 export declare class TplFormulaControl extends React.Component<TplFormulaControlProps, TplFormulaControlState> {
     static defaultProps: Partial<TplFormulaControlProps>;
@@ -53,9 +54,7 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     appCorpusData: any;
     constructor(props: TplFormulaControlProps);
     componentDidMount(): Promise<void>;
-    componentDidUpdate(prevProps: TplFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
-    onExpressionClick(expression: string, brace?: Array<CodeMirror.Position>): void;
     onExpressionMouseEnter(e: MouseEvent, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     handleKeyDown(e: any): void;
@@ -64,11 +63,15 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     handleOnChange(value: any): void;
     checkOpenFormulaPicker(value: string): void;
     handleClear(): void;
-    handleFormulaClick(): void;
+    /**
+     * 公式编辑器打开完成一些异步任务的加载
+     */
+    beforeFormulaEditorOpen(): Promise<void>;
+    handleFormulaClick(e: React.MouseEvent, type?: string): Promise<void>;
     editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     editorAutoMark(): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export default class TplFormulaControlRenderer extends TplFormulaControl {
 }