解决冲突

Admin.NET/Admin.NET.Application/Configuration/Logging.json

@@ -5,7 +5,8 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning",
-      "Microsoft.EntityFrameworkCore": "Information"
+      "Microsoft.EntityFrameworkCore": "Information",
+      "AspNetCoreRateLimit": "None"
     },
     "File": {
       "Enabled": false, // 启用文件日志

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="AngleSharp" Version="1.1.2" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.2" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.3" />
     <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.5" />
     <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.5" />
     <PackageReference Include="Furion.Pure" Version="4.9.5.5" />
@@ -39,7 +39,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1076" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1077" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Core/Extension/SqlSugarExtension.cs

@@ -197,7 +197,7 @@ public static class SqlSugarExtension
 
             return Expression.Constant(valueparsed, propertyType);
         }
-        if (propertyType == typeof(long))
+        if (propertyType == typeof(long) || propertyType == typeof(long?))
         {
             string? stringLong = GetStringFromJsonElement(value);
 

Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.08.26",
+	"lastBuildTime": "2024.08.27",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -66,11 +66,11 @@
 		"vue-grid-layout": "3.0.0-beta1",
 		"vue-i18n": "^9.14.0",
 		"vue-json-pretty": "^2.4.0",
-		"vue-plugin-hiprint": "0.0.57-beta28",
+		"vue-plugin-hiprint": "0.0.57-beta29",
 		"vue-router": "^4.4.3",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.1.7",
+		"vxe-pc-ui": "^4.1.8",
 		"vxe-table": "^4.7.59",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.5",
@@ -84,8 +84,8 @@
 		"@types/node": "^20.14.14",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.2.0",
+		"@typescript-eslint/eslint-plugin": "^8.3.0",
-		"@typescript-eslint/parser": "^8.2.0",
+		"@typescript-eslint/parser": "^8.3.0",
 		"@vitejs/plugin-vue": "^5.1.2",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@vue/compiler-sfc": "^3.4.38",

Web/src/components/iconSelector/index.vue

@@ -210,3 +210,9 @@ watch(
 	}
 );
 </script>
+
+<style scoped>
+:deep(.el-tabs__nav) {
+	float: right !important;
+}
+</style>

Web/src/views/system/print/component/editPrint.vue

@@ -123,6 +123,7 @@ const loadTemplate = () => {
 	hiprintDesignRef.value?.hiprintTemplate.clear();
 	if (JSON.stringify(state.ruleForm) !== '{}') {
 		hiprintDesignRef.value?.hiprintTemplate.update(JSON.parse(state.ruleForm.template));
+		hiprintDesignRef.value?.initPaper();
 	}
 };
 

Web/src/views/system/print/component/hiprint/index.vue

@@ -163,13 +163,14 @@ const state = reactive({
 
 // 计算当前纸张类型
 const curPaperType = computed(() => {
+	let { width, height } = state.curPaper;
 	let type = 'other';
 	let types: any = state.paperTypes;
 	for (const key in types) {
 		let item = types[key];
-		let { width, height } = state.curPaper;
 		if (item.width === width && item.height === height) {
 			type = key;
+			break;
 		}
 	}
 	return type;
@@ -321,8 +322,18 @@ onMounted(() => {
 	// otherPaper(); // 默认纸张
 });
 
+// 初始化纸张大小
+const initPaper = () => {
+	var template = hiprintTemplate.value.getJson();
+	var width = template.panels[0].width;
+	var height = template.panels[0].height;
+
+	state.curPaper = { type: '', width: width, height: height }; // 计算纸张类型和状态
+	hiprintTemplate.value.setPaper(width, height); // 设置纸张大小
+};
+
 // 导出对象
-defineExpose({ hiprintTemplate });
+defineExpose({ hiprintTemplate, initPaper });
 </script>
 
 <style lang="scss" scoped>