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

Merge pull request '更新统计bug' (#277) from aq982 into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/277
This commit is contained in:
zuohuaijun 2025-02-27 15:42:55 +08:00
commit 2c607ae49b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm
View File

@ -268,6 +268,7 @@ const state = reactive({
showAdvanceQueryUI: false, showAdvanceQueryUI: false,
queryParams: { queryParams: {
searchKey: undefined, searchKey: undefined,
GroupBy: [] as any,
@if(Model.QueryWhetherList.Count > 0) { @if(Model.QueryWhetherList.Count > 0) {
@foreach (var column in Model.QueryWhetherList) { @foreach (var column in Model.QueryWhetherList) {
@:@(@column.LowerPropertyName): undefined, @:@(@column.LowerPropertyName): undefined,
@ -350,7 +351,7 @@ const checkTableColumnVisible = (tableColumnName: any) => {
if (@column.Statistical == "Y"){ if (@column.Statistical == "Y"){
@: if (column.field === '@(@column.LowerPropertyName)') { @: if (column.field === '@(@column.LowerPropertyName)') {
@: // 计算表格内总和 @: // 计算表格内总和
@: return `${data.reduce((sum, row) => sum + (row.@(@column.LowerPropertyName) || 0), 0)}/总数：${totalSum.@(@column.LowerPropertyName)}` @: return `${data.reduce((sum, row) => sum + (row.@(@column.LowerPropertyName) || 0), 0)}/总数：${totalSum?.@(@column.LowerPropertyName)||0}`
@: } @: }
} }
} }
@ -377,6 +378,9 @@ const checkTableColumnVisible = (tableColumnName: any) => {
return checkTableColumnVisible(`@Model.LowerClassName:${column.field}`); return checkTableColumnVisible(`@Model.LowerClassName:${column.field}`);
}, },
}, },
@if(@Model.TableField.Any(x=>x.Statistical == "Y")||@Model.TableField.Any(x=>x.IsGroupBy == "Y")){
@:showFooter: true, // ✅ 正确控制表尾显示
}
} }
); );
@ -398,6 +402,12 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
// 查询操作 // 查询操作
const handleQuery = async (reset = false) => { const handleQuery = async (reset = false) => {
options.loading = true; options.loading = true;
state.queryParams.GroupBy = [];
@foreach (var column in Model.TableField){
if (@column.IsGroupBy == "Y"){
@:state.queryParams.GroupBy.push('@(@column.PropertyName)');
}
}
@if(@Model.TableField.Any(x=>x.Statistical == "Y")){ @if(@Model.TableField.Any(x=>x.Statistical == "Y")){
@if (@Model.IsApiService) { @if (@Model.IsApiService) {
@:state.totalSum =getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)GetTotalSumPost(params).data.result; @:state.totalSum =getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)GetTotalSumPost(params).data.result;