fix:

1.配置关系新增（之内/之外），条件关系改为大写（AND/OR）

src/app/components/LogicPanel.jsx

@@ -18,10 +18,10 @@ const component = forwardRef(({
       return <ProFormSegmented
         name="relation"
         fieldProps={{style:{marginLeft:"50%"}}}
-        initialValue="and"
+        initialValue="AND"
         valueEnum={{
-          and: t('operation.and'),
-          or: t('operation.or'),
+          AND: t('operation.and'),
+          OR: t('operation.or'),
         }}
       />
     }

src/app/pages/IndexDefine/constants.js

@@ -109,11 +109,13 @@ export const LOGIC_TYPE = {
   "IS NOT NULL": "不为空",
   "LIKE": "包含",
   "NOT LIKE": "不包含",
+  "IN":"之内",
+  "NOT IN":"之外"
 }
 
 export const WHERE_COND = [
-  {label: "在...内", value: "IN"},
-  {label: "不在...内", value: "NOT_IN"},
+  {label: "之内", value: "IN"},
+  {label: "之外", value: "NOT_IN"},
   {label: "等于", value: "EQUALS"},
   {label: "之间", value: "BETWEEN"},
   {label: "大于", value: "MORE_THAN"},

src/utils/listTools.js

@@ -96,6 +96,10 @@ export function bizConditionToSQL(attributes) {
           defaultConfig +=` ${cdt} ${bizName} ${operator}`
           continue
         }
+        if (LOGIC_TYPE[operator]==="之内"||LOGIC_TYPE[operator]==="之外"){
+          defaultConfig +=` ${cdt} ${bizName} ${operator} (${value})`
+          continue
+        }
         defaultConfig +=` ${cdt} ${bizName} ${operator} ${value} `
       }
     }