Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7 into dev

@CONTROL/移动端多项数据控件/CONTROL-BASE.vue.ftl

@@ -306,7 +306,7 @@
     * @param {Array<any>}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
-    public selectdata:Array<any> = [];
+    public selectedArray:Array<any> = [];
 
     /**
     * 多选计数
@@ -533,7 +533,7 @@
         }
         this.items.forEach((item:any)=>{
             // 计算是否选中
-            let index = this.selectdata.findIndex((temp:any)=>{return temp.srfkey == item.srfkey});
+            let index = this.selectedArray.findIndex((temp:any)=>{return temp.srfkey == item.srfkey});
             if(index != -1 || Object.is(this.selectedValue,item.srfkey)){
                 item.checked = true;
             }else{
@@ -636,13 +636,13 @@
     */
     public item_click(item:any){
         if(this.isChoose){
-            let count = this.selectdata.findIndex((i) => {
+            let count = this.selectedArray.findIndex((i) => {
             return i.mobentityid == item.mobentityid;
         });
             if (count === -1) {
-                this.selectdata.push(item);
+                this.selectedArray.push(item);
             } else {
-                this.selectdata.splice(count, 1);
+                this.selectedArray.splice(count, 1);
             }
         } else {
             this.goPage(item)
@@ -664,7 +664,7 @@
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
     public getDatas(): any[] {
-      return this.service.handleRequestDatas(this.context,this.selectdata);
+      return this.service.handleRequestDatas(this.context,this.selectedArray);
     }
 
     /**
@@ -673,7 +673,7 @@
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
     public getData(): any {
-        return this.selectdata[0];
+        return this.selectedArray[0];
     }
 
     /**
@@ -827,8 +827,8 @@
      */
     public mdctrl_click($event: any, tag: any, item: any): void {
         $event.stopPropagation();
-        this.selectdata = [];
-        this.selectdata.push(item);
+        this.selectedArray = [];
+        this.selectedArray.push(item);
 <#if ctrl.getPSDEUIActionGroup()?? && ctrl.getPSDEUIActionGroup().getPSUIActionGroupDetails()??>
 <#assign details = ctrl.getPSDEUIActionGroup().getPSUIActionGroupDetails()>
 <#list details as detail>
@@ -867,7 +867,7 @@
     public onSimpleSelChange(item: any = {}) {
         this.$emit('selectionchange', [item]);
         this.selectedValue = item.srfkey;
-        this.selectdata = [];
+        this.selectedArray = [];
         this.goPage(item);
     }
 
@@ -886,18 +886,44 @@
      */
     public checkboxSelect(item:any){
         item.checked = !item.checked
-        let count = this.selectdata.findIndex((_item:any) => {
+        let count = this.selectedArray.findIndex((_item:any) => {
             return _item.${appde.getKeyPSAppDEField().getCodeName()?lower_case} == item.${appde.getKeyPSAppDEField().getCodeName()?lower_case};
         });
         if(count == -1){
-            this.selectdata.push(item);
+            this.selectedArray.push(item);
         }else{
-            this.selectdata.splice(count , 1);
+            this.selectedArray.splice(count , 1);
         }
-        let _count = Object.is(this.items.length , this.selectdata.length)? 1 : this.selectdata.length > 0 ? 2 : 0;
+        let _count = Object.is(this.items.length , this.selectedArray.length)? 1 : this.selectedArray.length > 0 ? 2 : 0;
         this.$emit("checkBoxChange", _count)
         this.$forceUpdate();
     }
+    /** 
+     * checkbox 选中回调
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}
+     */
+    public checkboxChange(data: any) {
+        let { detail } = data;
+        if (!detail) {
+            return;
+        }
+        let { value } = detail;
+        this.selectednumber = 0;
+        this.items.forEach((item: any, index: number) => {
+            if (item.value) {
+                this.selectednumber++;
+            }
+            if (Object.is(item.${appde.getKeyPSAppDEField().getCodeName()?lower_case}, value)) {
+                if (detail.checked) {
+                    this.selectedArray.push(this.items[index]);
+                } else {
+                    this.selectedArray.splice(this.selectedArray.findIndex((i: any) => i.value === item.value), 1)
+                }
+            }
+        });
+        this.$emit('selectionchange', this.selectedArray);
+    }
 
     /**
      * 全选事件
@@ -910,9 +936,9 @@
             this.items[index].checked = value;
         }
         if(value){
-            this.selectdata = [...this.items];
+            this.selectedArray = [...this.items];
         }else{
-            this.selectdata = [];
+            this.selectedArray = [];
         }
         this.$forceUpdate();
     }

APP/src/locale/lang/en-US-base.ts.ftl

@@ -58,6 +58,7 @@ export default {
             </#if>
         },
         portlets:{
+            <#if list app.getAppPSAppPortlets?? && list app.getAppPSAppPortlets()??>
             <#list app.getAppPSAppPortlets() as portlet>
             <#assign obj = portlet>
             <#if portlet.getPSSysPortlet?? && portlet.getPSSysPortlet()??>
@@ -71,6 +72,7 @@ export default {
              },
             </#if>
             </#list>
+            </#if>
         },
         menus: {
             <#list app.getAllPSAppMenuModels() as menu>

APP/src/locale/lang/zh-CN-base.ts.ftl

@@ -58,6 +58,7 @@ export default {
             </#if>
         },
         portlets:{
+            <#if list app.getAppPSAppPortlets?? && list app.getAppPSAppPortlets()??>
             <#list app.getAppPSAppPortlets() as portlet>
             <#assign obj = portlet>
             <#if portlet.getPSSysPortlet?? && portlet.getPSSysPortlet()??>
@@ -71,6 +72,7 @@ export default {
              },
             </#if>
             </#list>
+            </#if>
         },
         menus: {
             <#list app.getAllPSAppMenuModels() as menu>