数据分组---fix1

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

@@ -31,6 +31,7 @@
         </div>
   </#if>
         <row class="data-view-container" v-if="items.length > 0" :gutter="20" type="flex" justify="start" style="margin:0px;">
+        <#if ctrl.isEnableGroup?? && !ctrl.isEnableGroup()>
             <a v-for="(item,index) in items" :key="index" :href = "item.starturl">
                 <i-col <#if ctrl.getCardColLG() gt 0> :lg="${ctrl.getCardColLG()?c}"</#if><#if ctrl.getCardColMD() gt 0> :md="${ctrl.getCardColMD()?c}"</#if><#if ctrl.getCardColSM() gt 0> :sm="${ctrl.getCardColSM()?c}"</#if><#if ctrl.getCardColXS() gt 0> :xs="${ctrl.getCardColXS()?c}"</#if> style="<#if ctrl.getCardHeight() gt 0>height: ${ctrl.getCardHeight()?c}<#else>min-height: 170</#if>px;<#if ctrl.getCardWidth() gt 0> width: ${ctrl.getCardWidth()?c}px;</#if>margin-bottom: 10px;">
                     <el-card shadow="always" :class="[ item.isselected === true ? 'isselected' : false, 'single-card-data' ]" @click.native="handleClick(item)" @dblclick.native="handleDblClick(item)">
@@ -53,13 +54,50 @@
                     </el-card>
                 </i-col>
             </a>
+        <#elseif ctrl.isEnableGroup?? && ctrl.isEnableGroup()>
+            <el-collapse>
+                <el-collapse-item v-for="(group,index) in items" :key="index" :title="group.group">
+                    <div v-if="group.children.length > 0">
+                        <a v-for="(item,i) in group.children" :key="i" :href="item.starturl">
+                            <i-col  style="min-height: 170px;margin-bottom: 10px;max-width: 194px;">
+                                <el-card shadow="always" :class="[ item.isselected === true ? 'isselected' : false, 'single-card-data' ]" @click.native="handleClick(item)" @dblclick.native="handleDblClick(item)">
+                                <#if ctrl.getItemPSLayoutPanel()??>
+                                    <#assign panel = ctrl.getItemPSLayoutPanel()>
+                                    <@ibizindent blank=24>
+                                    ${P.getCtrlCode(panel, 'CONTROL.html').code}
+                                    </@ibizindent>
+                                <#elseif ctrl.itemRender??>
+                                    ${ctrl.itemRender.code}
+                                <#else>
+                                    <img v-if="item.srficonpath" :src="item.srficonpath" class="single-card-img" />
+                                    <img v-else src="/assets/img/noimage.png" class="single-card-img" />
+                                    <div class="single-card-default">
+                                        <Tooltip :content="item.srfmajortext">
+                                        {{item.srfmajortext}}
+                                        </Tooltip>
+                                    </div>
+                                </#if>
+                                </el-card>
+                            </i-col>
+                        </a>
+                    </div>
+                    <div v-else>
+                        {{ $t('app.commonWords.noData') }}
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </#if>
         </row>
         <div v-else class="app-data-empty">{{ $t('app.commonWords.noData') }}</div>
         <el-backtop target=".content-container .app-data-view"></el-backtop>
   </div>
 </#if>
 </template>
-
+<#if ctrl.getGroupMode?? && ctrl.getGroupMode() == 'CODELIST'>
+<#assign import_block>
+import CodeListService from "@service/app/codelist-service";
+</#assign>
+</#if>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
 </#ibizinclude>
@@ -162,6 +200,120 @@
      */
     public thisRef: any = this;
 
