feat: 调整自动化代码富文本模式下的可选查询条件

flipped-aurora · Feb 13, 2025 · a8e706a · a8e706a
1 parent f608bfa
commit a8e706a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/web/src/view/systemTools/autoCode/component/fieldDialog.vue b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
@@ -386,20 +386,22 @@
   }
 
   const canSelect = (item) => {
-    const fieldType = middleDate.value.fieldType
+    const fieldType = middleDate.value.fieldType;
+
+    if (fieldType === 'richtext') {
+      return item !== 'LIKE';
+    }
+
     if (fieldType !== 'string' && item === 'LIKE') {
-      return true
+      return true;
     }
 
-    if (
-      fieldType !== 'int' &&
-      fieldType !== 'time.Time' &&
-      fieldType !== 'float64' &&
-      (item === 'BETWEEN' || item === 'NOT BETWEEN')
-    ) {
-      return true
+    const nonNumericTypes = ['int', 'time.Time', 'float64'];
+    if (!nonNumericTypes.includes(fieldType) && ['BETWEEN', 'NOT BETWEEN'].includes(item)) {
+      return true;
     }
-    return false
+
+    return false;
   }
 
   const clearOther = () => {

diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
@@ -703,14 +703,7 @@
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                  :disabled="
-                    (row.fieldType !== 'string' && item.value === 'LIKE') ||
-                    (row.fieldType !== 'int' &&
-                      row.fieldType !== 'time.Time' &&
-                      row.fieldType !== 'float64' &&
-                      (item.value === 'BETWEEN' ||
-                        item.value === 'NOT BETWEEN'))
-                  "
+                  :disabled="canSelect(row.fieldType,item.value)"
                 />
               </el-select>
             </template>
@@ -1652,6 +1645,23 @@
       }
     }
   )
+
+  const canSelect = (fieldType,item) => {
+    if (fieldType === 'richtext') {
+      return item !== 'LIKE';
+    }
+
+    if (fieldType !== 'string' && item === 'LIKE') {
+      return true;
+    }
+
+    const nonNumericTypes = ['int', 'time.Time', 'float64'];
+    if (!nonNumericTypes.includes(fieldType) && ['BETWEEN', 'NOT BETWEEN'].includes(item)) {
+      return true;
+    }
+
+    return false;
+  }
 </script>
 
 <style>