wangxuefeng/low-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/new-sys' into 'release'

Browse Source 
fix: 修改保存报错bug

See merge request workbench/y-code!7
This commit is contained in:
林梓阳 2024-07-18 12:36:23 +08:00
commit 6b989638f0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/y-table.vue
View File

@ -104,7 +104,7 @@ const getData = () => {
return filterData.value[item.name] !== undefined && filterData.value[item.name] !== null; return filterData.value[item.name] !== undefined && filterData.value[item.name] !== null;
}) })
.map((item) => { .map((item) => {
return item.type === 'time' ? { return item.type === 'time' && filterData.value[item.name] ? {
name: item.name, name: item.name,
type: item.type, type: item.type,
start_time: filterData.value[item.name][0].format('YYYY-MM-DD'), start_time: filterData.value[item.name][0].format('YYYY-MM-DD'),

8
src/views/view-all-manage/create-view/index.vue
View File

@ -266,10 +266,10 @@ const toPreview = ({filter}) => {
if (!filter) { if (!filter) {
filterData = previewData.filterConfig filterData = previewData.filterConfig
.filter((item) => { .filter((item) => {
return previewData.filterData[item.name] !== undefined; return previewData.filterData[item.name] !== undefined && previewData.filterData[item.name] !== null;
}) })
.map((item) => { .map((item) => {
return item.type === 'time' ? { return item.type === 'time' && previewData.filterData[item.name] ? {
name: item.name, name: item.name,
type: item.type, type: item.type,
start_time: previewData.filterData[item.name][0].format('YYYY-MM-DD'), start_time: previewData.filterData[item.name][0].format('YYYY-MM-DD'),
@ -331,8 +331,8 @@ const toSaveView = () => {
fieldIds: fieldIds.value.toString(), fieldIds: fieldIds.value.toString(),
previewName: previewName.value, previewName: previewName.value,
showTypeId: showTypeId.value, showTypeId: showTypeId.value,
xDataId: xDataId.value.toString(), xDataId: xDataId.value?.toString(),
yDataId: yDataId.value.toString(), yDataId: yDataId.value?.toString(),
}).then(() => { }).then(() => {
message.success("保存成功，可前往视图列表查看"); message.success("保存成功，可前往视图列表查看");
nameVisible.value = false; nameVisible.value = false;