fix: 自定义条件过滤系统变量，自定义条件弹窗大小调整 (baidu#10480)

* fix: 自定义条件过滤系统变量，自定义条件弹窗大小调整 * fix: 自定义条件过滤系统变量，自定义条件弹窗大小调整 --------- Co-authored-by: hezhihang <[email protected]>
allenve · Jun 19, 2024 · 46aef7e · 46aef7e
1 parent f910ae9
commit 46aef7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/packages/amis-editor/src/renderer/ConditionFormulaControl.tsx b/packages/amis-editor/src/renderer/ConditionFormulaControl.tsx
@@ -12,7 +12,7 @@ import {
 import cx from 'classnames';
 import {FormItem, Button, PickerContainer, ConditionBuilderFields} from 'amis';
 import {reaction} from 'mobx';
-import {getVariables} from 'amis-editor-core';
+import {getQuickVariables} from 'amis-editor-core';
 
 interface ConditionFormulaControlProps extends FormControlProps {
   /**
@@ -99,7 +99,7 @@ export default class ConditionFormulaControl extends React.Component<
     let fieldsArr: ConditionBuilderFields = [];
     const {requiredDataPropsFields, fields} = this.props;
     if (requiredDataPropsFields) {
-      const variablesArr = await getVariables(this);
+      const variablesArr = await getQuickVariables(this);
 
       // 自身字段
       const selfName = this.props?.data?.name;

diff --git a/packages/amis-editor/src/renderer/StatusControl.tsx b/packages/amis-editor/src/renderer/StatusControl.tsx
@@ -255,7 +255,6 @@ export class StatusControl extends React.Component<
               getSchemaTpl('conditionFormulaControl', {
                 label: '条件设置',
                 name: 'condition',
-                modalSize: 'xs',
                 visibleOn: 'this.statusType === 3'
               })
             ]

diff --git a/packages/amis-editor/src/renderer/ValidationControl.tsx b/packages/amis-editor/src/renderer/ValidationControl.tsx
@@ -10,10 +10,8 @@ import {ConditionBuilderFields, FormItem, flattenTree} from 'amis';
 
 import {
   autobind,
-  getSchemaTpl,
-  getVariables,
-  isObjectShallowModified,
-  tipedLabel
+  getQuickVariables,
+  isObjectShallowModified
 } from 'amis-editor-core';
 import ValidationItem, {ValidatorData} from './ValidationItem';
 
@@ -89,7 +87,7 @@ export default class ValidationControl extends React.Component<
 
   @autobind
   async buildFieldsData() {
-    const variablesArr = await getVariables(this);
+    const variablesArr = await getQuickVariables(this);
     // 自身字段
     const selfName = this.props.data.name;