+<#if ctrl.isEnableGroup?? && ctrl.isEnableGroup()>
+    /**
+     * 分组属性
+     * 
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public groupProperty: string = "<#if ctrl.getGroupPSDEField?? && ctrl.getGroupPSDEField()??>${ctrl.getGroupPSDEField().getCodeName()?lower_case}</#if>";
+</#if>
+
+<#if ctrl.getGroupMode?? && ctrl.getGroupMode() == 'CODELIST'>
+    /**
+     * 代码表服务对象
+     *
+     * @type {CodeListService}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */  
+    public codeListService:CodeListService = new CodeListService({ $store: this.$store });
+
+    /**
+     * 分组代码表标识
+     * 
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public tag: string = "<#if ctrl.getGroupPSCodeList?? && ctrl.getGroupPSCodeList()??>${ctrl.getGroupPSCodeList().getCodeName()}</#if>";
+
+    /**
+     * 分组代码表类型
+     * 
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public codelistType: string = "<#if ctrl.getGroupPSCodeList?? && ctrl.getGroupPSCodeList()??>${ctrl.getGroupPSCodeList().getCodeListType()}</#if>";
+
+    /**
+     * 根据分组代码表绘制分组列表
+     * 
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public async drawCodelistGroup(){
+        let groups: Array<any> = [];
+        let groupTree:Array<any> = [];
+        let data:Array<any> = [...this.items];
+        // 动态代码表
+        if (Object.is(this.codelistType, "DYNAMIC")) {
+            groups = await this.codeListService.getItems(this.tag);
+        // 静态代码表
+        } else if(Object.is(this.codelistType, "STATIC")){
+            groups = await this.$store.getters.getCodeListItems(this.tag);
+        }
+        groups.forEach((group: any,i: number)=>{
+            let children:Array<any> = [];
+            data.forEach((item: any,j: number)=>{
+                if(Object.is(group.label,item[this.groupProperty])){
+                    children.push(item);
+                }
+            });
+            const tree: any ={
+                group: group.label,
+                children: children
+            }
+            groupTree.push(tree);
+        });
+        let child:Array<any> = [];
+        data.forEach((item: any)=>{
+            let i = groups.findIndex((group: any)=>Object.is(group,item[this.groupProperty]));
+            if(i < 0){
+                child.push(item);
+            }
+        })
+        const Tree: any = {
+            group: this.$t('app.commonWords.other'),
+            children: child
+        }
+        groupTree.push(Tree);
+        this.items = [...groupTree];
+    }
+</#if>
+
+<#if ctrl.getGroupMode?? && ctrl.getGroupMode() == 'AUTO'>
+    /**
+     * 绘制分组列表
+     * 
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public drawGroup(){
+        let data:Array<any> = [...this.items];
+        let groups:Array<any> = [];
+        data.forEach((item: any)=>{
+            if(item.hasOwnProperty(this.groupProperty)){
+                groups.push(item[this.groupProperty]);
+            }
+        });
+        groups = [...new Set(groups)];
+        let groupItems:Array<any> = [];
+        let groupTree:Array<any> = [];
+        groups.forEach((group: any,i: number)=>{
+            let children:Array<any> = [];
+            data.forEach((item: any,j: number)=>{
+                if(Object.is(group,item[this.groupProperty])){
+                    children.push(item);
+                }
+            });
+            const tree: any ={
+                group: group,
+                children: children
+            }
+            groupTree.push(tree);
+        });
+        this.items = [...groupTree];
+    }
+</#if>
+
     /**
      * 是否单选
      *
@@ -460,6 +612,11 @@
             if(this.isSelectFirstDefault){
                 this.handleClick(this.items[0]);
             }
+            <#if ctrl.getGroupMode?? && ctrl.getGroupMode() == 'AUTO'>
+            this.drawGroup();
+            <#elseif ctrl.getGroupMode?? && ctrl.getGroupMode() == 'CODELIST'>
+            this.drawCodelistGroup();
+            </#if>
         }, (response: any) => {
             if (response && response.status === 401) {
                 return;

@CONTROL/数据视图/CONTROL.less.ftl

@@ -72,6 +72,12 @@
         height: 100%;
 </#if>
         align-content: start;
+        .el-collapse{
+          width: 100%;
+          .el-collapse-item__content{
+            display: flex;
+          }
+        }
         .ivu-col{
           padding: 10px;
           .el-card__body{