diff --git a/build/script/preserve.ts b/build/script/preserve.ts index f3384c7254b445b80f83695784af1aedbe4253d1..443ad881e53f24d39da20340200aa7e5ffb22005 100644 --- a/build/script/preserve.ts +++ b/build/script/preserve.ts @@ -25,7 +25,7 @@ export async function runPreserve() { process.exit(1); } - fs.mkdirp(resolve('build/.cache')); + await fs.mkdirp(resolve('build/.cache')); function checkPkgUpdate() { const pkg = require('../../package.json'); const { dependencies, devDependencies } = pkg; diff --git a/build/vite/plugin/dynamicImport/index.ts b/build/vite/plugin/dynamicImport/index.ts index 2f179ad7ee872b17342468568be572fbeacc07bf..73cfe3c51a636da712e7dbdb3a24d1d199463ed0 100644 --- a/build/vite/plugin/dynamicImport/index.ts +++ b/build/vite/plugin/dynamicImport/index.ts @@ -33,7 +33,7 @@ const dynamicImportTransform = function (env: any = {}): Transform { try { const files = glob.sync('src/views/**/**.{vue,tsx}', { cwd: process.cwd() }); - const _code = ` + return ` export default function (id) { switch (id) { ${files @@ -47,7 +47,6 @@ const dynamicImportTransform = function (env: any = {}): Transform { } }\n\n `; - return _code; } catch (error) { console.error(error); return code; diff --git a/src/App.vue b/src/App.vue index bf11fc706c4bc7a75ce6ecc292c0e9ce50a4c1a9..a76f50b1fb90bef314011ecdb2d1fd7b7497542e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ diff --git a/src/components/ContextMenu/index.ts b/src/components/ContextMenu/index.ts index 97009158bc0e66108bf9473baa4f56e82105d71e..f53c42f069400d22264f8f7eed7c6569c6b4d7b9 100644 --- a/src/components/ContextMenu/index.ts +++ b/src/components/ContextMenu/index.ts @@ -3,10 +3,10 @@ import { isClient } from '/@/utils/is'; import { Options, Props } from './src/types'; import { createVNode, render } from 'vue'; const menuManager: { - doms: Element[]; + domList: Element[]; resolve: Fn; } = { - doms: [], + domList: [], resolve: () => {}, }; export const createContextMenu = function (options: Options) { @@ -32,9 +32,9 @@ export const createContextMenu = function (options: Options) { const bodyClick = function () { menuManager.resolve(''); }; - menuManager.doms.push(container); + menuManager.domList.push(container); const remove = function () { - menuManager.doms.forEach((dom: Element) => { + menuManager.domList.forEach((dom: Element) => { try { document.body.removeChild(dom); } catch (error) {} @@ -55,7 +55,7 @@ export const createContextMenu = function (options: Options) { export const unMountedContextMenu = function () { if (menuManager) { menuManager.resolve(''); - menuManager.doms = []; + menuManager.domList = []; } }; diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx index f94352670752408e6f1909f16ed0a47d2e3cf6e8..72a120dd4d5de7586372152716cea114a159108c 100644 --- a/src/components/Dropdown/Dropdown.tsx +++ b/src/components/Dropdown/Dropdown.tsx @@ -34,6 +34,7 @@ export default defineComponent({ )} , + // @ts-ignore divider && , ]; })} diff --git a/src/components/Excel/src/ImportExcel.vue b/src/components/Excel/src/ImportExcel.vue index 9c706545043d21f33c0679c1fdf36fe219a2c018..f31bec0dd348370ee4a7af8dcfd67bd9a2ae3df1 100644 --- a/src/components/Excel/src/ImportExcel.vue +++ b/src/components/Excel/src/ImportExcel.vue @@ -96,7 +96,7 @@ // fix can't select the same excel inputRefDom.value = ''; } - readerData(rawFile); + await readerData(rawFile); } /** diff --git a/src/components/Form/src/FormItem.tsx b/src/components/Form/src/FormItem.tsx index 2ffd9bb8474f185dac13012c264549c3601d0932..567d7703840d5062f9c296608217540e440867a2 100644 --- a/src/components/Form/src/FormItem.tsx +++ b/src/components/Form/src/FormItem.tsx @@ -2,7 +2,7 @@ import type { PropType } from 'vue'; import type { FormProps } from './types/form'; import type { FormSchema } from './types/form'; import type { ValidationRule } from 'ant-design-vue/lib/form/Form'; -import type { TableActionType } from '../../Table/src/types/table'; +import type { TableActionType } from '/@/components/Table'; import { defineComponent, computed, unref, toRef } from 'vue'; import { Form, Col } from 'ant-design-vue'; @@ -16,7 +16,7 @@ import { upperFirst, cloneDeep } from 'lodash-es'; import { useItemLabelWidth } from './hooks/useLabelWidth'; import { ComponentType } from './types'; -import { isNumber } from '../../../utils/is'; +import { isNumber } from '/@/utils/is'; export default defineComponent({ name: 'BasicFormItem', diff --git a/src/components/Form/src/props.ts b/src/components/Form/src/props.ts index 63bcbd51904f7ca5b91640cae05f867ddb1a8b26..b4dfed8b6db781d383e7e38f04a39917af9f7ba9 100644 --- a/src/components/Form/src/props.ts +++ b/src/components/Form/src/props.ts @@ -1,7 +1,7 @@ import type { FieldMapToTime, FormSchema } from './types/form'; import type { PropType } from 'vue'; import type { ColEx } from './types'; -import { TableActionType } from '../../Table/src/types/table'; +import { TableActionType } from '/@/components/Table'; export const basicProps = { model: { diff --git a/src/components/Menu/src/BasicMenu.tsx b/src/components/Menu/src/BasicMenu.tsx index 5842134c403a52e3e5d01be41212f45be39b54a9..dcd609269451487fc11f8ee2282ceb3188b30ce3 100644 --- a/src/components/Menu/src/BasicMenu.tsx +++ b/src/components/Menu/src/BasicMenu.tsx @@ -6,7 +6,7 @@ import { Menu } from 'ant-design-vue'; import SearchInput from './SearchInput.vue'; import MenuContent from './MenuContent'; -import { MenuModeEnum, MenuTypeEnum } from '/@/enums/menuEnum'; +import { MenuModeEnum, MenuThemeEnum, MenuTypeEnum } from '/@/enums/menuEnum'; import { menuStore } from '/@/store/modules/menu'; import { appStore } from '/@/store/modules/app'; @@ -255,7 +255,7 @@ export default defineComponent({ {getSlot(slots, 'header')} +