diff --git a/packages/components/autocomplete/src/index.vue b/packages/components/autocomplete/src/index.vue index 8d97bc825f..380c1dba43 100644 --- a/packages/components/autocomplete/src/index.vue +++ b/packages/components/autocomplete/src/index.vue @@ -104,7 +104,7 @@ import { useAttrs } from '@element-plus/hooks' import { ClickOutside } from '@element-plus/directives' import { generateId, isArray } from '@element-plus/utils/util' import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import ElInput from '@element-plus/components/input' import ElScrollbar from '@element-plus/components/scrollbar' import ElPopper, { Effect, Placement } from '@element-plus/components/popper' diff --git a/packages/components/backtop/src/index.vue b/packages/components/backtop/src/index.vue index 4347fad3dc..3a585178e3 100644 --- a/packages/components/backtop/src/index.vue +++ b/packages/components/backtop/src/index.vue @@ -21,7 +21,7 @@ import { defineComponent, ref, computed, onMounted, onBeforeUnmount } from 'vue' import throttle from 'lodash/throttle' import { on, off } from '@element-plus/utils/dom' import { easeInOutCubic } from '@element-plus/utils/animation' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' interface IElBacktopProps { visibilityHeight: number diff --git a/packages/components/infinite-scroll/src/index.ts b/packages/components/infinite-scroll/src/index.ts index b4067cc52b..4f32230b23 100644 --- a/packages/components/infinite-scroll/src/index.ts +++ b/packages/components/infinite-scroll/src/index.ts @@ -5,7 +5,7 @@ import { getScrollContainer, getOffsetTopDistance, } from '@element-plus/utils/dom' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import { entries } from '@element-plus/utils/util' import type { ObjectDirective, ComponentPublicInstance } from 'vue' diff --git a/packages/components/popper/src/index.vue b/packages/components/popper/src/index.vue index e631875e7f..3927b13b08 100644 --- a/packages/components/popper/src/index.vue +++ b/packages/components/popper/src/index.vue @@ -13,7 +13,7 @@ import { h, } from 'vue' import { ClickOutside } from '@element-plus/directives' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import usePopper from './use-popper/index' import defaultProps from './use-popper/defaults' diff --git a/packages/components/popper/src/renderers/trigger.ts b/packages/components/popper/src/renderers/trigger.ts index d9458c820f..bb4091cfd8 100644 --- a/packages/components/popper/src/renderers/trigger.ts +++ b/packages/components/popper/src/renderers/trigger.ts @@ -1,5 +1,5 @@ import { cloneVNode } from 'vue' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import { getFirstValidNode } from '@element-plus/utils/vnode' import type { VNode, Ref, ComponentPublicInstance } from 'vue' diff --git a/packages/components/slider/src/index.vue b/packages/components/slider/src/index.vue index 1dd785ca8e..a23d9e289d 100644 --- a/packages/components/slider/src/index.vue +++ b/packages/components/slider/src/index.vue @@ -95,7 +95,7 @@ import { INPUT_EVENT, } from '@element-plus/utils/constants' import { off, on } from '@element-plus/utils/dom' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import SliderButton from './button.vue' import SliderMarker from './marker.vue' import { useMarks } from './useMarks' diff --git a/packages/components/switch/src/index.vue b/packages/components/switch/src/index.vue index 032f7e11be..4f3d21bc76 100644 --- a/packages/components/switch/src/index.vue +++ b/packages/components/switch/src/index.vue @@ -69,7 +69,7 @@ import { import { isPromise } from '@vue/shared' import { elFormKey, elFormItemKey } from '@element-plus/tokens' import { isBool } from '@element-plus/utils/util' -import throwError, { debugWarn } from '@element-plus/utils/error' +import { throwError, debugWarn } from '@element-plus/utils/error' import type { PropType } from 'vue' import type { ElFormContext, ElFormItemContext } from '@element-plus/tokens' diff --git a/packages/components/tabs/src/tab-nav.vue b/packages/components/tabs/src/tab-nav.vue index 70c48136ba..00817d74c0 100644 --- a/packages/components/tabs/src/tab-nav.vue +++ b/packages/components/tabs/src/tab-nav.vue @@ -17,7 +17,7 @@ import { ResizableElement, } from '@element-plus/utils/resize-event' import { on, off } from '@element-plus/utils/dom' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import TabBar from './tab-bar.vue' import type { PropType } from 'vue' diff --git a/packages/components/tooltip/src/index.ts b/packages/components/tooltip/src/index.ts index 36afd6fbba..845601428f 100644 --- a/packages/components/tooltip/src/index.ts +++ b/packages/components/tooltip/src/index.ts @@ -4,7 +4,7 @@ import { popperDefaultProps, } from '@element-plus/components/popper' import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import { getFirstValidNode } from '@element-plus/utils/vnode' /** diff --git a/packages/components/virtual-list/src/components/dynamic-size-grid.ts b/packages/components/virtual-list/src/components/dynamic-size-grid.ts index 0f4d63c777..c744648928 100644 --- a/packages/components/virtual-list/src/components/dynamic-size-grid.ts +++ b/packages/components/virtual-list/src/components/dynamic-size-grid.ts @@ -1,5 +1,5 @@ import { isFunction } from '@vue/shared' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import createGrid from '../builders/buildGrid' import { diff --git a/packages/components/virtual-list/src/components/dynamic-size-list.ts b/packages/components/virtual-list/src/components/dynamic-size-list.ts index 9b898f1c05..33da1f1619 100644 --- a/packages/components/virtual-list/src/components/dynamic-size-list.ts +++ b/packages/components/virtual-list/src/components/dynamic-size-list.ts @@ -1,4 +1,4 @@ -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import createList from '../builders/buildList' diff --git a/packages/components/virtual-list/src/components/fixed-size-grid.ts b/packages/components/virtual-list/src/components/fixed-size-grid.ts index 5ff1f08a87..9dafc5ec4c 100644 --- a/packages/components/virtual-list/src/components/fixed-size-grid.ts +++ b/packages/components/virtual-list/src/components/fixed-size-grid.ts @@ -1,5 +1,5 @@ import { isNumber } from '@element-plus/utils/util' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import createGrid from '../builders/buildGrid' import { diff --git a/packages/components/virtual-list/src/components/fixed-size-list.ts b/packages/components/virtual-list/src/components/fixed-size-list.ts index 619f250465..a0157ad280 100644 --- a/packages/components/virtual-list/src/components/fixed-size-list.ts +++ b/packages/components/virtual-list/src/components/fixed-size-list.ts @@ -1,5 +1,5 @@ import { isString } from '@element-plus/utils/util' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import buildList from '../builders/buildList' import { isHorizontal } from '../utils' import { diff --git a/packages/hooks/use-lockscreen/index.ts b/packages/hooks/use-lockscreen/index.ts index 33f6d33724..3520cf2330 100644 --- a/packages/hooks/use-lockscreen/index.ts +++ b/packages/hooks/use-lockscreen/index.ts @@ -1,7 +1,7 @@ import { watch, isRef, onUnmounted } from 'vue' import getScrollBarWidth from '@element-plus/utils/scrollbar-width' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import { addClass, removeClass, diff --git a/packages/hooks/use-popper/index.ts b/packages/hooks/use-popper/index.ts index 3d5c213299..65d4635250 100644 --- a/packages/hooks/use-popper/index.ts +++ b/packages/hooks/use-popper/index.ts @@ -24,7 +24,7 @@ import { import { getFirstValidNode } from '@element-plus/utils/vnode' import { stop } from '@element-plus/utils/dom' import PopupManager from '@element-plus/utils/popup-manager' -import throwError from '@element-plus/utils/error' +import { throwError } from '@element-plus/utils/error' import useTeleport from '../use-teleport' import useTimeout from '../use-timeout' diff --git a/packages/utils/error.ts b/packages/utils/error.ts index 46688b1a2e..1521327ece 100644 --- a/packages/utils/error.ts +++ b/packages/utils/error.ts @@ -5,7 +5,7 @@ class ElementPlusError extends Error { } } -export default (scope: string, m: string) => { +export function throwError(scope: string, m: string): never { throw new ElementPlusError(`[${scope}] ${m}`) }