Skip to content

Commit

Permalink
fix: dealing with code formatter caused error
Browse files Browse the repository at this point in the history
  • Loading branch information
flingyp committed Dec 4, 2023
1 parent 4057d77 commit 3d0d60b
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 70 deletions.
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "@flypeng/stylelint-config",
"rules": {
"custom-property-pattern": null,
"selector-class-pattern": null
"selector-class-pattern": null,
"value-keyword-case": null
}
}
2 changes: 1 addition & 1 deletion build/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Components from 'unplugin-vue-components/vite';
import Icons from 'unplugin-icons/vite';
import IconsResolver from 'unplugin-icons/resolver';
import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
import viteCDNPlugin from 'vite-plugin-cdn-import';
import { Plugin as viteCDNPlugin } from 'vite-plugin-cdn-import';
import { VitePWA } from 'vite-plugin-pwa';

import { name, version } from '../package.json';
Expand Down
119 changes: 58 additions & 61 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,72 +15,69 @@ declare module '@vue/runtime-core' {
BaseTable: (typeof import('./src/components/common/BaseTable.vue'))['default'];
BaseTableHandle: (typeof import('./src/components/common/BaseTableHandle.vue'))['default'];
BaseTableSearch: (typeof import('./src/components/common/BaseTableSearch.vue'))['default'];
Echarts: (typeof import('./src/components/common/Echarts.vue'))['default'];
'IconAntDesign:fullscreenExitOutlined': (typeof import('~icons/ant-design/fullscreen-exit-outlined'))['default'];
'IconAntDesign:fullscreenOutlined': (typeof import('~icons/ant-design/fullscreen-outlined'))['default'];
'IconAntDesign:githubFilled': (typeof import('~icons/ant-design/github-filled'))['default'];
'IconAntDesign:settingOutlined': (typeof import('~icons/ant-design/setting-outlined'))['default'];
'IconCarbon:ibmWatsonLanguageTranslator': (typeof import('~icons/carbon/ibm-watson-language-translator'))['default'];
'IconFa:weixin': (typeof import('~icons/fa/weixin'))['default'];
'IconLineMd:menuFoldLeft': (typeof import('~icons/line-md/menu-fold-left'))['default'];
'IconLineMd:menuFoldRight': (typeof import('~icons/line-md/menu-fold-right'))['default'];
'IconLineMd:sunnyOutlineLoop': (typeof import('~icons/line-md/sunny-outline-loop'))['default'];
'IconLineMd:sunnyOutlineToMoonAltLoopTransition': (typeof import('~icons/line-md/sunny-outline-to-moon-alt-loop-transition'))['default'];
'IconMaterialSymbols:keyboardDoubleArrowLeftRounded': (typeof import('~icons/material-symbols/keyboard-double-arrow-left-rounded'))['default'];
'IconMaterialSymbols:keyboardDoubleArrowRightRounded': (typeof import('~icons/material-symbols/keyboard-double-arrow-right-rounded'))['default'];
'IconMaterialSymbols:rocketOutline': (typeof import('~icons/material-symbols/rocket-outline'))['default'];
'IconMdi:github': (typeof import('~icons/mdi/github'))['default'];
'IconMdi:shieldLockOutline': (typeof import('~icons/mdi/shield-lock-outline'))['default'];
'IconMdi:signIn': (typeof import('~icons/mdi/sign-in'))['default'];
'IconMdi:twitter': (typeof import('~icons/mdi/twitter'))['default'];
'IconMdi:windowClose': (typeof import('~icons/mdi/window-close'))['default'];
'IconOpenmoji:1stPlaceMedal': (typeof import('~icons/openmoji/1st-place-medal'))['default'];
'IconOpenmoji:2ndPlaceMedal': (typeof import('~icons/openmoji/2nd-place-medal'))['default'];
'IconOpenmoji:3rdPlaceMedal': (typeof import('~icons/openmoji/3rd-place-medal'))['default'];
'IconOpenmoji:abacus': (typeof import('~icons/openmoji/abacus'))['default'];
'IconOpenmoji:abButtonBloodType': (typeof import('~icons/openmoji/ab-button-blood-type'))['default'];
'IconOpenmoji:aButtonBloodType': (typeof import('~icons/openmoji/a-button-blood-type'))['default'];
'IconOpenmoji:alarmClock': (typeof import('~icons/openmoji/alarm-clock'))['default'];
'IconOpenmoji:angryFace': (typeof import('~icons/openmoji/angry-face'))['default'];
'IconOpenmoji:annoyedFaceWithTongue': (typeof import('~icons/openmoji/annoyed-face-with-tongue'))['default'];
'IconOpenmoji:apple': (typeof import('~icons/openmoji/apple'))['default'];
'IconPh:rocket': (typeof import('~icons/ph/rocket'))['default'];
'IconPh:rocketBold': (typeof import('~icons/ph/rocket-bold'))['default'];
'IconUil:alignJustify': (typeof import('~icons/uil/align-justify'))['default'];
NBackTop: (typeof import('naive-ui'))['NBackTop'];
NBreadcrumb: (typeof import('naive-ui'))['NBreadcrumb'];
NBreadcrumbItem: (typeof import('naive-ui'))['NBreadcrumbItem'];
NButton: (typeof import('naive-ui'))['NButton'];
NCard: (typeof import('naive-ui'))['NCard'];
NColorPicker: (typeof import('naive-ui'))['NColorPicker'];
'IconAntDesign:fullscreenExitOutlined': typeof import('~icons/ant-design/fullscreen-exit-outlined')['default']
'IconAntDesign:fullscreenOutlined': typeof import('~icons/ant-design/fullscreen-outlined')['default']
'IconAntDesign:githubFilled': typeof import('~icons/ant-design/github-filled')['default']
'IconAntDesign:settingOutlined': typeof import('~icons/ant-design/setting-outlined')['default']
'IconCarbon:ibmWatsonLanguageTranslator': typeof import('~icons/carbon/ibm-watson-language-translator')['default']
'IconFa:weixin': typeof import('~icons/fa/weixin')['default']
'IconLineMd:menuFoldLeft': typeof import('~icons/line-md/menu-fold-left')['default']
'IconLineMd:menuFoldRight': typeof import('~icons/line-md/menu-fold-right')['default']
'IconLineMd:sunnyOutlineLoop': typeof import('~icons/line-md/sunny-outline-loop')['default']
'IconLineMd:sunnyOutlineToMoonAltLoopTransition': typeof import('~icons/line-md/sunny-outline-to-moon-alt-loop-transition')['default']
'IconMaterialSymbols:keyboardDoubleArrowLeftRounded': typeof import('~icons/material-symbols/keyboard-double-arrow-left-rounded')['default']
'IconMaterialSymbols:keyboardDoubleArrowRightRounded': typeof import('~icons/material-symbols/keyboard-double-arrow-right-rounded')['default']
'IconMdi:github': typeof import('~icons/mdi/github')['default']
'IconMdi:shieldLockOutline': typeof import('~icons/mdi/shield-lock-outline')['default']
'IconMdi:signIn': typeof import('~icons/mdi/sign-in')['default']
'IconMdi:twitter': typeof import('~icons/mdi/twitter')['default']
'IconMdi:windowClose': typeof import('~icons/mdi/window-close')['default']
'IconOpenmoji:1stPlaceMedal': typeof import('~icons/openmoji/1st-place-medal')['default']
'IconOpenmoji:2ndPlaceMedal': typeof import('~icons/openmoji/2nd-place-medal')['default']
'IconOpenmoji:3rdPlaceMedal': typeof import('~icons/openmoji/3rd-place-medal')['default']
'IconOpenmoji:abacus': typeof import('~icons/openmoji/abacus')['default']
'IconOpenmoji:abButtonBloodType': typeof import('~icons/openmoji/ab-button-blood-type')['default']
'IconOpenmoji:aButtonBloodType': typeof import('~icons/openmoji/a-button-blood-type')['default']
'IconOpenmoji:alarmClock': typeof import('~icons/openmoji/alarm-clock')['default']
'IconOpenmoji:angryFace': typeof import('~icons/openmoji/angry-face')['default']
'IconOpenmoji:annoyedFaceWithTongue': typeof import('~icons/openmoji/annoyed-face-with-tongue')['default']
'IconOpenmoji:apple': typeof import('~icons/openmoji/apple')['default']
'IconPh:rocketBold': typeof import('~icons/ph/rocket-bold')['default']
'IconUil:alignJustify': typeof import('~icons/uil/align-justify')['default']
NBackTop: typeof import('naive-ui')['NBackTop']
NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem']
NButton: typeof import('naive-ui')['NButton']
NCard: typeof import('naive-ui')['NCard']
NColorPicker: typeof import('naive-ui')['NColorPicker']
NConfigProvider: (typeof import('naive-ui'))['NConfigProvider'];
NDataTable: (typeof import('naive-ui'))['NDataTable'];
NDatePicker: (typeof import('naive-ui'))['NDatePicker'];
NDescriptions: (typeof import('naive-ui'))['NDescriptions'];
NDescriptionsItem: (typeof import('naive-ui'))['NDescriptionsItem'];
NDataTable: typeof import('naive-ui')['NDataTable']
NDatePicker: typeof import('naive-ui')['NDatePicker']
NDescriptions: typeof import('naive-ui')['NDescriptions']
NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem']
NDialogProvider: (typeof import('naive-ui'))['NDialogProvider'];
NDivider: (typeof import('naive-ui'))['NDivider'];
NDrawer: (typeof import('naive-ui'))['NDrawer'];
NDrawerContent: (typeof import('naive-ui'))['NDrawerContent'];
NDropdown: (typeof import('naive-ui'))['NDropdown'];
NForm: (typeof import('naive-ui'))['NForm'];
NFormItem: (typeof import('naive-ui'))['NFormItem'];
NInput: (typeof import('naive-ui'))['NInput'];
NInputGroup: (typeof import('naive-ui'))['NInputGroup'];
NInputNumber: (typeof import('naive-ui'))['NInputNumber'];
NLayout: (typeof import('naive-ui'))['NLayout'];
NLayoutContent: (typeof import('naive-ui'))['NLayoutContent'];
NLayoutFooter: (typeof import('naive-ui'))['NLayoutFooter'];
NLayoutHeader: (typeof import('naive-ui'))['NLayoutHeader'];
NLayoutSider: (typeof import('naive-ui'))['NLayoutSider'];
NMenu: (typeof import('naive-ui'))['NMenu'];
NDivider: typeof import('naive-ui')['NDivider']
NDrawer: typeof import('naive-ui')['NDrawer']
NDrawerContent: typeof import('naive-ui')['NDrawerContent']
NDropdown: typeof import('naive-ui')['NDropdown']
NForm: typeof import('naive-ui')['NForm']
NFormItem: typeof import('naive-ui')['NFormItem']
NInput: typeof import('naive-ui')['NInput']
NInputGroup: typeof import('naive-ui')['NInputGroup']
NInputNumber: typeof import('naive-ui')['NInputNumber']
NLayout: typeof import('naive-ui')['NLayout']
NLayoutContent: typeof import('naive-ui')['NLayoutContent']
NLayoutFooter: typeof import('naive-ui')['NLayoutFooter']
NLayoutHeader: typeof import('naive-ui')['NLayoutHeader']
NLayoutSider: typeof import('naive-ui')['NLayoutSider']
NMenu: typeof import('naive-ui')['NMenu']
NMessageProvider: (typeof import('naive-ui'))['NMessageProvider'];
NNotificationProvider: (typeof import('naive-ui'))['NNotificationProvider'];
NPopover: (typeof import('naive-ui'))['NPopover'];
NSelect: (typeof import('naive-ui'))['NSelect'];
NPopover: typeof import('naive-ui')['NPopover']
NSelect: typeof import('naive-ui')['NSelect']
NSpin: (typeof import('naive-ui'))['NSpin'];
NSwitch: (typeof import('naive-ui'))['NSwitch'];
NTag: (typeof import('naive-ui'))['NTag'];
NSwitch: typeof import('naive-ui')['NSwitch']
NTag: typeof import('naive-ui')['NTag']
RenderIconify: (typeof import('./src/components/common/RenderIconify.vue'))['default'];
RouterLink: (typeof import('vue-router'))['RouterLink'];
RouterView: (typeof import('vue-router'))['RouterView'];
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vadmire-admin",
"private": true,
"type": "module",
"private": true,
"version": "1.8.0",
"description": "VAdmire Admin 是一款基于 Vue3 + TypeScript + NaiveUI 等技术栈搭建的后台系统",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
Expand Down
10 changes: 5 additions & 5 deletions src/layout/basic/BasicLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@ const contentHeight = computed(() => {

<style scoped>
.n-layout-header {
height: v-bind(headerheight + 'px');
height: v-bind(headerHeight + 'px');
}
.n-layout-footer {
height: v-bind(footerheight + 'px');
height: v-bind(footerHeight + 'px');
}
.n-layout-sider {
width: v-bind(siderwidth + 'px') !important;
height: v-bind(siderheight);
width: v-bind(siderWidth + 'px') !important;
height: v-bind(siderHeight);
}
.n-layout-content {
height: v-bind(contentheight);
height: v-bind(contentHeight);
}
</style>

0 comments on commit 3d0d60b

Please sign in to comment.