Browse Source

😎调整代码及升级npm包依赖

zuohuaijun 2 years ago
parent
commit
ee9794fa52

+ 0 - 6
Web/README.md

@@ -52,12 +52,6 @@
 > Vite 不再支持 Node 12 / 13 / 15,因为上述版本已经进入了 EOL 阶段。现在你必须使用 Node 14.18+ / 16+ 版本。
 
 ```bash
-# 克隆项目
-git clone https://gitee.com/zuohuaijun/Admin.NET
-
-# 进入项目
-cd web
-
 # 安装依赖
 pnpm install
 

+ 11 - 11
Web/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "admin.net",
 	"version": "2.4.33",
-	"description": "Admin.NET 有可能是.NET最好用的通用权限开发框架",
+	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
 	"scripts": {
@@ -26,7 +26,7 @@
 		"echarts": "^5.5.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.6.3",
+		"element-plus": "^2.7.0",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
@@ -50,9 +50,9 @@
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.7",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^9.11.0",
+		"vue-i18n": "^9.12.0",
 		"vue-json-pretty": "^2.4.0",
-		"vue-plugin-hiprint": "0.0.57-beta19",
+		"vue-plugin-hiprint": "0.0.57-beta20",
 		"vue-router": "^4.3.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
@@ -61,23 +61,23 @@
 	"devDependencies": {
 		"@plugin-web-update-notification/vite": "^1.7.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.12.5",
+		"@types/node": "^20.12.7",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^7.5.0",
-		"@typescript-eslint/parser": "^7.5.0",
+		"@typescript-eslint/eslint-plugin": "^7.6.0",
+		"@typescript-eslint/parser": "^7.6.0",
 		"@vitejs/plugin-vue": "^5.0.4",
 		"@vitejs/plugin-vue-jsx": "^3.1.0",
 		"@vue/compiler-sfc": "^3.4.21",
 		"code-inspector-plugin": "^0.11.0",
 		"eslint": "^9.0.0",
-		"eslint-plugin-vue": "^9.24.0",
+		"eslint-plugin-vue": "^9.24.1",
 		"less": "^4.2.0",
 		"prettier": "^3.2.5",
 		"rollup-plugin-visualizer": "^5.12.0",
-		"sass": "^1.74.1",
+		"sass": "^1.75.0",
 		"terser": "^5.30.3",
-		"typescript": "^5.4.4",
+		"typescript": "^5.4.5",
 		"vite": "^5.2.8",
 		"vite-plugin-cdn-import": "^0.3.5",
 		"vite-plugin-compression2": "^1.0.0",
@@ -103,4 +103,4 @@
 		"vue-next-admin",
 		"next-admin"
 	]
-}
+}

+ 2 - 2
Web/src/App.vue

@@ -4,7 +4,7 @@
 		<LockScreen v-if="themeConfig.isLockScreen" />
 		<Setings ref="setingsRef" v-show="setLockScreen" />
 		<CloseFull v-if="!themeConfig.isLockScreen" />
-		<Upgrade v-if="needUpdate" />
+		<!-- <Upgrade v-if="needUpdate" /> -->
 		<!-- <Sponsors /> -->
 	</el-config-provider>
 </template>
@@ -26,7 +26,7 @@ import setIntroduction from '/@/utils/setIconfont';
 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
 const Setings = defineAsyncComponent(() => import('/@/layout/navBars/topBar/setings.vue'));
 const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/topBar/closeFull.vue'));
-const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
+// const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
 // const Sponsors = defineAsyncComponent(() => import('/@/layout/sponsors/index.vue'));
 
 // 定义变量内容

+ 1 - 1
Web/src/layout/footer/index.vue

@@ -2,7 +2,7 @@
 	<div class="layout-footer pb15">
 		<div class="layout-footer-warp">
 			<div>{{ themeConfig.globalTitle }}</div>
-			<div class="mt5">Copyright © 2021-2014 zuohuaijun All rights reserved.</div>
+			<div class="mt5">Copyright © 2021-2014 Admin.NET All rights reserved.</div>
 		</div>
 	</div>
 </template>

+ 2 - 0
Web/src/layout/index.vue

@@ -46,11 +46,13 @@ const onLayoutResize = () => {
 		});
 	}
 };
+
 // 页面加载前
 onBeforeMount(() => {
 	onLayoutResize();
 	window.addEventListener('resize', onLayoutResize);
 });
+
 // 页面卸载时
 onUnmounted(() => {
 	window.removeEventListener('resize', onLayoutResize);

+ 0 - 3
Web/src/layout/navBars/topBar/user.vue

@@ -180,8 +180,6 @@ const onHandleCommandClick = (path: string) => {
 				clearAccessTokens();
 			})
 			.catch(() => {});
-	} else if (path === 'wareHouse') {
-		window.open('https://gitee.com/zuohuaijun/Admin.NET');
 	} else {
 		router.push(path);
 	}
@@ -267,7 +265,6 @@ const receiveNotice = (msg: any) => {
 		body: '你有一条新的消息',
 		icon: 'logo.png', //public目录下的
 		timeout: 4500, // 通知显示时间,单位为毫秒
-
 	});
 };
 </script>

+ 12 - 8
Web/src/layout/upgrade/index.vue

@@ -10,7 +10,7 @@
 			<div class="upgrade-content">
 				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
 				<div class="mt5">
-					<el-link type="primary" class="font12" href="https://gitee.com/zuohuaijun/Admin.NET/tree/next/Web/CHANGELOG.md" target="_black"> CHANGELOG.md </el-link>
+					<el-link type="primary" class="font12" href="https://xxx/CHANGELOG.md" target="_black"> CHANGELOG.md </el-link>
 				</div>
 				<!-- <div class="upgrade-content-desc mt5">{{ $t("message.upgrade.desc") }}</div> -->
 			</div>
@@ -44,10 +44,20 @@ const state = reactive({
 const getThemeConfig = computed(() => {
 	return themeConfig.value;
 });
+
+// 页面加载时
+onMounted(() => {
+	delayShow();
+	setTimeout(() => {
+		state.btnTxt = t('message.upgrade.btnTwo');
+	}, 200);
+});
+
 // 残忍拒绝
 const onCancel = () => {
 	state.isUpgrade = false;
 };
+
 // 马上更新
 const onUpgrade = () => {
 	state.isLoading = true;
@@ -58,19 +68,13 @@ const onUpgrade = () => {
 		// Local.set('version', state.version);
 	}, 2000);
 };
+
 // 延迟显示,防止刷新时界面显示太快
 const delayShow = () => {
 	setTimeout(() => {
 		state.isUpgrade = true;
 	}, 2000);
 };
-// 页面加载时
-onMounted(() => {
-	delayShow();
-	setTimeout(() => {
-		state.btnTxt = t('message.upgrade.btnTwo');
-	}, 200);
-});
 </script>
 
 <style scoped lang="scss">

+ 1 - 1
Web/src/stores/themeConfig.ts

@@ -141,7 +141,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 网站副标题(登录页顶部文字)
 			globalViceTitle: 'Admin.NET',
 			// 网站副标题(登录页顶部文字)
-			globalViceTitleMsg: '有可能是.NET最好用的通用权限开发框架',
+			globalViceTitleMsg: '站在巨人肩膀上的 .NET 通用权限开发框架',
 			// 默认初始语言,可选值"<zh-cn|en|zh-tw>",默认 zh-cn
 			globalI18n: 'zh-cn',
 			// 默认全局组件大小,可选值"<large|'default'|small>",默认 'large'