chore: update deps

package.json

@@ -63,7 +63,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
-    "@iconify/json": "^1.1.355",
+    "@iconify/json": "^1.1.356",
     "@purge-icons/generated": "^0.7.0",
     "@types/codemirror": "^5.60.0",
     "@types/crypto-js": "^4.0.1",
@@ -76,8 +76,8 @@
     "@types/qrcode": "^1.4.0",
     "@types/qs": "^6.9.6",
     "@types/sortablejs": "^1.10.6",
-    "@typescript-eslint/eslint-plugin": "^4.26.1",
-    "@typescript-eslint/parser": "^4.26.1",
+    "@typescript-eslint/eslint-plugin": "^4.27.0",
+    "@typescript-eslint/parser": "^4.27.0",
     "@vitejs/plugin-legacy": "^1.4.1",
     "@vitejs/plugin-vue": "^1.2.3",
     "@vitejs/plugin-vue-jsx": "^1.1.5",
@@ -91,12 +91,12 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-define-config": "^1.0.8",
     "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.11.0",
-    "esno": "^0.7.2",
+    "eslint-plugin-vue": "^7.11.1",
+    "esno": "^0.7.3",
     "fs-extra": "^10.0.0",
     "http-server": "^0.12.3",
     "husky": "^6.0.0",
-    "inquirer": "^8.1.0",
+    "inquirer": "^8.1.1",
     "is-ci": "^3.0.0",
     "less": "^4.1.1",
     "lint-staged": "^11.0.0",
@@ -121,7 +121,7 @@
     "vite-plugin-style-import": "^0.10.1",
     "vite-plugin-svg-icons": "^0.7.0",
     "vite-plugin-theme": "^0.8.1",
-    "vite-plugin-windicss": "^1.0.3",
+    "vite-plugin-windicss": "^1.0.4",
     "vue-eslint-parser": "^7.6.0",
     "vue-tsc": "^0.1.7"
   },

src/components/Table/index.ts

@@ -2,13 +2,9 @@ export { default as BasicTable } from './src/BasicTable.vue';
 export { default as TableAction } from './src/components/TableAction.vue';
 export { default as EditTableHeaderIcon } from './src/components/EditTableHeaderIcon.vue';
 export { default as TableImg } from './src/components/TableImg.vue';
-
 export * from './src/types/table';
 export * from './src/types/pagination';
 export * from './src/types/tableAction';
-
 export { useTable } from './src/hooks/useTable';
-
 export type { FormSchema, FormProps } from '/@/components/Form/src/types/form';
-
 export type { EditRecordRow } from './src/components/editable';

src/components/Table/src/componentMap.ts

 import type { Component } from 'vue';
