amis-editor 5.2.5 → 5.3.0

package/lib/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/lib/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -12,8 +12,9 @@ var React = require('react');
 var amisCore = require('amis-core');
 var cx = require('classnames');
 var amis = require('amis');
-var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
+var amisUi = require('amis-ui');
 var utils = require('./textarea-formula/utils.js');
+var FormulaControl = require('./FormulaControl.js');
 var mobx = require('mobx');
 var i18nRuntime = require('i18n-runtime');
 
@@ -29,263 +30,180 @@ var ExpressionFormulaControl = /** @class */function (_super) {
   tslib.__extends(ExpressionFormulaControl, _super);
   function ExpressionFormulaControl(props) {
     var _this = _super.call(this, props) || this;
-    Object.defineProperty(_this, "isUnmount", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(_this, "unReaction", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(_this, "appLocale", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(_this, "appCorpusData", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: void 0
-    });
     _this.state = {
       variables: [],
       formulaPickerValue: ''
     };
     return _this;
   }
-  Object.defineProperty(ExpressionFormulaControl.prototype, "componentDidMount", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function () {
-      return tslib.__awaiter(this, void 0, void 0, function () {
-        var editorStore, variablesArr;
-        var _this = this;
-        return tslib.__generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              this.initFormulaPickerValue(this.props.value);
-              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 = mobx.reaction(function () {
-                return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-              }, function () {
-                return tslib.__awaiter(_this, void 0, void 0, function () {
-                  var variablesArr;
-                  return tslib.__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*/, utils.getVariables(this)];
-                      case 1:
-                        variablesArr = _a.sent();
-                        this.setState({
-                          variables: variablesArr
-                        });
-                        return [2 /*return*/];
-                    }
-                  });
+  ExpressionFormulaControl.prototype.componentDidMount = function () {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var editorStore, variablesArr;
+      var _this = this;
+      return tslib.__generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            this.initFormulaPickerValue(this.props.value);
+            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 = mobx.reaction(function () {
+              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+            }, function () {
+              return tslib.__awaiter(_this, void 0, void 0, function () {
+                var variablesArr;
+                return tslib.__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*/, utils.getVariables(this)];
+                    case 1:
+                      variablesArr = _a.sent();
+                      this.setState({
+                        variables: variablesArr
+                      });
+                      return [2 /*return*/];
+                  }
                 });
               });
+            });
 
-              return [4 /*yield*/, utils.getVariables(this)];
-            case 1:
-              variablesArr = _a.sent();
-              this.setState({
-                variables: variablesArr
-              });
-              return [2 /*return*/];
-          }
-        });
+            return [4 /*yield*/, utils.getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr
+            });
+            return [2 /*return*/];
+        }
       });
-    }
-  });
+    });
+  };
 
-  Object.defineProperty(ExpressionFormulaControl.prototype, "componentDidUpdate", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (prevProps) {
-      return tslib.__awaiter(this, void 0, void 0, function () {
-        var variablesArr;
-        return tslib.__generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-              return [4 /*yield*/, utils.getVariables(this)];
-            case 1:
-              variablesArr = _a.sent();
-              this.setState({
-                variables: variablesArr
-              });
-              _a.label = 2;
-            case 2:
-              if (prevProps.value !== this.props.value) {
-                this.initFormulaPickerValue(this.props.value);
-              }
-              return [2 /*return*/];
-          }
-        });
+  ExpressionFormulaControl.prototype.componentDidUpdate = function (prevProps) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var variablesArr;
+      return tslib.__generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
+            return [4 /*yield*/, utils.getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr
+            });
+            _a.label = 2;
+          case 2:
+            if (prevProps.value !== this.props.value) {
+              this.initFormulaPickerValue(this.props.value);
+            }
+            return [2 /*return*/];
+        }
       });
-    }
-  });
+    });
+  };
 
