diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 8329c163..5cf54d58 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -97,7 +97,14 @@ const searchRef = ref(); const newsRef = ref(); const personalDrawerRef = ref(); -const state = reactive({ +interface State { + [key: string]: boolean | string; + isScreenfull: boolean; + disabledI18n: string; + disabledSize: string; +} + +const state = reactive({ isScreenfull: false, disabledI18n: 'zh-cn', disabledSize: 'large', diff --git a/src/types/global.d.ts b/src/types/global.d.ts index df4ac032..44969ff9 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -106,3 +106,17 @@ declare interface TableType { [key: string]: T; }; } + +// 定义全局属性的类型 +import { ComponentCustomProperties } from 'vue'; + +declare module '@vue/runtime-core' { + interface ComponentCustomProperties { + parseTime: Function; + parseDate: Function; + dateTimeStr: string; + dateStr: string; + timeStr: string; + baseURL: string; + } +} diff --git a/src/utils/other.ts b/src/utils/other.ts index 454dbeb2..2648b90d 100644 --- a/src/utils/other.ts +++ b/src/utils/other.ts @@ -176,8 +176,9 @@ export function handleOpenLink(val: RouteItem) { * 打开小窗口 */ export const openWindow = (url: string, title: string, w: number, h: number) => { - // Fixes dual-screen position Most browsers Firefox + // @ts-ignore const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left; + // @ts-ignore const dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top; const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width; @@ -396,7 +397,7 @@ export function getQueryString(url: string, paraName: string) { * @param rootId * @returns {*} */ -export function handleTree(data, id, parentId, children, rootId) { +export function handleTree(data: any, id: any, parentId: any, children: any, rootId: any) { id = id || 'id'; parentId = parentId || 'parentId'; children = children || 'children'; @@ -404,7 +405,7 @@ export function handleTree(data, id, parentId, children, rootId) { rootId || Math.min.apply( Math, - data.map((item) => { + data.map((item: any) => { return item[parentId]; }) ) || @@ -412,8 +413,8 @@ export function handleTree(data, id, parentId, children, rootId) { //对源数据深度克隆 const cloneData = JSON.parse(JSON.stringify(data)); //循环所有项 - const treeData = cloneData.filter((father) => { - const branchArr = cloneData.filter((child) => { + const treeData = cloneData.filter((father: any) => { + const branchArr = cloneData.filter((child: any) => { //返回每一项的子级数组 return father[id] === child[parentId]; }); @@ -455,7 +456,7 @@ export function toUnderline(str: string) { * * @param originUrl 原始路径 */ -const adaptationUrl = (originUrl: string) => { +const adaptationUrl = (originUrl?: string) => { // 微服务架构 不做路径转换,为空不做路径转换 const isMicro = import.meta.env.VITE_IS_MICRO; if (validateNull(isMicro) || isMicro === 'true') { diff --git a/src/views/ext/route.vue b/src/views/ext/route.vue index e60c595e..7287882c 100644 --- a/src/views/ext/route.vue +++ b/src/views/ext/route.vue @@ -22,7 +22,6 @@ import { fetchList, putObj, refreshObj } from '/@/api/admin/route'; import type { QueryLanguageId } from 'vue3-ts-jsoneditor'; import { useMessage } from '/@/hooks/message'; import { useI18n } from 'vue-i18n'; -import { renderValue } from 'vanilla-jsoneditor'; const { t } = useI18n(); const jsonData = ref({}); diff --git a/tsconfig.json b/tsconfig.json index f7d04ae3..704db556 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,39 +1,74 @@ { "compilerOptions": { - "target": "esnext", - "useDefineForClassFields": true, - "module": "esnext", - "moduleResolution": "node", - "strict": true, - "jsx": "preserve", - "sourceMap": true, - "resolveJsonModule": true, - "esModuleInterop": true, - "lib": ["esnext", "dom"], - "baseUrl": ".", - "allowJs": true, - "forceConsistentCasingInFileNames": true, - "allowSyntheticDefaultImports": true, - "strictFunctionTypes": false, - "noUnusedLocals": true, - "noUnusedParameters": true, - "experimentalDecorators": true, - "noImplicitAny": false, // 是否关闭 ts 2322 类型推导 - "skipLibCheck": true, + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, + "module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, + "lib": ["esnext", "dom", "dom.iterable", "scripthost"] /* Specify library files to be included in the compilation. */, + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + "jsx": "preserve" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */, + // "declaration": true /* Generates corresponding '.d.ts' file. */, + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true /* Import emit helpers from 'tslib'. */, + // "downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */, + "isolatedModules": true /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */, + + /* Strict Type-Checking Options */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + + /* Module Resolution Options */ + "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */, + "baseUrl": "." /* Base directory to resolve non-absolute module names. */, "paths": { - "/@/*": ["./src/*"] - }, - "types": [ - "@intlify/unplugin-vue-i18n/types", - "vite/client", - "element-plus/global", - "@types/intro.js", - "@types/qrcode", - "vite-plugin-svg-icons/client", - "unplugin-vue-define-options/macros-global" - ], - "typeRoots": ["./node_modules/@types/", "./types"] + "/@/*": ["src/*"] + } /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */, + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + "types": ["vite/client"] /* Type declaration files to be included in compilation. */, + "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */, + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + "experimentalDecorators": true /* Enables experimental support for ES7 decorators. */, + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true /* Skip type checking of declaration files. */, + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ }, - "include": ["src/**/*", "types/**/*.d.ts", "mock/**/*.ts", "auto-imports.d.ts"], - "exclude": ["dist", "node_modules"] + "include": ["src/**/*.ts", "src/**/*.vue", "src/**/*.tsx", "src/**/*.d.ts", "auto-imports.d.ts"], // **Represents any directory, and * represents any file. Indicates that all files in the src directory will be compiled + "exclude": ["node_modules", "dist"] // Indicates the file directory that does not need to be compiled }