Merge branch 'dev'

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

@@ -6,10 +6,11 @@
 <div>
 </#if>
     <div :class="['app-list',<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()>'${singleCss.getCssName()}',</#if>this.items.length > 0 ? '' : 'app-list-empty' ]">
-        <div v-if="items.length > 0">
 <#if ctrl.render??>
             ${ctrl.render.code}
-<#elseif ctrl.isEnableGroup?? && !ctrl.isEnableGroup()>                 
+<#else>
+        <div v-if="items.length > 0">
+<#if ctrl.isEnableGroup?? && !ctrl.isEnableGroup()>                 
             <div v-for = "item in items" :key="item.srfkey"  :class="['app-list-item', {'isSelect': item.isselected === true ? true : false}]" @click="handleClick(item)"  @dblclick="handleDblClick(item)">
   <#if ctrl.getItemPSLayoutPanel()??>
     <#assign panel = ctrl.getItemPSLayoutPanel()>
@@ -99,6 +100,7 @@
             </#if>
         </div>
         <el-backtop target=".content-container .app-list"></el-backtop>
+</#if>
     </div>
 <#if ctrl.getBatchPSDEToolbar?? && ctrl.getBatchPSDEToolbar()??>
     <row class='list-pagination' v-if="selections.length > 0">
@@ -893,7 +895,7 @@ import CodeListService from "@/codelist/codelist-service";
      *
      */
     public handleClick(args: any) {
-        this.clearSelection();
+        //  this.clearSelection();
         args.isselected = !args.isselected;
         this.selectchange();
     }
@@ -940,11 +942,15 @@ import CodeListService from "@/codelist/codelist-service";
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */ 
     public ActionModel:any ={
-    <#if ctrl.getPSAppViewUIActions?? && ctrl.getPSAppViewUIActions()??>
-    <#list ctrl.getPSAppViewUIActions() as viewUIAction>
-        <#if viewUIAction.getPSUIAction?? && viewUIAction.getPSUIAction()??>
-        <#assign UIAction = viewUIAction.getPSUIAction() />
-        "${UIAction.getUIActionTag()}":{name:"${UIAction.getUIActionTag()}",icon:"<#if UIAction.getPSSysImage()??><#assign img=UIAction.getPSSysImage() /><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>",caption:"${UIAction.getCaption()}",disabled: false, visabled: true,noprivdisplaymode:<#if UIAction.getNoPrivDisplayMode(view)??>${UIAction.getNoPrivDisplayMode(view)}</#if>,dataaccaction: "<#if UIAction.getDataAccessAction()??>${UIAction.getDataAccessAction()}</#if>", actiontarget: "${UIAction.getActionTarget()}"}<#if viewUIAction_has_next>,</#if>
+    <#if ctrl.getPSDEListItems?? && ctrl.getPSDEListItems()??>
+    <#list ctrl.getPSDEListItems() as listItem>
+        <#if listItem.getPSDEUIActionGroup?? && listItem.getPSDEUIActionGroup()??>
+        <#assign UIActionGrop = listItem.getPSDEUIActionGroup() />
+        <#if UIActionGrop.getPSUIActions?? && UIActionGrop.getPSUIActions()??>
+        <#list UIActionGrop.getPSUIActions() as UIAction >
+         "${UIAction.getUIActionTag()}":{name:"${UIAction.getUIActionTag()}",icon:"<#if UIAction.getPSSysImage()??><#assign img=UIAction.getPSSysImage() /><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>",caption:"${UIAction.getCaption()}",disabled: false, visabled: true,noprivdisplaymode:<#if UIAction.getNoPrivDisplayMode(view)??>${UIAction.getNoPrivDisplayMode(view)}</#if>,dataaccaction: "<#if UIAction.getDataAccessAction()??>${UIAction.getDataAccessAction()}</#if>", actiontarget: "${UIAction.getActionTarget()}"},
+        </#list>
+        </#if>
         </#if>
     </#list>
     </#if>

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

@@ -490,11 +490,15 @@ import CodeListService from "@/codelist/codelist-service";
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */ 
     public ActionModel:any ={
-    <#if ctrl.getPSAppViewUIActions?? && ctrl.getPSAppViewUIActions()??>
-    <#list ctrl.getPSAppViewUIActions() as viewUIAction>
-        <#if viewUIAction.getPSUIAction?? && viewUIAction.getPSUIAction()??>
-        <#assign UIAction = viewUIAction.getPSUIAction() />
-        "${UIAction.getUIActionTag()}":{name:"${UIAction.getUIActionTag()}",icon:"<#if UIAction.getPSSysImage()??><#assign img=UIAction.getPSSysImage() /><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>",caption:"${UIAction.getCaption()}",disabled: false, visabled: true,noprivdisplaymode:<#if UIAction.getNoPrivDisplayMode(view)??>${UIAction.getNoPrivDisplayMode(view)}</#if>,dataaccaction: "<#if UIAction.getDataAccessAction()??>${UIAction.getDataAccessAction()}</#if>", actiontarget: "${UIAction.getActionTarget()}"}<#if viewUIAction_has_next>,</#if>
+    <#if ctrl.getPSDEDataViewItems?? && ctrl.getPSDEDataViewItems()??>
+    <#list ctrl.getPSDEDataViewItems() as dataViewItem>
+        <#if dataViewItem.getPSDEUIActionGroup?? && dataViewItem.getPSDEUIActionGroup()??>
+         <#assign UIActionGrop = dataViewItem.getPSDEUIActionGroup() />
+            <#if UIActionGrop.getPSUIActions?? && UIActionGrop.getPSUIActions()??>
+            <#list UIActionGrop.getPSUIActions() as UIAction >
+             "${UIAction.getUIActionTag()}":{name:"${UIAction.getUIActionTag()}",icon:"<#if UIAction.getPSSysImage()??><#assign img=UIAction.getPSSysImage() /><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>",caption:"${UIAction.getCaption()}",disabled: false, visabled: true,noprivdisplaymode:<#if UIAction.getNoPrivDisplayMode(view)??>${UIAction.getNoPrivDisplayMode(view)}</#if>,dataaccaction: "<#if UIAction.getDataAccessAction()??>${UIAction.getDataAccessAction()}</#if>", actiontarget: "${UIAction.getActionTarget()}"},
+            </#list>
+            </#if>
         </#if>
     </#list>
     </#if>

APP/package.json.ftl

@@ -61,10 +61,8 @@ TARGET=PSSYSAPP
     "@types/mockjs": "^1.0.2",
     "@types/qs": "^6.9.0",
     "@vue/cli-plugin-babel": "^4.1.0",
-    "@vue/cli-plugin-e2e-cypress": "^4.1.0",
     "@vue/cli-plugin-router": "^4.1.0",
     "@vue/cli-plugin-typescript": "^4.1.0",
-    "@vue/cli-plugin-unit-jest": "^4.1.0",
     "@vue/cli-plugin-vuex": "^4.1.0",
     "@vue/cli-service": "^4.1.0",
     "@vue/test-utils": "1.0.0-beta.29",