diff --git a/package.json b/package.json index 5dc3093cf..7ddcedcd7 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "dev": "cross-env --max_old_space_size=4096 vite", "build": "vite build && esno ./build/script/postBuild.ts", "build:no-cache": "yarn clean:cache && npm run build", - "report": "cross-env REPORT=true npm run build ", + "report": "cross-env REPORT=true npm run build", + "type:check": "vue-tsc --noEmit --skipLibCheck", "preview": "npm run build && vite preview", "preview:dist": "vite preview", "log": "conventional-changelog -p angular -i CHANGELOG.md -s", @@ -115,7 +116,8 @@ "vite-plugin-svg-icons": "^0.4.1", "vite-plugin-theme": "^0.7.1", "vite-plugin-windicss": "0.14.0", - "vue-eslint-parser": "^7.6.0" + "vue-eslint-parser": "^7.6.0", + "vue-tsc": "^0.0.23" }, "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China.If it is abroad, you can delete it", diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index 140bd5638..4a00e4612 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -42,7 +42,7 @@ export function setComponentRuleType(rule: ValidationRule, component: ComponentT } } -export function handleInputNumberValue(component?: ComponentType, val: any) { +export function handleInputNumberValue(component?: ComponentType, val?: any) { if (!component) return val; if (['Input', 'InputPassword', 'InputSearch', 'InputTextArea'].includes(component)) { return val && isNumber(val) ? `${val}` : val; diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue index 9197342b9..377b62e53 100644 --- a/src/components/Modal/src/BasicModal.vue +++ b/src/components/Modal/src/BasicModal.vue @@ -36,7 +36,7 @@ :height="getWrapperHeight" :visible="visibleRef" :modalFooterHeight="footer !== undefined && !footer ? 0 : undefined" - v-bind="omit(getProps.wrapperProps, 'visible', 'height')" + v-bind="omit(getProps.wrapperProps, 'visible', 'height', 'modalFooterHeight')" @ext-height="handleExtHeight" @height-change="handleHeightChange" > diff --git a/src/components/Table/src/hooks/useTableHeader.ts b/src/components/Table/src/hooks/useTableHeader.ts index af46f0d08..515fc86da 100644 --- a/src/components/Table/src/hooks/useTableHeader.ts +++ b/src/components/Table/src/hooks/useTableHeader.ts @@ -27,7 +27,7 @@ export function useTableHeader(propsRef: ComputedRef, slots: Sl titleHelpMessage, showTableSetting, tableSetting, - }, + } as Recordable, { ...(slots.toolbar ? { diff --git a/src/components/Upload/src/data.tsx b/src/components/Upload/src/data.tsx index d71d967fb..493c2247c 100644 --- a/src/components/Upload/src/data.tsx +++ b/src/components/Upload/src/data.tsx @@ -128,7 +128,6 @@ export function createPreviewActionColumn({ handleDownload, }: { handleRemove: Fn; - handlePreview: Fn; handleDownload: Fn; }): BasicColumn { return { @@ -137,8 +136,6 @@ export function createPreviewActionColumn({ dataIndex: 'action', fixed: false, customRender: ({ record }) => { - // const { url } = (record || {}) as PreviewFileItem; - const actions: ActionItem[] = [ { label: t('component.upload.del'), @@ -150,12 +147,7 @@ export function createPreviewActionColumn({ onClick: handleDownload.bind(null, record), }, ]; - // if (isImgTypeByName(url)) { - // actions.unshift({ - // label: t('component.upload.preview'), - // onClick: handlePreview.bind(null, record), - // }); - // } + return ; }, }; diff --git a/src/hooks/core/useAttrs.ts b/src/hooks/core/useAttrs.ts index cd745ddde..9290ae72a 100644 --- a/src/hooks/core/useAttrs.ts +++ b/src/hooks/core/useAttrs.ts @@ -30,7 +30,7 @@ export function useAttrs(params: Params = {}): Ref | {} { } return acm; - }, {} as Hash); + }, {} as Recordable); attrs.value = res; }); diff --git a/src/hooks/web/useECharts.ts b/src/hooks/web/useECharts.ts index 4a90c37b0..d81591f18 100644 --- a/src/hooks/web/useECharts.ts +++ b/src/hooks/web/useECharts.ts @@ -67,7 +67,7 @@ export function useECharts( nextTick(() => { useTimeoutFn(() => { if (!chartInstance) { - initCharts(getDarkMode.value); + initCharts(getDarkMode.value as 'default'); if (!chartInstance) return; } @@ -87,7 +87,7 @@ export function useECharts( (theme) => { if (chartInstance) { chartInstance.dispose(); - initCharts(theme); + initCharts(theme as 'default'); setOptions(cacheOptions.value); } } diff --git a/src/hooks/web/useTabs.ts b/src/hooks/web/useTabs.ts index ca00ea2cd..b75cb361f 100644 --- a/src/hooks/web/useTabs.ts +++ b/src/hooks/web/useTabs.ts @@ -16,7 +16,7 @@ enum TableActionEnum { CLOSE, } -export function useTabs(_router: Router) { +export function useTabs(_router?: Router) { const appStore = useAppStore(); function canIUseTabs(): boolean { diff --git a/src/utils/helper/vuexHelper.ts b/src/utils/helper/vuexHelper.ts deleted file mode 100644 index 14a521dcf..000000000 --- a/src/utils/helper/vuexHelper.ts +++ /dev/null @@ -1,8 +0,0 @@ -import store from '/@/store'; - -export function hotModuleUnregisterModule(name: string) { - if (!name || !import.meta.hot) return; - if ((store.state as Recordable)[name]) { - store.unregisterModule(name); - } -} diff --git a/tsconfig.json b/tsconfig.json index 3c43e01f2..1aa42dfe6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,6 @@ "lib": ["dom", "esnext"], "types": ["vite/client"], "typeRoots": ["./node_modules/@types/", "./types"], - "incremental": true, "noImplicitAny": false, "skipLibCheck": true, "paths": { diff --git a/yarn.lock b/yarn.lock index 68c8011f3..9cd9436a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2077,6 +2077,11 @@ basic-auth@^1.0.3: resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884" integrity sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ= +big-integer@^1.6.17: + version "1.6.48" + resolved "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" + integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -2141,6 +2146,14 @@ binary-mirror-config@^1: resolved "https://registry.npmjs.org/binary-mirror-config/-/binary-mirror-config-1.30.0.tgz#17c6f6263dd2d1e1ebcec21351c2b712bdfc4593" integrity sha512-LAw4MnTH4o3IvIX27ixBueO9dHQ70Jv26gswNPUi91mdCAGU3Zg6e+1Se81tHrL5ppvO80Tv++1Wpb3kE+dy6Q== +binary@~0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" + integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + dependencies: + buffers "~0.1.1" + chainsaw "~0.1.0" + bl@^1.0.0: version "1.2.3" resolved "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" @@ -2154,6 +2167,11 @@ bluebird@^3.5.0, bluebird@^3.7.2: resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +bluebird@~3.4.1: + version "3.4.7" + resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= + boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -2229,6 +2247,11 @@ buffer-from@^1.0.0, buffer-from@^1.1.1: resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-indexof-polyfill@~1.0.0: + version "1.0.2" + resolved "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" + integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== + buffer@^5.2.1, buffer@^5.4.3: version "5.7.1" resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -2237,6 +2260,11 @@ buffer@^5.2.1, buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" +buffers@~0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" + integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -2361,6 +2389,13 @@ cfb@^1.1.4: crc-32 "~1.2.0" printj "~1.1.2" +chainsaw@~0.1.0: + version "0.1.0" + resolved "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" + integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + dependencies: + traverse ">=0.3.0 <0.4" + chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -3444,6 +3479,13 @@ download@^7.1.0: p-event "^2.1.0" pify "^3.0.0" +duplexer2@~0.1.4: + version "0.1.4" + resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -4281,6 +4323,16 @@ fsevents@~2.3.1: resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4969,7 +5021,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -5639,6 +5691,11 @@ lint-staged@^10.5.4: string-argv "0.3.1" stringify-object "^3.3.0" +listenercount@~1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" + integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= + listr2@^3.2.2: version "3.6.2" resolved "https://registry.npmjs.org/listr2/-/listr2-3.6.2.tgz#7260159f9108523eaa430d4a674db65b6c2d08cc" @@ -6169,7 +6226,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.5, mkdirp@~0.5.1: +"mkdirp@>=0.5 0", mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -7357,7 +7414,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.1: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -7607,7 +7664,7 @@ reusify@^1.0.4: resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.5.4: +rimraf@2, rimraf@^2.5.4: version "2.7.1" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7791,6 +7848,11 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" +setimmediate@~1.0.4: + version "1.0.5" + resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + shallow-equal@^1.0.0: version "1.2.1" resolved "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" @@ -8645,6 +8707,11 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +"traverse@>=0.3.0 <0.4": + version "0.3.9" + resolved "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" + integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + traverse@^0.6.6: version "0.6.6" resolved "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" @@ -8911,6 +8978,22 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +unzipper@0.10.11: + version "0.10.11" + resolved "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e" + integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw== + dependencies: + big-integer "^1.6.17" + binary "~0.3.0" + bluebird "~3.4.1" + buffer-indexof-polyfill "~1.0.0" + duplexer2 "~0.1.4" + fstream "^1.0.12" + graceful-fs "^4.2.2" + listenercount "~1.0.1" + readable-stream "~2.3.6" + setimmediate "~1.0.4" + upath@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" @@ -9201,6 +9284,13 @@ vue-router@^4.0.6: resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.0.6.tgz#91750db507d26642f225b0ec6064568e5fe448d6" integrity sha512-Y04llmK2PyaESj+N33VxLjGCUDuv9t4q2OpItEGU7POZiuQZaugV6cJpE6Qm1sVFtxufodLKN2y2dQl9nk0Reg== +vue-tsc@^0.0.23: + version "0.0.23" + resolved "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.0.23.tgz#e0e53a09ff29ac497f3bafab5a5c9ad63b1422f3" + integrity sha512-zQACemcjLMmMo4pJsQyo3g+2oP5lfZB2r1K1dS25gT9r4fpDoq226logIw/QzYYf+SI91QE4hwpdAjij3n6N9w== + dependencies: + unzipper "0.10.11" + vue-types@^3.0.0, vue-types@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/vue-types/-/vue-types-3.0.2.tgz#ec16e05d412c038262fc1efa4ceb9647e7fb601d"