-  Object.defineProperty(ExpressionFormulaControl.prototype, "componentWillUnmount", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function () {
-      var _a;
-      this.isUnmount = true;
-      (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
-    }
-  });
-  Object.defineProperty(ExpressionFormulaControl.prototype, "initFormulaPickerValue", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (value) {
-      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
-      });
-    }
-  });
-  Object.defineProperty(ExpressionFormulaControl.prototype, "renderFormulaValue", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (item) {
-      var html = {
-        __html: item.html
-      };
-      // bca-disable-next-line
-      return React__default["default"].createElement("span", {
-        dangerouslySetInnerHTML: html
-      });
-    }
-  });
-  Object.defineProperty(ExpressionFormulaControl.prototype, "handleConfirm", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: 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, "}") : '';
-      }
-      (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+  ExpressionFormulaControl.prototype.componentWillUnmount = function () {
+    var _a;
+    this.isUnmount = true;
+    (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+  };
+  ExpressionFormulaControl.prototype.initFormulaPickerValue = function (value) {
+    var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+      return p1;
+    })) || '';
+    this.setState({
+      formulaPickerValue: formulaPickerValue
+    });
+  };
+  ExpressionFormulaControl.prototype.handleConfirm = function (value) {
+    var _a, _b;
+    if (value === void 0) {
+      value = '';
     }
-  });
-  Object.defineProperty(ExpressionFormulaControl.prototype, "handleClearExpression", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (e) {
-      var _a, _b;
-      e.stopPropagation();
-      e.preventDefault();
-      (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, '');
+    var expressionReg = /^\$\{(.*)\}$/;
+    value = value.replace(/\r\n|\r|\n/g, ' ');
+    if (value && !expressionReg.test(value)) {
+      value = "${".concat(value, "}");
     }
-  });
-  Object.defineProperty(ExpressionFormulaControl.prototype, "render", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function () {
-      var _this = this;
-      var _a, _b;
-      var _c = this.props,
-        value = _c.value,
-        className = _c.className,
-        variableMode = _c.variableMode,
-        header = _c.header,
-        rest = tslib.__rest(_c, ["value", "className", "variableMode", "header"]);
-      var _d = this.state,
-        formulaPickerValue = _d.formulaPickerValue,
-        variables = _d.variables;
-      var highlightValue = FormulaEditor.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
-        html: formulaPickerValue
-      };
-      // 自身字段
-      var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
-      return React__default["default"].createElement("div", {
-        className: cx__default["default"]('ae-ExpressionFormulaControl', className)
-      }, React__default["default"].createElement(amis.PickerContainer, {
-        showTitle: false,
-        bodyRender: function (_a) {
-          _a.value;
-            var onChange = _a.onChange;
-          return React__default["default"].createElement(FormulaEditor.FormulaEditor, tslib.__assign({}, rest, {
-            evalMode: true,
-            variableMode: variableMode,
-            variables: variables,
-            header: header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
-            value: formulaPickerValue,
-            onChange: onChange,
-            selfVariableName: selfName
-          }));
+    (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+  };
+  ExpressionFormulaControl.prototype.handleClearExpression = function (e) {
+    var _a, _b;
+    e.stopPropagation();
+    e.preventDefault();
+    (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, '');
+  };
+  ExpressionFormulaControl.prototype.render = function () {
+    var _this = this;
+    var _a, _b;
+    var _c = this.props,
+      value = _c.value,
+      className = _c.className,
+      variableMode = _c.variableMode,
+      header = _c.header,
+      rest = tslib.__rest(_c, ["value", "className", "variableMode", "header"]);
+    var _d = this.state,
+      formulaPickerValue = _d.formulaPickerValue,
+      variables = _d.variables;
+    var highlightValue = amisUi.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
+      html: formulaPickerValue
+    };
+    // 自身字段
+    var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
+    return React__default["default"].createElement("div", {
+      className: cx__default["default"]('ae-ExpressionFormulaControl', className)
+    }, React__default["default"].createElement(amis.PickerContainer, {
+      showTitle: false,
+      bodyRender: function (_a) {
+        _a.value;
+          var onChange = _a.onChange;
+        return React__default["default"].createElement(amisUi.FormulaEditor, tslib.__assign({}, rest, {
+          evalMode: true,
+          variableMode: variableMode,
+          variables: variables,
+          header: header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+          value: formulaPickerValue,
+          onChange: onChange,
+          selfVariableName: selfName
+        }));
+      },
+      value: formulaPickerValue,
+      onConfirm: this.handleConfirm,
+      size: "md"
+    }, function (_a) {
+      var onClick = _a.onClick;
+      return formulaPickerValue ? React__default["default"].createElement(amis.Button, {
+        className: "btn-configured",
+        tooltip: {
+          placement: 'top',
+          tooltipTheme: 'dark',
+          mouseLeaveDelay: 20,
+          content: value,
+          tooltipClassName: 'btn-configured-tooltip',
+          children: function () {
+            return FormulaControl.renderFormulaValue(highlightValue);
+          }
         },
-        value: formulaPickerValue,
-        onConfirm: this.handleConfirm,
-        size: "md"
-      }, function (_a) {
-        var onClick = _a.onClick;
-        return formulaPickerValue ? React__default["default"].createElement(amis.Button, {
-          className: "btn-configured",
-          tooltip: {
-            placement: 'top',
-            tooltipTheme: 'dark',
-            mouseLeaveDelay: 20,
-            content: value,
-            tooltipClassName: 'btn-configured-tooltip',
-            children: function () {
-              return _this.renderFormulaValue(highlightValue);
-            }
-          },
-          onClick: onClick
-        }, "\u5DF2\u914D\u7F6E\u8868\u8FBE\u5F0F", React__default["default"].createElement(amis.Icon, {
-          icon: "input-clear",
-          className: "icon",
-          onClick: _this.handleClearExpression
-        })) : React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(amis.Button, {
-          className: "btn-set-expression",
-          onClick: onClick
-        }, "\u70B9\u51FB\u7F16\u5199\u8868\u8FBE\u5F0F"));
-      }));
-    }
-  });
-  Object.defineProperty(ExpressionFormulaControl, "defaultProps", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-      variableMode: 'tabs',
-      requiredDataPropsVariables: false,
-      evalMode: true
-    }
-  });
+        onClick: onClick
+      }, FormulaControl.renderFormulaValue(highlightValue), React__default["default"].createElement(amis.Icon, {
+        icon: "input-clear",
+        className: "icon",
+        onClick: _this.handleClearExpression
+      })) : React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(amis.Button, {
+        className: "btn-set-expression",
+        onClick: onClick
+      }, "\u70B9\u51FB\u7F16\u5199\u8868\u8FBE\u5F0F"));
+    }));
+  };
+  ExpressionFormulaControl.defaultProps = {
+    variableMode: 'tabs',
+    requiredDataPropsVariables: false,
+    evalMode: true
+  };
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "initFormulaPickerValue", null);
-  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "renderFormulaValue", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleConfirm", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleClearExpression", null);
   return ExpressionFormulaControl;

package/lib/renderer/FeatureControl.d.ts

@@ -56,7 +56,7 @@ export default class FeatureControl extends React.Component<FeatureControlProps,
      */
     destroyDragging(): void;
     renderItem(item: FeatureOption, index: number): JSX.Element;
-    renderAction(): JSX.Element | null;
+    renderAction(): any;
     render(): JSX.Element;
 }
 export declare class FeatureControlRenderer extends FeatureControl {