feat:ConditionBuilder字段配置支持defaultOp

hsm-lv · Nov 27, 2023 · b2f5916 · b2f5916
1 parent 9c92c4b
commit b2f5916
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/amis-ui/src/components/condition-builder/Item.tsx b/packages/amis-ui/src/components/condition-builder/Item.tsx
@@ -80,10 +80,16 @@ export class ConditionItem extends React.Component<ConditionItemProps> {
 
   @autobind
   handleLeftChange(leftValue: any) {
+    const {fields, config} = this.props;
+    // 获取默认Op
+    const field: any = fields.find(
+      (f: any) => f.name === leftValue.field
+    ) as any;
+
     const value = {
       ...this.props.value,
       left: leftValue,
-      op: undefined,
+      op: field?.defaultOp || config.types[field?.type]?.defaultOp || undefined,
       right: undefined
     };
     const onChange = this.props.onChange;

diff --git a/packages/amis-ui/src/components/condition-builder/config.ts b/packages/amis-ui/src/components/condition-builder/config.ts
@@ -61,6 +61,7 @@ const defaultConfig: ConditionBuilderConfig = {
       ]
     },
     number: {
+      defaultOp: 'equal',
       operators: [
         'equal',
         'not_equal',
@@ -75,6 +76,7 @@ const defaultConfig: ConditionBuilderConfig = {
       ]
     },
     date: {
+      defaultOp: 'equal',
       operators: [
         'equal',
         'not_equal',
@@ -90,6 +92,7 @@ const defaultConfig: ConditionBuilderConfig = {
     },
 
     time: {
+      defaultOp: 'equal',
       operators: [
         'equal',
         'not_equal',
@@ -105,6 +108,7 @@ const defaultConfig: ConditionBuilderConfig = {
     },
 
     datetime: {
+      defaultOp: 'equal',
       operators: [
         'equal',
         'not_equal',
@@ -120,6 +124,7 @@ const defaultConfig: ConditionBuilderConfig = {
     },
 
     select: {
+      defaultOp: 'select_equals',
       operators: [
         'select_equals',
         'select_not_equals',
@@ -130,6 +135,7 @@ const defaultConfig: ConditionBuilderConfig = {
     },
 
     boolean: {
+      defaultOp: 'equal',
       operators: ['equal', 'not_equal']
     }
   }