amis-editor 5.4.1 → 5.6.0-beta.0

package/esm/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.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.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -41,7 +41,7 @@ var GoConfigControl = /** @class */function (_super) {
       onClick: this.onClick
     }, label, React__default.createElement("div", {
       className: cx('ae-GoConfig-trigger')
-    }, "\u53BB\u7F16\u8F91"));
+    }, i18n("eee03351367bb1907dcc3140ffa3e3b8")));
   };
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], GoConfigControl.prototype, "onClick", null);
   return GoConfigControl;

package/esm/renderer/MapSourceControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -133,7 +133,7 @@ var MapSourceControl = /** @class */function (_super) {
       tooltip: labelRemark,
       className: cx("Form-lableRemark", labelRemark === null || labelRemark === void 0 ? void 0 : labelRemark.className),
       useMobileUI: useMobileUI,
-      container: popOverContainer ? popOverContainer : env && env.getModalContainer ? env.getModalContainer : undefined
+      container: popOverContainer || env.getModalContainer
     }) : null), React__default.createElement("div", null, render('validation-control-addBtn', {
       type: 'dropdown-button',
       level: 'link',

package/esm/renderer/NavBadgeControl.js

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

package/esm/renderer/NavDefaultActive.js

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

package/esm/renderer/NavSourceControl.d.ts

@@ -5,64 +5,82 @@ import React from 'react';
 import Sortable from 'sortablejs';
 import type { FormControlProps } from 'amis-core';
 import type { SchemaApi } from 'amis';
-export type valueType = 'text' | 'boolean' | 'number';
+export type SourceType = 'custom' | 'api' | '';
 export type NavControlItem = {
+    id?: string;
     label: string;
-    to: string;
-    target: string;
-    icon?: string;
-    unfolded?: boolean;
-    active?: boolean;
-    activeOn?: string;
-    overflow?: {
-        enable: boolean;
-        overflowLabel: string;
-        overflowIndicator: string;
-        maxVisibleCount: number;
+    to?: string;
+    target?: string;
+    icon?: string | {
+        id: string;
+        name: string;
+        svg: string;
     };
-    children?: Array<any>;
+    badge?: string;
+    children?: Array<NavControlItem>;
 };
 export interface NavControlProps extends FormControlProps {
 }
-export interface OptionControlState {
+export interface NavControlState {
     links: Array<NavControlItem>;
     api: SchemaApi;
-    source: 'custom' | 'api' | 'apicenter';
+    source: SourceType;
+    showDialog: boolean;
+    isEdit: boolean;
+    modalName: string;
+    modalParent: string;
+    modalIcon: string;
+    modalTarget: string;
+    modalBadge: string;
+    modalUrl: string;
+    currentIndex: string;
+    previousModalParent: string;
 }
-type IconType = {
-    id: string;
-    name: string;
-};
-export default class NavSourceControl extends React.Component<NavControlProps, OptionControlState> {
-    sortable?: Sortable;
+export declare class NavSourceControl extends React.Component<NavControlProps, NavControlState> {
+    sortables: Sortable[];
     drag?: HTMLElement | null;
-    target: HTMLElement | null;
-    $comp: string;
-    internalProps: string[];
     constructor(props: NavControlProps);
+    transformSource(source: SchemaApi): "api" | "custom";
     transformOptions(props: NavControlProps): any;
     /**
-     * 更新options字段的统一出口
+     * 更新统一出口
      */
     onChange(): void;
     /**
      * 切换选项类型
      */
-    handleSourceChange(source: 'custom' | 'api' | 'apicenter'): void;
+    handleSourceChange(source: SourceType): void;
+    dragRef(ref: any): void;
+    initDragging(): void;
+    handleDragging(e: Sortable.SortableEvent): void;
+    getNodePath(pathStr: string): {
+        path: string[];
+        parentPath: string;
+    } | {
+        path: string;
+        parentPath: string;
+    };
+    refreshBindDrag(): void;
+    destroyDragging(destroyRoot?: boolean): void;
     /**
      * 删除选项
      */
-    handleDelete(index: string): void;
-    handleAdd(): void;
-    renderHeader(): React.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;
+    handleDelete(index: string): Promise<unknown>;
+    handleUpdate(index: string): void;
+    getChildren(): any;
+    handleSubmit(): Promise<void>;
+    handleSetNavId(data: NavControlItem[], index: string): void;
+    handleDeleteNavId(data: NavControlItem[] | NavControlItem): void;
+    handleFilterTreeData(data: NavControlItem[]): void;
+    openModal(): void;
+    closeModal(): void;
+    handleChange(options: any): void;
     handleAPIChange(source: SchemaApi): void;
     renderApiPanel(): any;
+    renderHeader(): React.JSX.Element;
+    renderNav(dataSource: NavControlItem[], index?: string): React.JSX.Element;
+    renderDialog(): any;
     render(): React.JSX.Element;
 }
 export declare class NavSourceControlRenderer extends NavSourceControl {
 }
-export {};