gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
master 2024-11-05 13:41:09 +08:00
commit f4e5f255ae
4 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -45,7 +45,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.170" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="SSH.NET" Version="2024.1.0" /> <PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1115" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1116" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

3
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs
View File

@ -60,8 +60,7 @@ public static class SqlSugarFilter
if (orgIds == null || orgIds.Count == 0) return; if (orgIds == null || orgIds.Count == 0) return;
// 获取业务实体数据表 // 获取业务实体数据表
var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsSubclassOf(typeof(EntityBaseData)));
&& u.IsSubclassOf(typeof(EntityBaseData)));
if (!entityTypes.Any()) return; if (!entityTypes.Any()) return;
orgFilter = new ConcurrentDictionary<Type, LambdaExpression>(); orgFilter = new ConcurrentDictionary<Type, LambdaExpression>();

6
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2024.11.03", "lastBuildTime": "2024.11.04",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -48,7 +48,7 @@
"mqtt": "^5.10.1", "mqtt": "^5.10.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"ol": "^10.2.1", "ol": "^10.2.1",
"pinia": "^2.2.5", "pinia": "^2.2.6",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"push.js": "^1.0.12", "push.js": "^1.0.12",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
@ -71,7 +71,7 @@
"vue-router": "^4.4.5", "vue-router": "^4.4.5",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.2.37", "vxe-pc-ui": "^4.2.38",
"vxe-table": "^4.7.59", "vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",

28
Web/src/views/system/codeGen/component/genConfigDialog.vue
View File

@ -231,29 +231,13 @@ const rowDrop = () => {
const fullData = xGrid.value?.getTableData().fullData || []; const fullData = xGrid.value?.getTableData().fullData || [];
const newIndex = sortableEvent.newIndex as number; const newIndex = sortableEvent.newIndex as number;
const oldIndex = sortableEvent.oldIndex as number; const oldIndex = sortableEvent.oldIndex as number;
// 往前移动 var orderNo = fullData[newIndex - 1].orderNo;
if (oldIndex > newIndex) { fullData[newIndex].orderNo = orderNo! + 10;
const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1); const currentRow = fullData.splice(oldIndex, 1)[0];
for (let i = oldIndex; i > newIndex; i--) { fullData.splice(newIndex, 0, currentRow);
const row = fullData?.find((e) => e.orderNo == i); fullData.forEach((u, i) => (u.orderNo = 100 + i * 10));
if (row) {
row.orderNo += 1;
}
}
moveRow.orderNo = newIndex + 1;
} else {
// 往后移动
const moveRow = fullData?.find((e) => e.orderNo == oldIndex + 1);
for (let i = oldIndex; i < newIndex; i++) {
const row = fullData?.find((e) => e.orderNo == i + 2);
if (row) {
row.orderNo -= 1;
}
}
moveRow.orderNo = newIndex + 1;
}
// 更新表格数据 // 更新表格数据
xGrid.value?.updateData(); xGrid.value?.loadData(fullData);
}, },
}); });
}; };