Merge branch 'main' into i18n-dev-new

web/src/view/systemTools/autoCode/component/fieldDialog.vue

@@ -58,7 +58,10 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            :disabled="middleDate.fieldType!=='string'&&item.value==='LIKE'"
+            :disabled="
+              (middleDate.fieldType!=='string'&&item.value==='LIKE')||
+                ((middleDate.fieldType!=='int'&&middleDate.fieldType!=='time.Time'&&middleDate.fieldType!=='float64')&&(item.value==='BETWEEN' || item.value==='NOT BETWEEN'))
+            "
           />
         </el-select>
       </el-form-item>
@@ -133,6 +136,14 @@ const typeSearchOptions = ref([
   {
     label: 'LIKE',
     value: 'LIKE'
+  },
+  {
+    label: 'BETWEEN',
+    value: 'BETWEEN'
+  },
+  {
+    label: 'NOT BETWEEN',
+    value: 'NOT BETWEEN'
   }
 ])
 const typeOptions = ref([