1、高级筛选枚举下拉类型、时间类型转换

2、cellClassName

PC/InterFace.Dash/src/components/searchOverall/index.vue

@@ -95,7 +95,7 @@
                     :rules="rules && rules.value ? rules.value : []"
                   >
                     <el-select
-                      v-if="Object.keys(inputOrSelect(item.column)).length > 0"
+                      v-if="inputOrSelect(item.column)"
                       v-model="item.value"
                       placeholder="请选择内容"
                       :disabled="item.column == '' || item.hide ? true : false"
@@ -104,9 +104,7 @@
                       clearable
                     >
                       <el-option
-                        v-for="item in $staticOptions[
-                          inputOrSelect(item.column).filters
-                        ]()"
+                        v-for="item in inputOrSelect(item.column)"
                         :key="item.value"
                         :label="item.label"
                         :value="
@@ -119,7 +117,7 @@
                     </el-select>
                     <!-- 日期时间 -->
                     <el-date-picker
-                    v-else-if="getColumnType(item.column) == 'dateTime'"
+                    v-else-if="getColumnType(item.column) == 'datetime'"
                       type="datetime"
                       v-model="item.value"
                       :placeholder="'选择日期时间'"
@@ -461,8 +459,8 @@
       getColumnType(val) {
         var columnsType = this.tableColumns.filter(item => item.prop == val)
         if (columnsType.length > 0) {
-          if (columnsType[0].type) {
-            return columnsType[0].type
+          if (columnsType[0].apiBaseType) {
+            return columnsType[0].apiBaseType
           } 
         }  else {
           return ''
@@ -503,19 +501,15 @@
       },
       // 设置moreList列表的内容项是input还是select
       inputOrSelect(val) {
-        let data
+        let data = null
         if (val) {
           this.tableColumns.forEach((key) => {
             if (val == key.prop) {
-              if (key.filters) {
-                data = key
-              } else {
-                data = {}
+              if (key.enums_list && key.enums_list.length > 0) {
+                data = key.enums_list
               } 
             }
           })
-        } else {
-          data = {}
         } 
         return data
       },

PC/InterFace.Dash/src/components/umyTable/index.vue

@@ -12,6 +12,7 @@
     :border="tableBorder"
     style="width: 100%"
     :cell-style="cellStyle"
+    :cell-class-name="cellClassName"
     use-virtual
     :height="uTableHeight"
     header-row-class-name="uTableHeader"
@@ -316,6 +317,12 @@ export default {
         return Function;
       }
     },
+    cellClassName: {
+      type: Function,
+      default: () => {
+        return Function;
+      }
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,

PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/index.vue

@@ -95,7 +95,7 @@
                     :rules="rules && rules.value ? rules.value : []"
                   >
                     <el-select
-                    v-if="Object.keys(inputOrSelect(item.column)).length > 0"
+                      v-if="inputOrSelect(item.column)"
                       v-model="item.value"
                       placeholder="请选择内容"
                       :disabled="item.column == '' || item.hide ? true : false"
@@ -104,9 +104,7 @@
                       clearable
                     >
                       <el-option
-                      v-for="item in $staticOptions[
-                        inputOrSelect(item.column).filters
-                      ]()"
+                        v-for="item in inputOrSelect(item.column)"
                         :key="item.value"
                         :label="item.label"
                         :value="
@@ -119,7 +117,7 @@
                     </el-select>
                     <!-- 日期时间 -->
                     <el-date-picker
-                  v-else-if="getColumnType(item.column) == 'dateTime'"
+                    v-else-if="getColumnType(item.column) == 'datetime'"
                       type="datetime"
                       v-model="item.value"
                       :placeholder="'选择日期时间'"
@@ -461,8 +459,8 @@ export default {
       getColumnType(val) {
         var columnsType = this.tableColumns.filter(item => item.prop == val)
         if (columnsType.length > 0) {
-        if (columnsType[0].type) {
-          return columnsType[0].type
+          if (columnsType[0].apiBaseType) {
+            return columnsType[0].apiBaseType
           } 
         }  else {
           return ''
@@ -503,19 +501,15 @@ export default {
       },
       // 设置moreList列表的内容项是input还是select
       inputOrSelect(val) {
-      let data
+        let data = null
         if (val) {
           this.tableColumns.forEach((key) => {
             if (val == key.prop) {
-            if (key.filters) {
-              data = key
-            } else {
-              data = {}
+              if (key.enums_list && key.enums_list.length > 0) {
+                data = key.enums_list
               } 
             }
           })
-      } else {
-        data = {}
         } 
         return data
       },

PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue

@@ -12,6 +12,7 @@
     :border="tableBorder"
     style="width: 100%"
     :cell-style="cellStyle"
+    :cell-class-name="cellClassName"
     use-virtual
     :height="uTableHeight"
     header-row-class-name="uTableHeader"
@@ -316,6 +317,12 @@ export default {
         return Function;
       }
     },
+    cellClassName: {
+      type: Function,
+      default: () => {
+        return Function;
+      }
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,

PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/index.vue

@@ -95,7 +95,7 @@
                     :rules="rules && rules.value ? rules.value : []"
                   >
                     <el-select
-                      v-if="Object.keys(inputOrSelect(item.column)).length > 0"
+                      v-if="inputOrSelect(item.column)"
                       v-model="item.value"
                       placeholder="请选择内容"
                       :disabled="item.column == '' || item.hide ? true : false"
@@ -104,9 +104,7 @@
                       clearable
                     >
                       <el-option
-                        v-for="item in $staticOptions[
-                          inputOrSelect(item.column).filters
-                        ]()"
+                        v-for="item in inputOrSelect(item.column)"
                         :key="item.value"
                         :label="item.label"
                         :value="
@@ -119,7 +117,7 @@
                     </el-select>
                     <!-- 日期时间 -->
                     <el-date-picker
-                    v-else-if="getColumnType(item.column) == 'dateTime'"
+                    v-else-if="getColumnType(item.column) == 'datetime'"
                       type="datetime"
                       v-model="item.value"
                       :placeholder="'选择日期时间'"
@@ -461,8 +459,8 @@
       getColumnType(val) {
         var columnsType = this.tableColumns.filter(item => item.prop == val)
         if (columnsType.length > 0) {
-          if (columnsType[0].type) {
-            return columnsType[0].type
+          if (columnsType[0].apiBaseType) {
+            return columnsType[0].apiBaseType
           } 
         }  else {
           return ''
@@ -503,19 +501,15 @@
       },
       // 设置moreList列表的内容项是input还是select
       inputOrSelect(val) {
-        let data
+        let data = null
         if (val) {
           this.tableColumns.forEach((key) => {
             if (val == key.prop) {
-              if (key.filters) {
-                data = key
-              } else {
-                data = {}
+              if (key.enums_list && key.enums_list.length > 0) {
+                data = key.enums_list
               } 
             }
           })
-        } else {
-          data = {}
         } 
         return data
       },

PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue

@@ -12,6 +12,7 @@
     :border="tableBorder"
     style="width: 100%"
     :cell-style="cellStyle"
+    :cell-class-name="cellClassName"
     use-virtual
     :height="uTableHeight"
     header-row-class-name="uTableHeader"
@@ -316,6 +317,12 @@ export default {
         return Function;
       }
     },
+    cellClassName: {
+      type: Function,
+      default: () => {
+        return Function;
+      }
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,