Merge branch 'dev'

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

@@ -212,6 +212,14 @@ import CodeListService from "@/codelist/codelist-service";
      */
     @Prop() public fetchAction!: string;
 
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    @Prop() public isSingleSelect!: boolean;
+
 <#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??>
   <#list view.getPSAppViewLogics() as logic>
     <#if logic.getPFLogicCodeType() == 'APP_NEWDATA'>
@@ -897,6 +905,9 @@ import CodeListService from "@/codelist/codelist-service";
      */
     public handleClick(args: any) {
         //  this.clearSelection();
+        if(this.isingleSelect){
+            this.clearSelection();
+        }
         args.isselected = !args.isselected;
         this.selectchange();
     }

@CONTROL/列表导航/CONTROL.html.ftl

 <#assign content>
     :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}" 
+    :isSingleSelect="isSingleSelect"
   <#if view.getViewType() == 'DELISTEXPVIEW'>
     :viewUID="viewUID"
   </#if>

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

@@ -812,6 +812,11 @@ ${gridColumn.getName()}
             const sort: string = this.minorSortPSDEF+","+this.minorSortDir;
             Object.assign(page, { sort: sort });
         }
+        //清空selections
+        if(this.selections && this.selections.length > 0) {
+            this.selections = [];
+            this.$emit('selectionchange', this.selections);
+        }
         Object.assign(arg, page);
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
@@ -831,7 +836,7 @@ ${gridColumn.getName()}
             this.totalrow = response.total;
             this.items = JSON.parse(JSON.stringify(data));
             // 清空selections,gridItemsModel
-            //this.selections = [];
+            // this.selections = [];
             this.gridItemsModel = [];
             this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
             this.items.forEach((item:any)=>{
@@ -1364,10 +1369,6 @@ ${gridColumn.getName()}
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

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

@@ -116,7 +116,7 @@ ${backend_block}
         const backend = () => {
         <#if item.getPSAppDataEntity?? && item.getPSAppDataEntity()?? && item.getPSAppDEMethod?? && item.getPSAppDEMethod()??>
             const curService:${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}Service =  new ${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}Service();
-            curService.${item.getPSAppDEMethod().getCodeName()}<#if item.getActionTarget() == 'MULTIKEY'>Batch</#if>(context,data, ${item.isShowBusyIndicator()?c}).then((response: any) => {
+            curService.${item.getPSAppDEMethod().getCodeName()}<#if item.getActionTarget() == 'MULTIKEY' && item.getPSDEAction?? && item.getPSDEAction()?? && item.getPSDEAction().getActionType?? && item.getPSDEAction().getActionType()?? && item.getPSDEAction().getActionType() =="USERCUSTOM">Batch</#if>(context,data, ${item.isShowBusyIndicator()?c}).then((response: any) => {
                 if (!response || response.status !== 200) {
                     actionContext.$Notice.error({ title: '错误', desc: response.message });
                     return;