amis-editor 5.2.5-beta.7 → 5.3.0

package/esm/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @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';
@@ -141,8 +141,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.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/DateShortCutControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ExpressionFormulaControl.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { FormControlProps } from 'amis-core';
-import type { VariableItem } from 'amis-ui/lib/components/formula/Editor';
+import type { VariableItem } from 'amis-ui';
 interface ExpressionFormulaControlProps extends FormControlProps {
     /**
      * 用于提示的变量集合，默认为空
@@ -38,7 +38,6 @@ export default class ExpressionFormulaControl extends React.Component<Expression
     componentDidUpdate(prevProps: ExpressionFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
     initFormulaPickerValue(value: string): void;
-    renderFormulaValue(item: any): JSX.Element;
     handleConfirm(value?: string): void;
     handleClearExpression(e: React.MouseEvent<HTMLElement>): void;
     render(): JSX.Element;

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -8,8 +8,9 @@ import React__default from 'react';
 import { autobind } from 'amis-core';
 import cx from 'classnames';
 import { PickerContainer, Button, Icon, FormItem } from 'amis';
-import { FormulaEditor } from 'amis-ui/lib/components/formula/Editor';
+import { FormulaEditor } from 'amis-ui';
 import { getVariables } from './textarea-formula/utils.js';
+import { renderFormulaValue } from './FormulaControl.js';
 import { reaction } from 'mobx';
 import { i18n } from 'i18n-runtime';
 
@@ -101,35 +102,22 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
   };
   ExpressionFormulaControl.prototype.initFormulaPickerValue = function (value) {
-    var formulaPickerValue = value;
-    if (this.props.evalMode) {
-      formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
-        return p1;
-      })) || '';
-    }
+    var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+      return p1;
+    })) || '';
     this.setState({
       formulaPickerValue: formulaPickerValue
     });
   };
-  ExpressionFormulaControl.prototype.renderFormulaValue = function (item) {
-    var html = {
-      __html: item.html
-    };
-    // bca-disable-next-line
-    return React__default.createElement("span", {
-      dangerouslySetInnerHTML: html
-    });
-  };
   ExpressionFormulaControl.prototype.handleConfirm = function (value) {
     var _a, _b;
     if (value === void 0) {
       value = '';
     }
-    if (this.props.evalMode) {
-      value = value.replace(/^\$\{(.*)\}$/, function (match, p1) {
-        return p1;
-      });
-      value = value ? "${".concat(value, "}") : '';
+    var expressionReg = /^\$\{(.*)\}$/;
+    value = value.replace(/\r\n|\r|\n/g, ' ');
+    if (value && !expressionReg.test(value)) {
+      value = "${".concat(value, "}");
     }
     (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
   };
@@ -187,11 +175,11 @@ var ExpressionFormulaControl = /** @class */function (_super) {
           content: value,
           tooltipClassName: 'btn-configured-tooltip',
           children: function () {
-            return _this.renderFormulaValue(highlightValue);
+            return renderFormulaValue(highlightValue);
           }
         },
         onClick: onClick
-      }, "\u5DF2\u914D\u7F6E\u8868\u8FBE\u5F0F", React__default.createElement(Icon, {
+      }, renderFormulaValue(highlightValue), React__default.createElement(Icon, {
         icon: "input-clear",
         className: "icon",
         onClick: _this.handleClearExpression
@@ -207,7 +195,6 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     evalMode: true
   };
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "initFormulaPickerValue", null);
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "renderFormulaValue", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleConfirm", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleClearExpression", null);
   return ExpressionFormulaControl;

