fix: 修复condition-builder 中公式值默认不高亮的问题 (baidu#9525)

lhtuling · Jan 25, 2024 · adb70d6 · adb70d6
1 parent 8398e58
commit adb70d6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/packages/amis-ui/src/components/formula/Input.tsx b/packages/amis-ui/src/components/formula/Input.tsx
@@ -210,7 +210,7 @@ const FormulaInput: React.FC<FormulaInputProps> = props => {
       <ResultBox
         className={cx(`FormulaPicker-input-variable`)}
         allowInput={allowInput}
-        value={resultValue}
+        // value={resultValue}
         result={
           resultValue == null
             ? void 0

diff --git a/packages/amis-ui/src/components/formula/Picker.tsx b/packages/amis-ui/src/components/formula/Picker.tsx
@@ -1,4 +1,5 @@
 import {
+  anyChanged,
   isExpression,
   resolveVariableAndFilterForAsync,
   uncontrollable
@@ -191,7 +192,22 @@ export class FormulaPicker extends React.Component<
     };
   }
 
-  componentDidUpdate(prevProps: FormulaPickerProps) {
+  async componentDidMount() {
+    const {variables, data} = this.props;
+    if (typeof variables === 'function') {
+      const list = await variables(this.props);
+      this.setState({variables: list});
+    } else if (typeof variables === 'string' && isExpression(variables)) {
+      const result = await resolveVariableAndFilterForAsync(
+        variables,
+        data,
+        '|raw'
+      );
+      this.setState({variables: result});
+    }
+  }
+
+  async componentDidUpdate(prevProps: FormulaPickerProps) {
     const {value} = this.props;
 
     if (value !== prevProps.value) {
@@ -200,6 +216,21 @@ export class FormulaPicker extends React.Component<
         editorValue: this.value2EditorValue(this.props)
       });
     }
+
+    if (anyChanged(['variables', 'data'], this.props, prevProps)) {
+      const {variables, data} = this.props;
+      if (typeof variables === 'function') {
+        const list = await variables(this.props);
+        this.setState({variables: list});
+      } else if (typeof variables === 'string' && isExpression(variables)) {
+        const result = await resolveVariableAndFilterForAsync(
+          variables,
+          data,
+          '|raw'
+        );
+        this.setState({variables: result});
+      }
+    }
   }
 
   value2EditorValue(props: FormulaPickerProps) {
@@ -337,17 +368,6 @@ export class FormulaPicker extends React.Component<
   @autobind
   async handleClick() {
     const {variables, data} = this.props;
-    if (typeof variables === 'function') {
-      const list = await variables(this.props);
-      this.setState({variables: list});
-    } else if (typeof variables === 'string' && isExpression(variables)) {
-      const result = await resolveVariableAndFilterForAsync(
-        variables,
-        data,
-        '|raw'
-      );
-      this.setState({variables: result});
-    }
 
     const state = {
       ...(await this.props.onPickerOpen?.(this.props)),