diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue index 65abfcf..14afe0e 100644 --- a/src/views/final/comp/NewFilterModal.vue +++ b/src/views/final/comp/NewFilterModal.vue @@ -194,7 +194,7 @@ watch( function showModal() { show.value = true setTimeout(() => { - formValue.name = '' + // formValue.name = '' }, 300); } @@ -249,8 +249,9 @@ function edit(editFilter: any) { currentStatus.value = 'edit' const { searchname, ocrUsersearchchildList, id } = editFilter - currentEditId = id - formValue.name = searchname + +currentEditId = id + formValue.conditions = ocrUsersearchchildList.map((item) => { return { type: item.searchfield, @@ -258,6 +259,10 @@ function edit(editFilter: any) { result: unformatValue(item.searchfield, item.searchvalue), } }) + formValue.name = editFilter.searchname + // formValue.searchname = searchname + formValue.name = searchname +console.log(formValue) } defineExpose({ diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue index 26f6de9..1a305a5 100644 --- a/src/views/home/aside/comp/modals/NewFilterModal.vue +++ b/src/views/home/aside/comp/modals/NewFilterModal.vue @@ -217,7 +217,7 @@ function showModal() { typeOptions.value = list show.value = true setTimeout(() => { - formValue.name = '' + // formValue.name = '' }, 300); } diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue index e15bcf7..190a1db 100644 --- a/src/views/task/modal/NewFilterModal.vue +++ b/src/views/task/modal/NewFilterModal.vue @@ -194,7 +194,7 @@ watch( function showModal() { show.value = true setTimeout(() => { - formValue.name = '' + // formValue.name = '' }, 300); }