优化列表，数据视图，表格分组

@CONTROL/列表/CONTROL-BASE.vue.ftl

@@ -243,7 +243,7 @@ import CodeListService from "@/codelist/codelist-service";
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public groupFieldCodelist: any = {<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>type: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeListType()}',tag: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeName()}'</#if>};
+    public groupFieldCodelist: boolean = '<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>true<#else>false</#if>';
 
     /**
      * 分组数据
@@ -301,22 +301,17 @@ import CodeListService from "@/codelist/codelist-service";
             groups = Util.deepCopy(groupCodelist);
 
         }
-        if(Object.keys(this.groupFieldCodelist).length > 0){
-            let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
-            fields = Util.deepCopy(fieldCodelist);
-        }
         if(groups.length == 0){
             console.warn("分组数据无效");
         }
         groups.forEach((group: any,i: number)=>{
             let children:Array<any> = [];
             data.forEach((item: any,j: number)=>{
-                if(fields && fields.length > 0){
-                    const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                    if(arr && arr.length>0 && Object.is(group.label,arr[0].label)) {
+                if(this.groupFieldCodelist){
+                    if(Object.is(group.label,item[this.groupField])) {
                         children.push(item);
                     }
-                }else if(Object.is(group.label,item[this.groupField])){
+                }else if(Object.is(group.value,item[this.groupField])){
                     children.push(item);
                 }
             });
@@ -329,13 +324,10 @@ import CodeListService from "@/codelist/codelist-service";
         let child:Array<any> = [];
         data.forEach((item: any)=>{
             let i: number = 0;
-            if(fields && fields.length > 0){
-                const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                if(arr && arr.length>0) {
-                    i = groups.findIndex((group: any)=>Object.is(group.label,arr[0].label));
-                }
-            }else{
+            if(this.groupFieldCodelist){
                 i = groups.findIndex((group: any)=>Object.is(group.label,item[this.groupField]));
+            }else{
+                i = groups.findIndex((group: any)=>Object.is(group.value,item[this.groupField]));
             }
             if(i < 0){
                 child.push(item);
@@ -362,18 +354,9 @@ import CodeListService from "@/codelist/codelist-service";
         let data:Array<any> = [...this.items];
         let groups:Array<any> = [];
         let fields: Array<any> = [];
-        if(Object.keys(this.groupFieldCodelist).length > 0){
-            let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
-            fields = Util.deepCopy(fieldCodelist);
-        }
         data.forEach((item: any)=>{
             if(item.hasOwnProperty(this.groupField)){
-                if(fields && fields.length > 0){
-                    const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                    groups.push(arr[0].label);
-                }else{
-                    groups.push(item[this.groupField]);
-                }
+                groups.push(item[this.groupField]);
             }
         });
         groups = [...new Set(groups)];

@CONTROL/数据视图/CONTROL-BASE.vue.ftl

@@ -263,7 +263,7 @@ import CodeListService from "@/codelist/codelist-service";
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public groupFieldCodelist: any = {<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>type: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeListType()}',tag: '${ctrl.getGroupPSDEField().getPSCodeList().getCodeName()}'</#if>};
+    public groupFieldCodelist: boolean = '<#if ctrl.getGroupPSDEField()?? && ctrl.getGroupPSDEField().getPSCodeList?? && ctrl.getGroupPSDEField().getPSCodeList()??>true<#else>false</#if>';
 
     /**
      * 分组数据
@@ -358,11 +358,6 @@ import CodeListService from "@/codelist/codelist-service";
         if(Object.keys(this.groupCodelist).length > 0){
             let groupCodelist: any = await this.codeListService.getDataItems(this.groupCodelist);
             groups = Util.deepCopy(groupCodelist);
-
-        }
-        if(Object.keys(this.groupFieldCodelist).length > 0){
-            let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
-            fields = Util.deepCopy(fieldCodelist);
         }
         if(groups.length == 0){
             console.warn("分组数据无效");
@@ -370,12 +365,11 @@ import CodeListService from "@/codelist/codelist-service";
         groups.forEach((group: any,i: number)=>{
             let children:Array<any> = [];
             data.forEach((item: any,j: number)=>{
-                if(fields && fields.length > 0){
-                    const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                    if(arr && arr.length>0 && Object.is(group.label,arr[0].label)) {
+                if(this.groupFieldCodelist){
+                    if(Object.is(group.label,item[this.groupField])) {
                         children.push(item);
                     }
-                }else if(Object.is(group.label,item[this.groupField])){
+                }else if(Object.is(group.value,item[this.groupField])){
                     children.push(item);
                 }
             });
@@ -388,13 +382,10 @@ import CodeListService from "@/codelist/codelist-service";
         let child:Array<any> = [];
         data.forEach((item: any)=>{
             let i: number = 0;
-            if(fields && fields.length > 0){
-                const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                if(arr && arr.length>0) {
-                    i = groups.findIndex((group: any)=>Object.is(group.label,arr[0].label));
-                }
-            }else{
+            if(this.groupFieldCodelist){
                 i = groups.findIndex((group: any)=>Object.is(group.label,item[this.groupField]));
+            }else{
+                i = groups.findIndex((group: any)=>Object.is(group.value,item[this.groupField]));
             }
             if(i < 0){
                 child.push(item);
@@ -421,18 +412,9 @@ import CodeListService from "@/codelist/codelist-service";
         let data:Array<any> = [...this.items];
         let groups:Array<any> = [];
         let fields: Array<any> = [];
-        if(Object.keys(this.groupFieldCodelist).length > 0){
-            let fieldCodelist: any = await this.codeListService.getDataItems(this.groupFieldCodelist);
-            fields = Util.deepCopy(fieldCodelist);
-        }
         data.forEach((item: any)=>{
             if(item.hasOwnProperty(this.groupField)){
-                if(fields && fields.length > 0){
-                    const arr:Array<any> = fields.filter((field:any)=>{return field.value == item[this.groupField]});
-                    groups.push(arr[0].label);
-                }else{
-                    groups.push(item[this.groupField]);
-                }
+                groups.push(item[this.groupField]);
             }
         });
         groups = [...new Set(groups)];

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -1485,6 +1485,7 @@ ${gridColumn.getName()}
         }
         return codelist;
     }
+
     /**
      * 根据分组代码表绘制分组列表
      * 
@@ -1505,13 +1506,12 @@ ${gridColumn.getName()}
             let children:Array<any> = [];
             this.items.forEach((item: any,j: number)=>{
                 if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    if(Object.is(group.label,arr[0].label)){
+                    if(Object.is(group.label,item[this.groupAppField])){
                         item.groupById = Number((i+1) * 100 + (j+1) * 1);
                         item.group = '';
                         children.push(item);
                     }
-                }else if(Object.is(group.label,item[this.groupAppField])){
+                }else if(Object.is(group.value,item[this.groupAppField])){
                     item.groupById = Number((i+1) * 100 + (j+1) * 1);
                     item.group = '';
                     children.push(item);
@@ -1550,10 +1550,9 @@ ${gridColumn.getName()}
         this.items.forEach((item: any,index: number)=>{
             let i: number = 0;
             if(allGroupField && allGroupField.length > 0){
-                const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                i = allGroup.findIndex((group: any)=>Object.is(group.label,arr[0].label));
-            }else{
                 i = allGroup.findIndex((group: any)=>Object.is(group.label,item[this.groupAppField]));
+            }else{
+                i = allGroup.findIndex((group: any)=>Object.is(group.value,item[this.groupAppField]));
             }
             if(i < 0){
                 item.groupById = Number((allGroup.length+1) * 100 + (index+1) * 1);
@@ -1613,16 +1612,9 @@ ${gridColumn.getName()}
         if(!this.isEnableGroup) return;
         // 分组
         let allGroup: Array<any> = [];
-        let allGroupField: Array<any> =[];
-        allGroupField = this.getGroupCodelist(this.groupAppFieldCodelistType,this.groupAppFieldCodelistTag);
         this.items.forEach((item: any)=>{
             if(item.hasOwnProperty(this.groupAppField)){
-                if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    allGroup.push(arr[0].label);
-                }else{
-                    allGroup.push(item[this.groupAppField]);
-                }
+                allGroup.push(item[this.groupAppField]);
             }
         });
         let groupTree:Array<any> = [];