amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

package/esm/renderer/FormulaControl.js

@@ -1,437 +1,513 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
-import { __extends, __spreadArray, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
-import debounce from 'lodash/debounce';
-import uniqBy from 'lodash/uniqBy';
 import isNumber from 'lodash/isNumber';
 import isBoolean from 'lodash/isBoolean';
 import isPlainObject from 'lodash/isPlainObject';
 import isArray from 'lodash/isArray';
 import isString from 'lodash/isString';
-import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
 import cx from 'classnames';
-import { isExpression, FormulaExec, InputBox, ResultBox, PickerContainer, Button, Icon, FormItem } from 'amis';
+import { isExpression, FormulaExec, InputBox, TooltipWrapper, ResultBox, PickerContainer, Button, Icon, FormItem } from 'amis';
 import { FormulaEditor } from 'amis-ui/lib/components/formula/Editor';
 import { autobind } from 'amis-editor-core';
-import { dataMapping } from 'amis-core';
+import { getVariables } from './textarea-formula/utils.js';
 import { i18n } from 'i18n-runtime';
 
 /**
  * @file 表达式控件
  */
-
-var FormulaControl =
-/** @class */
-function (_super) {
+var FormulaDateType;
+(function (FormulaDateType) {
+  FormulaDateType[FormulaDateType["NotDate"] = 0] = "NotDate";
+  FormulaDateType[FormulaDateType["IsDate"] = 1] = "IsDate";
+  FormulaDateType[FormulaDateType["IsRange"] = 2] = "IsRange"; // 日期时间范围类
+})(FormulaDateType || (FormulaDateType = {}));
+var FormulaControl = /** @class */function (_super) {
   __extends(FormulaControl, _super);
-
   function FormulaControl(props) {
     var _this = _super.call(this, props) || this;
-
-    _this.handleSimpleInputChange = debounce(function (value) {
-      var _a, _b;
-
-      var curValue = _this.replaceExpression(value);
-
-      (_b = (_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, curValue);
-    }, 250, {
-      trailing: true,
-      leading: false
+    Object.defineProperty(_this, "isUnmount", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "handleSimpleInputChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function (value) {
+        var _a, _b;
+        var curValue = _this.outReplaceExpression(value);
+        (_b = (_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, curValue);
+      }
+    });
+    Object.defineProperty(_this, "handleInputChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function (value) {
+        var _a, _b;
+        (_b = (_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+      }
     });
-
-    _this.handleInputChange = function (value) {
-      var _a, _b;
-
-      (_b = (_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
-    };
-
     _this.state = {
-      variables: _this.normalizeVariables(props.variables),
-      variableMode: 'tabs',
-      evalMode: true
+      variables: [],
+      variableMode: 'tabs'
     };
     return _this;
   }
-
-  FormulaControl.prototype.componentDidUpdate = function (prevProps) {
-    var _this = this; // 优先使用props中的变量数据
-
-
-    if (!this.props.variables) {
-      // 从amis数据域中取变量数据
-      this.resolveVariablesFromScope().then(function (variables) {
-        if (Array.isArray(variables)) {
-          var vars = variables.filter(function (item) {
-            var _a;
-
-            return (_a = item.children) === null || _a === void 0 ? void 0 : _a.length;
-          });
-
-          if (!_this.isUnmount && !isEqual(vars, _this.state.variables)) {
-            _this.setState({
-              variables: vars
-            });
+  Object.defineProperty(FormulaControl.prototype, "componentDidMount", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      return __awaiter(this, void 0, void 0, function () {
+        var variablesArr;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              return [4 /*yield*/, getVariables(this)];
+            case 1:
+              variablesArr = _a.sent();
+              this.setState({
+                variables: variablesArr
+              });
+              return [2 /*return*/];
           }
-        }
+        });
       });
     }
-
-    if (this.props.data !== prevProps.data) {
-      this.setState({
-        variables: dataMapping(this.props.variables, this.props.data)
+  });
+
+  Object.defineProperty(FormulaControl.prototype, "componentDidUpdate", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: 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*/];
+          }
+        });
       });
     }
-  };
-
-  FormulaControl.prototype.componentWillUnmount = function () {
-    this.isUnmount = true;
-  }; // 组件默认值设置交互中未使用
-
-
-  FormulaControl.prototype.normalizeVariables = function (variables) {
-    var _a, _b, _c;
-
-    if (!variables) {
-      return [];
-    }
-
-    if (variables && variables.some(function (item) {
-      return isExpression(item.children);
-    })) {
-      variables = dataMapping(variables, this.props.data);
+  });
+
+  Object.defineProperty(FormulaControl.prototype, "componentWillUnmount", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      this.isUnmount = true;
     }
-
-    var _d = this.props,
-        context = _d.context,
-        evalMode = _d.evalMode; // 自身字段
-
-    var field = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
-    var ancestorField = (_c = context === null || context === void 0 ? void 0 : context.node) === null || _c === void 0 ? void 0 : _c.ancestorField;
-    return uniqBy(__spreadArray(__spreadArray(__spreadArray([], Array.isArray(variables) ? variables : [], true), ancestorField ? ancestorField.map(function (item) {
-      return {
-        label: item,
-        value: evalMode ? "this.".concat(item) : item
-      };
-    }) : [], true), field ? [{
-      label: field,
-      value: "this.".concat(field)
-    }] : [], true), 'value');
-  };
+  });
   /**
    * 将 ${xx}（非 \${xx}）替换成 \${xx}
    * 备注: 手动编辑时，自动处理掉 ${xx}，避免识别成 公式表达式
    */
