diff --git a/.vscode/settings.json b/.vscode/settings.json index cf8d576fb15a9166e2a89de6bcc96469569b6f21..671b12c674271ac825ab42ef95149b87ed71d789 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,7 @@ "editor.cursorSmoothCaretAnimation": true, "editor.detectIndentation": false, "diffEditor.ignoreTrimWhitespace": false, + "javascript.format.insertSpaceBeforeFunctionParenthesis": true, "editor.formatOnPaste": true, "editor.formatOnSave": true, "editor.suggestSelection": "first", @@ -108,18 +109,22 @@ // =========================================== // ================ Eslint =================== // =========================================== - "eslint.enable": true, + // "eslint.enable": true, + "eslint.alwaysShowStatus": true, "eslint.options": { // 配置 - "plugins": [ - "html", - "vue", - "javascript", - "jsx", - "typescript" - ] - }, - "eslint.autoFixOnSave": true, + "plugins": ["html", "vue", "javascript", "jsx", "typescript"], + "extensions": [".js", ".jsx", ".ts", ".tsx", ".vue"] + }, + "eslint.validate": [ + "javascript", + "typescript", + "reacttypescript", + "reactjavascript", + "html", + "vue" + ], + // "eslint.autoFixOnSave": true, // =========================================== // ================ Vetur ==================== // =========================================== @@ -181,19 +186,12 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, - "i18n-ally.localesPaths": [ - "src/locales/lang", - ], + "i18n-ally.localesPaths": ["src/locales/lang"], "i18n-ally.keystyle": "nested", "i18n-ally.sortKeys": true, "i18n-ally.namespace": true, "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", - "i18n-ally.enabledParsers": [ - "ts" - ], + "i18n-ally.enabledParsers": ["ts"], "i18n-ally.sourceLanguage": "zh", - "i18n-ally.enabledFrameworks": [ - "vue", - "react" - ] -} \ No newline at end of file + "i18n-ally.enabledFrameworks": ["vue", "react"] +} diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 92fd1b6cbda6fd6ba70817f0b04414f4e635a317..bc12dfb6afda83af2245e4f94c614dd778446d8d 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -5,6 +5,7 @@ - 新增`mixSideTrigger`配置。用于配置左侧混合模式菜单打开方式。可选`hover`,默认`click` - 新增`mixSideFixed`配置。用于固定左侧混合模式菜单 - modal 组件新增`height`和`min-height`属性 +- 新增`PageWrapper`组件。并应用于示例页面 ### 🐛 Bug Fixes diff --git a/src/components/Form/src/hooks/useFormContext.ts b/src/components/Form/src/hooks/useFormContext.ts index 9bfc92523c779a95dbf5be4665613cce7f96033b..01dfadd7619afa46209e0f695888b6b2e7a2e736 100644 --- a/src/components/Form/src/hooks/useFormContext.ts +++ b/src/components/Form/src/hooks/useFormContext.ts @@ -1,4 +1,4 @@ -import { InjectionKey } from 'vue'; +import type { InjectionKey } from 'vue'; import { createContext, useContext } from '/@/hooks/core/useContext'; export interface FormContextProps { diff --git a/src/components/Page/index.ts b/src/components/Page/index.ts index ae205ecc1f8fba8db27e38867f391a6460af23ee..0b74020befdb4cf3270a73812cf580248e3ae67f 100644 --- a/src/components/Page/index.ts +++ b/src/components/Page/index.ts @@ -1,2 +1,4 @@ import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; export const PageFooter = createAsyncComponent(() => import('./src/PageFooter.vue')); + +export { default as PageWrapper } from './src/PageWrapper.vue'; diff --git a/src/components/Page/src/PageFooter.vue b/src/components/Page/src/PageFooter.vue index 66baa3abc3f8ade4ce692ef507ff81e26dd08d8e..e6d02370ece7dffc733f6b18ec2443828886cee0 100644 --- a/src/components/Page/src/PageFooter.vue +++ b/src/components/Page/src/PageFooter.vue @@ -1,9 +1,10 @@