package/esm/renderer/FeatureControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/FlexSettingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -36,11 +36,11 @@ var getFlexItem = function (props) {
   var isColumn = curDirection === 'column' || curDirection === 'column-reverse';
   // 主轴排列方向
   var directionItemOptions = [{
-    label: '水平方向',
+    label: i18n("ed33c46d1d69336bb011813e8352fa01"),
     value: 'row',
     icon: 'drow'
   }, {
-    label: '垂直方向',
+    label: i18n("963e9ff4252cdef288063c41eb6d4998"),
     value: 'column',
     icon: 'dcolumn'
   }, {
@@ -61,7 +61,7 @@ var getFlexItem = function (props) {
     icon: 'jFlexStart',
     iconClassName: scaleX[curDirection]
   }, {
-    label: isColumn ? '垂直居中' : '水平居中',
+    label: isColumn ? i18n("4117e80d2c2e52f795ec64160f399364") : i18n("d365d58d281508b9982f6a0370649ae2"),
     value: 'center',
     icon: 'jCenter',
     iconClassName: scaleX[curDirection]
@@ -76,7 +76,7 @@ var getFlexItem = function (props) {
     icon: 'jSpaceBetween',
     iconClassName: scaleX[curDirection]
   }, {
-    label: '间隔分布',
+    label: i18n("21af94c1abc5891b2703c9321417a1a9"),
     value: 'space-around',
     icon: 'jSpaceAround',
     iconClassName: scaleX[curDirection]
@@ -88,7 +88,7 @@ var getFlexItem = function (props) {
     icon: 'aFlexStart',
     iconClassName: scaleY[curDirection]
   }, {
-    label: isColumn ? '水平居中' : '垂直居中',
+    label: isColumn ? i18n("d365d58d281508b9982f6a0370649ae2") : i18n("4117e80d2c2e52f795ec64160f399364"),
     value: 'center',
     icon: 'aCenter',
     iconClassName: scaleY[curDirection]
@@ -103,7 +103,7 @@ var getFlexItem = function (props) {
     icon: 'aBaseline',
     iconClassName: scaleY[curDirection]
   }, {
-    label: isColumn ? '水平铺开' : i18n("cbac406a3f51abad691702015b0784ba"),
+    label: isColumn ? i18n("849b9b944a65eb0685f3e6af60a0c523") : i18n("cbac406a3f51abad691702015b0784ba"),
     value: 'stretch',
     icon: 'aStretch',
     iconClassName: isColumn ? 'scaleX-90' : ''
@@ -167,7 +167,7 @@ var FlexSettingControl = /** @class */function (_super) {
     return _super !== null && _super.apply(this, arguments) || this;
   }
   FlexSettingControlRenderer = __decorate([FormItem({
-    type: 'flex-setting'
+    type: 'flex-layout-setting'
   })], FlexSettingControlRenderer);
   return FlexSettingControlRenderer;
 })(FlexSettingControl);

package/esm/renderer/FormulaControl.d.ts

@@ -2,6 +2,7 @@
  * @file 表达式控件
  */
 import React from 'react';
+import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
 import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/Editor';
 import { FormControlProps } from 'amis-core';
 import type { BaseEventContext } from 'amis-editor-core';
@@ -11,6 +12,7 @@ export declare enum FormulaDateType {
     IsDate = 1,
     IsRange = 2
 }
+export declare function renderFormulaValue(item: any): JSX.Element;
 export interface FormulaControlProps extends FormControlProps {
     manager?: EditorManager;
     /**
@@ -67,7 +69,6 @@ export interface FormulaControlProps extends FormControlProps {
      * 备注2: 开关组件可以设置 true 和 false 对应的值，如果设置了就不是普通的 boolean 类型；
      * 备注3: 默认都是字符串类型；
      */
-    valueType?: string;
     /**
      * 不在表单项上触发时，传入想要获取变量的 表单props 获取对应变量
      */
@@ -83,11 +84,16 @@ export interface FormulaControlProps extends FormControlProps {
      * 默认为 FormulaDateType.NotDate
      */
     DateTimeType?: FormulaDateType;
+    /**
+     * 自定义fx面板
+     */
+    customFormulaPicker?: React.FC<CustomFormulaPickerProps>;
 }
 interface FormulaControlState {
     /** 变量数据 */
     variables: any;
     variableMode?: 'tree' | 'tabs';
+    formulaPickerOpen: boolean;
 }
 export default class FormulaControl extends React.Component<FormulaControlProps, FormulaControlState> {
     static defaultProps: Partial<FormulaControlProps>;
@@ -112,10 +118,11 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     hasDateShortcutkey(str: string): boolean;
     transExpr(str: string): string;
     handleConfirm(value: any): void;
+    handleFormulaClick(): void;
+    closeFormulaPicker(): void;
     handleSimpleInputChange: (value: any) => void;
     handleInputChange: (value: any) => void;
     filterCustomRendererProps(rendererSchema: any): any;
-    renderFormulaValue(item: any): JSX.Element;
     getContextData(): any;
     render(): JSX.Element;
 }

package/esm/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -12,8 +12,9 @@ import isArray from 'lodash/isArray';
 import isString from 'lodash/isString';
 import omit from 'lodash/omit';
 import cx from 'classnames';
-import { isExpression, FormulaExec, InputBox, TooltipWrapper, ResultBox, PickerContainer, Button, Icon, FormItem } from 'amis';
-import { FormulaEditor } from 'amis-ui/lib/components/formula/Editor';
+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 { reaction } from 'mobx';
 import { getVariables } from './textarea-formula/utils.js';
@@ -28,6 +29,15 @@ var FormulaDateType;
   FormulaDateType[FormulaDateType["IsDate"] = 1] = "IsDate";
   FormulaDateType[FormulaDateType["IsRange"] = 2] = "IsRange"; // 日期时间范围类
 })(FormulaDateType || (FormulaDateType = {}));
+function renderFormulaValue(item) {
+  var html = {
+    __html: typeof item === 'string' ? item : item.html
+  };
+  // bca-disable-next-line
+  return React__default.createElement("span", {
+    dangerouslySetInnerHTML: html
+  });
+}
 var FormulaControl = /** @class */function (_super) {
   __extends(FormulaControl, _super);
   function FormulaControl(props) {
@@ -43,7 +53,8 @@ var FormulaControl = /** @class */function (_super) {
     };
     _this.state = {
       variables: [],
-      variableMode: 'tabs'
+      variableMode: 'tabs',
+      formulaPickerOpen: false
     };
     return _this;
   }
@@ -225,8 +236,20 @@ var FormulaControl = /** @class */function (_super) {
   };
   FormulaControl.prototype.handleConfirm = function (value) {
     var _a, _b;
+    value = value.replace(/\r\n|\r|\n/g, ' ');
     var val = !value ? undefined : isExpression(value) || this.hasDateShortcutkey(value) ? value : "${".concat(value, "}");
     (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, val);
+    this.closeFormulaPicker();
+  };
+  FormulaControl.prototype.handleFormulaClick = function () {
+    this.setState({
+      formulaPickerOpen: true
+    });
+  };
+  FormulaControl.prototype.closeFormulaPicker = function () {
+    this.setState({
+      formulaPickerOpen: false
+    });
   };
   // 剔除掉一些用不上的属性
   FormulaControl.prototype.filterCustomRendererProps = function (rendererSchema) {
@@ -242,7 +265,7 @@ var FormulaControl = /** @class */function (_super) {
         name: (_c = (_b = rendererSchema.name) !== null && _b !== void 0 ? _b : data.name) !== null && _c !== void 0 ? _c : 'value'
       });
       // 默认要剔除的字段
-      var deleteProps = ['label', 'id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value', 'inputControlClassName', 'themeCss'];
+      var deleteProps = ['label', 'id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'static', 'staticOn', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value', 'inputControlClassName', 'css', 'validateApi', 'themeCss'];
       // 当前组件要剔除的字段
       if (this.props.needDeleteProps) {
         deleteProps.push.apply(deleteProps, __spreadArray([], __read(this.props.needDeleteProps), false));
@@ -276,40 +299,44 @@ var FormulaControl = /** @class */function (_super) {
     }
     return curRendererSchema;
   };
-  FormulaControl.prototype.renderFormulaValue = function (item) {
-    var html = {
-      __html: item.html
-    };
-    // bca-disable-next-line
-    return React__default.createElement("span", {
-      dangerouslySetInnerHTML: html
-    });
-  };
   FormulaControl.prototype.getContextData = function () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
+    var curContextData = (_c = (_b = (_a = this.props.data) === null || _a === void 0 ? void 0 : _a.__super) === null || _b === void 0 ? void 0 : _b.__props__) === null || _c === void 0 ? void 0 : _c.data;
+    if (!curContextData) {
+      var curComp = (_d = this.props.node) === null || _d === void 0 ? void 0 : _d.getComponent();
+      if ((_e = curComp === null || curComp === void 0 ? void 0 : curComp.props) === null || _e === void 0 ? void 0 : _e.data) {
+        curContextData = curComp.props.data;
+      }
+    }
     // 当前数据域
-    return ((_c = (_b = (_a = this.props.data) === null || _a === void 0 ? void 0 : _a.__super) === null || _b === void 0 ? void 0 : _b.__props__) === null || _c === void 0 ? void 0 : _c.data) || ((_d = this.props.manager) === null || _d === void 0 ? void 0 : _d.amisStore) || {};
+    return curContextData;
   };
   FormulaControl.prototype.render = function () {
+    var _a;
     var _this = this;
-    var _a, _b;
-    var _c = this.props,
-      className = _c.className;
-      _c.label;
-      var value = _c.value,
-      header = _c.header;
-      _c.variables;
-      var placeholder = _c.placeholder,
-      simple = _c.simple,
-      rendererSchema = _c.rendererSchema,
-      rendererWrapper = _c.rendererWrapper,
-      manager = _c.manager,
-      _d = _c.useExternalFormData,
-      useExternalFormData = _d === void 0 ? false : _d,
-      render = _c.render,
-      rest = __rest(_c, ["className", "label", "value", "header", "variables", "placeholder", "simple", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "render"]);
+    var _b, _c, _d;
+    var _e = this.props,
+      className = _e.className;
+      _e.label;
+      var value = _e.value,
+      header = _e.header,
+      placeholder = _e.placeholder,
+      simple = _e.simple,
+      rendererSchema = _e.rendererSchema,
+      rendererWrapper = _e.rendererWrapper,
+      manager = _e.manager,
+      _f = _e.useExternalFormData,
+      useExternalFormData = _f === void 0 ? false : _f,
+      customFormulaPicker = _e.customFormulaPicker;
+      _e.clearable;
+      var render = _e.render,
+      rest = __rest(_e, ["className", "label", "value", "header", "placeholder", "simple", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "customFormulaPicker", "clearable", "render"]);
+    var _h = this.state,
+      formulaPickerOpen = _h.formulaPickerOpen,
+      variables = _h.variables,
+      variableMode = _h.variableMode;
     // 自身字段
-    var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
+    (_c = (_b = this.props) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.name;
     // 判断是否含有公式表达式
     var isExpr = isExpression(value);
     // 判断当前是否有循环引用，备注：非精准识别，待优化
@@ -318,10 +345,11 @@ var FormulaControl = /** @class */function (_super) {
       isLoop = (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) ? this.isLoopExpression(value, rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) : false;
     }
     // 判断是否含有公式表达式
-    var isTypeError = !this.isExpectType(value);
+    // const isTypeError = !this.isExpectType(value);
     var exprValue = this.transExpr(value);
-    var isError = isLoop || isTypeError;
-    var highlightValue = isExpression(value) ? FormulaEditor.highlightValue(exprValue, this.state.variables) || {
+    var isError = isLoop;
+    var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker;
+    var highlightValue = isExpression(value) ? FormulaEditor.highlightValue(exprValue, variables) || {
       html: exprValue
     } : value;
     // 公式表达式弹窗内容过滤
@@ -355,63 +383,59 @@ var FormulaControl = /** @class */function (_super) {
         mouseLeaveDelay: 20,
         content: exprValue,
         children: function () {
-          return _this.renderFormulaValue(highlightValue);
+          return renderFormulaValue(highlightValue);
         }
       }
     }, React__default.createElement("div", {
       className: "ae-editor-FormulaControl-tooltipBox"
+    }, React__default.createElement("div", {
+      className: "ae-editor-FormulaControl-ResultBox-wrapper",
+      onClick: this.handleFormulaClick
     }, React__default.createElement(ResultBox, {
       className: cx('ae-editor-FormulaControl-ResultBox', isError ? 'is-error' : ''),
       allowInput: false,
-      clearable: true,
       value: value,
       result: {
-        html: this.hasDateShortcutkey(value) ? i18n("48942ef507ea38d8ead03f8bfdffae5a") : i18n("0d9d899edb456e8806a99850e9c38212")
+        html: this.hasDateShortcutkey(value) ? value : highlightValue.html
       },
-      itemRender: this.renderFormulaValue,
+      itemRender: renderFormulaValue,
       onChange: this.handleInputChange,
       onResultChange: function () {
         _this.handleInputChange(undefined);
       }
-    }))), React__default.createElement(PickerContainer, {
-      showTitle: false,
-      bodyRender: function (_a) {
-        var _b;
-        _a.value;
-          var onChange = _a.onChange;
-        return React__default.createElement(FormulaEditor, __assign({}, rest, {
-          evalMode: true,
-          variableMode: (_b = rest.variableMode) !== null && _b !== void 0 ? _b : _this.state.variableMode,
-          variables: _this.state.variables,
-          header: header || i18n("a9400c408441f1f7f6d6954deb05ae9a"),
-          value: filterValue,
-          onChange: onChange,
-          selfVariableName: selfName
-        }));
+    })), value && React__default.createElement(Icon, {
+      icon: "input-clear",
+      className: "input-clear-icon",
+      iconContent: "InputText-clear",
+      onClick: function () {
+        return _this.handleInputChange('');
+      }
+    }))), React__default.createElement(Button, {
+      className: "ae-editor-FormulaControl-button",
+      size: "sm",
+      tooltip: {
+        enterable: false,
+        content: i18n("303efd5ba79e639001b4328cd266dddc"),
+        tooltipTheme: 'dark',
+        placement: 'left',
+        mouseLeaveDelay: 0
       },
-      value: value,
-      onConfirm: this.handleConfirm,
-      size: "md"
-    }, function (_a) {
-      var _b;
-      var onClick = _a.onClick;
-      return React__default.createElement(Button, {
-        className: "ae-editor-FormulaControl-button",
-        size: "sm",
-        tooltip: {
-          enterable: false,
-          content: i18n("303efd5ba79e639001b4328cd266dddc"),
-          placement: 'left',
-          mouseLeaveDelay: 0
-        },
-        onClick: onClick
-      }, React__default.createElement(Icon, {
-        icon: "function",
-        className: cx('ae-editor-FormulaControl-icon', 'icon', (_b = {}, _b['is-filled'] = !!isFx, _b))
-      }));
-    }), isError && React__default.createElement("div", {
+      onClick: this.handleFormulaClick
+    }, React__default.createElement(Icon, {
+      icon: "input-fx",
+      className: cx('ae-editor-FormulaControl-icon', 'icon', (_a = {}, _a['is-filled'] = !!isFx, _a))
+    })), isError && React__default.createElement("div", {
       className: "desc-msg error-msg"
-    }, isLoop ? i18n("7d92f998d24da41b58db140b1864f773") : i18n("b5cc1cd60cd694f45142dc52a5bf53fc")));
+    }, isLoop ? i18n("7d92f998d24da41b58db140b1864f773") : i18n("b5cc1cd60cd694f45142dc52a5bf53fc")), formulaPickerOpen ? React__default.createElement(FormulaPickerCmp, __assign({}, this.props, {
+      value: filterValue,
+      initable: true,
+      header: header,
+      variables: variables,
+      variableMode: (_d = rest.variableMode) !== null && _d !== void 0 ? _d : variableMode,
+      evalMode: true,
+      onClose: this.closeFormulaPicker,
+      onConfirm: this.handleConfirm
+    })) : null);
   };
   FormulaControl.defaultProps = {
     simple: false,
@@ -426,8 +450,9 @@ var FormulaControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Boolean)], FormulaControl.prototype, "hasDateShortcutkey", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], FormulaControl.prototype, "transExpr", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], FormulaControl.prototype, "handleConfirm", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], FormulaControl.prototype, "handleFormulaClick", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], FormulaControl.prototype, "closeFormulaPicker", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], FormulaControl.prototype, "filterCustomRendererProps", null);
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], FormulaControl.prototype, "renderFormulaValue", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], FormulaControl.prototype, "getContextData", null);
   return FormulaControl;
 }(React__default.Component);