-
 import {
   Input,
   Select,
@@ -9,7 +8,6 @@ import {
   DatePicker,
   TimePicker,
 } from 'ant-design-vue';
-
 import type { ComponentType } from './types/componentType';
 import { ApiSelect } from '/@/components/Form';
 
@@ -17,7 +15,6 @@ const componentMap = new Map<ComponentType, Component>();
 
 componentMap.set('Input', Input);
 componentMap.set('InputNumber', InputNumber);
-
 componentMap.set('Select', Select);
 componentMap.set('ApiSelect', ApiSelect);
 componentMap.set('Switch', Switch);

src/components/Table/src/components/EditTableHeaderIcon.vue

@@ -8,13 +8,9 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { FormOutlined } from '@ant-design/icons-vue';
-
-  import { propTypes } from '/@/utils/propTypes';
   export default defineComponent({
     name: 'EditTableHeaderIcon',
     components: { FormOutlined },
-    props: {
-      title: propTypes.string.def(''),
-    },
+    props: { title: { type: String, default: '' } },
   });
 </script>

src/components/Table/src/components/HeaderCell.vue

@@ -8,12 +8,11 @@
 <script lang="ts">
   import type { PropType } from 'vue';
   import type { BasicColumn } from '../types/table';
-
   import { defineComponent, computed } from 'vue';
   import BasicHelp from '/@/components/Basic/src/BasicHelp.vue';
   import EditTableHeaderCell from './EditTableHeaderIcon.vue';
-
   import { useDesign } from '/@/hooks/web/useDesign';
+
   export default defineComponent({
     name: 'TableHeaderCell',
     components: {

src/components/Table/src/components/TableAction.vue

@@ -32,16 +32,13 @@
   import { defineComponent, PropType, computed, toRaw } from 'vue';
   import { MoreOutlined } from '@ant-design/icons-vue';
   import { Divider } from 'ant-design-vue';
-
   import Icon from '/@/components/Icon/index';
   import { ActionItem, TableActionType } from '/@/components/Table';
   import { PopConfirmButton } from '/@/components/Button';
   import { Dropdown } from '/@/components/Dropdown';
-
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useTableContext } from '../hooks/useTableContext';
   import { usePermission } from '/@/hooks/web/usePermission';
-
   import { isBoolean, isFunction } from '/@/utils/is';
   import { propTypes } from '/@/utils/propTypes';
   import { ACTION_COLUMN_FLAG } from '../const';

src/components/Table/src/components/TableFooter.vue

@@ -13,7 +13,6 @@
 </template>
 <script lang="ts">
   import type { PropType } from 'vue';
-
   import { defineComponent, unref, computed, toRaw } from 'vue';
   import { Table } from 'ant-design-vue';
   import { cloneDeep } from 'lodash-es';

src/components/Table/src/components/TableHeader.vue

@@ -16,12 +16,10 @@
 <script lang="ts">
   import type { TableSetting, ColumnChangeParam } from '../types/table';
   import type { PropType } from 'vue';
-
   import { defineComponent } from 'vue';
   import { Divider } from 'ant-design-vue';
   import TableSettingComponent from './settings/index.vue';
   import TableTitle from './TableTitle.vue';
-
   import { useDesign } from '/@/hooks/web/useDesign';
 
   export default defineComponent({

src/components/Table/src/components/TableImg.vue

@@ -35,7 +35,6 @@
   import type { CSSProperties } from 'vue';
   import { defineComponent, computed } from 'vue';
   import { useDesign } from '/@/hooks/web/useDesign';
-
   import { Image, Badge } from 'ant-design-vue';
   import { propTypes } from '/@/utils/propTypes';
 

src/components/Table/src/components/TableTitle.vue

@@ -5,10 +5,10 @@
 </template>
 <script lang="ts">
   import { computed, defineComponent, PropType } from 'vue';
-
   import { BasicTitle } from '/@/components/Basic/index';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { isFunction } from '/@/utils/is';
+
   export default defineComponent({
     name: 'BasicTableTitle',
     components: { BasicTitle },

src/components/Table/src/components/settings/ColumnSetting.vue

@@ -90,6 +90,7 @@
   </Tooltip>
 </template>
 <script lang="ts">
+  import type { BasicColumn, ColumnChangeParam } from '../../types/table';
   import {
     defineComponent,
     ref,
@@ -104,18 +105,14 @@
   import { SettingOutlined, DragOutlined } from '@ant-design/icons-vue';
   import { Icon } from '/@/components/Icon';
   import { ScrollContainer } from '/@/components/Container';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTableContext } from '../../hooks/useTableContext';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useSortable } from '/@/hooks/web/useSortable';
-
   import { isNullAndUnDef } from '/@/utils/is';
   import { getPopupContainer } from '/@/utils';
   import { omit } from 'lodash-es';
 
-  import type { BasicColumn, ColumnChangeParam } from '../../types/table';
-
   interface State {
     checkAll: boolean;
     checkedList: string[];

src/components/Table/src/components/settings/FullScreenSetting.vue

@@ -11,9 +11,7 @@
   import { defineComponent } from 'vue';
   import { Tooltip } from 'ant-design-vue';
   import { FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue';
-
   import { useFullscreen } from '@vueuse/core';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTableContext } from '../../hooks/useTableContext';
 

src/components/Table/src/components/settings/RedoSetting.vue

@@ -10,7 +10,6 @@
   import { defineComponent } from 'vue';
   import { Tooltip } from 'ant-design-vue';
   import { RedoOutlined } from '@ant-design/icons-vue';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTableContext } from '../../hooks/useTableContext';
 

src/components/Table/src/components/settings/SizeSetting.vue

@@ -24,11 +24,9 @@
 </template>
 <script lang="ts">
   import type { SizeType } from '../../types/table';
-
   import { defineComponent, ref } from 'vue';
   import { Tooltip, Dropdown, Menu } from 'ant-design-vue';
   import { ColumnHeightOutlined } from '@ant-design/icons-vue';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTableContext } from '../../hooks/useTableContext';
   import { getPopupContainer } from '/@/utils';

src/components/Table/src/components/settings/index.vue

@@ -9,14 +9,11 @@
 <script lang="ts">
   import type { PropType } from 'vue';
   import type { TableSetting, ColumnChangeParam } from '../../types/table';
-
   import { defineComponent, computed } from 'vue';
-
   import ColumnSetting from './ColumnSetting.vue';
   import SizeSetting from './SizeSetting.vue';
   import RedoSetting from './RedoSetting.vue';
   import FullScreenSetting from './FullScreenSetting.vue';
-
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({

src/components/Table/src/const.ts

@@ -22,5 +22,7 @@ export const DEFAULT_FILTER_FN = defaultFilterFn;
 
 //  Default layout of table cells
 export const DEFAULT_ALIGN = 'center';
+
 export const INDEX_COLUMN_FLAG = 'INDEX';
+
 export const ACTION_COLUMN_FLAG = 'ACTION';

src/components/Table/src/hooks/useColumns.ts

 import type { BasicColumn, BasicTableProps, CellFormat, GetColumnsParams } from '../types/table';
 import type { PaginationProps } from '../types/pagination';
 import type { ComputedRef } from 'vue';
-
 import { unref, Ref, computed, watch, ref, toRaw } from 'vue';
-
 import { renderEditCell } from '../components/editable';
-
 import { usePermission } from '/@/hooks/web/usePermission';
 import { useI18n } from '/@/hooks/web/useI18n';
-
 import { isBoolean, isArray, isString, isObject, isFunction } from '/@/utils/is';
 import { isEqual, cloneDeep } from 'lodash-es';
 import { formatToDate } from '/@/utils/dateUtil';
-
 import { DEFAULT_ALIGN, PAGE_SIZE, INDEX_COLUMN_FLAG, ACTION_COLUMN_FLAG } from '../const';
 
 function handleItem(item: BasicColumn, ellipsis: boolean) {

src/components/Table/src/hooks/useDataSource.ts

 import type { BasicTableProps, FetchParams, SorterResult } from '../types/table';
 import type { PaginationProps } from '../types/pagination';
-
 import {
   ref,
   unref,
@@ -12,13 +11,10 @@ import {
   Ref,
   watchEffect,
 } from 'vue';
-
 import { useTimeoutFn } from '/@/hooks/core/useTimeout';
-
 import { buildUUID } from '/@/utils/uuid';
 import { isFunction, isBoolean } from '/@/utils/is';
 import { get, cloneDeep } from 'lodash-es';
-
 import { FETCH_SETTING, ROW_KEY, PAGE_SIZE } from '../const';
 
 interface ActionType {
@@ -179,7 +175,10 @@ export function useDataSource(
     if (!api || !isFunction(api)) return;
     try {
       setLoading(true);
-      const { pageField, sizeField, listField, totalField } = fetchSetting || FETCH_SETTING;
+      const { pageField, sizeField, listField, totalField } = Object.assign(
+        FETCH_SETTING,
+        fetchSetting
+      );
       let pageParams: Recordable = {};
 
       const { current = 1, pageSize = PAGE_SIZE } = unref(getPaginationInfo) as PaginationProps;

src/components/Table/src/hooks/usePagination.tsx

 import type { PaginationProps } from '../types/pagination';
 import type { BasicTableProps } from '../types/table';
-
 import { computed, unref, ref, ComputedRef } from 'vue';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
-
 import { isBoolean } from '/@/utils/is';
-
 import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const';
 import { useI18n } from '/@/hooks/web/useI18n';
 

src/components/Table/src/hooks/useRowSelection.ts

 import type { BasicTableProps, TableRowSelection } from '../types/table';
-
 import { computed, ref, unref, ComputedRef, Ref, toRaw } from 'vue';
 import { ROW_KEY } from '../const';
 

src/components/Table/src/hooks/useTable.ts

@@ -3,7 +3,6 @@ import type { PaginationProps } from '../types/pagination';
 import type { DynamicProps } from '/#/utils';
 import type { FormActionType } from '/@/components/Form';
 import type { WatchStopHandle } from 'vue';
-
 import { getDynamicProps } from '/@/utils';
 import { ref, onUnmounted, unref, watch, toRaw } from 'vue';
 import { isProdMode } from '/@/utils/env';

src/components/Table/src/hooks/useTableContext.ts

 import type { Ref } from 'vue';
 import type { BasicTableProps, TableActionType } from '../types/table';
-
 import { provide, inject, ComputedRef } from 'vue';
 
 const key = Symbol('basic-table');

src/components/Table/src/hooks/useTableExpand.ts

 import type { ComputedRef, Ref } from 'vue';
 import type { BasicTableProps } from '../types/table';
-
 import { computed, unref, ref, toRaw } from 'vue';
 import { ROW_KEY } from '../const';
 

src/components/Table/src/hooks/useTableForm.ts

@@ -3,6 +3,7 @@ import type { BasicTableProps, FetchParams } from '../types/table';
 import { unref, computed } from 'vue';
 import type { FormProps } from '/@/components/Form';
 import { isFunction } from '/@/utils/is';
+
 export function useTableForm(
   propsRef: ComputedRef<BasicTableProps>,
   slots: Slots,

src/components/Table/src/hooks/useTableHeader.ts

 import type { ComputedRef, Slots } from 'vue';
 import type { BasicTableProps, InnerHandlers } from '../types/table';
-
 import { unref, computed, h } from 'vue';
 import TableHeader from '../components/TableHeader.vue';
-
 import { isString } from '/@/utils/is';
 import { getSlot } from '/@/utils/helper/tsxHelper';
 

src/components/Table/src/hooks/useTableScroll.ts

 import type { BasicTableProps, TableRowSelection, BasicColumn } from '../types/table';
 import type { Ref, ComputedRef } from 'vue';
-
 import { computed, unref, ref, nextTick, watch } from 'vue';
-
 import { getViewportOffset } from '/@/utils/domUtils';
 import { isBoolean } from '/@/utils/is';
-
 import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn';
 import { useModalContext } from '/@/components/Modal';
 import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated';

src/components/Table/src/hooks/useTableStyle.ts

 import type { ComputedRef } from 'vue';
 import type { BasicTableProps, TableCustomRecord } from '../types/table';
-
 import { unref } from 'vue';
 import { isFunction } from '/@/utils/is';
+
 export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls: string) {
   function getRowClassName(record: TableCustomRecord, index: number) {
     const { striped, rowClassName } = unref(propsRef);
@@ -13,7 +13,5 @@ export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls:
     return (index || 0) % 2 === 1 ? `${prefixCls}-row__striped` : '';
   }
 
-  return {
-    getRowClassName,
-  };
+  return { getRowClassName };
 }

src/components/Table/src/types/table.ts

@@ -165,7 +165,7 @@ export interface BasicTableProps<T = any> {
   // 查询条件请求之前处理
   handleSearchInfoFn?: Fn;
   // 请求接口配置
-  fetchSetting?: FetchSetting;
+  fetchSetting?: Partial<FetchSetting>;
   // 立即请求接口
   immediate?: boolean;
   // 在开起搜索表单的时候，如果没有数据是否显示表格