Browse Source

修改错误的日期搜索传参bug

wu 4 months ago
parent
commit
2a3593d089

+ 1 - 1
src/components/ColumnDesign/scene.vue

@@ -280,7 +280,7 @@ export default {
           item.format = val.format
           item.type = val.dateType
           item.dateType = val.dateType
-          item.value = val.conditions[0].values
+          item.value = val.conditions[0].values ? val.conditions[0].values[0] !== 'Invalid date' ? val.conditions[0].values : null : null
           item.function = val.conditions[0].function
         }
       })

+ 1 - 1
src/views/basic/dynamicModel/list/Search.vue

@@ -507,7 +507,7 @@ export default {
       let arr = []
       for (let i = 0; i < this.searchList.length; i++) {
         const e = this.searchList[i]
-        if (e.conditions && e.conditions.length && e.conditions[0] && e.conditions[0].values && e.conditions[0].values.length && e.conditions[0].values[0] !== '') {
+        if (e.conditions && e.conditions.length && e.conditions[0] && e.conditions[0].values && e.conditions[0].values.length && e.conditions[0].values[0] !== ''&& e.conditions[0].values[0] !== 'Invalid date') {
           let obj = {}
           obj.cubeColumnId = e.__vModel__
           obj.function = e.conditions[0].function