Merge branch 'dev'

@CONTROL/视图布局面板/实体工作流动态导航表格视图/VIEW.vue.ftl

-<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
-    <#ibizinclude>
-    ../@MACRO/VIEW_CAPTION.vue.ftl
-    </#ibizinclude>
+<#assign view_content>
     <split id="${view.getCodeName()?lower_case}" v-model="split" mode="horizontal">
         <div slot='left'>
             <el-tree ref="tree" :data="wfStepModel" node-key="userTaskId" :highlight-current="true" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
@@ -19,5 +14,7 @@
             </div>
         </div>
     </split>
-    </card>
-</div>
+</#assign>
+<#ibizinclude>
\ No newline at end of file
+../@MACRO/VIEW_LAYOUT_BASE.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/视图布局面板/实体工作流动态编辑视图/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION.vue.ftl

@VIEW/实体工作流动态导航表格视图/VIEW-BASE.vue.ftl

@@ -32,6 +32,14 @@
      */
     public isSingleSelect:boolean = true;
 
+    /**
+     * 搜索值
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public query: string = '';
+
     /**
      * 左侧树的默认配置
      *
@@ -106,6 +114,22 @@
             tree.setCurrentKey(data.userTaskId);
         })
     }
+
+    /**
+     * 快速搜索
+     *
+     * @param {*} $event
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public onSearch($event: any): void {
+        <#if grid??>
+        const grid: any = this.$refs.${grid.name};
+        if (grid) {
+            grid.load(this.context,true);
+        }
+        </#if>
+    }
+    
 <#if view.hasPSControl('grid')>
 <#assign grid = view.getPSControl('grid')>