diff --git a/package.json b/package.json index cc02287..e16a98a 100644 --- a/package.json +++ b/package.json @@ -33,18 +33,18 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^2.2.1", "animate.css": "^4.1.1", - "axios": "^1.3.4", - "echarts": "^5.4.1", + "axios": "^1.3.5", + "echarts": "^5.4.2", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.2.32", - "intro.js": "^6.0.0", + "element-plus": "2.3.3", + "intro.js": "^7.0.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", - "pinia": "^2.0.32", + "pinia": "^2.0.34", "qrcode": "^1.5.1", - "qs": "^6.11.0", + "qs": "^6.11.1", "url": "^0.11.0", "vue": "3.2.47", "vue-i18n": "9.2.2", @@ -53,53 +53,53 @@ "web-storage-cache": "^1.1.1" }, "devDependencies": { - "@commitlint/cli": "^17.4.4", + "@commitlint/cli": "^17.5.1", "@commitlint/config-conventional": "^17.4.4", - "@iconify/json": "^2.2.29", - "@intlify/unplugin-vue-i18n": "^0.8.2", + "@iconify/json": "^2.2.48", + "@intlify/unplugin-vue-i18n": "^0.10.0", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.1", - "@types/lodash-es": "^4.17.6", - "@types/node": "^18.14.2", + "@types/lodash-es": "^4.17.7", + "@types/node": "^18.15.11", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.0", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.54.0", - "@typescript-eslint/parser": "^5.54.0", - "@vitejs/plugin-legacy": "^4.0.1", - "@vitejs/plugin-vue": "^4.0.0", - "@vitejs/plugin-vue-jsx": "^3.0.0", - "autoprefixer": "^10.4.13", - "consola": "^2.15.3", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.6.0", - "eslint-define-config": "^1.15.0", + "@typescript-eslint/eslint-plugin": "^5.58.0", + "@typescript-eslint/parser": "^5.58.0", + "@vitejs/plugin-legacy": "^4.0.2", + "@vitejs/plugin-vue": "^4.1.0", + "@vitejs/plugin-vue-jsx": "^3.0.1", + "autoprefixer": "^10.4.14", + "consola": "^3.0.1", + "eslint": "^8.38.0", + "eslint-config-prettier": "^8.8.0", + "eslint-define-config": "^1.17.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-vue": "^9.9.0", + "eslint-plugin-vue": "^9.10.0", "husky": "^8.0.3", "less": "^4.1.3", - "lint-staged": "^13.1.2", + "lint-staged": "^13.2.1", "plop": "^3.1.2", "postcss": "^8.4.21", "postcss-html": "^1.5.0", "postcss-less": "^6.0.0", - "prettier": "^2.8.4", - "rimraf": "^4.1.2", - "rollup": "^3.17.3", - "stylelint": "^15.2.0", + "prettier": "^2.8.7", + "rimraf": "^5.0.0", + "rollup": "^3.20.2", + "stylelint": "^15.4.0", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.5", - "stylelint-config-recommended": "^10.0.1", - "stylelint-config-standard": "^30.0.1", - "stylelint-order": "^6.0.2", - "terser": "^5.16.5", - "typescript": "4.9.5", - "unplugin-vue-define-options": "^1.2.3", - "vite": "4.1.4", + "stylelint-config-recommended": "^11.0.0", + "stylelint-config-standard": "^32.0.0", + "stylelint-order": "^6.0.3", + "terser": "^5.16.9", + "typescript": "5.0.4", + "unplugin-vue-define-options": "^1.3.3", + "vite": "4.2.1", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", "vite-plugin-mock": "^2.9.6", - "vite-plugin-progress": "^0.0.6", + "vite-plugin-progress": "^0.0.7", "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-style-import": "2.0.0", "vite-plugin-svg-icons": "^2.0.1", diff --git a/src/layout/components/AppView.vue b/src/layout/components/AppView.vue index ace76b6..ef3fe66 100644 --- a/src/layout/components/AppView.vue +++ b/src/layout/components/AppView.vue @@ -25,13 +25,14 @@ const getCaches = computed((): string[] => { 'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]', { '!min-h-[calc(100%-var(--app-footer-height))]': - fixedHeader && (layout === 'classic' || layout === 'topLeft') && footer, + ((fixedHeader && (layout === 'classic' || layout === 'topLeft')) || layout === 'top') && + footer, '!min-h-[calc(100%-var(--tags-view-height)-var(--top-tool-height)-var(--app-footer-height))]': - ((!fixedHeader && layout === 'classic') || layout === 'top') && footer, + !fixedHeader && layout === 'classic' && footer, '!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]': - !fixedHeader && layout === 'topLeft' && footer, + !fixedHeader && (layout === 'topLeft' || layout === 'top') && footer, '!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer, diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index d388d5f..e3e4676 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -177,7 +177,9 @@ export const useRenderLayout = () => { class={[ `${prefixCls}-content-scrollbar`, { - 'mt-[var(--tags-view-height)]': fixedHeader.value + 'mt-[var(--tags-view-height)] !pb-[calc(var(--tags-view-height)+var(--app-footer-height))]': + fixedHeader.value, + 'pb-[var(--app-footer-height)]': !fixedHeader.value } ]} >