From e024f6a6e76d531fa00d8895fb0cfca9f1cc15a4 Mon Sep 17 00:00:00 2001 From: vben Date: Wed, 1 Dec 2021 23:09:28 +0800 Subject: [PATCH] fix: typo --- build/vite/plugin/index.ts | 4 ---- package.json | 2 ++ pnpm-lock.yaml | 4 ++++ src/components/Table/index.ts | 1 + src/components/Table/src/props.ts | 26 ++++++++++++------------- src/design/ant/btn.less | 32 ------------------------------- src/design/ant/index.less | 6 ------ vite.config.ts | 2 ++ 8 files changed, 22 insertions(+), 55 deletions(-) diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts index 93a2c00f..c8609217 100644 --- a/build/vite/plugin/index.ts +++ b/build/vite/plugin/index.ts @@ -14,7 +14,6 @@ import { configVisualizerConfig } from './visualizer'; import { configThemePlugin } from './theme'; import { configImageminPlugin } from './imagemin'; import { configSvgIconsPlugin } from './svgSprite'; -import { configHmrPlugin } from './hmr'; export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) { const { @@ -37,9 +36,6 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) { // vite-plugin-windicss vitePlugins.push(windiCSS()); - // TODO - !isBuild && vitePlugins.push(configHmrPlugin()); - // @vitejs/plugin-legacy VITE_LEGACY && isBuild && vitePlugins.push(legacy()); diff --git a/package.json b/package.json index 8e650e48..903e4074 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,8 @@ "@iconify/iconify": "^2.1.0", "@logicflow/core": "^0.7.11", "@logicflow/extension": "^0.7.11", + "@vue/runtime-core": "^3.2.23", + "@vue/shared": "^3.2.23", "@vueuse/core": "^7.1.2", "@vueuse/shared": "^7.1.2", "@zxcvbn-ts/core": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a1a44c2..1948ed54 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,6 +36,8 @@ specifiers: '@vitejs/plugin-vue': ^1.10.1 '@vitejs/plugin-vue-jsx': ^1.3.0 '@vue/compiler-sfc': 3.2.23 + '@vue/runtime-core': ^3.2.23 + '@vue/shared': ^3.2.23 '@vue/test-utils': ^2.0.0-rc.17 '@vueuse/core': ^7.1.2 '@vueuse/shared': ^7.1.2 @@ -122,6 +124,8 @@ dependencies: '@iconify/iconify': 2.1.0 '@logicflow/core': 0.7.11 '@logicflow/extension': 0.7.11 + '@vue/runtime-core': 3.2.23 + '@vue/shared': 3.2.23 '@vueuse/core': 7.1.2_vue@3.2.23 '@vueuse/shared': 7.1.2_vue@3.2.23 '@zxcvbn-ts/core': 1.0.0 diff --git a/src/components/Table/index.ts b/src/components/Table/index.ts index 7fe08c9d..1ec9568b 100644 --- a/src/components/Table/index.ts +++ b/src/components/Table/index.ts @@ -2,6 +2,7 @@ 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'; diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts index f63da4ce..c0ca27ab 100644 --- a/src/components/Table/src/props.ts +++ b/src/components/Table/src/props.ts @@ -15,10 +15,10 @@ import { DEFAULT_FILTER_FN, DEFAULT_SORT_FN, FETCH_SETTING, DEFAULT_SIZE } from import { propTypes } from '/@/utils/propTypes'; export const basicProps = { - clickToRowSelect: propTypes.bool.def(true), - isTreeTable: propTypes.bool.def(false), + clickToRowSelect: { type: Boolean, default: true }, + isTreeTable: Boolean, tableSetting: propTypes.shape({}), - inset: propTypes.bool, + inset: Boolean, sortFn: { type: Function as PropType<(sortInfo: SorterResult) => any>, default: DEFAULT_SORT_FN, @@ -27,10 +27,10 @@ export const basicProps = { type: Function as PropType<(data: Partial>) => any>, default: DEFAULT_FILTER_FN, }, - showTableSetting: propTypes.bool, - autoCreateKey: propTypes.bool.def(true), - striped: propTypes.bool.def(true), - showSummary: propTypes.bool, + showTableSetting: Boolean, + autoCreateKey: { type: Boolean, default: true }, + striped: { type: Boolean, default: true }, + showSummary: Boolean, summaryFunc: { type: [Function, Array] as PropType<(...arg: any[]) => any[]>, default: null, @@ -40,7 +40,7 @@ export const basicProps = { default: null, }, indentSize: propTypes.number.def(24), - canColDrag: propTypes.bool.def(true), + canColDrag: { type: Boolean, default: true }, api: { type: Function as PropType<(...arg: any[]) => Promise>, default: null, @@ -64,8 +64,8 @@ export const basicProps = { }, }, // 立即请求接口 - immediate: propTypes.bool.def(true), - emptyDataIsShowTable: propTypes.bool.def(true), + immediate: { type: Boolean, default: true }, + emptyDataIsShowTable: { type: Boolean, default: true }, // 额外的请求参数 searchInfo: { type: Object as PropType, @@ -87,7 +87,7 @@ export const basicProps = { type: [Array] as PropType, default: () => [], }, - showIndexColumn: propTypes.bool.def(true), + showIndexColumn: { type: Boolean, default: true }, indexColumnProps: { type: Object as PropType, default: null, @@ -96,8 +96,8 @@ export const basicProps = { type: Object as PropType, default: null, }, - ellipsis: propTypes.bool.def(true), - canResize: propTypes.bool.def(true), + ellipsis: { type: Boolean, default: true }, + canResize: { type: Boolean, default: true }, clearSelectOnPageChange: propTypes.bool, resizeHeightOffset: propTypes.number.def(0), rowSelection: { diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index ab194f16..c997d016 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -1,19 +1,5 @@ // button reset .ant-btn { - // display: inline-flex; - // justify-content: center; - // align-items: center; - // &.ant-btn-success:not(.ant-btn-link), - // &.ant-btn-error:not(.ant-btn-link), - // &.ant-btn-warning:not(.ant-btn-link), - // &.ant-btn-primary:not(.ant-btn-link) { - // box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08) !important; - // } - // &-group { - // .ant-btn:not(:first-child) { - // bottom: 1px; - // } - // } &-link:hover, &-link:focus, &-link:active { @@ -29,23 +15,12 @@ color: @white; background-color: @button-primary-hover-color; } - // - //&[disabled], - //&[disabled]:hover { - // color: fade(@button-cancel-color, 40%) !important; - // background-color: fade(@button-cancel-bg-color, 40%) !important; - // border-color: fade(@button-cancel-border-color, 40%) !important; - //} } &-primary:not(&-background-ghost):not([disabled]) { color: @white; } - //&-primary:not(&-background-ghost) { - // border-width: 0; - //} - &-default { color: @button-cancel-color; background-color: @button-cancel-bg-color; @@ -127,13 +102,6 @@ background-color: @button-success-active-color; border-color: @button-success-active-color; } - - //&[disabled], - //&[disabled]:hover { - // color: @white; - // background-color: fade(@button-success-color, 40%); - // border-color: fade(@button-success-color, 40%); - //} } &-warning.ant-btn-link:not([disabled='disabled']) { diff --git a/src/design/ant/index.less b/src/design/ant/index.less index fc9349ce..f9334bb6 100644 --- a/src/design/ant/index.less +++ b/src/design/ant/index.less @@ -1,12 +1,6 @@ @import './pagination.less'; @import './input.less'; @import './btn.less'; -// @import './table.less'; - -// TODO beta.11 fix -.ant-col { - width: 100%; -} .ant-image-preview-root { img { diff --git a/vite.config.ts b/vite.config.ts index 2ac61e0b..2a887470 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -95,6 +95,8 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { optimizeDeps: { // @iconify/iconify: The dependency is dynamically and virtually loaded by @purge-icons/generated, so it needs to be specified explicitly include: [ + '@vue/runtime-core', + '@vue/shared', '@iconify/iconify', 'ant-design-vue/es/locale/zh_CN', 'ant-design-vue/es/locale/en_US',