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

@CONTROL/视图布局面板/实体移动端卡片视图/VIEW.less.ftl

@@ -6,3 +6,7 @@
     justify-content: space-between;
     padding: 0 15px;
 }
+.batch_btn{
+  display: flex;
+  justify-content: center;
+}
\ No newline at end of file

@CONTROL/视图布局面板/实体移动端卡片视图/VIEW.vue.ftl

@@ -41,19 +41,17 @@
 <#assign view_content>
 ${P.getCtrlCode('dataview', 'CONTROL.html').code}
 </#assign>
-<#assign custom_toolbar>
-<ion-button class="app-view-toolbar-button"  @click="cancelSelect" >
-    <ion-icon name="arrow-undo-outline"></ion-icon>
-    {{$t('app.button.cancel')}}
-</ion-button>
-</#assign>
 <#assign view_footer>
     <#if dataview.getBatchPSDEToolbar?? && dataview.getBatchPSDEToolbar()??>
         <#assign batchToolbar = dataview.getBatchPSDEToolbar()>
-    <div v-show="showCheack" >
+    <div v-show="showCheack" class="batch_btn">
             <@ibizindent blank=8>
             ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
             </@ibizindent>
+        <ion-button class="app-view-toolbar-button"  @click="cancelSelect" >
+            <ion-icon name="arrow-undo-outline"></ion-icon>
+            {{$t('app.button.cancel')}}
+        </ion-button>
     </div>     
     </#if>
 </#assign>

@CONTROL/视图布局面板/实体移动端多数据视图/VIEW.vue.ftl

@@ -45,12 +45,16 @@ ${P.getCtrlCode('mdctrl', 'CONTROL.html').code}
 </#assign>
 <#assign view_footer>
     <#if mdctrl.getBatchPSDEToolbar?? && mdctrl.getBatchPSDEToolbar()??>
-        <#assign batchToolbar = mdctrl.getBatchPSDEToolbar()>
-    <div v-show="showCheack" >
-            <@ibizindent blank=8>
-            ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
-            </@ibizindent>
-    </div>     
+        <#assign batchToolbar = mdctrl.getBatchPSDEToolbar()> 
+        <div v-show="showCheack" class="batch_btn">
+                <@ibizindent blank=8>
+                ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
+                </@ibizindent>
+            <ion-button class="app-view-toolbar-button"  @click="cancelSelect" >
+                <ion-icon name="arrow-undo-outline"></ion-icon>
+                {{$t('app.button.cancel')}}
+            </ion-button>
+        </div>     
     </#if>
 </#assign>
 </#if>

@CONTROL/视图布局面板/实体移动端日历视图/VIEW.vue.ftl

@@ -6,11 +6,15 @@ ${P.getCtrlCode('calendar', 'CONTROL.html').code}
 <#assign view_footer>
     <#if calendar.getBatchPSDEToolbar?? && calendar.getBatchPSDEToolbar()??>
         <#assign batchToolbar = calendar.getBatchPSDEToolbar()>
-    <div v-show="showCheack" >
-            <@ibizindent blank=8>
-            ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
-            </@ibizindent>
-    </div>     
+        <div v-show="showCheack" class="batch_btn">
+                <@ibizindent blank=8>
+                ${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
+                </@ibizindent>
+            <ion-button class="app-view-toolbar-button"  @click="cancelSelect" >
+                <ion-icon name="arrow-undo-outline"></ion-icon>
+                {{$t('app.button.cancel')}}
+            </ion-button>
+        </div>    
     </#if>
 </#assign>
 </#if>