zpc --- 零时修复

@CONTROL/@MACRO/FUNC/MACRO.ftl

+<#--  计数器ui  -->
 <#macro badge item>
   <#if item.getPSUIAction?? && item.getPSUIAction()?? && item.getPSUIAction().getPSAppCounter?? && item.getPSUIAction().getPSAppCounter()??>
     <#assign uiaction = item.getPSUIAction() />
@@ -9,3 +10,17 @@
 <#nested>
   </#if>
 </#macro>
+
+<#--  搜索框的输入提示信息  -->
+<#macro getQuickSearchPlaceholder view>
+  请输入<#t>
+  <#assign isdrawcComma = false />
+  <#if view.getPSDataEntity?? && view.getPSDataEntity()?? && view.getPSDataEntity().getAllPSDEFields?? && view.getPSDataEntity().getAllPSDEFields()??>
+    <#list view.getPSDataEntity().getAllPSDEFields() as field>
+      <#if field.isEnableQuickSearch()>
+        <#if isdrawcComma>，<#else><#assign isdrawcComma = true /></#if><#t>
+        ${field.getLogicName()}<#t>
+      </#if>
+    </#list>
+  </#if>
+</#macro>
\ No newline at end of file

@CONTROL/表格/CONTROL.less.ftl

@@ -45,7 +45,7 @@
     }
     .grid-pagination {
         height: 36px;
-        padding: 6px 0px;
+        padding: 2px 0px;
         button{
           height: 22px;
         }

@CONTROL/视图布局面板/@MACRO/VIEW_LAYOUT_BASE.ftl

+<#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <#if view.getPSSysCss?? && view.getPSSysCss()??>
 <#assign styleName = view.getPSSysCss().getCssName()/>
 </#if>
@@ -6,7 +7,7 @@
 <#else>
 <#assign isStyleName = false/>
 </#if>
-  <app-layout viewName="${view.getCodeName()?lower_case}" viewTitle="${view.getTitle()}"<#if view.isShowCaptionBar?? && (view.isShowCaptionBar() == false)> :isShowCaptionBar="false"</#if><#if !view.hasPSControl('toolbar')> :isShowToolbar="false"</#if> :className="{ 'view-container': true<#if !isStyleName>, 'default-mode-view': true</#if>, '${view.getViewType()?lower_case}': true, '${srffilepath2(view.getCodeName())}': true<#if view.getPSSysCss?? && view.getPSSysCss()??>, '${view.getPSSysCss().getCssName()}': true</#if><#if viewStyle??>, '${viewStyle}': true</#if> }"<#if !isStyleName> layoutMode="VIEW"</#if> :isShowUserInfo="isDefaultView()" :openMode="openMode" @close-view="closeView($event)">
+  <app-layout viewName="${view.getCodeName()?lower_case}" viewTitle="${view.getTitle()}"<#if (noCaption?? && noCaption) || (view.isShowCaptionBar?? && (view.isShowCaptionBar() == false))> :isShowCaptionBar="false"</#if><#if !view.hasPSControl('toolbar')> :isShowToolbar="false"</#if> :className="{ 'view-container': true<#if !isStyleName>, 'default-mode-view': true</#if>, '${view.getViewType()?lower_case}': true, '${srffilepath2(view.getCodeName())}': true<#if view.getPSSysCss?? && view.getPSSysCss()??>, '${view.getPSSysCss().getCssName()}': true</#if><#if viewStyle??>, '${viewStyle}': true</#if> }"<#if !isStyleName> layoutMode="VIEW"</#if> :isShowUserInfo="isDefaultView()" :openMode="openMode" @close-view="closeView($event)">
     <template slot="headerLeft">
       <div class="view-header-left">
 <#if isStyleName>        <go-back-button v-if="isDefaultView()"/></#if>
@@ -17,7 +18,7 @@
 <#if view.hasPSControl('toolbar')>
     <template slot="headerRight">
       <div class="view-header-right">
-        <app-header-menus :toolbarModel="toolBarModels" @menu-click="toolbar_click($event)" mode="<#if isStyleName>view2<#else><#if header_menu_mode??>${header_menu_mode}<#else>view</#if></#if>" :openMode="openMode"<#if view.isEnableQuickSearch?? && view.isEnableQuickSearch()> :isEnableQuickSearch="true" v-model="query" @search="onSearch($event)"</#if>/>
+        <app-header-menus :toolbarModel="toolBarModels" @menu-click="toolbar_click($event)" mode="<#if isStyleName>view2<#else><#if header_menu_mode??>${header_menu_mode}<#else>view</#if></#if>" :openMode="openMode"<#if view.isEnableQuickSearch?? && view.isEnableQuickSearch()> :isEnableQuickSearch="true" searchPlaceholder="<@getQuickSearchPlaceholder view />" v-model="query" @search="onSearch($event)"</#if>/>
       </div>
     </template>
 </#if>

@CONTROL/视图布局面板/实体数据多项选择视图/VIEW.vue.ftl

@@ -47,6 +47,7 @@
             </card>
         </div>
 </#assign>
+<#assign noCaption = true />
 <#ibizinclude>
 ../@MACRO/VIEW_LAYOUT_BASE.ftl
 </#ibizinclude>
\ No newline at end of file

@CONTROL/视图布局面板/实体数据选择视图/VIEW.vue.ftl

@@ -12,6 +12,7 @@
                 </row>
             </card>
 </#assign>
+<#assign noCaption = true />
 <#ibizinclude>
 ../@MACRO/VIEW_LAYOUT_BASE.ftl
 </#ibizinclude>
\ No newline at end of file

@CONTROL/视图布局面板/实体选择树视图（部件视图）/VIEW.vue.ftl

@@ -7,6 +7,7 @@
 </#if>
 </@ibizindent>
 </#assign>
+<#assign noCaption = true />
 <#ibizinclude>
 ../@MACRO/VIEW_LAYOUT_BASE.ftl
 </#ibizinclude>

@CONTROL/视图布局面板/实体选择表格视图/VIEW.vue.ftl

@@ -8,6 +8,7 @@
             </#if>
             </@ibizindent>
 </#assign>
+<#assign noCaption = true />
 <#ibizinclude>
 ../@MACRO/VIEW_LAYOUT_BASE.ftl
 </#ibizinclude>
\ No newline at end of file