Merge branch 'master' into dev-v1.1
| | |
| | | readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']> |
| | | readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']> |
| | | } |
| | | } |
| | | } |
| | |
| | | state.loading = false; |
| | | }); |
| | | |
| | | onMounted(() => { |
| | | if (typeof window !== 'undefined' && window.addEventListener) { |
| | | console.log('onMounted'); |
| | | window.addEventListener('visibilitychange', handleFocus); |
| | | // window.addEventListener('focus', handleFocus2); |
| | | } |
| | | }); |
| | | |
| | | onUnmounted(() => { |
| | | console.log('onUnmounted'); |
| | | window.removeEventListener('visibilitychange', handleFocus); |
| | | // window.removeEventListener('focus', handleFocus2); |
| | | }); |
| | | |
| | | function handleFocus() { |
| | | console.log('handleFocus1'); |
| | | } |
| | | |
| | | function handleFocus2() { |
| | | console.log('handleFocus2'); |
| | | } |
| | | |
| | | const { |
| | | getDataSource: getList, |
| | | proTableProps, |