@@ -437,9 +462,10 @@ var FormulaControl = /** @class */function (_super) {
     return _super !== null && _super.apply(this, arguments) || this;
   }
   FormulaControlRenderer = __decorate([FormItem({
-    type: 'ae-formulaControl'
+    type: 'ae-formulaControl',
+    detectProps: ['rendererSchema']
   })], FormulaControlRenderer);
   return FormulaControlRenderer;
 })(FormulaControl);
 
-export { FormulaDateType, FormulaControl as default };
+export { FormulaDateType, FormulaControl as default, renderFormulaValue };

package/esm/renderer/GoConfigControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/MapSourceControl.d.ts

@@ -4,10 +4,11 @@
 /// <reference types="lodash" />
 import React from 'react';
 import { FormControlProps } from 'amis-core';
-import { SchemaApi } from 'amis/lib/Schema';
+import type { SchemaApi } from 'amis';
 declare enum MapType {
     CUSTOM = "custom",
-    API = "api"
+    API = "api",
+    VARIABLE = "variable"
 }
 export interface MapSourceControlProps extends FormControlProps {
     className?: string;

package/esm/renderer/MapSourceControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -19,6 +19,7 @@ var MapType;
 (function (MapType) {
   MapType["CUSTOM"] = "custom";
   MapType["API"] = "api";
+  MapType["VARIABLE"] = "variable";
 })(MapType || (MapType = {}));
 var MapSourceControl = /** @class */function (_super) {
   __extends(MapSourceControl, _super);
@@ -27,7 +28,7 @@ var MapSourceControl = /** @class */function (_super) {
     _this.debounceMapChange = debounce(_this.handleMapChange, 250);
     var mapType = MapType.CUSTOM;
     if (props.data.hasOwnProperty('source') && props.data.source) {
-      mapType = MapType.API;
+      mapType = /\$\{(.*?)\}/g.test(props.data.source) ? MapType.VARIABLE : MapType.API;
     }
     _this.state = {
       map: props.data.map,
@@ -71,7 +72,7 @@ var MapSourceControl = /** @class */function (_super) {
       });
       return;
     }
-    if (mapType === MapType.API) {
+    if ([MapType.API, MapType.VARIABLE].includes(mapType)) {
       onBulkChange && onBulkChange({
         source: source,
         map: undefined,
@@ -109,6 +110,9 @@ var MapSourceControl = /** @class */function (_super) {
     }, {
       label: i18n("f99603414a616bdee85de0e6e3938b65"),
       value: MapType.API
+    }, {
+      label: i18n("50334fc77fc5a2c2636f14f158d3c417"),
+      value: MapType.VARIABLE
     }].map(function (item) {
       return __assign(__assign({}, item), {
         onClick: function () {
@@ -315,10 +319,17 @@ var MapSourceControl = /** @class */function (_super) {
   };
   MapSourceControl.prototype.render = function () {
     var mapType = this.state.mapType;
-    var className = this.props.className;
+    var _a = this.props,
+      className = _a.className,
+      render = _a.render;
     return React__default.createElement("div", {
       className: cx('ae-OptionControl', className)
-    }, this.renderHeader(), mapType === MapType.CUSTOM ? this.renderMap() : this.renderApiPanel());
+    }, this.renderHeader(), mapType === MapType.CUSTOM ? this.renderMap() : null, mapType === MapType.API ? this.renderApiPanel() : null, mapType === MapType.VARIABLE ? render('variable', getSchemaTpl('sourceBindControl', {
+      label: false,
+      className: 'ae-ExtendMore'
+    }), {
+      onChange: this.handleAPIChange
+    }) : null);
   };
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], MapSourceControl.prototype, "handleMapTypeChange", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], MapSourceControl.prototype, "handleMapChange", null);