amis-editor 6.2.2 → 6.4.0

package/esm/renderer/APIControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -806,4 +806,4 @@ var APIControl = /** @class */function (_super) {
 })(APIControl);
 
 export { APIControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/BadgeControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -297,4 +297,4 @@ var BadgeControl = /** @class */function (_super) {
 })(BadgeControl);
 
 export { BadgeControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/ButtonGroupControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -36,4 +36,4 @@ var ButtonGroupControl = /** @class */ (function (_super) {
 })(ButtonGroupControl));
 
 export { ButtonGroupControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/DataBindingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -250,4 +250,4 @@ var SimpleDataBindingControl = /** @class */function (_super) {
 })(SimpleDataBindingControl);
 
 export { DataBindingControl, SimpleDataBindingControl };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/DataMappingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -63,4 +63,4 @@ var DataMappingControl = /** @class */ (function (_super) {
 })(DataMappingControl));
 
 export { DataMappingControl };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/DataPickerControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -76,4 +76,4 @@ var DataPickerControl = /** @class */ (function (_super) {
     ], DataPickerControlRenderer);
     return DataPickerControlRenderer;
 })(DataPickerControl));
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/DateShortCutControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -436,4 +436,4 @@ var DateShortCutControl = /** @class */function (_super) {
 })(DateShortCutControl);
 
 export { DateShortCutControl };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,16 +1,15 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
 import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
-import { autobind } from 'amis-core';
+import { isExpression, autobind } from 'amis-core';
 import cx from 'classnames';
 import { PickerContainer, Button, Icon, FormItem } from 'amis';
-import { FormulaEditor } from 'amis-ui';
-import { renderFormulaValue } from './FormulaControl.js';
+import { FormulaEditor, InputBox, FormulaCodeEditor } from 'amis-ui';
 import { reaction } from 'mobx';
 import { getVariables } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
@@ -30,25 +29,34 @@ var ExpressionFormulaControl = /** @class */function (_super) {
   }
   ExpressionFormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variablesArr;
       var _this = this;
       return __generator(this, function (_a) {
-        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 = reaction(function () {
-          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-        }, function () {
-          return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-              return [2 /*return*/];
+        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 = reaction(function () {
+              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+            }, function () {
+              return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                  this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                  return [2 /*return*/];
+                });
+              });
             });
-          });
-        });
-        return [2 /*return*/];
+            return [4 /*yield*/, getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr
+            });
+            return [2 /*return*/];
+        }
       });
     });
   };
