浏览代码

😎代码优化、升级依赖

zuohuaijun 1 年之前
父节点
当前提交
57233ff128

+ 2 - 2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -34,10 +34,10 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.3.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.5.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.159" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.160" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1034" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1036" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 0 - 2
Admin.NET/Admin.NET.Core/Const/CommonConst.cs

@@ -4,8 +4,6 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
-using Elastic.Clients.Elasticsearch.SnapshotLifecycleManagement;
-
 namespace Admin.NET.Core;
 
 /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/Program.cs

@@ -16,7 +16,7 @@ public class WebComponent : IWebComponent
             return !new[] { "Microsoft.Hosting", "Microsoft.AspNetCore" }.Any(u => category.StartsWith(u)) && logLevel >= LogLevel.Information;
         });
 
-        // 设置接口超时时间和上传大小
+        // 设置接口超时时间和上传大小-Kestrel
         builder.WebHost.ConfigureKestrel(u =>
         {
             u.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30);

+ 5 - 5
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.6.25",
+	"lastBuildTime": "2024.6.28",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -14,8 +14,8 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@logicflow/core": "2.0.0-beta.0",
-		"@logicflow/extension": "2.0.0-beta.0",
+		"@logicflow/core": "^1.2.27",
+		"@logicflow/extension": "^1.2.27",
 		"@microsoft/signalr": "^8.0.0",
 		"@vue-office/docx": "^1.6.2",
 		"@vue-office/excel": "^1.7.8",
@@ -54,7 +54,7 @@
 		"splitpanes": "^3.1.5",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.4.30",
+		"vue": "^3.4.31",
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.8",
 		"vue-grid-layout": "3.0.0-beta1",
@@ -77,7 +77,7 @@
 		"@typescript-eslint/parser": "^7.14.1",
 		"@vitejs/plugin-vue": "^5.0.5",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
-		"@vue/compiler-sfc": "^3.4.30",
+		"@vue/compiler-sfc": "^3.4.31",
 		"code-inspector-plugin": "^0.14.2",
 		"eslint": "^9.5.0",
 		"eslint-plugin-vue": "^9.26.0",

+ 44 - 56
Web/src/views/system/dict/index.vue

@@ -4,38 +4,30 @@
 			<el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
 				<el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
 					<template #header>
-						<el-icon size="16"
-							style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>字典
+						<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>字典
 					</template>
 					<el-form :model="state.queryDictTypeParams" ref="queryForm" :inline="true" @submit.native.prevent>
 						<el-form-item label="名称">
-							<el-input v-model="state.queryDictTypeParams.name" @keyup.enter.native="handleDictTypeQuery"
-								placeholder="字典名称" clearable />
+							<el-input v-model="state.queryDictTypeParams.name" @keyup.enter.native="handleDictTypeQuery" placeholder="字典名称" clearable />
 						</el-form-item>
 						<!-- <el-form-item label="字典编码">
 							<el-input v-model="state.queryDictTypeParams.code" placeholder="字典编码" clearable />
 						</el-form-item> -->
 						<el-form-item>
 							<el-button-group>
-								<el-button type="primary" icon="ele-Search" @click="handleDictTypeQuery"
-									v-auth="'sysDictType:page'"> 查询
-								</el-button>
+								<el-button type="primary" icon="ele-Search" @click="handleDictTypeQuery" v-auth="'sysDictType:page'"> 查询 </el-button>
 								<el-button icon="ele-Refresh" @click="resetDictTypeQuery"> 重置 </el-button>
 							</el-button-group>
 						</el-form-item>
 						<el-form-item>
-							<el-button type="primary" icon="ele-Plus" @click="openAddDictType"
-								v-auth="'sysDictType:add'"> 新增 </el-button>
+							<el-button type="primary" icon="ele-Plus" @click="openAddDictType" v-auth="'sysDictType:add'"> 新增 </el-button>
 						</el-form-item>
 					</el-form>
 
-					<el-table :data="state.dictTypeData" style="width: 100%" v-loading="state.typeLoading"
-						@row-click="handleDictType" highlight-current-row border>
+					<el-table :data="state.dictTypeData" style="width: 100%" v-loading="state.typeLoading" @row-click="handleDictType" highlight-current-row border>
 						<el-table-column type="index" label="序号" width="55" align="center" />
-						<el-table-column prop="name" label="字典名称" min-width="120" header-align="center"
-							show-overflow-tooltip />
-						<el-table-column prop="code" label="字典编码" min-width="140" header-align="center"
-							show-overflow-tooltip />
+						<el-table-column prop="name" label="字典名称" min-width="120" header-align="center" show-overflow-tooltip />
+						<el-table-column prop="code" label="字典编码" min-width="140" header-align="center" show-overflow-tooltip />
 						<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
@@ -51,47 +43,46 @@
 						<el-table-column label="操作" width="110" fixed="right" align="center">
 							<template #default="scope">
 								<el-tooltip content="字典值">
-									<el-button icon="ele-Memo" size="small" text type="primary"
-										@click="openDictDataDialog(scope.row)" v-auth="'sysDictType:page'"> </el-button>
+									<el-button icon="ele-Memo" size="small" text type="primary" @click="openDictDataDialog(scope.row)" v-auth="'sysDictType:page'"> </el-button>
 								</el-tooltip>
 								<el-tooltip content="编辑">
-									<el-button icon="ele-Edit" size="small" text type="primary"
-										@click="openEditDictType(scope.row)" v-auth="'sysDictType:update'"> </el-button>
+									<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictType(scope.row)" v-auth="'sysDictType:update'"> </el-button>
 								</el-tooltip>
 								<el-tooltip content="删除">
-									<el-button icon="ele-Delete" size="small" text type="danger"
-										@click="delDictType(scope.row)" v-auth="'sysDictType:delete'"> </el-button>
+									<el-button icon="ele-Delete" size="small" text type="danger" @click="delDictType(scope.row)" v-auth="'sysDictType:delete'"> </el-button>
 								</el-tooltip>
 							</template>
 						</el-table-column>
 					</el-table>
-					<el-pagination v-model:currentPage="state.tableDictTypeParams.page"
-						v-model:page-size="state.tableDictTypeParams.pageSize" :total="state.tableDictTypeParams.total"
-						:page-sizes="[10, 20, 50, 100]" small background @size-change="handleDictTypeSizeChange"
+					<el-pagination
+						v-model:currentPage="state.tableDictTypeParams.page"
+						v-model:page-size="state.tableDictTypeParams.pageSize"
+						:total="state.tableDictTypeParams.total"
+						:page-sizes="[10, 20, 50, 100]"
+						small
+						background
+						@size-change="handleDictTypeSizeChange"
 						@current-change="handleDictTypeCurrentChange"
-						layout="total, sizes, prev, pager, next, jumper" />
+						layout="total, sizes, prev, pager, next, jumper"
+					/>
 				</el-card>
 			</el-col>
 
 			<el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
 				<el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
 					<template #header>
-						<el-icon size="16"
-							style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>字典值【{{
-								state.editDictTypeName }}】
+						<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>字典值【{{ state.editDictTypeName }}】
 					</template>
 					<el-form :model="state.queryDictDataParams" ref="queryForm" :inline="true" @submit.native.prevent>
 						<!-- <el-form-item label="字典值">
 							<el-input v-model="state.queryDictDataParams.value" placeholder="字典值" />
 						</el-form-item> -->
 						<el-form-item label="编码">
-							<el-input v-model="state.queryDictDataParams.code" placeholder="编码"
-								@keyup.enter="handleDictDataQuery" />
+							<el-input v-model="state.queryDictDataParams.code" placeholder="编码" @keyup.enter="handleDictDataQuery" />
 						</el-form-item>
 						<el-form-item>
 							<el-button-group>
-								<el-button type="primary" icon="ele-Search" @click="handleDictDataQuery"> 查询
-								</el-button>
+								<el-button type="primary" icon="ele-Search" @click="handleDictDataQuery"> 查询 </el-button>
 								<el-button icon="ele-Refresh" @click="resetDictDataQuery"> 重置 </el-button>
 							</el-button-group>
 						</el-form-item>
@@ -102,21 +93,16 @@
 
 					<el-table :data="state.dictDataData" style="width: 100%" v-loading="state.loading" border>
 						<el-table-column type="index" label="序号" width="55" align="center" />
-						<el-table-column prop="value" label="字典值" header-align="center" min-width="120"
-							show-overflow-tooltip>
+						<el-table-column prop="value" label="字典值" header-align="center" min-width="120" show-overflow-tooltip>
 							<template #default="scope">
-								<el-tag :type="scope.row.tagType" :style="scope.row.styleSetting"
-									:class="scope.row.classSetting">{{ scope.row.value }}</el-tag>
+								<el-tag :type="scope.row.tagType" :style="scope.row.styleSetting" :class="scope.row.classSetting">{{ scope.row.value }}</el-tag>
 							</template>
 						</el-table-column>
-						<el-table-column prop="code" label="编码" header-align="center" min-width="120"
-							show-overflow-tooltip />
-						<el-table-column prop="name" label="名称" header-align="center" min-width="120"
-							show-overflow-tooltip />
+						<el-table-column prop="code" label="编码" header-align="center" min-width="120" show-overflow-tooltip />
+						<el-table-column prop="name" label="名称" header-align="center" min-width="120" show-overflow-tooltip />
 						<el-table-column prop="extData" label="拓展数据" width="90" align="center">
 							<template #default="scope">
-								<el-tag type="warning"
-									v-if="scope.row.extData == null || scope.row.extData == ''">空</el-tag>
+								<el-tag type="warning" v-if="scope.row.extData == null || scope.row.extData == ''">空</el-tag>
 								<el-tag type="success" v-else>有值</el-tag>
 							</template>
 						</el-table-column>
@@ -135,29 +121,31 @@
 						<el-table-column label="操作" width="80" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tooltip content="编辑">
-									<el-button icon="ele-Edit" size="small" text type="primary"
-										@click="openEditDictData(scope.row)"> </el-button>
+									<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictData(scope.row)"> </el-button>
 								</el-tooltip>
 								<el-tooltip content="删除">
-									<el-button icon="ele-Delete" size="small" text type="danger"
-										@click="delDictData(scope.row)"> </el-button>
+									<el-button icon="ele-Delete" size="small" text type="danger" @click="delDictData(scope.row)"> </el-button>
 								</el-tooltip>
 							</template>
 						</el-table-column>
 					</el-table>
-					<el-pagination v-model:currentPage="state.tableDictDataParams.page"
-						v-model:page-size="state.tableDictDataParams.pageSize" :total="state.tableDictDataParams.total"
-						:page-sizes="[10, 20, 50, 100]" small background @size-change="handleDictDataSizeChange"
+					<el-pagination
+						v-model:currentPage="state.tableDictDataParams.page"
+						v-model:page-size="state.tableDictDataParams.pageSize"
+						:total="state.tableDictDataParams.total"
+						:page-sizes="[10, 20, 50, 100]"
+						small
+						background
+						@size-change="handleDictDataSizeChange"
 						@current-change="handleDictDataCurrentChange"
-						layout="total, sizes, prev, pager, next, jumper" />
+						layout="total, sizes, prev, pager, next, jumper"
+					/>
 				</el-card>
 			</el-col>
 		</el-row>
 
-		<EditDictType ref="editDictTypeRef" :title="state.editDictTypeTitle" @handleQuery="handleDictTypeQuery"
-			@handleUpdate="updateDictSession" />
-		<EditDictData ref="editDictDataRef" :title="state.editDictDataTitle" @handleQuery="handleDictDataQuery"
-			@handleUpdate="updateDictSession" />
+		<EditDictType ref="editDictTypeRef" :title="state.editDictTypeTitle" @handleQuery="handleDictTypeQuery" @handleUpdate="updateDictSession" />
+		<EditDictData ref="editDictDataRef" :title="state.editDictDataTitle" @handleQuery="handleDictDataQuery" @handleUpdate="updateDictSession" />
 	</div>
 </template>
 
@@ -297,7 +285,7 @@ const delDictType = (row: any) => {
 			updateDictSession();
 			ElMessage.success('删除成功');
 		})
-		.catch(() => { });
+		.catch(() => {});
 };
 
 // 删除字典值
@@ -313,7 +301,7 @@ const delDictData = (row: any) => {
 			updateDictSession();
 			ElMessage.success('删除成功');
 		})
-		.catch(() => { });
+		.catch(() => {});
 };
 
 // 改变字典页面容量