Skip to content

Commit

Permalink
chore: upgrade dep
Browse files Browse the repository at this point in the history
  • Loading branch information
umbrella22 committed Sep 14, 2024
1 parent 218306a commit f59ca0c
Show file tree
Hide file tree
Showing 5 changed files with 2,340 additions and 1,759 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.DS_Store
node_modules/
/dist/
build/win-unpacked/
build/win-ia32-unpacked/
!build/icons
build/*
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
86 changes: 43 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,91 +63,91 @@
}
},
"dependencies": {
"axios": "^1.7.4",
"electron-updater": "^6.3.0",
"express": "4.20.0",
"fs-extra": "^11.1.0"
"axios": "^1.7.7",
"electron-updater": "^6.3.4",
"express": "4.21.0",
"fs-extra": "^11.2.0"
},
"devDependencies": {
"@babel/core": "^7.22.5",
"@babel/eslint-parser": "^7.22.5",
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.22.5",
"@babel/plugin-proposal-do-expressions": "^7.22.5",
"@babel/plugin-proposal-export-default-from": "^7.22.5",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/plugin-proposal-do-expressions": "^7.24.7",
"@babel/plugin-proposal-export-default-from": "^7.24.7",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-function-bind": "^7.22.5",
"@babel/plugin-proposal-function-sent": "^7.22.5",
"@babel/plugin-proposal-function-bind": "^7.24.7",
"@babel/plugin-proposal-function-sent": "^7.24.7",
"@babel/plugin-proposal-json-strings": "^7.18.6",
"@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-proposal-pipeline-operator": "^7.22.5",
"@babel/plugin-proposal-throw-expressions": "^7.22.5",
"@babel/plugin-proposal-pipeline-operator": "^7.24.7",
"@babel/plugin-proposal-throw-expressions": "^7.24.7",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@babel/register": "^7.22.5",
"@babel/runtime": "^7.22.5",
"@types/fs-extra": "^11.0.1",
"@babel/plugin-transform-runtime": "^7.25.4",
"@babel/preset-env": "^7.25.4",
"@babel/register": "^7.24.6",
"@babel/runtime": "^7.25.6",
"@types/fs-extra": "^11.0.4",
"@types/node": "^18.14.5",
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"@vue/babel-preset-jsx": "^1.4.0",
"adm-zip": "^0.5.10",
"autoprefixer": "^10.4.14",
"babel-loader": "^9.1.2",
"adm-zip": "^0.5.16",
"autoprefixer": "^10.4.20",
"babel-loader": "^9.1.3",
"cfonts": "^2.10.0",
"chalk": "^4.1.2",
"copy-webpack-plugin": "^11.0.0",
"core-js": "^3.31.0",
"core-js": "^3.38.1",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"date-fns": "^2.30.0",
"del": "^6.1.1",
"dotenv": "^16.1.4",
"electron": "^24.8.5",
"electron-builder": "^24.4.0",
"dotenv": "^16.4.5",
"electron": "^31.6.0",
"electron-builder": "^25.0.5",
"electron-devtools-installer": "^3.2.0",
"element-ui": "^2.15.13",
"esbuild-loader": "^3.0.1",
"element-ui": "^2.15.14",
"esbuild-loader": "^4.2.2",
"eslint": "^7.32.0",
"eslint-config-standard": "^14.1.1",
"eslint-friendly-formatter": "^4.0.1",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-standard": "^5.0.0",
"eslint-webpack-plugin": "^3.2.0",
"extract-zip": "^2.0.1",
"html-webpack-plugin": "^5.5.3",
"html-webpack-plugin": "^5.6.0",
"listr2": "^5.0.7",
"mini-css-extract-plugin": "2.7.6",
"mini-css-extract-plugin": "2.9.1",
"minimist": "^1.2.8",
"node-loader": "^2.0.0",
"nprogress": "^0.2.0",
"pinia": "^2.0.33",
"pinia": "^2.2.2",
"portfinder": "^1.0.32",
"postcss": "^8.4.31",
"postcss-loader": "^7.3.3",
"sass": "^1.63.4",
"sass-loader": "^13.3.2",
"style-loader": "^3.3.3",
"postcss": "^8.4.45",
"postcss-loader": "^8.1.1",
"sass": "^1.78.0",
"sass-loader": "^16.0.1",
"style-loader": "^4.0.0",
"svg-sprite-loader": "^6.0.11",
"terser-webpack-plugin": "^5.3.9",
"vue": "^2.7.14",
"terser-webpack-plugin": "^5.3.10",
"vue": "^2.7.16",
"vue-html-loader": "^1.2.4",
"vue-i18n": "^8.27.1",
"vue-loader": "15.10.1",
"vue-router": "^3.6.5",
"vue-style-loader": "^4.1.3",
"vue-template-compiler": "^2.7.14",
"vue-template-compiler": "^2.7.16",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-hot-middleware": "^2.25.3",
"webpack-merge": "^5.9.0"
"webpack-dev-server": "^5.1.0",
"webpack-hot-middleware": "^2.26.1",
"webpack-merge": "^6.0.1"
}
}
}
22 changes: 12 additions & 10 deletions src/renderer/layout/index.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<template>
<div class="app-wrapper" :class="IsUseSysTitle ? 'UseSysTitle' : 'NoUseSysTitle'">
<div
class="app-wrapper"
:class="IsUseSysTitle ? 'UseSysTitle' : 'NoUseSysTitle'"
>
<div :class="classObj">
<navbar></navbar>
<div class="container-set">
<sidebar class="sidebar-container" :class="IsUseSysTitle ? 'UseSysTitle' : 'NoUseSysTitle'"></sidebar>
<sidebar
class="sidebar-container"
:class="IsUseSysTitle ? 'UseSysTitle' : 'NoUseSysTitle'"
></sidebar>
<div class="main-container">
<app-main></app-main>
</div>
Expand All @@ -22,26 +28,22 @@ import { ipcRenderer } from "electron";
const { sidebarStatus } = useAppStore();
const IsUseSysTitle = ref(false);
const sidebarSwitch = computed(() => sidebarStatus.opened)
const sidebarSwitch = computed(() => sidebarStatus.opened);
ipcRenderer.invoke("IsUseSysTitle").then(res => {
ipcRenderer.invoke("IsUseSysTitle").then((res) => {
IsUseSysTitle.value = res;
});
const classObj = computed(() => {
return {
hideSidebar: !sidebarSwitch.value,
openSidebar: sidebarSwitch.value
openSidebar: sidebarSwitch.value,
};
});
</script>

<style rel="stylesheet/scss" lang="scss" scoped>
@import "@/styles/mixin.scss";
.app-wrapper {
@include clearfix;
position: relative;
height: 100%;
width: 100%;
Expand All @@ -57,6 +59,6 @@ const classObj = computed(() => {
}
.NoUseSysTitle {
top: 38px
top: 38px;
}
</style>
8 changes: 4 additions & 4 deletions src/renderer/styles/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

// 侧边栏
.sidebar-container {
.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
}

transition: width .28s;
width: 256px !important;
height: 100%;
Expand All @@ -23,6 +19,10 @@
z-index: 1001;
overflow: hidden;

.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
}

a {
display: inline-block;
width: 100%;
Expand Down
Loading

0 comments on commit f59ca0c

Please sign in to comment.