amis-editor 6.5.0 → 6.7.0

package/esm/renderer/RangePartsControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -417,4 +417,4 @@ var MarksControl = /** @class */function (_super) {
 })(MarksControl);
 
 export { MarksControl, PartsControl };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/StatusControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -222,4 +222,4 @@ var StatusControl = /** @class */function (_super) {
 })(StatusControl);
 
 export { StatusControl };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/SwitchMoreControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -385,10 +385,11 @@ var SwitchMore = /** @class */function (_super) {
     return _super !== null && _super.apply(this, arguments) || this;
   }
   SwitchMoreRenderer = __decorate([FormItem({
-    type: 'ae-switch-more'
+    type: 'ae-switch-more',
+    strictMode: false
   })], SwitchMoreRenderer);
   return SwitchMoreRenderer;
 })(SwitchMore);
 
 export { SwitchMore as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/TableColumnWidthControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -173,4 +173,4 @@ var TableColumnWidthControl = /** @class */function (_super) {
 })(TableColumnWidthControl);
 
 export { TableColumnWidthControl as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/TimelineItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -522,4 +522,4 @@ var TimelineItemControl = /** @class */function (_super) {
 })(React__default.Component);
 
 export { TimelineItemControl as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/TplFormulaControl.d.ts

@@ -2,10 +2,10 @@
  * @file 长文本公式输入框
  */
 import React from 'react';
-import type { VariableItem, CodeMirror } from 'amis-ui';
 import { FormControlProps } from 'amis-core';
 import { FormulaPlugin } from './textarea-formula/plugin';
 import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
+import type { VariableItem, CodeMirror } from 'amis-ui';
 export interface TplFormulaControlProps extends FormControlProps {
     /**
      * 用于提示的变量集合，默认为空
@@ -32,10 +32,23 @@ export interface TplFormulaControlProps extends FormControlProps {
      * 弹窗顶部标题，默认为 "表达式"
      */
     header: string;
+    /**
+     * 简化成员操作
+     */
+    simplifyMemberOprs?: boolean;
+    /**
+     * 支付支持快捷变量
+     */
+    quickVariables?: boolean;
+    /**
+     * 额外的快捷变量
+     */
+    quickVars?: Array<VariableItem>;
 }
 interface TplFormulaControlState {
     value: string;
     variables: Array<VariableItem>;
+    quickVariables: Array<VariableItem>;
     formulaPickerOpen: boolean;
     formulaPickerValue: string;
     expressionBrace?: Array<CodeMirror.Position>;
@@ -43,11 +56,14 @@ interface TplFormulaControlState {
         [key: string]: string;
     };
     loading: boolean;
+    menuIsOpened: boolean;
+    quickVariablesIsOpened: boolean;
 }
 export declare class TplFormulaControl extends React.Component<TplFormulaControlProps, TplFormulaControlState> {
     static defaultProps: Partial<TplFormulaControlProps>;
     wrapRef: React.RefObject<HTMLDivElement>;
     tooltipRef: React.RefObject<HTMLDivElement>;
+    buttonTarget: HTMLElement;
     editorPlugin: FormulaPlugin;
     unReaction: any;
     appLocale: string;
@@ -55,6 +71,7 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     constructor(props: TplFormulaControlProps);
     componentDidMount(): Promise<void>;
     componentWillUnmount(): void;
+    menuRef(ref: HTMLDivElement): void;
     onExpressionMouseEnter(e: MouseEvent, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     handleKeyDown(e: any): void;
@@ -71,6 +88,12 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     editorAutoMark(): void;
+    closeMenuOuter(): void;
+    closeQuickVariablesOuter(): void;
+    renderMenuOuter(): React.JSX.Element;
+    renderQuickVariablesOuter(): React.JSX.Element;
+    handleQuickVariableSelect(item: VariableItem): void;
+    renderButton(): React.JSX.Element;
     render(): React.JSX.Element;
 }
 export default class TplFormulaControlRenderer extends TplFormulaControl {

package/esm/renderer/TplFormulaControl.js

@@ -1,20 +1,20 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
-import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __spreadArray, __read, __rest, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import cx from 'classnames';
 import { reaction } from 'mobx';
-import { FormulaEditor, CodeMirrorEditor } from 'amis-ui';
-import { Icon, Button, TooltipWrapper, FormItem } from 'amis';
-import { autobind } from 'amis-core';
+import { Overlay, PopOver, VariableList, FormulaEditor, CodeMirrorEditor } from 'amis-ui';
+import { Button, Icon, TooltipWrapper, FormItem } from 'amis';
+import { RootClose, isMobile, autobind } from 'amis-core';
 import { editorFactory, FormulaPlugin } from './textarea-formula/plugin.js';
 import { renderFormulaValue } from './FormulaControl.js';
 import FormulaPicker from './textarea-formula/FormulaPicker.js';
-import { getVariables } from 'amis-editor-core';
+import { getQuickVariables, getVariables } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -33,18 +33,21 @@ var TplFormulaControl = /** @class */function (_super) {
     _this.state = {
       value: '',
       variables: [],
+      quickVariables: [],
       formulaPickerOpen: false,
       formulaPickerValue: '',
       tooltipStyle: {
         display: 'none'
       },
-      loading: false
+      loading: false,
+      menuIsOpened: false,
+      quickVariablesIsOpened: false
     };
     return _this;
   }
   TplFormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore, variables;
+      var editorStore, variables, quickVariables;
       var _this = this;
       return __generator(this, function (_a) {
         switch (_a.label) {
@@ -72,8 +75,12 @@ var TplFormulaControl = /** @class */function (_super) {
             return [4 /*yield*/, getVariables(this)];
           case 1:
             variables = _a.sent();
+            return [4 /*yield*/, getQuickVariables(this)];
+          case 2:
+            quickVariables = _a.sent();
             this.setState({
-              variables: variables
+              variables: variables,
+              quickVariables: quickVariables
             });
             return [2 /*return*/];
         }
@@ -91,6 +98,9 @@ var TplFormulaControl = /** @class */function (_super) {
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.dispose();
     (_b = this.unReaction) === null || _b === void 0 ? void 0 : _b.call(this);
   };
+  TplFormulaControl.prototype.menuRef = function (ref) {
+    this.buttonTarget = ref;
+  };
   TplFormulaControl.prototype.onExpressionMouseEnter = function (e, expression, brace) {
     var _a;
     var wrapperRect = (_a = this.wrapRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
@@ -317,11 +327,12 @@ var TplFormulaControl = /** @class */function (_super) {
   };
   TplFormulaControl.prototype.handleEditorMounted = function (cm, editor) {
     var _this = this;
-    var variables = this.props.variables || this.state.variables;
+    var variables = this.state.variables;
+    var quickVariables = this.state.quickVariables;
     this.editorPlugin = new FormulaPlugin(editor, {
       getProps: function () {
         return __assign(__assign({}, _this.props), {
-          variables: variables
+          variables: __spreadArray(__spreadArray([], __read(variables), false), __read(quickVariables), false)
         });
       },
       onExpressionMouseEnter: this.onExpressionMouseEnter,
@@ -333,6 +344,140 @@ var TplFormulaControl = /** @class */function (_super) {
     var _a;
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.autoMark();
   };
+  TplFormulaControl.prototype.closeMenuOuter = function () {
+    this.setState({
+      menuIsOpened: false
+    });
+  };
+  TplFormulaControl.prototype.closeQuickVariablesOuter = function () {
+    this.setState({
+      quickVariablesIsOpened: false
+    });
+  };
+  TplFormulaControl.prototype.renderMenuOuter = function () {
+    var _this = this;
+    var _a = this.props,
+      popOverContainer = _a.popOverContainer,
+      cx = _a.classnames,
+      ns = _a.classPrefix;
+    var menuIsOpened = this.state.menuIsOpened;
+    return React__default.createElement(Overlay, {
+      container: popOverContainer || this.wrapRef.current,
+      target: function () {
+        return _this.wrapRef.current;
+      },
+      placement: "right-bottom-right-top",
+      show: true
+    }, React__default.createElement(PopOver, {
+      classPrefix: ns,
+      className: cx('DropDown-popover')
+    }, React__default.createElement(RootClose, {
+      disabled: !menuIsOpened,
+      onRootClose: this.closeMenuOuter
+    }, function (ref) {
+      return React__default.createElement("ul", {
+        className: cx('DropDown-menu-root', 'DropDown-menu', {
+          'is-mobile': isMobile()
+        }),
+        onClick: _this.closeMenuOuter,
+        ref: ref
+      }, React__default.createElement("li", {
+        onClick: function () {
+          return _this.setState({
+            quickVariablesIsOpened: true
+          });
+        }
+      }, "\u5FEB\u6377\u53D8\u91CF"), React__default.createElement("li", {
+        onClick: _this.handleFormulaClick
+      }, "\u51FD\u6570\u8BA1\u7B97"));
+    })));
+  };
+  TplFormulaControl.prototype.renderQuickVariablesOuter = function () {
+    var _this = this;
+    var _a = this.props,
+      popOverContainer = _a.popOverContainer,
+      cx = _a.classnames,
+      ns = _a.classPrefix;
+    var _b = this.state,
+      quickVariables = _b.quickVariables,
+      quickVariablesIsOpened = _b.quickVariablesIsOpened;
+    return React__default.createElement(Overlay, {
+      container: popOverContainer || this.wrapRef.current,
+      target: function () {
+        return _this.wrapRef.current;
+      },
+      placement: "right-bottom-right-top",
+      show: true
+    }, React__default.createElement(PopOver, {
+      classPrefix: ns,
+      className: cx('DropDown-popover')
+    }, React__default.createElement(RootClose, {
+      disabled: !quickVariablesIsOpened,
+      onRootClose: this.closeQuickVariablesOuter
+    }, function (ref) {
+      return React__default.createElement("ul", {
+        className: cx('DropDown-menu-root', 'DropDown-menu', {
+          'is-mobile': isMobile()
+        }),
+        ref: ref
+      }, React__default.createElement(VariableList, {
+        className: cx('FormulaEditor-VariableList', 'FormulaEditor-VariableList-root'),
+        data: quickVariables,
+        onSelect: _this.handleQuickVariableSelect,
+        popOverContainer: popOverContainer,
+        simplifyMemberOprs: true
+      }));
+    })));
+  };
+  TplFormulaControl.prototype.handleQuickVariableSelect = function (item) {
+    var _this = this;
+    var value = this.props.value || '';
+    var newValue = value + '${' + item.value + '}';
+    this.handleOnChange(newValue);
+    this.closeQuickVariablesOuter();
+    setTimeout(function () {
+      _this.editorAutoMark();
+    }, 100);
+  };
+  TplFormulaControl.prototype.renderButton = function () {
+    var _this = this;
+    var _a = this.props,
+      loading = _a.loading,
+      quickVariables = _a.quickVariables;
+    var _b = this.state,
+      menuIsOpened = _b.menuIsOpened,
+      quickVariablesIsOpened = _b.quickVariablesIsOpened;
+    return React__default.createElement("div", {
+      className: "ae-TplFormulaControl-buttonWrapper",
+      ref: this.menuRef
+    }, quickVariables ? React__default.createElement(Button, {
+      className: "ae-TplFormulaControl-buttonWrapper-button",
+      size: "sm",
+      onClick: function () {
+        return _this.setState({
+          menuIsOpened: true
+        });
+      }
+    }, React__default.createElement(Icon, {
+      icon: "add",
+      className: cx('ae-TplFormulaControl-icon', 'icon')
+    })) : React__default.createElement(Button, {
+      className: "ae-TplFormulaControl-button",
+      size: "sm",
+      tooltip: {
+        enterable: false,
+        content: i18n("0e69a56857c65181f96cd272d20455d6"),
+        tooltipTheme: 'dark',
+        placement: 'left',
+        mouseLeaveDelay: 0
+      },
+      onClick: this.handleFormulaClick,
+      loading: loading
+    }, React__default.createElement(Icon, {
+      icon: "input-add-fx",
+      className: cx('ae-TplFormulaControl-icon', 'icon')
+    })), menuIsOpened ? this.renderMenuOuter() : null, quickVariablesIsOpened ? this.renderQuickVariablesOuter() : null);
+  };
   TplFormulaControl.prototype.render = function () {
     var _this = this;
     var _a = this.props,
@@ -341,14 +486,16 @@ var TplFormulaControl = /** @class */function (_super) {
       _a.label;
       var placeholder = _a.placeholder,
       customFormulaPicker = _a.customFormulaPicker,
-      clearable = _a.clearable,
-      rest = __rest(_a, ["className", "header", "label", "placeholder", "customFormulaPicker", "clearable"]);
+      clearable = _a.clearable;
+      _a.quickVariables;
+      _a.simplifyMemberOprs;
+      var rest = __rest(_a, ["className", "header", "label", "placeholder", "customFormulaPicker", "clearable", "quickVariables", "simplifyMemberOprs"]);
     var _b = this.state,
       formulaPickerOpen = _b.formulaPickerOpen,
       formulaPickerValue = _b.formulaPickerValue,
       variables = _b.variables,
-      tooltipStyle = _b.tooltipStyle,
-      loading = _b.loading;
+      tooltipStyle = _b.tooltipStyle;
+      _b.loading;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker;
     var highlightValue = FormulaEditor.highlightValue(formulaPickerValue, variables) || {
       html: formulaPickerValue
@@ -374,22 +521,7 @@ var TplFormulaControl = /** @class */function (_super) {
       className: "input-clear-icon",
       iconContent: "InputText-clear",
       onClick: this.handleClear
-    })), React__default.createElement(Button, {
-      className: "ae-TplFormulaControl-button",
-      size: "sm",
-      tooltip: {
-        enterable: false,
-        content: i18n("0e69a56857c65181f96cd272d20455d6"),
-        tooltipTheme: 'dark',
-        placement: 'left',
-        mouseLeaveDelay: 0
-      },
-      onClick: this.handleFormulaClick,
-      loading: loading
-    }, React__default.createElement(Icon, {
-      icon: "input-add-fx",
-      className: cx('ae-TplFormulaControl-icon', 'icon')
-    })), React__default.createElement(TooltipWrapper, {
+    })), this.renderButton(), React__default.createElement(TooltipWrapper, {
       trigger: "hover",
       placement: "top",
       style: {
@@ -424,6 +556,7 @@ var TplFormulaControl = /** @class */function (_super) {
     requiredDataPropsVariables: false,
     placeholder: i18n("02cc4f8f5a9aefbc03c778f7a5c989c7")
   };
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [HTMLDivElement]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "menuRef", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [MouseEvent, String, Array]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "onExpressionMouseEnter", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "hiddenToolTip", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleKeyDown", null);
@@ -436,6 +569,12 @@ var TplFormulaControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [HTMLElement, Object]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "editorFactory", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleEditorMounted", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "editorAutoMark", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "closeMenuOuter", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "closeQuickVariablesOuter", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "renderMenuOuter", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "renderQuickVariablesOuter", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleQuickVariableSelect", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TplFormulaControl.prototype, "renderButton", null);
   return TplFormulaControl;
 }(React__default.Component);
 /** @class */(function (_super) {
@@ -450,4 +589,4 @@ var TplFormulaControl = /** @class */function (_super) {
 })(TplFormulaControl);
 
 export { TplFormulaControl };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/TransferTableControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -448,4 +448,4 @@ var TransferTableControl = BaseOptionControl(TransferTableOption);
 })(TransferTableControl);
 
 export { TransferTableOption as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/TreeOptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -612,4 +612,4 @@ var TreeOptionControl = /** @class */function (_super) {
 })(TreeOptionControl);
 
 export { TreeOptionControl as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/ValidateApiControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -84,4 +84,4 @@ var ValidationApiControl = /** @class */function (_super) {
 })(ValidationApiControl);
 
 export { ValidationApiControl as default };
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/esm/renderer/ValidationControl.d.ts

@@ -26,7 +26,7 @@ export default class ValidationControl extends React.Component<ValidationControl
     constructor(props: ValidationControlProps);
     componentDidMount(): Promise<void>;
     componentWillReceiveProps(nextProps: ValidationControlProps): void;
-    buildFieldsData(): Promise<ConditionBuilderFields>;
+    buildFieldsData(): Promise<any>;
     getAvaliableValids(props: ValidationControlProps): {
         defaultValidators: Record<string, Validator>;
         moreValidators: Record<string, Validator>;
@@ -63,6 +63,11 @@ export default class ValidationControl extends React.Component<ValidationControl
      * 规则列表
      */
     renderValidaton(): React.JSX.Element;
+    filterCustomRendererProps(rendererSchema: any): any;
+    /**
+     * 获取rendererSchema的值
+     */
+    static getRendererSchemaFromProps(props: ValidationControlProps): any;
     render(): React.JSX.Element;
 }
 export declare class ValidationControlRenderer extends ValidationControl {