diff --git a/package.json b/package.json index 9039228b4ee4ff0911fc11a63f8f77921b3d0f10..176f2e79af61814f5fb2025779a4da74bcfd46ae 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,10 @@ "scripts": { "bootstrap": "yarn install", "serve": "esno ./build/script/preserve.ts && cross-env NODE_ENV=development vite", - "build": "rimraf dist && cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts", + "build": " rimraf dist && cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts", "build:site": "cross-env SITE=true npm run build ", "build:no-cache": "yarn clean:cache && npm run build", + "typecheck": "typecheck .", "report": "cross-env REPORT=true npm run build ", "preview": "npm run build && esno ./build/script/preview.ts", "preview:dist": "esno ./build/script/preview.ts", @@ -59,6 +60,8 @@ "@typescript-eslint/eslint-plugin": "^4.6.0", "@typescript-eslint/parser": "^4.6.0", "@vue/compiler-sfc": "^3.0.2", + "@vuedx/typecheck": "^0.2.4-0", + "@vuedx/typescript-plugin-vue": "^0.2.4-0", "autoprefixer": "^9.8.6", "commitizen": "^4.2.2", "conventional-changelog-cli": "^2.1.0", diff --git a/src/components/Authority/src/index.vue b/src/components/Authority/src/index.vue index 9a56a2c48dbacd08a41ed961ed76307876d9b84f..7dfd1387cc2a6d3949dd0acbcd766fb59b5406d5 100644 --- a/src/components/Authority/src/index.vue +++ b/src/components/Authority/src/index.vue @@ -12,7 +12,7 @@ props: { // 指定角色可见 value: { - type: [Number, Array, String] as PropType, + type: [Number, Array, String] as PropType, default: '', }, }, diff --git a/src/components/Button/index.vue b/src/components/Button/index.vue index 80b72375b46c5404dcf0546118bf9a472c1f0277..c387b1fcc5d372689a9e212b866ef4260cfefd2b 100644 --- a/src/components/Button/index.vue +++ b/src/components/Button/index.vue @@ -35,7 +35,7 @@ default: 'throttle', }, color: { - type: String as PropType<'error' | 'warning' | 'success'>, + type: String as PropType<'error' | 'warning' | 'success' | ''>, }, // 防抖节流时间 throttleTime: { diff --git a/src/components/Description/src/types.ts b/src/components/Description/src/types.ts index df10e87f7828769da0bae018f3c3cedc706de7a6..a27b2f48f759823d877bfca63e3af09d740409c7 100644 --- a/src/components/Description/src/types.ts +++ b/src/components/Description/src/types.ts @@ -10,7 +10,7 @@ export interface DescItem { labelStyle?: any; field: string; - label: string; + label: any; // 和并列 span?: number; show?: (...arg: any) => boolean; @@ -30,7 +30,7 @@ export interface DescOptions { * 数据 * @type object */ - data: object; + data: any; /** * 内置的CollapseContainer组件配置 * @type CollapseContainerOptions diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts index a38b12e535469ab9cd82b609b760e550f34a9291..960b376c38025113b1421d51bb0fb77a8dbdd160 100644 --- a/src/components/Form/src/types/index.ts +++ b/src/components/Form/src/types/index.ts @@ -1,7 +1,7 @@ import { ColSpanType } from 'ant-design-vue/types/grid/col'; export interface ColEx { - style: object; + style?: any; /** * raster number of cells to occupy, 0 corresponds to display: none * @default none (0) diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue index f9d0e718e9078f63e37a42c5bf1b8590e4cd7f1f..1e7fbd42a26bad80540bb4fb66b410ed05109e18 100644 --- a/src/components/Tinymce/src/Editor.vue +++ b/src/components/Tinymce/src/Editor.vue @@ -1,6 +1,6 @@ @@ -23,7 +23,7 @@ import { useScript } from '/@/hooks/web/useScript'; import { snowUuid } from '/@/utils/uuid'; import { bindHandlers } from './helper'; - // import lineHeight from './lineHeight'; + import lineHeight from './lineHeight'; const CDN_URL = 'https://cdn.bootcdn.net/ajax/libs/tinymce/5.5.1'; @@ -120,7 +120,7 @@ } function initEditor() { - // getTinymce().PluginManager.add('lineHeight', lineHeight(getTinymce())); + getTinymce().PluginManager.add('lineHeight', lineHeight(getTinymce())); getTinymce().init(unref(initOptions)); } diff --git a/src/types/module.d.ts b/src/types/module.d.ts new file mode 100644 index 0000000000000000000000000000000000000000..d8cd24b797a497e9bb2fb99e724a5ea7321a5971 --- /dev/null +++ b/src/types/module.d.ts @@ -0,0 +1,4 @@ +declare module 'ant-design-vue/es/locale/zh_CN'; +declare module 'globby!/@/router/routes/modules/**/*.@(ts)'; +declare module 'globby!/@/router/menus/modules/**/*.@(ts)'; +declare const React: string; diff --git a/src/types/shim-vue.d.ts b/src/types/shim-vue.d.ts deleted file mode 100644 index fa1605f5a44c6b13d78349cbdedcd95bd3ea0005..0000000000000000000000000000000000000000 --- a/src/types/shim-vue.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -declare module '*.vue' { - import { defineComponent } from 'vue'; - const component: ReturnType; - // import { ComponentOptions } from 'vue'; - // const component: ReturnType; - export default component; -} -// declare module '*.vue' { -// import Vue from 'vue'; -// export default Vue; -// } diff --git a/src/types/source.d.ts b/src/types/source.d.ts deleted file mode 100644 index 0416ee4a20ddfea883309ae21bbee5f3f7c05ad6..0000000000000000000000000000000000000000 --- a/src/types/source.d.ts +++ /dev/null @@ -1,83 +0,0 @@ -declare module 'ant-design-vue/es/locale/zh_CN'; -declare module 'globby!/@/router/routes/modules/**/*.@(ts)'; -declare module 'globby!/@/router/menus/modules/**/*.@(ts)'; - -declare const React: string; -declare module '*.bmp' { - const src: string; - export default src; -} - -declare module '*.gif' { - const src: string; - export default src; -} - -declare module '*.jpg' { - const src: string; - export default src; -} - -declare module '*.jpeg' { - const src: string; - export default src; -} - -declare module '*.png' { - const src: string; - export default src; -} - -declare module '*.webp' { - const src: string; - export default src; -} - -declare module '*.json' { - /** 得到json表达的对象/数组【混入到代码中】 - */ - const content: any | any[]; - export default content; -} - -declare module '*.svg' { - /** 文件路径 - */ - const content: string; - export = content; -} -declare module '*.scss' { - /** scss 导出 (:export{}) - */ - const content: { - [className: string]: string; - }; - export default content; -} -declare module '*.less' { - const content: { - [className: string]: string; - }; - export default content; -} -declare module '*.styl' { - const content: { - [className: string]: string; - }; - export default content; -} -declare module '*.css' { - /** 一个空对象 - */ - const content: any; - export default content; -} - -declare module '*.module.scss' { - /** css 模块 - */ - const content: { - [localClassName: string]: string; - }; - export default content; -} diff --git a/src/types/vue-app-env.d.ts b/src/types/vue-app-env.d.ts new file mode 100644 index 0000000000000000000000000000000000000000..8b554858e872cb8f7725fcbfe0e96d2593827f14 --- /dev/null +++ b/src/types/vue-app-env.d.ts @@ -0,0 +1,103 @@ +declare module '*.vue' { + import { defineComponent } from 'vue'; + const Component: ReturnType; + export default Component; +} + +declare namespace NodeJS { + interface Process { + env: ProcessEnv; + } + interface ProcessEnv { + /** + * By default, there are two modes in Vite: + * + * * `development` is used by vite and vite serve + * * `production` is used by vite build + * + * You can overwrite the default mode used for a command by passing the --mode option flag. + * + */ + readonly NODE_ENV: 'development' | 'production'; + } +} + +declare let process: NodeJS.Process; + +declare module '*.bmp' { + const src: string; + export default src; +} + +declare module '*.gif' { + const src: string; + export default src; +} + +declare module '*.jpg' { + const src: string; + export default src; +} + +declare module '*.jpeg' { + const src: string; + export default src; +} + +declare module '*.png' { + const src: string; + export default src; +} + +declare module '*.webp' { + const src: string; + export default src; +} + +declare module '*.svg' { + const src: string; + export default src; +} + +declare module '*.json' { + const content: any | any[]; + export default content; +} + +declare module '*.scss' { + const content: { + readonly [className: string]: string; + }; + export default content; +} +declare module '*.less' { + const content: { + readonly [className: string]: string; + }; + export default content; +} +declare module '*.styl' { + const content: { + readonly [className: string]: string; + }; + export default content; +} +declare module '*.css' { + const content: any; + export default content; +} + +declare module '*.module.css' { + const classes: { readonly [key: string]: string }; + export default classes; +} + +declare module '*.module.scss' { + const classes: { readonly [key: string]: string }; + export default classes; +} + +declare module '*.module.sass' { + const classes: { readonly [key: string]: string }; + export default classes; +} diff --git a/src/views/demo/table/FixedHeight.vue b/src/views/demo/table/FixedHeight.vue index 118ed16bae2a6eaa3754fef261842dc09f12727e..389da36e1736b8e05b4c9ae54c9567d88640c4d6 100644 --- a/src/views/demo/table/FixedHeight.vue +++ b/src/views/demo/table/FixedHeight.vue @@ -4,7 +4,7 @@