Commit e9064631c7914d70d541834d37f47aea1466c525
1 parent
513823bf
chore: update deps
Showing
29 changed files
with
96 additions
and
143 deletions
package.json
@@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
63 | "devDependencies": { | 63 | "devDependencies": { |
64 | "@commitlint/cli": "^12.1.4", | 64 | "@commitlint/cli": "^12.1.4", |
65 | "@commitlint/config-conventional": "^12.1.4", | 65 | "@commitlint/config-conventional": "^12.1.4", |
66 | - "@iconify/json": "^1.1.355", | 66 | + "@iconify/json": "^1.1.356", |
67 | "@purge-icons/generated": "^0.7.0", | 67 | "@purge-icons/generated": "^0.7.0", |
68 | "@types/codemirror": "^5.60.0", | 68 | "@types/codemirror": "^5.60.0", |
69 | "@types/crypto-js": "^4.0.1", | 69 | "@types/crypto-js": "^4.0.1", |
@@ -76,8 +76,8 @@ | @@ -76,8 +76,8 @@ | ||
76 | "@types/qrcode": "^1.4.0", | 76 | "@types/qrcode": "^1.4.0", |
77 | "@types/qs": "^6.9.6", | 77 | "@types/qs": "^6.9.6", |
78 | "@types/sortablejs": "^1.10.6", | 78 | "@types/sortablejs": "^1.10.6", |
79 | - "@typescript-eslint/eslint-plugin": "^4.26.1", | ||
80 | - "@typescript-eslint/parser": "^4.26.1", | 79 | + "@typescript-eslint/eslint-plugin": "^4.27.0", |
80 | + "@typescript-eslint/parser": "^4.27.0", | ||
81 | "@vitejs/plugin-legacy": "^1.4.1", | 81 | "@vitejs/plugin-legacy": "^1.4.1", |
82 | "@vitejs/plugin-vue": "^1.2.3", | 82 | "@vitejs/plugin-vue": "^1.2.3", |
83 | "@vitejs/plugin-vue-jsx": "^1.1.5", | 83 | "@vitejs/plugin-vue-jsx": "^1.1.5", |
@@ -91,12 +91,12 @@ | @@ -91,12 +91,12 @@ | ||
91 | "eslint-config-prettier": "^8.3.0", | 91 | "eslint-config-prettier": "^8.3.0", |
92 | "eslint-define-config": "^1.0.8", | 92 | "eslint-define-config": "^1.0.8", |
93 | "eslint-plugin-prettier": "^3.4.0", | 93 | "eslint-plugin-prettier": "^3.4.0", |
94 | - "eslint-plugin-vue": "^7.11.0", | ||
95 | - "esno": "^0.7.2", | 94 | + "eslint-plugin-vue": "^7.11.1", |
95 | + "esno": "^0.7.3", | ||
96 | "fs-extra": "^10.0.0", | 96 | "fs-extra": "^10.0.0", |
97 | "http-server": "^0.12.3", | 97 | "http-server": "^0.12.3", |
98 | "husky": "^6.0.0", | 98 | "husky": "^6.0.0", |
99 | - "inquirer": "^8.1.0", | 99 | + "inquirer": "^8.1.1", |
100 | "is-ci": "^3.0.0", | 100 | "is-ci": "^3.0.0", |
101 | "less": "^4.1.1", | 101 | "less": "^4.1.1", |
102 | "lint-staged": "^11.0.0", | 102 | "lint-staged": "^11.0.0", |
@@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
121 | "vite-plugin-style-import": "^0.10.1", | 121 | "vite-plugin-style-import": "^0.10.1", |
122 | "vite-plugin-svg-icons": "^0.7.0", | 122 | "vite-plugin-svg-icons": "^0.7.0", |
123 | "vite-plugin-theme": "^0.8.1", | 123 | "vite-plugin-theme": "^0.8.1", |
124 | - "vite-plugin-windicss": "^1.0.3", | 124 | + "vite-plugin-windicss": "^1.0.4", |
125 | "vue-eslint-parser": "^7.6.0", | 125 | "vue-eslint-parser": "^7.6.0", |
126 | "vue-tsc": "^0.1.7" | 126 | "vue-tsc": "^0.1.7" |
127 | }, | 127 | }, |
src/components/Table/index.ts
@@ -2,13 +2,9 @@ export { default as BasicTable } from './src/BasicTable.vue'; | @@ -2,13 +2,9 @@ export { default as BasicTable } from './src/BasicTable.vue'; | ||
2 | export { default as TableAction } from './src/components/TableAction.vue'; | 2 | export { default as TableAction } from './src/components/TableAction.vue'; |
3 | export { default as EditTableHeaderIcon } from './src/components/EditTableHeaderIcon.vue'; | 3 | export { default as EditTableHeaderIcon } from './src/components/EditTableHeaderIcon.vue'; |
4 | export { default as TableImg } from './src/components/TableImg.vue'; | 4 | export { default as TableImg } from './src/components/TableImg.vue'; |
5 | - | ||
6 | export * from './src/types/table'; | 5 | export * from './src/types/table'; |
7 | export * from './src/types/pagination'; | 6 | export * from './src/types/pagination'; |
8 | export * from './src/types/tableAction'; | 7 | export * from './src/types/tableAction'; |
9 | - | ||
10 | export { useTable } from './src/hooks/useTable'; | 8 | export { useTable } from './src/hooks/useTable'; |
11 | - | ||
12 | export type { FormSchema, FormProps } from '/@/components/Form/src/types/form'; | 9 | export type { FormSchema, FormProps } from '/@/components/Form/src/types/form'; |
13 | - | ||
14 | export type { EditRecordRow } from './src/components/editable'; | 10 | export type { EditRecordRow } from './src/components/editable'; |
src/components/Table/src/componentMap.ts
1 | import type { Component } from 'vue'; | 1 | import type { Component } from 'vue'; |
2 | - | ||
3 | import { | 2 | import { |
4 | Input, | 3 | Input, |
5 | Select, | 4 | Select, |
@@ -9,7 +8,6 @@ import { | @@ -9,7 +8,6 @@ import { | ||
9 | DatePicker, | 8 | DatePicker, |
10 | TimePicker, | 9 | TimePicker, |
11 | } from 'ant-design-vue'; | 10 | } from 'ant-design-vue'; |
12 | - | ||
13 | import type { ComponentType } from './types/componentType'; | 11 | import type { ComponentType } from './types/componentType'; |
14 | import { ApiSelect } from '/@/components/Form'; | 12 | import { ApiSelect } from '/@/components/Form'; |
15 | 13 | ||
@@ -17,7 +15,6 @@ const componentMap = new Map<ComponentType, Component>(); | @@ -17,7 +15,6 @@ const componentMap = new Map<ComponentType, Component>(); | ||
17 | 15 | ||
18 | componentMap.set('Input', Input); | 16 | componentMap.set('Input', Input); |
19 | componentMap.set('InputNumber', InputNumber); | 17 | componentMap.set('InputNumber', InputNumber); |
20 | - | ||
21 | componentMap.set('Select', Select); | 18 | componentMap.set('Select', Select); |
22 | componentMap.set('ApiSelect', ApiSelect); | 19 | componentMap.set('ApiSelect', ApiSelect); |
23 | componentMap.set('Switch', Switch); | 20 | componentMap.set('Switch', Switch); |
src/components/Table/src/components/EditTableHeaderIcon.vue
@@ -8,13 +8,9 @@ | @@ -8,13 +8,9 @@ | ||
8 | <script lang="ts"> | 8 | <script lang="ts"> |
9 | import { defineComponent } from 'vue'; | 9 | import { defineComponent } from 'vue'; |
10 | import { FormOutlined } from '@ant-design/icons-vue'; | 10 | import { FormOutlined } from '@ant-design/icons-vue'; |
11 | - | ||
12 | - import { propTypes } from '/@/utils/propTypes'; | ||
13 | export default defineComponent({ | 11 | export default defineComponent({ |
14 | name: 'EditTableHeaderIcon', | 12 | name: 'EditTableHeaderIcon', |
15 | components: { FormOutlined }, | 13 | components: { FormOutlined }, |
16 | - props: { | ||
17 | - title: propTypes.string.def(''), | ||
18 | - }, | 14 | + props: { title: { type: String, default: '' } }, |
19 | }); | 15 | }); |
20 | </script> | 16 | </script> |
src/components/Table/src/components/HeaderCell.vue
@@ -8,12 +8,11 @@ | @@ -8,12 +8,11 @@ | ||
8 | <script lang="ts"> | 8 | <script lang="ts"> |
9 | import type { PropType } from 'vue'; | 9 | import type { PropType } from 'vue'; |
10 | import type { BasicColumn } from '../types/table'; | 10 | import type { BasicColumn } from '../types/table'; |
11 | - | ||
12 | import { defineComponent, computed } from 'vue'; | 11 | import { defineComponent, computed } from 'vue'; |
13 | import BasicHelp from '/@/components/Basic/src/BasicHelp.vue'; | 12 | import BasicHelp from '/@/components/Basic/src/BasicHelp.vue'; |
14 | import EditTableHeaderCell from './EditTableHeaderIcon.vue'; | 13 | import EditTableHeaderCell from './EditTableHeaderIcon.vue'; |
15 | - | ||
16 | import { useDesign } from '/@/hooks/web/useDesign'; | 14 | import { useDesign } from '/@/hooks/web/useDesign'; |
15 | + | ||
17 | export default defineComponent({ | 16 | export default defineComponent({ |
18 | name: 'TableHeaderCell', | 17 | name: 'TableHeaderCell', |
19 | components: { | 18 | components: { |
src/components/Table/src/components/TableAction.vue
@@ -32,16 +32,13 @@ | @@ -32,16 +32,13 @@ | ||
32 | import { defineComponent, PropType, computed, toRaw } from 'vue'; | 32 | import { defineComponent, PropType, computed, toRaw } from 'vue'; |
33 | import { MoreOutlined } from '@ant-design/icons-vue'; | 33 | import { MoreOutlined } from '@ant-design/icons-vue'; |
34 | import { Divider } from 'ant-design-vue'; | 34 | import { Divider } from 'ant-design-vue'; |
35 | - | ||
36 | import Icon from '/@/components/Icon/index'; | 35 | import Icon from '/@/components/Icon/index'; |
37 | import { ActionItem, TableActionType } from '/@/components/Table'; | 36 | import { ActionItem, TableActionType } from '/@/components/Table'; |
38 | import { PopConfirmButton } from '/@/components/Button'; | 37 | import { PopConfirmButton } from '/@/components/Button'; |
39 | import { Dropdown } from '/@/components/Dropdown'; | 38 | import { Dropdown } from '/@/components/Dropdown'; |
40 | - | ||
41 | import { useDesign } from '/@/hooks/web/useDesign'; | 39 | import { useDesign } from '/@/hooks/web/useDesign'; |
42 | import { useTableContext } from '../hooks/useTableContext'; | 40 | import { useTableContext } from '../hooks/useTableContext'; |
43 | import { usePermission } from '/@/hooks/web/usePermission'; | 41 | import { usePermission } from '/@/hooks/web/usePermission'; |
44 | - | ||
45 | import { isBoolean, isFunction } from '/@/utils/is'; | 42 | import { isBoolean, isFunction } from '/@/utils/is'; |
46 | import { propTypes } from '/@/utils/propTypes'; | 43 | import { propTypes } from '/@/utils/propTypes'; |
47 | import { ACTION_COLUMN_FLAG } from '../const'; | 44 | import { ACTION_COLUMN_FLAG } from '../const'; |
src/components/Table/src/components/TableFooter.vue
@@ -13,7 +13,6 @@ | @@ -13,7 +13,6 @@ | ||
13 | </template> | 13 | </template> |
14 | <script lang="ts"> | 14 | <script lang="ts"> |
15 | import type { PropType } from 'vue'; | 15 | import type { PropType } from 'vue'; |
16 | - | ||
17 | import { defineComponent, unref, computed, toRaw } from 'vue'; | 16 | import { defineComponent, unref, computed, toRaw } from 'vue'; |
18 | import { Table } from 'ant-design-vue'; | 17 | import { Table } from 'ant-design-vue'; |
19 | import { cloneDeep } from 'lodash-es'; | 18 | import { cloneDeep } from 'lodash-es'; |
src/components/Table/src/components/TableHeader.vue
@@ -16,12 +16,10 @@ | @@ -16,12 +16,10 @@ | ||
16 | <script lang="ts"> | 16 | <script lang="ts"> |
17 | import type { TableSetting, ColumnChangeParam } from '../types/table'; | 17 | import type { TableSetting, ColumnChangeParam } from '../types/table'; |
18 | import type { PropType } from 'vue'; | 18 | import type { PropType } from 'vue'; |
19 | - | ||
20 | import { defineComponent } from 'vue'; | 19 | import { defineComponent } from 'vue'; |
21 | import { Divider } from 'ant-design-vue'; | 20 | import { Divider } from 'ant-design-vue'; |
22 | import TableSettingComponent from './settings/index.vue'; | 21 | import TableSettingComponent from './settings/index.vue'; |
23 | import TableTitle from './TableTitle.vue'; | 22 | import TableTitle from './TableTitle.vue'; |
24 | - | ||
25 | import { useDesign } from '/@/hooks/web/useDesign'; | 23 | import { useDesign } from '/@/hooks/web/useDesign'; |
26 | 24 | ||
27 | export default defineComponent({ | 25 | export default defineComponent({ |
src/components/Table/src/components/TableImg.vue
@@ -35,7 +35,6 @@ | @@ -35,7 +35,6 @@ | ||
35 | import type { CSSProperties } from 'vue'; | 35 | import type { CSSProperties } from 'vue'; |
36 | import { defineComponent, computed } from 'vue'; | 36 | import { defineComponent, computed } from 'vue'; |
37 | import { useDesign } from '/@/hooks/web/useDesign'; | 37 | import { useDesign } from '/@/hooks/web/useDesign'; |
38 | - | ||
39 | import { Image, Badge } from 'ant-design-vue'; | 38 | import { Image, Badge } from 'ant-design-vue'; |
40 | import { propTypes } from '/@/utils/propTypes'; | 39 | import { propTypes } from '/@/utils/propTypes'; |
41 | 40 |
src/components/Table/src/components/TableTitle.vue
@@ -5,10 +5,10 @@ | @@ -5,10 +5,10 @@ | ||
5 | </template> | 5 | </template> |
6 | <script lang="ts"> | 6 | <script lang="ts"> |
7 | import { computed, defineComponent, PropType } from 'vue'; | 7 | import { computed, defineComponent, PropType } from 'vue'; |
8 | - | ||
9 | import { BasicTitle } from '/@/components/Basic/index'; | 8 | import { BasicTitle } from '/@/components/Basic/index'; |
10 | import { useDesign } from '/@/hooks/web/useDesign'; | 9 | import { useDesign } from '/@/hooks/web/useDesign'; |
11 | import { isFunction } from '/@/utils/is'; | 10 | import { isFunction } from '/@/utils/is'; |
11 | + | ||
12 | export default defineComponent({ | 12 | export default defineComponent({ |
13 | name: 'BasicTableTitle', | 13 | name: 'BasicTableTitle', |
14 | components: { BasicTitle }, | 14 | components: { BasicTitle }, |
src/components/Table/src/components/settings/ColumnSetting.vue
@@ -90,6 +90,7 @@ | @@ -90,6 +90,7 @@ | ||
90 | </Tooltip> | 90 | </Tooltip> |
91 | </template> | 91 | </template> |
92 | <script lang="ts"> | 92 | <script lang="ts"> |
93 | + import type { BasicColumn, ColumnChangeParam } from '../../types/table'; | ||
93 | import { | 94 | import { |
94 | defineComponent, | 95 | defineComponent, |
95 | ref, | 96 | ref, |
@@ -104,18 +105,14 @@ | @@ -104,18 +105,14 @@ | ||
104 | import { SettingOutlined, DragOutlined } from '@ant-design/icons-vue'; | 105 | import { SettingOutlined, DragOutlined } from '@ant-design/icons-vue'; |
105 | import { Icon } from '/@/components/Icon'; | 106 | import { Icon } from '/@/components/Icon'; |
106 | import { ScrollContainer } from '/@/components/Container'; | 107 | import { ScrollContainer } from '/@/components/Container'; |
107 | - | ||
108 | import { useI18n } from '/@/hooks/web/useI18n'; | 108 | import { useI18n } from '/@/hooks/web/useI18n'; |
109 | import { useTableContext } from '../../hooks/useTableContext'; | 109 | import { useTableContext } from '../../hooks/useTableContext'; |
110 | import { useDesign } from '/@/hooks/web/useDesign'; | 110 | import { useDesign } from '/@/hooks/web/useDesign'; |
111 | import { useSortable } from '/@/hooks/web/useSortable'; | 111 | import { useSortable } from '/@/hooks/web/useSortable'; |
112 | - | ||
113 | import { isNullAndUnDef } from '/@/utils/is'; | 112 | import { isNullAndUnDef } from '/@/utils/is'; |
114 | import { getPopupContainer } from '/@/utils'; | 113 | import { getPopupContainer } from '/@/utils'; |
115 | import { omit } from 'lodash-es'; | 114 | import { omit } from 'lodash-es'; |
116 | 115 | ||
117 | - import type { BasicColumn, ColumnChangeParam } from '../../types/table'; | ||
118 | - | ||
119 | interface State { | 116 | interface State { |
120 | checkAll: boolean; | 117 | checkAll: boolean; |
121 | checkedList: string[]; | 118 | checkedList: string[]; |
src/components/Table/src/components/settings/FullScreenSetting.vue
@@ -11,9 +11,7 @@ | @@ -11,9 +11,7 @@ | ||
11 | import { defineComponent } from 'vue'; | 11 | import { defineComponent } from 'vue'; |
12 | import { Tooltip } from 'ant-design-vue'; | 12 | import { Tooltip } from 'ant-design-vue'; |
13 | import { FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue'; | 13 | import { FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue'; |
14 | - | ||
15 | import { useFullscreen } from '@vueuse/core'; | 14 | import { useFullscreen } from '@vueuse/core'; |
16 | - | ||
17 | import { useI18n } from '/@/hooks/web/useI18n'; | 15 | import { useI18n } from '/@/hooks/web/useI18n'; |
18 | import { useTableContext } from '../../hooks/useTableContext'; | 16 | import { useTableContext } from '../../hooks/useTableContext'; |
19 | 17 |
src/components/Table/src/components/settings/RedoSetting.vue
@@ -10,7 +10,6 @@ | @@ -10,7 +10,6 @@ | ||
10 | import { defineComponent } from 'vue'; | 10 | import { defineComponent } from 'vue'; |
11 | import { Tooltip } from 'ant-design-vue'; | 11 | import { Tooltip } from 'ant-design-vue'; |
12 | import { RedoOutlined } from '@ant-design/icons-vue'; | 12 | import { RedoOutlined } from '@ant-design/icons-vue'; |
13 | - | ||
14 | import { useI18n } from '/@/hooks/web/useI18n'; | 13 | import { useI18n } from '/@/hooks/web/useI18n'; |
15 | import { useTableContext } from '../../hooks/useTableContext'; | 14 | import { useTableContext } from '../../hooks/useTableContext'; |
16 | 15 |
src/components/Table/src/components/settings/SizeSetting.vue
@@ -24,11 +24,9 @@ | @@ -24,11 +24,9 @@ | ||
24 | </template> | 24 | </template> |
25 | <script lang="ts"> | 25 | <script lang="ts"> |
26 | import type { SizeType } from '../../types/table'; | 26 | import type { SizeType } from '../../types/table'; |
27 | - | ||
28 | import { defineComponent, ref } from 'vue'; | 27 | import { defineComponent, ref } from 'vue'; |
29 | import { Tooltip, Dropdown, Menu } from 'ant-design-vue'; | 28 | import { Tooltip, Dropdown, Menu } from 'ant-design-vue'; |
30 | import { ColumnHeightOutlined } from '@ant-design/icons-vue'; | 29 | import { ColumnHeightOutlined } from '@ant-design/icons-vue'; |
31 | - | ||
32 | import { useI18n } from '/@/hooks/web/useI18n'; | 30 | import { useI18n } from '/@/hooks/web/useI18n'; |
33 | import { useTableContext } from '../../hooks/useTableContext'; | 31 | import { useTableContext } from '../../hooks/useTableContext'; |
34 | import { getPopupContainer } from '/@/utils'; | 32 | import { getPopupContainer } from '/@/utils'; |
src/components/Table/src/components/settings/index.vue
@@ -9,14 +9,11 @@ | @@ -9,14 +9,11 @@ | ||
9 | <script lang="ts"> | 9 | <script lang="ts"> |
10 | import type { PropType } from 'vue'; | 10 | import type { PropType } from 'vue'; |
11 | import type { TableSetting, ColumnChangeParam } from '../../types/table'; | 11 | import type { TableSetting, ColumnChangeParam } from '../../types/table'; |
12 | - | ||
13 | import { defineComponent, computed } from 'vue'; | 12 | import { defineComponent, computed } from 'vue'; |
14 | - | ||
15 | import ColumnSetting from './ColumnSetting.vue'; | 13 | import ColumnSetting from './ColumnSetting.vue'; |
16 | import SizeSetting from './SizeSetting.vue'; | 14 | import SizeSetting from './SizeSetting.vue'; |
17 | import RedoSetting from './RedoSetting.vue'; | 15 | import RedoSetting from './RedoSetting.vue'; |
18 | import FullScreenSetting from './FullScreenSetting.vue'; | 16 | import FullScreenSetting from './FullScreenSetting.vue'; |
19 | - | ||
20 | import { useI18n } from '/@/hooks/web/useI18n'; | 17 | import { useI18n } from '/@/hooks/web/useI18n'; |
21 | 18 | ||
22 | export default defineComponent({ | 19 | export default defineComponent({ |
src/components/Table/src/const.ts
@@ -22,5 +22,7 @@ export const DEFAULT_FILTER_FN = defaultFilterFn; | @@ -22,5 +22,7 @@ export const DEFAULT_FILTER_FN = defaultFilterFn; | ||
22 | 22 | ||
23 | // Default layout of table cells | 23 | // Default layout of table cells |
24 | export const DEFAULT_ALIGN = 'center'; | 24 | export const DEFAULT_ALIGN = 'center'; |
25 | + | ||
25 | export const INDEX_COLUMN_FLAG = 'INDEX'; | 26 | export const INDEX_COLUMN_FLAG = 'INDEX'; |
27 | + | ||
26 | export const ACTION_COLUMN_FLAG = 'ACTION'; | 28 | export const ACTION_COLUMN_FLAG = 'ACTION'; |
src/components/Table/src/hooks/useColumns.ts
1 | import type { BasicColumn, BasicTableProps, CellFormat, GetColumnsParams } from '../types/table'; | 1 | import type { BasicColumn, BasicTableProps, CellFormat, GetColumnsParams } from '../types/table'; |
2 | import type { PaginationProps } from '../types/pagination'; | 2 | import type { PaginationProps } from '../types/pagination'; |
3 | import type { ComputedRef } from 'vue'; | 3 | import type { ComputedRef } from 'vue'; |
4 | - | ||
5 | import { unref, Ref, computed, watch, ref, toRaw } from 'vue'; | 4 | import { unref, Ref, computed, watch, ref, toRaw } from 'vue'; |
6 | - | ||
7 | import { renderEditCell } from '../components/editable'; | 5 | import { renderEditCell } from '../components/editable'; |
8 | - | ||
9 | import { usePermission } from '/@/hooks/web/usePermission'; | 6 | import { usePermission } from '/@/hooks/web/usePermission'; |
10 | import { useI18n } from '/@/hooks/web/useI18n'; | 7 | import { useI18n } from '/@/hooks/web/useI18n'; |
11 | - | ||
12 | import { isBoolean, isArray, isString, isObject, isFunction } from '/@/utils/is'; | 8 | import { isBoolean, isArray, isString, isObject, isFunction } from '/@/utils/is'; |
13 | import { isEqual, cloneDeep } from 'lodash-es'; | 9 | import { isEqual, cloneDeep } from 'lodash-es'; |
14 | import { formatToDate } from '/@/utils/dateUtil'; | 10 | import { formatToDate } from '/@/utils/dateUtil'; |
15 | - | ||
16 | import { DEFAULT_ALIGN, PAGE_SIZE, INDEX_COLUMN_FLAG, ACTION_COLUMN_FLAG } from '../const'; | 11 | import { DEFAULT_ALIGN, PAGE_SIZE, INDEX_COLUMN_FLAG, ACTION_COLUMN_FLAG } from '../const'; |
17 | 12 | ||
18 | function handleItem(item: BasicColumn, ellipsis: boolean) { | 13 | function handleItem(item: BasicColumn, ellipsis: boolean) { |
src/components/Table/src/hooks/useDataSource.ts
1 | import type { BasicTableProps, FetchParams, SorterResult } from '../types/table'; | 1 | import type { BasicTableProps, FetchParams, SorterResult } from '../types/table'; |
2 | import type { PaginationProps } from '../types/pagination'; | 2 | import type { PaginationProps } from '../types/pagination'; |
3 | - | ||
4 | import { | 3 | import { |
5 | ref, | 4 | ref, |
6 | unref, | 5 | unref, |
@@ -12,13 +11,10 @@ import { | @@ -12,13 +11,10 @@ import { | ||
12 | Ref, | 11 | Ref, |
13 | watchEffect, | 12 | watchEffect, |
14 | } from 'vue'; | 13 | } from 'vue'; |
15 | - | ||
16 | import { useTimeoutFn } from '/@/hooks/core/useTimeout'; | 14 | import { useTimeoutFn } from '/@/hooks/core/useTimeout'; |
17 | - | ||
18 | import { buildUUID } from '/@/utils/uuid'; | 15 | import { buildUUID } from '/@/utils/uuid'; |
19 | import { isFunction, isBoolean } from '/@/utils/is'; | 16 | import { isFunction, isBoolean } from '/@/utils/is'; |
20 | import { get, cloneDeep } from 'lodash-es'; | 17 | import { get, cloneDeep } from 'lodash-es'; |
21 | - | ||
22 | import { FETCH_SETTING, ROW_KEY, PAGE_SIZE } from '../const'; | 18 | import { FETCH_SETTING, ROW_KEY, PAGE_SIZE } from '../const'; |
23 | 19 | ||
24 | interface ActionType { | 20 | interface ActionType { |
@@ -179,7 +175,10 @@ export function useDataSource( | @@ -179,7 +175,10 @@ export function useDataSource( | ||
179 | if (!api || !isFunction(api)) return; | 175 | if (!api || !isFunction(api)) return; |
180 | try { | 176 | try { |
181 | setLoading(true); | 177 | setLoading(true); |
182 | - const { pageField, sizeField, listField, totalField } = fetchSetting || FETCH_SETTING; | 178 | + const { pageField, sizeField, listField, totalField } = Object.assign( |
179 | + FETCH_SETTING, | ||
180 | + fetchSetting | ||
181 | + ); | ||
183 | let pageParams: Recordable = {}; | 182 | let pageParams: Recordable = {}; |
184 | 183 | ||
185 | const { current = 1, pageSize = PAGE_SIZE } = unref(getPaginationInfo) as PaginationProps; | 184 | const { current = 1, pageSize = PAGE_SIZE } = unref(getPaginationInfo) as PaginationProps; |
src/components/Table/src/hooks/usePagination.tsx
1 | import type { PaginationProps } from '../types/pagination'; | 1 | import type { PaginationProps } from '../types/pagination'; |
2 | import type { BasicTableProps } from '../types/table'; | 2 | import type { BasicTableProps } from '../types/table'; |
3 | - | ||
4 | import { computed, unref, ref, ComputedRef } from 'vue'; | 3 | import { computed, unref, ref, ComputedRef } from 'vue'; |
5 | import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue'; | 4 | import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue'; |
6 | - | ||
7 | import { isBoolean } from '/@/utils/is'; | 5 | import { isBoolean } from '/@/utils/is'; |
8 | - | ||
9 | import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const'; | 6 | import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const'; |
10 | import { useI18n } from '/@/hooks/web/useI18n'; | 7 | import { useI18n } from '/@/hooks/web/useI18n'; |
11 | 8 |
src/components/Table/src/hooks/useRowSelection.ts
1 | import type { BasicTableProps, TableRowSelection } from '../types/table'; | 1 | import type { BasicTableProps, TableRowSelection } from '../types/table'; |
2 | - | ||
3 | import { computed, ref, unref, ComputedRef, Ref, toRaw } from 'vue'; | 2 | import { computed, ref, unref, ComputedRef, Ref, toRaw } from 'vue'; |
4 | import { ROW_KEY } from '../const'; | 3 | import { ROW_KEY } from '../const'; |
5 | 4 |
src/components/Table/src/hooks/useTable.ts
@@ -3,7 +3,6 @@ import type { PaginationProps } from '../types/pagination'; | @@ -3,7 +3,6 @@ import type { PaginationProps } from '../types/pagination'; | ||
3 | import type { DynamicProps } from '/#/utils'; | 3 | import type { DynamicProps } from '/#/utils'; |
4 | import type { FormActionType } from '/@/components/Form'; | 4 | import type { FormActionType } from '/@/components/Form'; |
5 | import type { WatchStopHandle } from 'vue'; | 5 | import type { WatchStopHandle } from 'vue'; |
6 | - | ||
7 | import { getDynamicProps } from '/@/utils'; | 6 | import { getDynamicProps } from '/@/utils'; |
8 | import { ref, onUnmounted, unref, watch, toRaw } from 'vue'; | 7 | import { ref, onUnmounted, unref, watch, toRaw } from 'vue'; |
9 | import { isProdMode } from '/@/utils/env'; | 8 | import { isProdMode } from '/@/utils/env'; |
src/components/Table/src/hooks/useTableContext.ts
1 | import type { Ref } from 'vue'; | 1 | import type { Ref } from 'vue'; |
2 | import type { BasicTableProps, TableActionType } from '../types/table'; | 2 | import type { BasicTableProps, TableActionType } from '../types/table'; |
3 | - | ||
4 | import { provide, inject, ComputedRef } from 'vue'; | 3 | import { provide, inject, ComputedRef } from 'vue'; |
5 | 4 | ||
6 | const key = Symbol('basic-table'); | 5 | const key = Symbol('basic-table'); |
src/components/Table/src/hooks/useTableExpand.ts
1 | import type { ComputedRef, Ref } from 'vue'; | 1 | import type { ComputedRef, Ref } from 'vue'; |
2 | import type { BasicTableProps } from '../types/table'; | 2 | import type { BasicTableProps } from '../types/table'; |
3 | - | ||
4 | import { computed, unref, ref, toRaw } from 'vue'; | 3 | import { computed, unref, ref, toRaw } from 'vue'; |
5 | import { ROW_KEY } from '../const'; | 4 | import { ROW_KEY } from '../const'; |
6 | 5 |
src/components/Table/src/hooks/useTableForm.ts
@@ -3,6 +3,7 @@ import type { BasicTableProps, FetchParams } from '../types/table'; | @@ -3,6 +3,7 @@ import type { BasicTableProps, FetchParams } from '../types/table'; | ||
3 | import { unref, computed } from 'vue'; | 3 | import { unref, computed } from 'vue'; |
4 | import type { FormProps } from '/@/components/Form'; | 4 | import type { FormProps } from '/@/components/Form'; |
5 | import { isFunction } from '/@/utils/is'; | 5 | import { isFunction } from '/@/utils/is'; |
6 | + | ||
6 | export function useTableForm( | 7 | export function useTableForm( |
7 | propsRef: ComputedRef<BasicTableProps>, | 8 | propsRef: ComputedRef<BasicTableProps>, |
8 | slots: Slots, | 9 | slots: Slots, |
src/components/Table/src/hooks/useTableHeader.ts
1 | import type { ComputedRef, Slots } from 'vue'; | 1 | import type { ComputedRef, Slots } from 'vue'; |
2 | import type { BasicTableProps, InnerHandlers } from '../types/table'; | 2 | import type { BasicTableProps, InnerHandlers } from '../types/table'; |
3 | - | ||
4 | import { unref, computed, h } from 'vue'; | 3 | import { unref, computed, h } from 'vue'; |
5 | import TableHeader from '../components/TableHeader.vue'; | 4 | import TableHeader from '../components/TableHeader.vue'; |
6 | - | ||
7 | import { isString } from '/@/utils/is'; | 5 | import { isString } from '/@/utils/is'; |
8 | import { getSlot } from '/@/utils/helper/tsxHelper'; | 6 | import { getSlot } from '/@/utils/helper/tsxHelper'; |
9 | 7 |
src/components/Table/src/hooks/useTableScroll.ts
1 | import type { BasicTableProps, TableRowSelection, BasicColumn } from '../types/table'; | 1 | import type { BasicTableProps, TableRowSelection, BasicColumn } from '../types/table'; |
2 | import type { Ref, ComputedRef } from 'vue'; | 2 | import type { Ref, ComputedRef } from 'vue'; |
3 | - | ||
4 | import { computed, unref, ref, nextTick, watch } from 'vue'; | 3 | import { computed, unref, ref, nextTick, watch } from 'vue'; |
5 | - | ||
6 | import { getViewportOffset } from '/@/utils/domUtils'; | 4 | import { getViewportOffset } from '/@/utils/domUtils'; |
7 | import { isBoolean } from '/@/utils/is'; | 5 | import { isBoolean } from '/@/utils/is'; |
8 | - | ||
9 | import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn'; | 6 | import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn'; |
10 | import { useModalContext } from '/@/components/Modal'; | 7 | import { useModalContext } from '/@/components/Modal'; |
11 | import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated'; | 8 | import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated'; |
src/components/Table/src/hooks/useTableStyle.ts
1 | import type { ComputedRef } from 'vue'; | 1 | import type { ComputedRef } from 'vue'; |
2 | import type { BasicTableProps, TableCustomRecord } from '../types/table'; | 2 | import type { BasicTableProps, TableCustomRecord } from '../types/table'; |
3 | - | ||
4 | import { unref } from 'vue'; | 3 | import { unref } from 'vue'; |
5 | import { isFunction } from '/@/utils/is'; | 4 | import { isFunction } from '/@/utils/is'; |
5 | + | ||
6 | export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls: string) { | 6 | export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls: string) { |
7 | function getRowClassName(record: TableCustomRecord, index: number) { | 7 | function getRowClassName(record: TableCustomRecord, index: number) { |
8 | const { striped, rowClassName } = unref(propsRef); | 8 | const { striped, rowClassName } = unref(propsRef); |
@@ -13,7 +13,5 @@ export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls: | @@ -13,7 +13,5 @@ export function useTableStyle(propsRef: ComputedRef<BasicTableProps>, prefixCls: | ||
13 | return (index || 0) % 2 === 1 ? `${prefixCls}-row__striped` : ''; | 13 | return (index || 0) % 2 === 1 ? `${prefixCls}-row__striped` : ''; |
14 | } | 14 | } |
15 | 15 | ||
16 | - return { | ||
17 | - getRowClassName, | ||
18 | - }; | 16 | + return { getRowClassName }; |
19 | } | 17 | } |
src/components/Table/src/types/table.ts
@@ -165,7 +165,7 @@ export interface BasicTableProps<T = any> { | @@ -165,7 +165,7 @@ export interface BasicTableProps<T = any> { | ||
165 | // ๆฅ่ฏขๆกไปถ่ฏทๆฑไนๅๅค็ | 165 | // ๆฅ่ฏขๆกไปถ่ฏทๆฑไนๅๅค็ |
166 | handleSearchInfoFn?: Fn; | 166 | handleSearchInfoFn?: Fn; |
167 | // ่ฏทๆฑๆฅๅฃ้ ็ฝฎ | 167 | // ่ฏทๆฑๆฅๅฃ้ ็ฝฎ |
168 | - fetchSetting?: FetchSetting; | 168 | + fetchSetting?: Partial<FetchSetting>; |
169 | // ็ซๅณ่ฏทๆฑๆฅๅฃ | 169 | // ็ซๅณ่ฏทๆฑๆฅๅฃ |
170 | immediate?: boolean; | 170 | immediate?: boolean; |
171 | // ๅจๅผ่ตทๆ็ดข่กจๅ็ๆถๅ๏ผๅฆๆๆฒกๆๆฐๆฎๆฏๅฆๆพ็คบ่กจๆ ผ | 171 | // ๅจๅผ่ตทๆ็ดข่กจๅ็ๆถๅ๏ผๅฆๆๆฒกๆๆฐๆฎๆฏๅฆๆพ็คบ่กจๆ ผ |
yarn.lock
@@ -1191,10 +1191,10 @@ | @@ -1191,10 +1191,10 @@ | ||
1191 | dependencies: | 1191 | dependencies: |
1192 | cross-fetch "^3.0.6" | 1192 | cross-fetch "^3.0.6" |
1193 | 1193 | ||
1194 | -"@iconify/json@^1.1.355": | ||
1195 | - version "1.1.355" | ||
1196 | - resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.355.tgz#cb2363653e4df6763e87e8716b3508eff0da3f1d" | ||
1197 | - integrity sha512-xHhdtI/YH8fFF/IG6YYs28Hi1SRr4ZzqRoi09wds7iX4cBvdP6RqnUxaxgiksSFSEAqF+8sZrhLDo3hkAT5v2w== | 1194 | +"@iconify/json@^1.1.356": |
1195 | + version "1.1.356" | ||
1196 | + resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.356.tgz#248b25843cf91618dff7ef4494a1b331efd1eb82" | ||
1197 | + integrity sha512-HeG9neoS5oatUTF6zlAAyDNPxbj0NvGDFqzd4wBtqu5mE4/xjhDO+S1obkgqpBrDedgoXDwIFkGx9Mx1HJCnaw== | ||
1198 | 1198 | ||
1199 | "@intlify/core-base@9.1.6": | 1199 | "@intlify/core-base@9.1.6": |
1200 | version "9.1.6" | 1200 | version "9.1.6" |
@@ -1787,13 +1787,13 @@ | @@ -1787,13 +1787,13 @@ | ||
1787 | "@types/unist" "*" | 1787 | "@types/unist" "*" |
1788 | "@types/vfile-message" "*" | 1788 | "@types/vfile-message" "*" |
1789 | 1789 | ||
1790 | -"@typescript-eslint/eslint-plugin@^4.26.1": | ||
1791 | - version "4.26.1" | ||
1792 | - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz#b9c7313321cb837e2bf8bebe7acc2220659e67d3" | ||
1793 | - integrity sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw== | 1790 | +"@typescript-eslint/eslint-plugin@^4.27.0": |
1791 | + version "4.27.0" | ||
1792 | + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz#0b7fc974e8bc9b2b5eb98ed51427b0be529b4ad0" | ||
1793 | + integrity sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ== | ||
1794 | dependencies: | 1794 | dependencies: |
1795 | - "@typescript-eslint/experimental-utils" "4.26.1" | ||
1796 | - "@typescript-eslint/scope-manager" "4.26.1" | 1795 | + "@typescript-eslint/experimental-utils" "4.27.0" |
1796 | + "@typescript-eslint/scope-manager" "4.27.0" | ||
1797 | debug "^4.3.1" | 1797 | debug "^4.3.1" |
1798 | functional-red-black-tree "^1.0.1" | 1798 | functional-red-black-tree "^1.0.1" |
1799 | lodash "^4.17.21" | 1799 | lodash "^4.17.21" |
@@ -1801,60 +1801,60 @@ | @@ -1801,60 +1801,60 @@ | ||
1801 | semver "^7.3.5" | 1801 | semver "^7.3.5" |
1802 | tsutils "^3.21.0" | 1802 | tsutils "^3.21.0" |
1803 | 1803 | ||
1804 | -"@typescript-eslint/experimental-utils@4.26.1": | ||
1805 | - version "4.26.1" | ||
1806 | - resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz#a35980a2390da9232aa206b27f620eab66e94142" | ||
1807 | - integrity sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ== | 1804 | +"@typescript-eslint/experimental-utils@4.27.0": |
1805 | + version "4.27.0" | ||
1806 | + resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c" | ||
1807 | + integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ== | ||
1808 | dependencies: | 1808 | dependencies: |
1809 | "@types/json-schema" "^7.0.7" | 1809 | "@types/json-schema" "^7.0.7" |
1810 | - "@typescript-eslint/scope-manager" "4.26.1" | ||
1811 | - "@typescript-eslint/types" "4.26.1" | ||
1812 | - "@typescript-eslint/typescript-estree" "4.26.1" | 1810 | + "@typescript-eslint/scope-manager" "4.27.0" |
1811 | + "@typescript-eslint/types" "4.27.0" | ||
1812 | + "@typescript-eslint/typescript-estree" "4.27.0" | ||
1813 | eslint-scope "^5.1.1" | 1813 | eslint-scope "^5.1.1" |
1814 | eslint-utils "^3.0.0" | 1814 | eslint-utils "^3.0.0" |
1815 | 1815 | ||
1816 | -"@typescript-eslint/parser@^4.26.1": | ||
1817 | - version "4.26.1" | ||
1818 | - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz#cecfdd5eb7a5c13aabce1c1cfd7fbafb5a0f1e8e" | ||
1819 | - integrity sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ== | 1816 | +"@typescript-eslint/parser@^4.27.0": |
1817 | + version "4.27.0" | ||
1818 | + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94" | ||
1819 | + integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ== | ||
1820 | dependencies: | 1820 | dependencies: |
1821 | - "@typescript-eslint/scope-manager" "4.26.1" | ||
1822 | - "@typescript-eslint/types" "4.26.1" | ||
1823 | - "@typescript-eslint/typescript-estree" "4.26.1" | 1821 | + "@typescript-eslint/scope-manager" "4.27.0" |
1822 | + "@typescript-eslint/types" "4.27.0" | ||
1823 | + "@typescript-eslint/typescript-estree" "4.27.0" | ||
1824 | debug "^4.3.1" | 1824 | debug "^4.3.1" |
1825 | 1825 | ||
1826 | -"@typescript-eslint/scope-manager@4.26.1": | ||
1827 | - version "4.26.1" | ||
1828 | - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz#075a74a15ff33ee3a7ed33e5fce16ee86689f662" | ||
1829 | - integrity sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ== | 1826 | +"@typescript-eslint/scope-manager@4.27.0": |
1827 | + version "4.27.0" | ||
1828 | + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d" | ||
1829 | + integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw== | ||
1830 | dependencies: | 1830 | dependencies: |
1831 | - "@typescript-eslint/types" "4.26.1" | ||
1832 | - "@typescript-eslint/visitor-keys" "4.26.1" | 1831 | + "@typescript-eslint/types" "4.27.0" |
1832 | + "@typescript-eslint/visitor-keys" "4.27.0" | ||
1833 | 1833 | ||
1834 | -"@typescript-eslint/types@4.26.1": | ||
1835 | - version "4.26.1" | ||
1836 | - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz#9e7c523f73c34b04a765e4167ca5650436ef1d38" | ||
1837 | - integrity sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg== | 1834 | +"@typescript-eslint/types@4.27.0": |
1835 | + version "4.27.0" | ||
1836 | + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8" | ||
1837 | + integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA== | ||
1838 | 1838 | ||
1839 | -"@typescript-eslint/typescript-estree@4.26.1": | ||
1840 | - version "4.26.1" | ||
1841 | - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz#b2ce2e789233d62283fae2c16baabd4f1dbc9633" | ||
1842 | - integrity sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg== | 1839 | +"@typescript-eslint/typescript-estree@4.27.0": |
1840 | + version "4.27.0" | ||
1841 | + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da" | ||
1842 | + integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g== | ||
1843 | dependencies: | 1843 | dependencies: |
1844 | - "@typescript-eslint/types" "4.26.1" | ||
1845 | - "@typescript-eslint/visitor-keys" "4.26.1" | 1844 | + "@typescript-eslint/types" "4.27.0" |
1845 | + "@typescript-eslint/visitor-keys" "4.27.0" | ||
1846 | debug "^4.3.1" | 1846 | debug "^4.3.1" |
1847 | globby "^11.0.3" | 1847 | globby "^11.0.3" |
1848 | is-glob "^4.0.1" | 1848 | is-glob "^4.0.1" |
1849 | semver "^7.3.5" | 1849 | semver "^7.3.5" |
1850 | tsutils "^3.21.0" | 1850 | tsutils "^3.21.0" |
1851 | 1851 | ||
1852 | -"@typescript-eslint/visitor-keys@4.26.1": | ||
1853 | - version "4.26.1" | ||
1854 | - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz#0d55ea735cb0d8903b198017d6d4f518fdaac546" | ||
1855 | - integrity sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw== | 1852 | +"@typescript-eslint/visitor-keys@4.27.0": |
1853 | + version "4.27.0" | ||
1854 | + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81" | ||
1855 | + integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg== | ||
1856 | dependencies: | 1856 | dependencies: |
1857 | - "@typescript-eslint/types" "4.26.1" | 1857 | + "@typescript-eslint/types" "4.27.0" |
1858 | eslint-visitor-keys "^2.0.0" | 1858 | eslint-visitor-keys "^2.0.0" |
1859 | 1859 | ||
1860 | "@vitejs/plugin-legacy@^1.4.1": | 1860 | "@vitejs/plugin-legacy@^1.4.1": |
@@ -1966,7 +1966,7 @@ | @@ -1966,7 +1966,7 @@ | ||
1966 | 1966 | ||
1967 | "@vue/compiler-sfc@3.0.11", "@vue/compiler-sfc@^3.0.11": | 1967 | "@vue/compiler-sfc@3.0.11", "@vue/compiler-sfc@^3.0.11": |
1968 | version "3.0.11" | 1968 | version "3.0.11" |
1969 | - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679" | 1969 | + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679" |
1970 | integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw== | 1970 | integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw== |
1971 | dependencies: | 1971 | dependencies: |
1972 | "@babel/parser" "^7.13.9" | 1972 | "@babel/parser" "^7.13.9" |
@@ -2048,10 +2048,10 @@ | @@ -2048,10 +2048,10 @@ | ||
2048 | dependencies: | 2048 | dependencies: |
2049 | vue-demi "*" | 2049 | vue-demi "*" |
2050 | 2050 | ||
2051 | -"@windicss/plugin-utils@1.0.3": | ||
2052 | - version "1.0.3" | ||
2053 | - resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-1.0.3.tgz#04d039ef56b58180079df3f9b3bd8a21a57368d3" | ||
2054 | - integrity sha512-SBYjmWBO+dOqxJgyyOAETOuMdcugvVgZYQc3rb7KtcTW5u9UkFXtiuGdoq8cWyFpSkn46gmjCb4WNbY3kEIVnQ== | 2051 | +"@windicss/plugin-utils@1.0.4": |
2052 | + version "1.0.4" | ||
2053 | + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-1.0.4.tgz#dd375789d610a8700d540bb09d296a163d7588b3" | ||
2054 | + integrity sha512-1Eqw+/lhk3vqW8vgttmLDbzE6YIFL047Kuy/v6jhQd3w7RG+fPbQE6YwnqJerPYvCcRwujQ9ABrLr0+cS+i0tQ== | ||
2055 | dependencies: | 2055 | dependencies: |
2056 | "@antfu/utils" "^0.1.6" | 2056 | "@antfu/utils" "^0.1.6" |
2057 | debug "^4.3.2" | 2057 | debug "^4.3.2" |
@@ -3909,9 +3909,9 @@ doctypes@^1.1.0: | @@ -3909,9 +3909,9 @@ doctypes@^1.1.0: | ||
3909 | integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= | 3909 | integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= |
3910 | 3910 | ||
3911 | dom-align@^1.10.4: | 3911 | dom-align@^1.10.4: |
3912 | - version "1.12.0" | ||
3913 | - resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c" | ||
3914 | - integrity sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA== | 3912 | + version "1.12.2" |
3913 | + resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.2.tgz#0f8164ebd0c9c21b0c790310493cd855892acd4b" | ||
3914 | + integrity sha512-pHuazgqrsTFrGU2WLDdXxCFabkdQDx72ddkraZNih1KsMcN5qsRSTR9O4VJRlwTPCPb5COYg3LOfiMHHcPInHg== | ||
3915 | 3915 | ||
3916 | dom-scroll-into-view@^2.0.0: | 3916 | dom-scroll-into-view@^2.0.0: |
3917 | version "2.0.1" | 3917 | version "2.0.1" |
@@ -4197,10 +4197,10 @@ es-to-primitive@^1.2.1: | @@ -4197,10 +4197,10 @@ es-to-primitive@^1.2.1: | ||
4197 | is-date-object "^1.0.1" | 4197 | is-date-object "^1.0.1" |
4198 | is-symbol "^1.0.2" | 4198 | is-symbol "^1.0.2" |
4199 | 4199 | ||
4200 | -esbuild-node-loader@^0.0.0: | ||
4201 | - version "0.0.0" | ||
4202 | - resolved "https://registry.npmjs.org/esbuild-node-loader/-/esbuild-node-loader-0.0.0.tgz#2243724e6f57e401ac5b68a6aeb6531e3d7c6078" | ||
4203 | - integrity sha512-f4Zs1sWMst3PwVfiRpZIos/BV31a8KVSyIXodXeQjNkgc1mLIBKw7p0uY7qbLoq7ICfrsQJgvXIwPHRSHd5qSA== | 4200 | +esbuild-node-loader@^0.1.1: |
4201 | + version "0.1.1" | ||
4202 | + resolved "https://registry.npmjs.org/esbuild-node-loader/-/esbuild-node-loader-0.1.1.tgz#b43937133e70435f9dd1dc058a5ac27ccc7addbe" | ||
4203 | + integrity sha512-n24xYzMfKmPupUZgs0QYBr52HUSh1M1vDtBfkEVa6pdENqo5+U5WP+zaj4Iw2MinuYk1axLW8+NVutrBCkrdmA== | ||
4204 | dependencies: | 4204 | dependencies: |
4205 | esbuild "^0.12.6" | 4205 | esbuild "^0.12.6" |
4206 | 4206 | ||
@@ -4279,10 +4279,10 @@ eslint-plugin-prettier@^3.4.0: | @@ -4279,10 +4279,10 @@ eslint-plugin-prettier@^3.4.0: | ||
4279 | dependencies: | 4279 | dependencies: |
4280 | prettier-linter-helpers "^1.0.0" | 4280 | prettier-linter-helpers "^1.0.0" |
4281 | 4281 | ||
4282 | -eslint-plugin-vue@^7.11.0: | ||
4283 | - version "7.11.0" | ||
4284 | - resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz#c19b098899b7e3cd692beffbbe73611064ef1ea6" | ||
4285 | - integrity sha512-Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw== | 4282 | +eslint-plugin-vue@^7.11.1: |
4283 | + version "7.11.1" | ||
4284 | + resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz#77eb4b44032d5cca79f9af21d06991d8694a314a" | ||
4285 | + integrity sha512-lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw== | ||
4286 | dependencies: | 4286 | dependencies: |
4287 | eslint-utils "^2.1.0" | 4287 | eslint-utils "^2.1.0" |
4288 | natural-compare "^1.4.0" | 4288 | natural-compare "^1.4.0" |
@@ -4366,14 +4366,14 @@ eslint@^7.28.0: | @@ -4366,14 +4366,14 @@ eslint@^7.28.0: | ||
4366 | text-table "^0.2.0" | 4366 | text-table "^0.2.0" |
4367 | v8-compile-cache "^2.0.3" | 4367 | v8-compile-cache "^2.0.3" |
4368 | 4368 | ||
4369 | -esno@^0.7.2: | ||
4370 | - version "0.7.2" | ||
4371 | - resolved "https://registry.npmjs.org/esno/-/esno-0.7.2.tgz#64f557e5263ed729f572cabcdfac9bc7cda10fa4" | ||
4372 | - integrity sha512-qNb3hiDZqp84msR0+yrksCu7MIA8aDMkglKvfrOww7DkG9ah1acGJcP5yxUH7EmM5WpwZ0cLPQUw17nvTMY4mA== | 4369 | +esno@^0.7.3: |
4370 | + version "0.7.3" | ||
4371 | + resolved "https://registry.npmjs.org/esno/-/esno-0.7.3.tgz#e99b063241d0527df4de2c69471dfe91c00a314b" | ||
4372 | + integrity sha512-ONTHZLBipMC9uK9oqASzqYGCrjcqp/N0NXt/Q0WpYw/Ikm9he+rYER2ATx6czaFcMvwrbIXBlNe9hSEiTrNKow== | ||
4373 | dependencies: | 4373 | dependencies: |
4374 | cross-spawn "^7.0.3" | 4374 | cross-spawn "^7.0.3" |
4375 | esbuild "^0.12.8" | 4375 | esbuild "^0.12.8" |
4376 | - esbuild-node-loader "^0.0.0" | 4376 | + esbuild-node-loader "^0.1.1" |
4377 | esbuild-register "^2.6.0" | 4377 | esbuild-register "^2.6.0" |
4378 | 4378 | ||
4379 | espree@^6.2.1: | 4379 | espree@^6.2.1: |
@@ -5818,10 +5818,10 @@ inquirer@6.5.2: | @@ -5818,10 +5818,10 @@ inquirer@6.5.2: | ||
5818 | strip-ansi "^5.1.0" | 5818 | strip-ansi "^5.1.0" |
5819 | through "^2.3.6" | 5819 | through "^2.3.6" |
5820 | 5820 | ||
5821 | -inquirer@^8.1.0: | ||
5822 | - version "8.1.0" | ||
5823 | - resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.1.0.tgz#68ce5ce5376cf0e89765c993d8b7c1e62e184d69" | ||
5824 | - integrity sha512-1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw== | 5821 | +inquirer@^8.1.1: |
5822 | + version "8.1.1" | ||
5823 | + resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.1.1.tgz#7c53d94c6d03011c7bb2a947f0dca3b98246c26a" | ||
5824 | + integrity sha512-hUDjc3vBkh/uk1gPfMAD/7Z188Q8cvTGl0nxwaCdwSbzFh6ZKkZh+s2ozVxbE5G9ZNRyeY0+lgbAIOUFsFf98w== | ||
5825 | dependencies: | 5825 | dependencies: |
5826 | ansi-escapes "^4.2.1" | 5826 | ansi-escapes "^4.2.1" |
5827 | chalk "^4.1.1" | 5827 | chalk "^4.1.1" |
@@ -10642,12 +10642,12 @@ vite-plugin-theme@^0.8.1: | @@ -10642,12 +10642,12 @@ vite-plugin-theme@^0.8.1: | ||
10642 | esbuild-plugin-alias "^0.1.2" | 10642 | esbuild-plugin-alias "^0.1.2" |
10643 | tinycolor2 "^1.4.2" | 10643 | tinycolor2 "^1.4.2" |
10644 | 10644 | ||
10645 | -vite-plugin-windicss@^1.0.3: | ||
10646 | - version "1.0.3" | ||
10647 | - resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-1.0.3.tgz#bd45cfee13777e7b57c37a257ebcb7e73fee94ab" | ||
10648 | - integrity sha512-y9pudcMajdI88PTs49qGftlfAvsLUUhK2Eig+xn5sgxPCbAc3Rj5phXJkRzGDqfmEzGwbpF6JwjmiGmZkm8V+g== | 10645 | +vite-plugin-windicss@^1.0.4: |
10646 | + version "1.0.4" | ||
10647 | + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-1.0.4.tgz#8515822266efcd359ea506c280b00397954f5fc6" | ||
10648 | + integrity sha512-3foNePu1+DHBrCMZhKf84rNH7pgWUoN53h1cKrnLBI4UruCCBmVvZ8W2Kr5cNGgh/ME/nslON2RQPoHxE+F0gA== | ||
10649 | dependencies: | 10649 | dependencies: |
10650 | - "@windicss/plugin-utils" "1.0.3" | 10650 | + "@windicss/plugin-utils" "1.0.4" |
10651 | chalk "^4.1.1" | 10651 | chalk "^4.1.1" |
10652 | debug "^4.3.2" | 10652 | debug "^4.3.2" |
10653 | windicss "^3.1.3" | 10653 | windicss "^3.1.3" |