Merge branch 'test' into jie

src/views/task/aside/Aside.vue

@@ -21,7 +21,7 @@ const taskStore = useTaskStore()
 const taskListRef: any = ref(null)
 // 展示字段
 const showFieldList = ref<any[]>([])
-
+const search = ref('')
 function collapseHandler() {
   collapse.value = !collapse.value
 }
@@ -62,6 +62,12 @@ function showFilter() {
 const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
+  if (!value) {
+    console.log('setShowSearch', value)
+    search.value = ''
+    taskListRef.value.search('')
+    return
+  }
   showSearch.value = value
 }
 
@@ -201,6 +207,7 @@ defineExpose({
 
       <div v-show="showSearch" class="warpper">
         <n-input
+          v-model:value="search"
           style="flex: 1; height: 32px"
           placeholder="请输入你需要搜索的内容"
           @input="inputHandler"
@@ -231,9 +238,9 @@ defineExpose({
     <!-- 过滤列表 -->
     <FilterModalVue
       ref="filterModalRef"
+      :type="2"
       @edit-filter="editFilter"
       @show-new-filter="showModal(newFilterModalRef)"
-      :type="2"
     />
     <!-- 新增过滤 -->
     <NewFilterModalVue ref="newFilterModalRef" />

src/views/task/modal/BatchModal.vue

@@ -334,6 +334,10 @@ async function refreshHandler() {
 watch(() => taskStore.activeId, async (newValue, oldValue) => {
   refreshHandler()
 })
+
+function switchBatch() {
+  setBatch(!batch.value)
+}
 </script>
 
 <template>
@@ -408,7 +412,7 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
                 </n-popselect>
               </div>
               <div>
-                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true)">
+                <div v-show="!showActions" class="wrapper-content-form-button" @click="switchBatch()">
                   <SvgIcon style="margin-right: 6px;" size="22" name="batch" />
                   批量审批
                 </div>