From 6287c1f92da7a8d2fa7d9076d1282dbaf247042c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Sun, 12 Dec 2021 23:28:03 +0800 Subject: [PATCH] refactor(utils): remove isServer (#4792) --- packages/components/cascader-panel/src/index.vue | 4 ++-- packages/components/cascader/src/index.vue | 4 ++-- packages/components/color-picker/src/draggable.ts | 4 ++-- packages/components/dialog/src/use-dialog.ts | 5 ++--- packages/components/image/src/image.vue | 11 +++++------ packages/components/input/src/input.vue | 4 ++-- packages/components/message-box/src/messageBox.ts | 4 ++-- packages/components/message/src/message-method.ts | 4 ++-- packages/components/notification/src/notify.ts | 4 ++-- packages/components/select/src/useSelect.ts | 4 ++-- packages/components/table/src/table-body/index.ts | 4 ++-- .../components/table/src/table-header/event-helper.ts | 6 +++--- packages/components/table/src/table-layout.ts | 6 +++--- packages/components/teleport/src/teleport.vue | 4 ++-- .../virtual-list/src/builders/build-grid.ts | 4 ++-- .../virtual-list/src/builders/build-list.ts | 4 ++-- .../virtual-list/src/components/scrollbar.ts | 4 ++-- packages/directives/click-outside/index.ts | 4 ++-- packages/hooks/use-lockscreen/index.ts | 4 ++-- packages/hooks/use-model-toggle/index.ts | 8 ++++---- packages/utils/dom.ts | 10 +++++----- packages/utils/global-nodes.ts | 4 ++-- packages/utils/isServer.ts | 1 - packages/utils/popup-manager.ts | 10 +++++----- packages/utils/raf.ts | 4 ++-- packages/utils/resize-event.ts | 4 ++-- packages/utils/scroll-into-view.ts | 4 ++-- packages/utils/scrollbar-width.ts | 4 ++-- packages/utils/util.ts | 4 ++-- 29 files changed, 69 insertions(+), 72 deletions(-) delete mode 100644 packages/utils/isServer.ts diff --git a/packages/components/cascader-panel/src/index.vue b/packages/components/cascader-panel/src/index.vue index e40c7694ee..52dc1c058f 100644 --- a/packages/components/cascader-panel/src/index.vue +++ b/packages/components/cascader-panel/src/index.vue @@ -26,9 +26,9 @@ import { watch, } from 'vue' import isEqual from 'lodash/isEqual' +import { isClient } from '@vueuse/core' import { EVENT_CODE, focusNode, getSibling } from '@element-plus/utils/aria' import { UPDATE_MODEL_EVENT, CHANGE_EVENT } from '@element-plus/utils/constants' -import isServer from '@element-plus/utils/isServer' import scrollIntoView from '@element-plus/utils/scroll-into-view' import { arrayFlat, @@ -266,7 +266,7 @@ export default defineComponent({ } const scrollToExpandingNode = () => { - if (isServer) return + if (!isClient) return menuList.value.forEach((menu) => { const menuElement = menu?.$el diff --git a/packages/components/cascader/src/index.vue b/packages/components/cascader/src/index.vue index e0f21d3e0e..36141876db 100644 --- a/packages/components/cascader/src/index.vue +++ b/packages/components/cascader/src/index.vue @@ -158,6 +158,7 @@ import { import { isPromise } from '@vue/shared' import debounce from 'lodash/debounce' +import { isClient } from '@vueuse/core' import ElCascaderPanel, { CommonProps, } from '@element-plus/components/cascader-panel' @@ -173,7 +174,6 @@ import { useLocale, useSize } from '@element-plus/hooks' import { EVENT_CODE, focusNode, getSibling } from '@element-plus/utils/aria' import { UPDATE_MODEL_EVENT, CHANGE_EVENT } from '@element-plus/utils/constants' -import isServer from '@element-plus/utils/isServer' import { addResizeListener, removeResizeListener, @@ -491,7 +491,7 @@ export default defineComponent({ const tagWrapperEl = tagWrapper.value const suggestionPanelEl = suggestionPanel.value?.$el - if (isServer || !inputInner) return + if (!isClient || !inputInner) return if (suggestionPanelEl) { const suggestionList = suggestionPanelEl.querySelector( diff --git a/packages/components/color-picker/src/draggable.ts b/packages/components/color-picker/src/draggable.ts index 94cef09afb..e50a4c2be5 100644 --- a/packages/components/color-picker/src/draggable.ts +++ b/packages/components/color-picker/src/draggable.ts @@ -1,4 +1,4 @@ -import isServer from '@element-plus/utils/isServer' +import { isClient } from '@vueuse/core' import { on, off } from '@element-plus/utils/dom' let isDragging = false @@ -10,7 +10,7 @@ export declare interface IOptions { } export default function (element: HTMLElement, options: IOptions) { - if (isServer) return + if (!isClient) return const moveFn = function (event: Event) { options.drag?.(event) diff --git a/packages/components/dialog/src/use-dialog.ts b/packages/components/dialog/src/use-dialog.ts index d569893481..986dabef9c 100644 --- a/packages/components/dialog/src/use-dialog.ts +++ b/packages/components/dialog/src/use-dialog.ts @@ -1,9 +1,8 @@ import { computed, ref, watch, nextTick, onMounted } from 'vue' -import { useTimeoutFn } from '@vueuse/core' +import { useTimeoutFn, isClient } from '@vueuse/core' import { useLockscreen, useRestoreActive, useModal } from '@element-plus/hooks' import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants' -import isServer from '@element-plus/utils/isServer' import PopupManager from '@element-plus/utils/popup-manager' import { isNumber } from '@element-plus/utils/util' @@ -101,7 +100,7 @@ export const useDialog = ( } function doOpen() { - if (isServer) { + if (!isClient) { return } diff --git a/packages/components/image/src/image.vue b/packages/components/image/src/image.vue index 3a800114cf..e99bbb7d90 100644 --- a/packages/components/image/src/image.vue +++ b/packages/components/image/src/image.vue @@ -44,10 +44,9 @@