-
-
-  FormulaControl.prototype.replaceExpression = function (expression) {
-    if (expression && isString(expression) && isExpression(expression)) {
-      return expression.replace(/(^|[^\\])\$\{/g, '\\${');
+  Object.defineProperty(FormulaControl.prototype, "outReplaceExpression", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (expression) {
+      if (expression && isString(expression) && isExpression(expression)) {
+        return expression.replace(/(^|[^\\])\$\{/g, '\\${');
+      }
+      return expression;
     }
-
-    return expression;
-  }; // 根据 name 值 判断当前表达式是否 存在循环引用问题
-
-
-  FormulaControl.prototype.isLoopExpression = function (expression, selfName) {
-    if (!expression || !selfName || !isString(expression)) {
-      return false;
+  });
+  Object.defineProperty(FormulaControl.prototype, "inReplaceExpression", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (expression) {
+      if (expression && isString(expression)) {
+        return expression.replace(/\\\$\{/g, '${');
+      }
+      return expression;
     }
-
-    var variables = FormulaExec.collect(expression);
-    return variables.some(function (variable) {
-      return variable === selfName;
-    });
-  }; // 判断是否是期望类型
-
-
-  FormulaControl.prototype.isExpectType = function (value) {
-    if (value === null || value === undefined) {
-      return true; // 数值为空不进行类型识别
+  });
+  // 根据 name 值 判断当前表达式是否 存在循环引用问题
+  Object.defineProperty(FormulaControl.prototype, "isLoopExpression", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (expression, selfName) {
+      if (!expression || !selfName || !isString(expression)) {
+        return false;
+      }
+      var variables = [];
+      try {
+        variables = FormulaExec.collect(expression);
+      } catch (e) {}
+      return variables.some(function (variable) {
+        return variable === selfName;
+      });
     }
+  });
+  // 判断是否是期望类型
+  Object.defineProperty(FormulaControl.prototype, "isExpectType", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (value) {
+      if (value === null || value === undefined) {
+        return true; // 数值为空不进行类型识别
+      }
 
-    var expectType = this.props.valueType;
-
-    if (expectType === null || expectType === undefined) {
-      return true; // expectType为空，则不进行类型识别
-    } // 当前数据域
-
-
-    var curData = this.getContextData();
-
-    if (expectType === 'number' && isNumber(value) || expectType === 'boolean' && isBoolean(value) || expectType === 'object' && isPlainObject(value) || expectType === 'array' && isArray(value)) {
-      return true;
-    } else if (isString(value)) {
-      if (isExpression(value)) {
-        // 根据公式运算结果判断类型
-        var formulaValue = FormulaExec.formula(value, curData);
-
-        if (expectType === 'number' && isNumber(formulaValue) || expectType === 'boolean' && isBoolean(formulaValue) || expectType === 'object' && isPlainObject(formulaValue) || expectType === 'array' && isArray(formulaValue) || expectType === 'string' && isString(formulaValue)) {
+      var rendererSchema = this.props.rendererSchema;
+      var expectType = this.props.valueType;
+      if (expectType === null || expectType === undefined) {
+        return true; // expectType为空，则不进行类型识别
+      }
+      // 当前数据域
+      var curData = this.getContextData();
+      if (rendererSchema.type === 'switch' && (rendererSchema.trueValue !== undefined || rendererSchema.falseValue !== undefined)) {
+        // 开关类型组件单独处理
+        return rendererSchema.trueValue === value || rendererSchema.falseValue === value;
+      } else if (expectType === 'number' && isNumber(value) || expectType === 'boolean' && isBoolean(value) || expectType === 'object' && isPlainObject(value) || expectType === 'array' && isArray(value)) {
+        return true;
+      } else if (isString(value)) {
+        if (isExpression(value)) {
+          // 根据公式运算结果判断类型
+          var formulaValue = FormulaExec.formula(value, curData);
+          if (expectType === 'number' && isNumber(formulaValue) || expectType === 'boolean' && isBoolean(formulaValue) || expectType === 'object' && isPlainObject(formulaValue) || expectType === 'array' && isArray(formulaValue) || expectType === 'string' && isString(formulaValue)) {
+            return true;
+          }
+        } else if (expectType === 'string') {
+          // 非公式字符串
           return true;
         }
-      } else if (expectType === 'string') {
-        // 非公式字符串
+      }
+      return false;
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "matchDate", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (str) {
+      var matchDate = /^(.+)?(\+|-)(\d+)(minute|min|hour|day|week|month|year|weekday|second|millisecond)s?$/i;
+      var m = matchDate.exec(str);
+      return m ? m[1] ? this.matchDate(m[1]) : true : false;
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "matchDateRange", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (str) {
+      if (/^(now|today)$/.test(str)) {
         return true;
       }
+      return this.matchDate(str);
     }
-
-    return false;
-  };
-
-  FormulaControl.prototype.resolveVariablesFromScope = function () {
-    var _a;
-
-    return __awaiter(this, void 0, void 0, function () {
-      var _b, node, manager, dataPropsAsOptions;
-
-      return __generator(this, function (_c) {
-        switch (_c.label) {
-          case 0:
-            _b = this.props.formProps || this.props, node = _b.node, manager = _b.manager;
-            return [4
-            /*yield*/
-            , manager === null || manager === void 0 ? void 0 : manager.getContextSchemas(node)];
-
-          case 1:
-            _c.sent();
-
-            dataPropsAsOptions = (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions();
-
-            if (dataPropsAsOptions) {
-              return [2
-              /*return*/
-              , dataPropsAsOptions.map(function (item) {
-                return __assign({
-                  selectMode: 'tree'
-                }, item);
-              })];
-            }
-
-            return [2
-            /*return*/
-            , []];
+  });
+  // 日期类组件 & 是否存在快捷键判断
+  Object.defineProperty(FormulaControl.prototype, "hasDateShortcutkey", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (str) {
+      var _a;
+      var DateTimeType = this.props.DateTimeType;
+      if (DateTimeType === FormulaDateType.IsDate) {
+        if (/^(now|today)$/.test(str)) {
+          return true;
+        }
+        return this.matchDate(str);
+      } else if (DateTimeType === FormulaDateType.IsRange) {
+        var start_end = (_a = str === null || str === void 0 ? void 0 : str.split) === null || _a === void 0 ? void 0 : _a.call(str, ',');
+        if (start_end && start_end.length === 2) {
+          return this.matchDateRange(start_end[0].trim()) && this.matchDateRange(start_end[1].trim());
         }
-      });
-    });
-  };
-
-  FormulaControl.prototype.handleConfirm = function (value) {
-    var _a, _b;
-
-    (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
-  }; // 剔除掉一些用不上的属性
-
-
-  FormulaControl.prototype.filterCustomRendererProps = function (rendererSchema) {
-    var _a;
-
-    var _b = this.props,
-        data = _b.data,
-        name = _b.name;
-    var curRendererSchema = null;
-
-    if (rendererSchema) {
-      curRendererSchema = Object.assign({}, rendererSchema, data, {
-        type: (_a = rendererSchema.type) !== null && _a !== void 0 ? _a : data.type
-      }); // 默认要剔除的字段
-
-      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']; // 当前组件要剔除的字段
-
-      if (this.props.needDeleteProps) {
-        deleteProps.push.apply(deleteProps, this.props.needDeleteProps);
-      }
-
-      if (name && name === 'min') {
-        // 避免min影响自身默认值设置
-        deleteProps.push('min');
       }
-
-      if (name && name === 'max') {
-        // 避免max影响自身默认值设置
-        deleteProps.push('max');
+      // 非日期类组件使用，也直接false
+      // if (DateTimeType === FormulaDateType.NotDate) {
+      //   return false;
+      // }
+      return false;
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "transExpr", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (str) {
+      if (typeof str === 'string' && (str === null || str === void 0 ? void 0 : str.slice(0, 2)) === '${' && (str === null || str === void 0 ? void 0 : str.slice(-1)) === '}') {
+        // 非最外层内容还存在表达式情况
+        if (isExpression(str.slice(2, -1))) {
+          return str;
+        }
+        if (str.lastIndexOf('${') > str.indexOf('}') && str.indexOf('}') > -1) {
+          return str;
+        }
+        return str.slice(2, -1);
       }
-
-      curRendererSchema = omit(curRendererSchema, deleteProps); // 避免没有清空icon
-
-      if (curRendererSchema.clearable !== undefined && !curRendererSchema.clearable) {
+      return str;
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "handleConfirm", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (value) {
+      var _a, _b;
+      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);
+    }
+  });
+  // 剔除掉一些用不上的属性
+  Object.defineProperty(FormulaControl.prototype, "filterCustomRendererProps", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (rendererSchema) {
+      var _a, _b, _c;
+      var _d = this.props,
+        data = _d.data,
+        name = _d.name,
+        placeholder = _d.placeholder;
+      var curRendererSchema = null;
+      if (rendererSchema) {
+        curRendererSchema = Object.assign({}, rendererSchema, data, {
+          type: (_a = rendererSchema.type) !== null && _a !== void 0 ? _a : data.type,
+          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'];
+        // 当前组件要剔除的字段
+        if (this.props.needDeleteProps) {
+          deleteProps.push.apply(deleteProps, this.props.needDeleteProps);
+        }
+        if (name && name === 'min') {
+          // 避免min影响自身默认值设置
+          deleteProps.push('min');
+        }
+        if (name && name === 'max') {
+          // 避免max影响自身默认值设置
+          deleteProps.push('max');
+        }
+        curRendererSchema = omit(curRendererSchema, deleteProps);
+        // 设置可清空
         curRendererSchema.clearable = true;
-      } // 设置统一的占位提示
-
-
-      if (curRendererSchema.type === 'select') {
-        curRendererSchema.placeholder = i18n("51d8a85a3c59453eed398eb8f5d35585");
-        curRendererSchema.inputClassName = 'ae-editor-FormulaControl-select-style';
-      } else {
-        curRendererSchema.placeholder = i18n("cb73fbd12620c6ff4d7e5d1047c3be4d");
-      } // 设置popOverContainer
-
-
-      curRendererSchema.popOverContainer = window.document.body;
+        // 设置统一的占位提示
+        if (curRendererSchema.type === 'select') {
+          !curRendererSchema.placeholder && (curRendererSchema.placeholder = i18n("8f7ae284d0039fe05b9f57fd5ae3ede9"));
+          curRendererSchema.inputClassName = 'ae-editor-FormulaControl-select-style';
+        } else if (placeholder) {
+          curRendererSchema.placeholder = placeholder;
+        } else {
+          curRendererSchema.placeholder = i18n("e0c7ac5eb397512fdbe71600baa09dab");
+        }
+        // 设置popOverContainer
+        curRendererSchema.popOverContainer = window.document.body;
+      }
+      return curRendererSchema;
     }
-
-    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; // 当前数据域
-
-
-    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) || {};
-  };
-
-  FormulaControl.prototype.render = function () {
-    var _this = this;
-
-    var _a, _b;
-
-    var _c = this.props,
-        className = _c.className,
-        label = _c.label,
-        value = _c.value,
+  });
+  Object.defineProperty(FormulaControl.prototype, "renderFormulaValue", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (item) {
+      var html = {
+        __html: item.html
+      };
+      // bca-disable-next-line
+      return React__default.createElement("span", {
+        dangerouslySetInnerHTML: html
+      });
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "getContextData", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _a, _b, _c, _d;
+      // 当前数据域
+      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) || {};
+    }
+  });
+  Object.defineProperty(FormulaControl.prototype, "render", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      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,
-        evalMode = _c.evalMode,
         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", "evalMode", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "render"]);
-
-    var labelText = typeof label === 'string' ? label : ''; // 自身字段
-
-    var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name; // 判断是否含有公式表达式
-
-    var isExpr = isExpression(value); // 判断当前是否有循环引用，备注：非精准识别，待优化
-
-    var isLoop = false;
-
-    if (isExpr && (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name)) {
-      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);
-    var isError = isLoop || isTypeError;
-    var highlightValue = isExpression(value) ? FormulaEditor.highlightValue(value, this.state.variables, evalMode !== null && evalMode !== void 0 ? evalMode : this.state.evalMode) : value;
-    return React__default.createElement("div", {
-      className: cx('ae-editor-FormulaControl', isError ? 'is-has-tooltip' : '', className)
-    }, !simple && !rendererSchema && !isExpr && React__default.createElement(InputBox, {
-      className: "ae-editor-FormulaControl-input",
-      value: value,
-      clearable: true,
-      placeholder: placeholder,
-      onChange: this.handleSimpleInputChange
-    }), !simple && rendererSchema && !isExpr && React__default.createElement("div", {
-      className: cx('ae-editor-FormulaControl-custom-renderer', rendererWrapper ? 'border-wrapper' : '')
-    }, render('inner', this.filterCustomRendererProps(rendererSchema), {
-      inputOnly: true,
-      value: value,
-      data: useExternalFormData ? __assign({}, this.props.data) : {},
-      onChange: this.handleSimpleInputChange,
-      manager: manager
-    })), !simple && isExpr && React__default.createElement(ResultBox, {
-      className: cx('ae-editor-FormulaControl-ResultBox', isError ? 'is-error' : ''),
-      allowInput: false,
-      clearable: true,
-      value: value,
-      result: highlightValue,
-      itemRender: this.renderFormulaValue,
-      onChange: this.handleInputChange,
-      onResultChange: function () {
-        _this.handleInputChange(undefined);
+        rest = __rest(_c, ["className", "label", "value", "header", "variables", "placeholder", "simple", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "render"]);
+      // 自身字段
+      var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
+      // 判断是否含有公式表达式
+      var isExpr = isExpression(value);
+      // 判断当前是否有循环引用，备注：非精准识别，待优化
+      var isLoop = false;
+      if (isExpr && (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name)) {
+        isLoop = (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) ? this.isLoopExpression(value, rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) : false;
       }
-    }), React__default.createElement(PickerContainer, {
-      showTitle: false,
-      bodyRender: function (_a) {
+      // 判断是否含有公式表达式
+      var isTypeError = !this.isExpectType(value);
+      var exprValue = this.transExpr(value);
+      var isError = isLoop || isTypeError;
+      var highlightValue = isExpression(value) ? FormulaEditor.highlightValue(exprValue, this.state.variables) || {
+        html: exprValue
+      } : value;
+      // 公式表达式弹窗内容过滤
+      var filterValue = isExpression(value) ? exprValue : this.hasDateShortcutkey(value) ? value : undefined;
+      // 值 是表达式或日期快捷
+      var isFx = !simple && (isExpr || this.hasDateShortcutkey(value));
+      return React__default.createElement("div", {
+        className: cx('ae-editor-FormulaControl', isError ? 'is-has-tooltip' : '', className)
+      }, !simple && !isExpr && !this.hasDateShortcutkey(value) && !rendererSchema && React__default.createElement(InputBox, {
+        className: "ae-editor-FormulaControl-input",
+        value: this.inReplaceExpression(value),
+        clearable: true,
+        placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : i18n("e0c7ac5eb397512fdbe71600baa09dab"),
+        onChange: this.handleSimpleInputChange
+      }), !simple && !isExpr && !this.hasDateShortcutkey(value) && rendererSchema && React__default.createElement("div", {
+        className: cx('ae-editor-FormulaControl-custom-renderer', rendererWrapper ? 'border-wrapper' : '')
+      }, render('inner', this.filterCustomRendererProps(rendererSchema), {
+        inputOnly: true,
+        value: this.inReplaceExpression(value),
+        data: useExternalFormData ? __assign({}, this.props.data) : {},
+        onChange: this.handleSimpleInputChange,
+        manager: manager
+      })), isFx && React__default.createElement(TooltipWrapper, {
+        trigger: "hover",
+        placement: "top",
+        style: {
+          fontSize: '12px'
+        },
+        tooltip: {
+          tooltipTheme: 'dark',
+          mouseLeaveDelay: 20,
+          content: exprValue,
+          children: function () {
+            return _this.renderFormulaValue(highlightValue);
+          }
+        }
+      }, React__default.createElement("div", {
+        className: "ae-editor-FormulaControl-tooltipBox"
+      }, 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")
+        },
+        itemRender: this.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: value,
+        onConfirm: this.handleConfirm,
+        size: "md"
+      }, function (_a) {
         var _b;
-
-        var value = _a.value,
-            onChange = _a.onChange;
-        return React__default.createElement(FormulaEditor, __assign({}, rest, {
-          evalMode: evalMode !== null && evalMode !== void 0 ? evalMode : _this.state.evalMode,
-          variableMode: (_b = rest.variableMode) !== null && _b !== void 0 ? _b : _this.state.variableMode,
-          variables: _this.state.variables,
-          header: header || labelText,
-          value: isString(value) ? value : undefined,
-          onChange: onChange,
-          selfVariableName: selfName
+        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))
         }));
-      },
-      value: value,
-      onConfirm: this.handleConfirm,
-      size: "md"
-    }, function (_a) {
-      var _b;
-
-      var onClick = _a.onClick;
-      return React__default.createElement(Button, {
-        size: "sm",
-        tooltip: i18n("303efd5ba79e639001b4328cd266dddc"),
-        tooltipPlacement: "left",
-        onClick: onClick
-      }, React__default.createElement(Icon, {
-        icon: "function",
-        className: cx('ae-editor-FormulaControl-icon', 'icon', (_b = {}, _b['is-filled'] = !!value, _b))
-      }));
-    }), isExpr && !isError && React__default.createElement("div", {
-      className: "desc-msg info-msg",
-      title: value
-    }, value), isError && React__default.createElement("div", {
-      className: "desc-msg error-msg"
-    }, isLoop ? i18n("7d92f998d24da41b58db140b1864f773") : i18n("b5cc1cd60cd694f45142dc52a5bf53fc")));
-  };
-
-  FormulaControl.defaultProps = {
-    simple: false
-  };
-
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Object)], FormulaControl.prototype, "replaceExpression", null);
-
+      }), isError && React__default.createElement("div", {
+        className: "desc-msg error-msg"
+      }, isLoop ? i18n("7d92f998d24da41b58db140b1864f773") : i18n("b5cc1cd60cd694f45142dc52a5bf53fc")));
+    }
+  });
+  Object.defineProperty(FormulaControl, "defaultProps", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: {
+      simple: false,
+      rendererWrapper: false,
+      DateTimeType: FormulaDateType.NotDate,
+      requiredDataPropsVariables: false
+    }
+  });
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Object)], FormulaControl.prototype, "outReplaceExpression", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Object)], FormulaControl.prototype, "inReplaceExpression", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, String]), __metadata("design:returntype", Boolean)], FormulaControl.prototype, "isLoopExpression", null);
-
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Boolean)], FormulaControl.prototype, "isExpectType", null);
-
+  __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", [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);
-
-/** @class */
-(function (_super) {
+/** @class */(function (_super) {
   __extends(FormulaControlRenderer, _super);
-
   function FormulaControlRenderer() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
-
   FormulaControlRenderer = __decorate([FormItem({
     type: 'ae-formulaControl'
   })], FormulaControlRenderer);
   return FormulaControlRenderer;
 })(FormulaControl);
 
-export { FormulaControl as default };
+export { FormulaDateType, FormulaControl as default };