File tree Expand file tree Collapse file tree 1 file changed +12
-2
lines changed
Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -200,7 +200,12 @@ export default function useAdmate({
200200 const TERMINAL_STATE = conclude ( [ state , defaultState ] )
201201 // merge, assignIn, Object.assign 对对象属性的修改在 vue 2中无法触发更新
202202 // 但是对于对象本身是可以生效的,且直接赋值反而无效
203- mergeState === 'deep' ? merge ( _form , TERMINAL_STATE ) : assignIn ( _form , TERMINAL_STATE )
203+ if ( mergeState === 'deep' ) {
204+ merge ( _form , TERMINAL_STATE )
205+ }
206+ else {
207+ assignIn ( _form , TERMINAL_STATE )
208+ }
204209 }
205210
206211 const getList = ( payload = _list . filter , payloadAs : PayloadAs ) : Promise < unknown > => {
@@ -291,7 +296,11 @@ export default function useAdmate({
291296 _getListProxy ( )
292297 }
293298 else {
299+ getListTrigger . value = 'd'
294300 setValue ( _list . filter , _list . pageNumberAt , currPageNumber - 1 )
301+ if ( ! _list . watchFilter ) {
302+ _getListProxy ( )
303+ }
295304 }
296305 }
297306 else {
@@ -507,7 +516,8 @@ export default function useAdmate({
507516 }
508517 else {
509518 // 翻页不需要防抖
510- getListTrigger . value = 'pageNumberChange'
519+ // ||= 的目的是删除当前分页最后一条记录时也会触发翻页
520+ getListTrigger . value ??= 'pageNumberChange'
511521 _getListProxy ( )
512522 }
513523 } ,
You can’t perform that action at this time.
0 commit comments