feat(BaTable):增强公共搜索渲染为 datetime 和 date 的支持

Author: build-admin

web/src/components/table/comSearch/index.vue

@@ -40,7 +40,10 @@
 
                             <!-- 时间范围 -->
                             <el-col
-                                v-else-if="item.render == 'datetime' && (item.operator == 'RANGE' || item.operator == 'NOT RANGE')"
+                                v-else-if="
+                                    (item.render == 'datetime' || item.comSearchRender == 'datetime' || item.comSearchRender == 'date') &&
+                                    (item.operator == 'RANGE' || item.operator == 'NOT RANGE')
+                                "
                                 :xs="24"
                                 :sm="12"
                             >
@@ -88,7 +91,7 @@
                                         <!-- 时间筛选 -->
                                         <el-date-picker
                                             class="datetime-picker w100"
-                                            v-if="item.render == 'datetime' || item.comSearchRender == 'date'"
+                                            v-if="item.render == 'datetime' || item.comSearchRender == 'date' || item.comSearchRender == 'datetime'"
                                             v-model="baTable.comSearch.form[item.prop!]"
                                             :type="item.comSearchRender == 'date' ? 'date' : 'datetime'"
                                             :value-format="item.comSearchRender == 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'"

web/src/utils/baTable.ts

@@ -617,7 +617,10 @@ export default class baTable {
 
             let val = null
             const fieldDataTemp = this.comSearch.fieldData.get(key)
-            if (fieldDataTemp.render == 'datetime' && (fieldDataTemp.operator == 'RANGE' || fieldDataTemp.operator == 'NOT RANGE')) {
+            if (
+                (fieldDataTemp.render == 'datetime' || fieldDataTemp.comSearchRender == 'datetime' || fieldDataTemp.comSearchRender == 'date') &&
+                (fieldDataTemp.operator == 'RANGE' || fieldDataTemp.operator == 'NOT RANGE')
+            ) {
                 // 时间范围
                 if (this.comSearch.form[key] && this.comSearch.form[key].length >= 2) {
                     if (fieldDataTemp.comSearchRender == 'date') {

web/types/table.d.ts

@@ -340,7 +340,7 @@ declare global {
         // 公共搜索框的 placeholder
         operatorPlaceholder?: string | string[]
         // 公共搜索渲染方式，render=tag|switch 时公共搜索也会渲染为下拉，数字会渲染为范围筛选，时间渲染为时间选择器等
-        comSearchRender?: 'remoteSelect' | 'select' | 'date' | 'customRender' | 'slot'
+        comSearchRender?: 'remoteSelect' | 'select' | 'date' | 'datetime' | 'customRender' | 'slot'
         // 公共搜索自定义组件/函数渲染
         comSearchCustomRender?: string | Component
         // 公共搜索自定义渲染为 slot 时，slot 的名称