diff --git a/src/components/common/y-table.vue b/src/components/common/y-table.vue index e519106..2298a50 100644 --- a/src/components/common/y-table.vue +++ b/src/components/common/y-table.vue @@ -104,7 +104,7 @@ const getData = () => { return filterData.value[item.name] !== undefined && filterData.value[item.name] !== null; }) .map((item) => { - return item.type === 'time' ? { + return item.type === 'time' && filterData.value[item.name] ? { name: item.name, type: item.type, start_time: filterData.value[item.name][0].format('YYYY-MM-DD'), diff --git a/src/views/view-all-manage/create-view/index.vue b/src/views/view-all-manage/create-view/index.vue index ff1d4b8..b8023a7 100644 --- a/src/views/view-all-manage/create-view/index.vue +++ b/src/views/view-all-manage/create-view/index.vue @@ -266,10 +266,10 @@ const toPreview = ({filter}) => { if (!filter) { filterData = previewData.filterConfig .filter((item) => { - return previewData.filterData[item.name] !== undefined; + return previewData.filterData[item.name] !== undefined && previewData.filterData[item.name] !== null; }) .map((item) => { - return item.type === 'time' ? { + return item.type === 'time' && previewData.filterData[item.name] ? { name: item.name, type: item.type, start_time: previewData.filterData[item.name][0].format('YYYY-MM-DD'), @@ -331,8 +331,8 @@ const toSaveView = () => { fieldIds: fieldIds.value.toString(), previewName: previewName.value, showTypeId: showTypeId.value, - xDataId: xDataId.value.toString(), - yDataId: yDataId.value.toString(), + xDataId: xDataId.value?.toString(), + yDataId: yDataId.value?.toString(), }).then(() => { message.success("保存成功,可前往视图列表查看"); nameVisible.value = false;