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

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

@@ -670,9 +670,6 @@ import CodeListService from "@service/app/codelist-service";
                 this.items.some((val: any, num: number) =>{
                     if(JSON.stringify(val) == JSON.stringify(record)){
                         this.items.splice(num,1);
-                        <#if ctrl.isEnableGroup?? && ctrl.isEnableGroup()>
-                        this.group();
-                        </#if>
                         return true;
                     }
                 }); 
@@ -723,6 +720,9 @@ import CodeListService from "@service/app/codelist-service";
                       this.items.some((item:any,index:number)=>{
                             if(Object.is(item.srfkey,data.srfkey)){
                                 this.items.splice(index,1);
+                                <#if ctrl.isEnableGroup?? && ctrl.isEnableGroup()>
+                                this.group();
+                                </#if>
                                 return true;
                             }
                         });

@LOGIC/@UIACTION/后台调用/LOGIC.vue.ftl

@@ -92,10 +92,6 @@ ${backend_block}
           context.srfsessionkey = context.srfsessionid;
             delete context.srfsessionid;
         }
-        <#-- 关闭编辑视图 -->
-        <#if item.isCloseEditView()>
-              actionContext.closeView(null);
-        </#if>
         const backend = () => {
         <#if item.getPSAppDataEntity?? && item.getPSAppDataEntity()?? && item.getPSAppDEMethod?? && item.getPSAppDEMethod()??>
             const curService:${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}Service =  new ${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}Service();
@@ -117,6 +113,10 @@ ${backend_block}
                     xData.refresh(args);
                 }
                 </#if>
+                <#-- 关闭编辑视图 -->
+                <#if item.isCloseEditView()>
+                actionContext.closeView(null);
+                </#if>
                 <#--  后续界面行为  -->
                 <#if item.getNextPSUIAction?? && item.getNextPSUIAction()??>
                 <#assign nextPSUIAction = item.getNextPSUIAction()/>