@@ -68,7 +76,7 @@ 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 === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+    var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{([\s\S]*)\}$/, function (match, p1) {
       return p1;
     })) || '';
     this.setState({
@@ -80,8 +88,8 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     if (value === void 0) {
       value = '';
     }
-    var expressionReg = /^\$\{(.*)\}$/;
-    value = value.replace(/\r\n|\r|\n/g, ' ');
+    var expressionReg = /^\$\{([\s\S]*)\}$/;
+    // value = value.replace(/\r\n|\r|\n/g, ' ');
     if (value && !expressionReg.test(value)) {
       value = "${".concat(value, "}");
     }
@@ -123,9 +131,7 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     var _d = this.state,
       formulaPickerValue = _d.formulaPickerValue,
       variables = _d.variables;
-    var highlightValue = FormulaEditor.highlightValue(formulaPickerValue, variables) || {
-      html: formulaPickerValue
-    };
+    var isNewExpression = isExpression(value);
     // 自身字段
     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.createElement("div", {
@@ -133,14 +139,14 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     }, React__default.createElement(PickerContainer, {
       showTitle: false,
       bodyRender: function (_a) {
-        _a.value;
-          var onChange = _a.onChange;
+        var value = _a.value,
+          onChange = _a.onChange;
         return React__default.createElement(FormulaEditor, __assign({}, rest, {
           evalMode: true,
           variableMode: variableMode,
           variables: variables,
           header: header || i18n("a9400c408441f1f7f6d6954deb05ae9a"),
-          value: formulaPickerValue,
+          value: value,
           onChange: onChange,
           selfVariableName: selfName
         }));
@@ -150,26 +156,46 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       size: size !== null && size !== void 0 ? size : 'lg'
     }, function (_a) {
       var onClick = _a.onClick;
-      return formulaPickerValue ? React__default.createElement(Button, {
+      return value && !isNewExpression ? React__default.createElement(InputBox, {
+        value: value,
+        onChange: rest.onChange
+      }) : formulaPickerValue ? React__default.createElement(Button, {
         className: "btn-configured",
         tooltip: {
-          placement: 'top',
+          placement: 'left',
           tooltipTheme: 'dark',
           mouseLeaveDelay: 20,
           content: value,
           tooltipClassName: 'btn-configured-tooltip',
           children: function () {
-            return renderFormulaValue(highlightValue);
+            return React__default.createElement(FormulaCodeEditor, {
+              readOnly: true,
+              value: typeof value === 'string' ? value.substring(2, value.length - 1) : '',
+              variables: variables,
+              evalMode: true,
+              editorTheme: "dark",
+              editorOptions: {
+                lineNumbers: false
+              }
+            });
           }
         },
         onClick: function (e) {
           return _this.handleOnClick(e, onClick);
         }
-      }, renderFormulaValue(highlightValue), React__default.createElement(Icon, {
+      }, React__default.createElement(FormulaCodeEditor, {
+        singleLine: true,
+        readOnly: true,
+        highlightMode: "expression",
+        value: value,
+        variables: variables,
+        evalMode: false
+      }), React__default.createElement(Icon, {
         icon: "input-clear",
         className: "icon",
         onClick: _this.handleClearExpression
       })) : React__default.createElement(React__default.Fragment, null, React__default.createElement(Button, {
+        size: "sm",
         className: "btn-set-expression",
         onClick: function (e) {
           return _this.handleOnClick(e, onClick);
@@ -200,4 +226,4 @@ var ExpressionFormulaControl = /** @class */function (_super) {
 })(ExpressionFormulaControl);
 
 export { ExpressionFormulaControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/FeatureControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -9,7 +9,7 @@ import React__default from 'react';
 import { findDOMNode } from 'react-dom';
 import Sortable from 'sortablejs';
 import cx from 'classnames';
-import clone from 'lodash/clone';
+import cloneDeep from 'lodash/cloneDeep';
 import remove from 'lodash/remove';
 import isPlainObject from 'lodash/isPlainObject';
 import { Icon, Button, autobind, FormItem } from 'amis';
@@ -57,14 +57,15 @@ var FeatureControl = /** @class */function (_super) {
       removeFeature = _b.removeFeature,
       data = _b.data,
       onBulkChange = _b.onBulkChange;
+    var schema = cloneDeep(data);
     var _c = this.state,
       inUseFeat = _c.inUseFeat,
       unUseFeat = _c.unUseFeat;
-    (_a = item.remove) === null || _a === void 0 ? void 0 : _a.call(item, data);
-    removeFeature === null || removeFeature === void 0 ? void 0 : removeFeature(item, data);
-    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(data);
+    (_a = item.remove) === null || _a === void 0 ? void 0 : _a.call(item, schema);
+    removeFeature === null || removeFeature === void 0 ? void 0 : removeFeature(item, schema);
     remove(inUseFeat, item);
     item.add && unUseFeat.push(item);
+    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
     this.setState({
       inUseFeat: inUseFeat,
       unUseFeat: unUseFeat
@@ -75,8 +76,9 @@ var FeatureControl = /** @class */function (_super) {
       data = _a.data,
       onBulkChange = _a.onBulkChange,
       onSort = _a.onSort;
-    onSort === null || onSort === void 0 ? void 0 : onSort(data, e);
-    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(data);
+    var schema = cloneDeep(data);
+    onSort === null || onSort === void 0 ? void 0 : onSort(schema, e);
+    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
   };
   FeatureControl.prototype.handleAdd = function (item) {
     var _a;
@@ -89,7 +91,7 @@ var FeatureControl = /** @class */function (_super) {
       unUseFeat = _c.unUseFeat;
     inUseFeat.push(item);
     remove(unUseFeat, item);
-    var schema = clone(data);
+    var schema = cloneDeep(data);
     (_a = item.add) === null || _a === void 0 ? void 0 : _a.call(item, schema);
     addFeature === null || addFeature === void 0 ? void 0 : addFeature(item, schema);
     onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
@@ -153,7 +155,7 @@ var FeatureControl = /** @class */function (_super) {
       data = _a.data,
       onBulkChange = _a.onBulkChange,
       onItemCheck = _a.onItemCheck;
-    var schema = clone(data);
+    var schema = cloneDeep(data);
     onItemCheck === null || onItemCheck === void 0 ? void 0 : onItemCheck(res, index, schema);
     onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
   };
@@ -225,7 +227,7 @@ var FeatureControl = /** @class */function (_super) {
     if (customAction && typeof customAction === 'function') {
       var schema = customAction({
         onBulkChange: onBulkChange,
-        schema: clone(data)
+        schema: cloneDeep(data)
       });
       if (isPlainObject(schema) && typeof schema.type === 'string') {
         return render('custom-action', schema);
@@ -293,4 +295,4 @@ var FeatureControl = /** @class */function (_super) {
 })(FeatureControl);
 
 export { FeatureControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/FieldSetting.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -490,4 +490,4 @@ var FieldSetting = /** @class */function (_super) {
 })(FieldSetting);
 
 export { FieldSetting };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/FlexSettingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -149,7 +149,7 @@ var FlexSettingControl = /** @class */function (_super) {
       className: "ap-Flex"
     }, !label && React__default.createElement("div", {
       className: "ap-Flex-label"
-    }, i18n("98204720c30a843a9234bdf22dc05d51")), flexItems.map(function (item) {
+    }, "\u5185\u90E8\u5BF9\u9F50\u8BBE\u7F6E"), flexItems.map(function (item) {
       return React__default.createElement("div", {
         className: "ap-Flex-item ap-Flex-".concat(item.field),
         key: item.field
@@ -174,4 +174,4 @@ var FlexSettingControl = /** @class */function (_super) {
 })(FlexSettingControl);
 
 export { FlexSettingControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/FormulaControl.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
-import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/Editor';
+import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/CodeEditor';
 import { FormControlProps } from 'amis-core';
 import type { BaseEventContext } from 'amis-editor-core';
 import { EditorManager } from 'amis-editor-core';
@@ -12,6 +12,11 @@ export declare enum FormulaDateType {
     IsDate = 1,
     IsRange = 2
 }
+/**
+ * @deprecated 废弃，直接用 codemirror 渲染输入框即可，自带高亮
+ * @param item
+ * @returns
+ */
 export declare function renderFormulaValue(item: any): React.JSX.Element;
 export interface FormulaControlProps extends FormControlProps {
     manager?: EditorManager;

package/esm/renderer/FormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -13,8 +13,8 @@ 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, Icon, Button, FormItem } from 'amis';
-import { FormulaEditor } from 'amis-ui';
+import { isExpression, FormulaExec, InputBox, TooltipWrapper, Button, Icon, FormItem } from 'amis';
+import { FormulaCodeEditor } from 'amis-ui';
 import FormulaPicker from './textarea-formula/FormulaPicker.js';
 import { getVariables, JSONPipeOut, translateSchema, autobind } from 'amis-editor-core';
 import { reaction } from 'mobx';
@@ -29,6 +29,11 @@ var FormulaDateType;
   FormulaDateType[FormulaDateType["IsDate"] = 1] = "IsDate";
   FormulaDateType[FormulaDateType["IsRange"] = 2] = "IsRange"; // 日期时间范围类
 })(FormulaDateType || (FormulaDateType = {}));
+/**
+ * @deprecated 废弃，直接用 codemirror 渲染输入框即可，自带高亮
+ * @param item
+ * @returns
+ */
 function renderFormulaValue(item) {
   var html = {
     __html: typeof item === 'string' ? item : item === null || item === void 0 ? void 0 : item.html
@@ -61,24 +66,33 @@ var FormulaControl = /** @class */function (_super) {
   }
   FormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variables;
       var _this = this;
       return __generator(this, function (_a) {
-        editorStore = window.editorStore;
-        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-        this.unReaction = reaction(function () {
-          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-        }, function () {
-          return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-              return [2 /*return*/];
+        switch (_a.label) {
+          case 0:
+            editorStore = window.editorStore;
+            this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+            this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+            this.unReaction = reaction(function () {
+              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+            }, function () {
+              return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                  this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                  return [2 /*return*/];
+                });
+              });
             });
-          });
-        });
-        return [2 /*return*/];
+            return [4 /*yield*/, getVariables(this)];
+          case 1:
+            variables = _a.sent();
+            this.setState({
+              variables: variables
+            });
+            return [2 /*return*/];
+        }
       });
     });
   };
@@ -195,7 +209,7 @@ var FormulaControl = /** @class */function (_super) {
     return false;
   };
   FormulaControl.prototype.transExpr = 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 (typeof str === 'string' && str.slice(0, 2) === '${' && str.slice(-1) === '}') {
       // 非最外层内容还存在表达式情况
       if (isExpression(str.slice(2, -1))) {
         return str;
@@ -209,7 +223,7 @@ var FormulaControl = /** @class */function (_super) {
   };
   FormulaControl.prototype.handleConfirm = function (value) {
     var _a, _b;
-    value = value.replace(/\r\n|\r|\n/g, ' ');
+    // 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();
@@ -359,7 +373,6 @@ var FormulaControl = /** @class */function (_super) {
   };
   FormulaControl.prototype.render = function () {
     var _a;
-    var _this = this;
     var _b;
     var _c = this.props,
       className = _c.className;
@@ -394,9 +407,6 @@ var FormulaControl = /** @class */function (_super) {
     var exprValue = this.transExpr(value);
     var isError = isLoop;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker;
-    var highlightValue = isExpression(value) ? FormulaEditor.highlightValue(exprValue, variables) || {
-      html: exprValue
-    } : value;
     // 公式表达式弹窗内容过滤
     var filterValue = isExpression(value) ? exprValue : this.hasDateShortcutkey(value) ? value : undefined;
     // 值 是表达式或日期快捷
@@ -419,7 +429,7 @@ var FormulaControl = /** @class */function (_super) {
       manager: manager
     })), isFx && React__default.createElement(TooltipWrapper, {
       trigger: "hover",
-      placement: "top",
+      placement: "left",
       style: {
         fontSize: '12px'
       },
@@ -427,33 +437,45 @@ var FormulaControl = /** @class */function (_super) {
         tooltipTheme: 'dark',
         mouseLeaveDelay: 20,
         content: exprValue,
+        tooltipClassName: 'btn-configured-tooltip',
         children: function () {
-          return renderFormulaValue(highlightValue);
+          return React__default.createElement(FormulaCodeEditor, {
+            readOnly: true,
+            value: exprValue,
+            variables: variables,
+            evalMode: true,
+            editorTheme: "dark",
+            editorOptions: {
+              lineNumbers: false
+            }
+          });
         }
       }
     }, 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,
-      value: value,
-      result: {
-        html: this.hasDateShortcutkey(value) ? value : highlightValue === null || highlightValue === void 0 ? void 0 : highlightValue.html
+      className: cx('ae-editor-FormulaControl-tooltipBox')
+    }, React__default.createElement(InputBox, {
+      onClick: this.handleFormulaClick,
+      hasError: isError,
+      inputRender: function (_a) {
+        var value = _a.value,
+          onChange = _a.onChange,
+          onFocus = _a.onFocus,
+          onBlur = _a.onBlur;
+        return React__default.createElement(FormulaCodeEditor, {
+          singleLine: true,
+          value: value,
+          onChange: onChange,
+          onFocus: onFocus,
+          onBlur: onBlur,
+          functions: [],
+          variables: variables,
+          evalMode: false,
+          highlightMode: "expression",
+          readOnly: true
+        });
       },
-      itemRender: renderFormulaValue,
-      onChange: this.handleInputChange,
-      onResultChange: function () {
-        _this.handleInputChange(undefined);
-      }
-    })), value && React__default.createElement(Icon, {
-      icon: "input-clear",
-      className: "input-clear-icon",
-      onClick: function () {
-        return _this.handleInputChange('');
-      }
+      value: value,
+      onChange: this.handleInputChange
     }))), React__default.createElement(Button, {
       className: "ae-editor-FormulaControl-button",
       size: "sm",
@@ -516,4 +538,4 @@ var FormulaControl = /** @class */function (_super) {
 })(FormulaControl);
 
 export { FormulaDateType, FormulaControl as default, renderFormulaValue };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/FunctionEditorControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -104,4 +104,4 @@ var FunctionEditorControl = /** @class */ (function (_super) {
 })(FunctionEditorControl));
 
 export { FunctionEditorControl as default };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/esm/renderer/GoConfigControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -59,4 +59,4 @@ var GoConfigControl = /** @class */function (_super) {
 })(GoConfigControl);
 
 export { GoConfigControl };
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};