amis-saas-6892 [Feature] 编辑器fx 交互优化

Change-Id: I2deff274ad0b2f572167e61b9114db7795e7680c

packages/amis-editor/src/renderer/FormulaControl.tsx

@@ -137,21 +137,13 @@ export default class FormulaControl extends React.Component<
     };
   }
 
+  componentDidMount(): void {
+    this.getVariables();
+  }
+
   componentDidUpdate(prevProps: FormulaControlProps) {
     // 优先使用props中的变量数据
-    if (!this.props.variables) {
+    this.getVariables();
-      // 从amis数据域中取变量数据
-      this.resolveVariablesFromScope().then(variables => {
-        if (Array.isArray(variables)) {
-          const vars = variables.filter(item => item.children?.length);
-          if (!this.isUnmount && !isEqual(vars, this.state.variables)) {
-            this.setState({
-              variables: vars
-            });
-          }
-        }
-      });
-    }
     if (this.props.data !== prevProps.data) {
       this.setState({
         variables: dataMapping(this.props.variables, this.props.data)
@@ -196,6 +188,23 @@ export default class FormulaControl extends React.Component<
     );
   }
 
+  // 设置 variables
+  getVariables() {
+    if (!this.props.variables) {
+      // 从amis数据域中取变量数据
+      this.resolveVariablesFromScope().then(variables => {
+        if (Array.isArray(variables)) {
+          const vars = variables.filter(item => item.children?.length);
+          if (!this.isUnmount && !isEqual(vars, this.state.variables)) {
+            this.setState({
+              variables: vars
+            });
+          }
+        }
+      });
+    }
+  }
+
   /**
    * 将 ${xx}（非 \${xx}）替换成 \${xx}
    * 备注: 手动编辑时，自动处理掉 ${xx}，避免识别成 公式表达式
@@ -326,17 +335,10 @@ export default class FormulaControl extends React.Component<
     this.props?.onChange?.(val);
   }
 
-  handleSimpleInputChange = debounce(
+  handleSimpleInputChange = (value: any) => {
-    (value: any) => {
+    const curValue = this.replaceExpression(value);
-      const curValue = this.replaceExpression(value);
+    this.props?.onChange?.(curValue);
-      this.props?.onChange?.(curValue);
+  };
-    },
-    250,
-    {
-      trailing: true,
-      leading: false
-    }
-  );
 
   handleInputChange = (value: any) => {
     this.props?.onChange?.(value);
@@ -544,7 +546,7 @@ export default class FormulaControl extends React.Component<
             allowInput={false}
             clearable={true}
             value={value}
-            result={highlightValue}
+            result={{html: '已配置表达式'}}
             itemRender={this.renderFormulaValue}
             onChange={this.handleInputChange}
             onResultChange={() => {
@@ -581,8 +583,12 @@ export default class FormulaControl extends React.Component<
           {({onClick}: {onClick: (e: React.MouseEvent) => void}) => (
             <Button
               size="sm"
-              tooltip={'点击配置表达式'}
+              tooltip={{
-              tooltipPlacement="left"
+                enterable: false,
+                content: '点击配置表达式',
+                placement: 'left',
+                mouseLeaveDelay: 0
+              }}
               onClick={onClick}
               // active={simple && value} // 不需要，避免 hover 时无任何反馈效果
             >