From c92fb535f358acafd7402715a45e85c0e9445d46 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Thu, 22 Aug 2024 15:11:19 +0800
Subject: [PATCH] 新版ui的模板

---
 backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 1 file changed, 142 insertions(+), 175 deletions(-)

diff --git a/backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl b/backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl
index bdad6bc..e2f214a 100644
--- a/backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl
+++ b/backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl
@@ -58,6 +58,7 @@ deleteBaseURL：删除一行数据的BaseURL
 editBaseURL：编辑一行数据的BaseURL
  -->
 
+
 <#setting number_format="#">
 <#assign displayFields=bpmDataTemplate.displayField?eval>
 <#assign conditionFields=bpmDataTemplate.conditionField?eval>
@@ -83,7 +84,6 @@ editBaseURL：编辑一行数据的BaseURL
     <#assign templateAlias=bpmDataTemplate.alias>
     <#assign pageSize=bpmDataTemplate.pageSize>
     <#assign urlPre="$">
-    <#assign tableActionFields=manageFields?filter(it -> managePermission[it.name] && it.name != 'add' && it.name != 'import' && it.name != 'export')>
 </#noparse>
 
 <#--日期选择器 日期范围 日期时分秒 普通日期-->
@@ -198,7 +198,7 @@ editBaseURL：编辑一行数据的BaseURL
         <#if (field.dataType=="varchar") >
             <#assign val="'"+val+"'" >
         </#if>
-        isTab
+
         <#if con_index==0>
             <#assign rtn="value" + operate + val >
         <#else>
@@ -215,18 +215,6 @@ editBaseURL：编辑一行数据的BaseURL
         <#if type==1>
             <el-main class="table-main">
 
-        <#--查询条件-->
-            <#if conditionFields?if_exists>
-                <el-form  ref="form" :model="searchForm" :inline="true">
-                    <div class="searchItemLeftCss">
-                        <#list conditionFields as field>
-                            <@genCondition field=field/>
-                        </#list>
-                    </div>
-                    <el-button size="mini" style="margin-left: 10px" class="themeColors" icon="el-icon-search" @click="search" style="height: 32px;">查询</el-button>
-                    <el-button size="mini" class="blurred-search-btn__item" icon="el-icon-refresh" @click="reset"  style="height: 32px;">重置</el-button>
-                </el-form>
-            </#if>
             <div id="printData" ref="printData" style="page-break-inside: avoid;">
                 <ht-table
                         ref="multipleTemplateTable"
@@ -251,9 +239,9 @@ editBaseURL：编辑一行数据的BaseURL
                         :auto-fix="true"
                         :rowKey="getRowKey"
                         :isDataTemplateList="true"
+                        :justShowSearch="true"
                         v-loading="multipleTemplateTableloading"
                         @filter-change="filterChange"
-                        :justShowSearch="true"
                 >
                     <template v-slot:toolbar>
                         <div class="top_btn_col">
@@ -294,60 +282,10 @@ editBaseURL：编辑一行数据的BaseURL
                 class-name="right_menu"
                 align="${tableConfigure.opterateAlign}"
                 width="${tableConfigure.operateWidth}"
-                v-if="!notPrint && showRightMenu">
+                v-if="!notPrint && showRightMenu"
+        >
             <template slot-scope="scope">
-            <#noparse><#if managePermissionState == true> </#noparse>
-            <#noparse>
-                <#if tableActionFields?size lte 3>
-                <#list tableActionFields as manage>
-                <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
-                </#list>
-                  <#else>
-                  <#list tableActionFields as manage>
-                  <#if manage_index lte 2>
-                  <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
-                </#if>
-                </#list>
-
-                <el-popover ref="popoverRef" style="display: inline-block;" :append-to-body="true" placement="bottom" popper-class="table-action-popover"
-                            trigger="click">
-                    <div class="table-more-action" @click="setTimeout(() => document.querySelector('body').removeChild(document.querySelector('.el-popover')), 800)">
-                        <#list tableActionFields as manage>
-                        <#if manage_index gt 2>
-                        <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
-                    </#if>
-                </#list>
-                </div>
-                <el-button size="mini" type="text" slot="reference" @click="">
-                    更多
-                </el-button>
-                </el-popover>
-                </#if>
-                <#attempt>
-                <@extend.row />
-                <#recover>
-                </#attempt>
-            </#noparse>
-        <#--  	<el-dropdown  v-if="filedList.length > 0"name="templateDropdown_" size="mini" class="template-dropdown" split-button trigger="click" placement="bottom">
-<div class="template-dropdown-item">
-<div v-if="false"></div>
-<#noparse>
-<#list manageFields as manage>
-  <@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
-</#list>
-<div v-else class="not_children_dropdown" ></div>
-</#noparse>
-</div>
-  <el-dropdown-menu slot="dropdown" v-if="filedList.length > 1">
-      <el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);'  plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>
-      <#noparse>
-<#list manageFields as manage>
-  <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
-</#list>
-    </#noparse>
-</el-dropdown-menu>
-</el-dropdown>  -->
-            <#noparse>	</#if > </#noparse>
+                <#noparse>	</#if > </#noparse>
             <#noparse>
                 <#list manageFields as manage>
                 <!-- 开关按钮 -->
@@ -379,6 +317,72 @@ editBaseURL：编辑一行数据的BaseURL
                 </#if>
                 </#list>
             </#noparse>
+            <#noparse><#if managePermissionState == true> </#noparse>
+
+            <ht-button-container v-if="filedList.length > 0" :limit="3">
+                <template slot="defaultContent">
+                    <div v-if="false"></div>
+                    <#noparse>
+                    <#list manageFields as manage>
+                    <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
+                </#list>
+                </#noparse>
+                </template>
+                <template slot="moreContent">
+                    <div v-if="false"></div>
+                    <#noparse>
+                    <#list manageFields as manage>
+                    <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
+                </#list>
+                </#noparse>
+                </template>
+            </ht-button-container>
+
+
+
+
+        <#--			<ht-dropdown v-if="filedList.length > 0">-->
+        <#--				<div class="template-dropdown-item" slot="genFirstBtn">-->
+        <#--					<div v-if="false"></div>-->
+        <#--					<#noparse>-->
+        <#--					<#list manageFields as manage>-->
+        <#--					<@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>-->
+        <#--					</#list>-->
+        <#--				<div v-else class="not_children_dropdown" ></div>-->
+        <#--				</#noparse>-->
+        <#--				</div>-->
+
+        <#--				<template slot="genManage" v-if="filedList.length > 1">-->
+        <#--					<el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);'  plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>-->
+        <#--					<#noparse>-->
+        <#--					<#list manageFields as manage>-->
+        <#--					<@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>-->
+        <#--					</#list>-->
+        <#--				</#noparse>-->
+        <#--				</template>-->
+        <#--			</ht-dropdown>-->
+
+
+        <#--  	<el-dropdown  v-if="filedList.length > 0"name="templateDropdown_" size="mini" class="template-dropdown" split-button trigger="click" placement="bottom">
+<div class="template-dropdown-item">
+<div v-if="false"></div>
+<#noparse>
+<#list manageFields as manage>
+  <@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
+</#list>
+<div v-else class="not_children_dropdown" ></div>
+</#noparse>
+</div>
+  <el-dropdown-menu slot="dropdown" v-if="filedList.length > 1">
+      <el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);'  plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>
+      <#noparse>
+<#list manageFields as manage>
+  <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
+</#list>
+    </#noparse>
+</el-dropdown-menu>
+</el-dropdown>  -->
+
         <#--							<#noparse>-->
         <#--								<#if (manageFields?size == 1) >-->
         <#--							</#noparse>-->
@@ -613,43 +617,53 @@ editBaseURL：编辑一行数据的BaseURL
 <#--生成查询条件宏 -->
 <#macro genCondition field>
     <#assign content=field.controlContent>
-    <el-form-item label="${field.cm}" style="padding-right:10px;" v-if="display('${field.mpDisplay}')" v-show="${!field.isShow}">
+    <ht-table-search-field :label="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${field.name}'}', '${field.cm}')" prop="${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" style="padding-right:10px;" v-if="display('${field.mpDisplay}')" v-show="${!field.isShow}">
         <#if field.vf=="static" >
+        <#-- colPrefix如果是外部表，值是返回"",非外部表的话就会有一个前缀，所以这里直接用这个拼接就行 -->
             <#switch field.ct>
                 <#case "onetext">
                     <#if field.ty == 'number'>
-                        <el-input type="number" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" placeholder="${field.cm}" name="Q^${field.colPrefix!}${field.na}^${field.qt}" clearable></el-input>
+                        <ht-input type="number" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" :placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')"  name="Q^${field.colPrefix!}${field.na}^${field.qt}" <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if> clearable></ht-input>
                     <#else>
-                        <el-input type="text" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" placeholder="${field.cm}" name="Q^${field.colPrefix!}${field.na}^${field.qt}" clearable @keyup.enter.native="searchEnterFun"></el-input>
+                        <ht-input type="text" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" :placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')"  name="Q^${field.colPrefix!}${field.na}^${field.qt}" <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if> clearable @keyup.enter.native="searchEnterFun"></ht-input>
                     </#if>
                     <#break>
                 <#-- 自定义对话框 -->
                 <#case "customDialog">
                     <#assign dg=content>
-                    <ht-dialog class="search-item" isFromList="true" ht-query="${field.colPrefix!}${field.na}" special-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" :custdialog='${util.getCustDialogAttr(field.colPrefix!,field)}' permission="w" atter="searchForm.${field.colPrefix!}${field.na}" />
+                    <ht-custom-dialog
+                            v-model="searchForm.${field.colPrefix!}${field.na}"
+                            model-name="searchForm.${field.na}"
+                            class="search-item search-custom-dialog"
+                            isFromList="true"
+                            ht-query="${field.colPrefix!}${field.na}"
+                            special-query="${field.colPrefix!}${field.na}"
+                            operation="${field.qt}"
+                            :custdialog='${util.getCustDialogAttr(field.colPrefix,field)}'
+                            permission="w"
+                            <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if>
+                            atter="searchForm.${field.colPrefix!}${field.na}">
+                    </ht-custom-dialog>
                     <#break>
                 <#case "date"><#--日期选择器 -->
                     <@genQueryDate field=field/>
                     <#break>
-                <#case "month"><#--月份选择器 -->
-                    <@genQueryMonth field=field/>
-                    <#break>
                 <#case "select"><#--下拉选项-->
                     <#assign options=content>
                     <div style="display:inline">
                         <#if util.getJsonByPath(field.option,'choiceType')=="dynamic">
-                        <#--<el-select size="mini" v-model="searchForm.${colPrefix}${field.na}" class="search-item" placeholder="${field.cm}" operation="${field.qt}" ht-select-query="${util.getSelectQuery(field.option,false)}" ht-query="${colPrefix}${field.na}" name="Q^${colPrefix}${field.na}^${field.qt}" clearable>
-                        </el-select>-->
-                            <ht-select  v-model="searchForm.${field.colPrefix!}${field.na}"  model-name="searchForm.${field.colPrefix!}${field.na}"
-                                        placeholder="${field.cm}"
-                                        :ganged="${util.getSelectQuery(field.option,type!=1)}"
-                                        permission="w">
+                            <ht-select clearable filterable  v-model="searchForm.${field.colPrefix!}${field.na}" model-name="searchForm.${field.colPrefix!}${field.na}"
+                                       class="search-item" ht-query="${field.colPrefix!}${field.na}" operation="${field.qt}"
+                                    <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if>
+                                    <#if field.cm?if_exists>:placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')" </#if>
+                                       :ganged="${util.getSelectQuery(field.option,type!=1)}"
+                            >
                             </ht-select>
                         <#else>
-                            <el-select size="mini" v-model="searchForm.${field.colPrefix!}${field.na}" class="search-item" placeholder="${field.cm}" operation="${field.qt}" ht-query="${field.colPrefix!}${field.na}" name="Q^${field.colPrefix!}${field.na}^${field.qt}">
-                                <el-option label="全部" value=""></el-option>
+                            <el-select size="mini" clearable filterable  v-model="searchForm.${field.colPrefix!}${field.na}" class="search-item" :placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')"  operation="${field.qt}" ht-query="${field.colPrefix!}${field.na}" name="Q^${field.colPrefix!}${field.na}^${field.qt}">
+                                <el-option :label="$td('${'formTemplate.${bpmDataTemplate.alias}.search.all'}', '全部')" value=""></el-option>
                                 <#list field.controlContent as opt>
-                                    <el-option label="${opt.value}" value="${opt.key}"></el-option>
+                                    <el-option  label="${opt.value}" value="${opt.key}"></el-option>
                                 </#list>
                             </el-select>
                         </#if>
@@ -659,7 +673,7 @@ editBaseURL：编辑一行数据的BaseURL
                     <#assign dickey=util.getJsonByPath(field.controlContent,'alias')>
                     <#assign resultField=util.getJsonByPath(field.controlContent,'resultField')>
                     <div style="display:inline-block;" class="col-md-12">
-                        <div ht-dic='${field.colPrefix!}${field.na}' dickey="${dickey}" resultfield="${resultField}" ht-query="${field.colPrefix!}${field.na}" bind="${field.colPrefix!}${field.na}" desc="数据字典" type="text"  ng-model="${field.colPrefix!}${field.na}" class="form-control"  ></div>
+                        <div ht-dic='${field.colPrefix!}${field.na}' dickey="${dickey}" resultfield="${resultField}" ht-query="${field.colPrefix!}${field.na}" bind="${field.colPrefix!}${field.na}" :desc="$td('${'formTemplate.${bpmDataTemplate.alias}.search.dic'}', '数据字典')" type="text"  ng-model="${field.colPrefix!}${field.na}" class="form-control"  <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if> ></div>
                     </div>
                     <#break>
                 <#case "radio"><#--单选按钮 -->
@@ -667,14 +681,12 @@ editBaseURL：编辑一行数据的BaseURL
                     ${getCheckboxOrRadio(field)}
                     <#break>
                 <#default>
-                    <el-input type="text" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" placeholder="${field.cm}" name="Q^${field.colPrefix!}${field.na}^${field.qt}" clearable @keyup.enter.native="searchEnterFun"></el-input>
+                    <ht-input type="text" size="mini" class="search-item" ht-query="${field.colPrefix!}${field.na}" v-model="searchForm.${field.colPrefix!}${field.na}" operation="${field.qt}" :placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')" name="Q^${field.colPrefix!}${field.na}^${field.qt}" <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if> clearable @keyup.enter.native="searchEnterFun"></ht-input>
                     <#break>
             </#switch>
         </#if>
-    </el-form-item>
+    </ht-table-search-field>
 </#macro>
-
-
 <#noparse>
     <#--管理列  以前的模板-->
     <#macro genManageOld manage managePermission actionUrl data>
@@ -682,13 +694,13 @@ editBaseURL：编辑一行数据的BaseURL
     <#if manage.name == 'edit'>
     <#if managePermission.edit>
     <el-button id="${manage.buttonId}"  v-show="scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)" v-if="permission.edit && display('${manage.mpDisplay}')"  type="text" @click="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:scope.row.${pkField},action:'edit',defId:'${bpmDataTemplate.defId}',
-			isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" size="mini" plain>{{$td('eip.common.edit', '${manage.desc}')}}</el-button>
+			isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', title: '${manage.title}' , dialogHeight: '${manage.dialogHeight}' } )" size="mini" plain>{{$td('eip.common.edit', '${manage.desc}')}}</el-button>
     </#if>
     <#--复制-->
     <#elseif manage.name == 'copy'>
     <#if managePermission.copy>
     <el-button id="${manage.buttonId}" type="text" v-if="display('${manage.mpDisplay}')"    size="mini"  @click="scriptClick('copyOne','${manage.afterScriptValue}',{pkField:scope.row.${pkField}})" >{{$td('eip.common.copy', '${manage.desc}')}}</el-button>
-    </#if>新增数据
+    </#if>
     <#--打印明细 -->
     <#elseif manage.name == 'printDetail'>
     <#if managePermission.printDetail>
@@ -712,7 +724,7 @@ editBaseURL：编辑一行数据的BaseURL
     </#if>
     <#--查询数据-->
     <#elseif manage.name == 'searchData'>
-    <#if managePermission.searchData>click
+    <#if managePermission.searchData>
     <el-button id="${manage.buttonId}" type="text" v-if="display('${manage.mpDisplay}')"   @click="scriptClick('searchData','${manage.afterScriptValue}',{flowFormData:'${manage.flowFormData}',pkField:scope.row.${pkField}, row:scope.row});" size="mini" plain>{{$td('eip.common.searchData', '${manage.desc}')}}</el-button>
     </#if>
 
@@ -738,7 +750,8 @@ editBaseURL：编辑一行数据的BaseURL
     <#--明细-->
     <#elseif manage.name == 'detail' >
     <#if managePermission.detail>
-    <el-button id="${manage.buttonId}"  type="text" v-if="display('${manage.mpDisplay}')"  @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row);' size="mini" plain>{{$td('eip.common.detail', '${manage.desc}')}}</el-button>
+    <el-button id="${manage.buttonId}"  type="text" v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+               @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row, null, false, false, scope.row, "${manage.afterScriptValue}", "${manage.dialogWidth}","${manage.dialogHeight}","${manage.title}" );' size="mini" plain>{{$td('eip.common.detail', '${manage.desc}')}}</el-button>
     </#if>
     <#elseif manage.name == 'url' &&manage.type=='1'>
     <#if util.fieldPermissionValidation('url', managePermission, manage.desc, manage.url, manage.urlParams)>
@@ -772,7 +785,9 @@ editBaseURL：编辑一行数据的BaseURL
     </#if>
     <#elseif manage.name == 'js' >
     <#if util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
-    <el-button id="${manage.buttonId}" type="text"  v-if="display('${manage.mpDisplay}')"  @click='customEvilJS(scope.row,"${manage.jsValue}")' size="small" plain>{{$td('eip.common.js', '${manage.desc}')}}</el-button>
+    <el-button id="${manage.buttonId}" type="text"
+               v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+               @click='customEvilJS(scope.row,"${manage.jsValue}")' size="small" plain>{{$td('eip.common.js', '${manage.desc}')}}</el-button>
     </#if>
     <#else>
     </#if>
@@ -783,19 +798,9 @@ editBaseURL：编辑一行数据的BaseURL
     <#--编辑-->
     <#if manage.name == 'edit'>
     <#if managePermission.edit && manage.linePosition>
-    <!-- <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
+    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
                       v-if="'${manage.linePosition}' && permission.edit && display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"  type="text" @click.native="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:scope.row.${pkField} || scope.row.id,action:'edit',defId:'${bpmDataTemplate.defId}',
-				isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item> -->
-    <el-button v-if="permission.edit && display('${manage.mpDisplay}')" type="text"
-               @click='operating("${templateId}",scope.row.${pkField},"edit","${bpmDataTemplate.defId}",scope.row.isStartFlow,"${manage.openType}");'
-               :plain="true" size="mini" <#if manage.beforeScript>
-    v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
-    </#if>
-    <#if manage.afterScript>
-    v-after-script="{script: '${manage.afterScript}', row: scope.row}"
-    </#if>
-    >${manage.desc}
-    </el-button>
+				isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}',title: '${manage.title}', dialogHeight: '${manage.dialogHeight}' })" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
     <#--复制-->
     <#elseif manage.name == 'copy'>
@@ -805,25 +810,12 @@ editBaseURL：编辑一行数据的BaseURL
     <#--打印明细 -->
     <#elseif manage.name == 'printDetail'>
     <#if managePermission.printDetail && manage.linePosition>
-    <el-dropdown-item  name="${manage.desc}" id="${manage.buttonId}" v-if="display('${manage.mpDisplay}')"    size="mini" @click.native='printDetail("${templateId}",scope.row.${pkField},"get");'>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
+    <el-dropdown-item  name="${manage.desc}" id="${manage.buttonId}" v-if="display('${manage.mpDisplay}')"    size="mini" @click.native='printDetail("${templateId}",scope.row.${pkField},"get")'>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
     <#--删除-->
     <#elseif manage.name == 'del'  && manage.linePosition>
     <#if managePermission.del>
-    <!-- <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="permission.del && display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"   @click.native="scriptClick('del','${manage.afterScriptValue}',{pkField:scope.row.${pkField} || scope.row.id})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item> -->
-    <el-button
-            type="text"
-            v-if="permission.del && display('${manage.mpDisplay}')"
-            @click='del(scope.row.${pkField});'
-            size="mini" plain
-    <#if manage.beforeScript>
-    v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
-    </#if>
-    <#if manage.afterScript>
-    v-after-script="{script: '${manage.afterScript}', row: scope.row}"
-    </#if>
-    >${manage.desc}</el-button>
-
+    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="permission.del && display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"   @click.native="scriptClick('del','${manage.afterScriptValue}',{pkField:scope.row.${pkField} || scope.row.id})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
 
     <#--新增流程-->
@@ -870,20 +862,9 @@ editBaseURL：编辑一行数据的BaseURL
     <#--明细-->
     <#elseif manage.name == 'detail' >
     <#if managePermission.detail && manage.linePosition>
-    <!-- <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="display('${manage.mpDisplay}')"  @click.native='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row);' size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item> -->
-    <el-button
-            type="text"
-            v-if="display('${manage.mpDisplay}')"
-            @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}");'
-            size="mini"
-            plain
-    <#if manage.beforeScript>scriptClick
-    v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
-    </#if>
-    <#if manage.afterScript>
-    v-after-script="{script: '${manage.afterScript}', row: scope.row}"
-    </#if>
-    >${manage.desc}</el-button>
+    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
+                      v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+                      @click.native='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row, null, false, false, scope.row, "${manage.afterScriptValue}", "${manage.dialogWidth}","${manage.dialogHeight}","${manage.title}" );' size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
 
     <#--url按钮-->
@@ -893,20 +874,6 @@ editBaseURL：编辑一行数据的BaseURL
                       @click.native="scriptClick('url','${manage.afterScriptValue}',{url:'${manage.url}',type:'new',fieldName:'', urlParams:'${manage.urlParams!}',pkField:scope.row.${pkField}, row:scope.row, dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}',openType: '${manage.openType}', tokenEnabled:'${manage.tokenEnabled}', tokenType:'${manage.tokenType}', tokenKey:'${manage.tokenKey}', tokenApi:'${manage.tokenApi}'})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
 
-
-    <#--组件按钮-->
-    <#elseif manage.name == 'moduleButton'>
-    <#if managePermission.moduleButton && manage.linePosition>
-    <component
-            is="${manage.url}"
-            :row="scope.row"
-            :column="scope.column"
-            :index="scope.$index"
-            desc= "${manage.desc}"
-            @RefreshTable="search('find')"
-            v-if="display('${manage.mpDisplay}') "
-    ></component>
-    </#if>
     <#--表单修改记录-->
     <#elseif manage.name == 'record' >
     <#if managePermission.record && manage.linePosition>
@@ -916,12 +883,13 @@ editBaseURL：编辑一行数据的BaseURL
     <#--js按钮-->
     <#elseif manage.name == 'js' >
     <#if manage.linePosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
-    <!-- <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="display('${manage.mpDisplay}')"  @click.native='customEvilJS(scope.row,"${manage.jsValue}", {dialogWidth: "${manage.dialogWidth}",dialogHeight: "${manage.dialogHeight}",openType: "${manage.openType}"})' size="small" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item> -->
-    <el-button size="mini" type="text" v-if="display('${manage.mpDisplay}')" @click.native='customEvilJS(scope.row,"${manage.jsValue}", {dialogWidth: "${manage.dialogWidth}",dialogHeight: "${manage.dialogHeight}",openType: "${manage.openType}"})'>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
+                      v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+                      @click.native='customEvilJS(scope.row,"${manage.jsValue}", {dialogWidth: "${manage.dialogWidth}",dialogHeight: "${manage.dialogHeight}",openType: "${manage.openType}"}, "${manage.afterScriptValue}")' size="small" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
     </#if>
 
     <#elseif manage.name == 'startFlow' && manage.linePosition && managePermission.startFlow>
-    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="!scope.row.isStartFlow&& '${bpmDataTemplate.defId}' && display('${manage.mpDisplay}')" @click.native='startFlow(scope.row.${pkField});'  plain> {{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
+    <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}" v-if="!scope.row.isStartFlow&& '${bpmDataTemplate.defId}' && display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)" @click.native='startFlow(scope.row.${pkField});'  plain> {{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-dropdown-item>
 
     <#--更新数据-->
     <#elseif  manage.name == 'batchUpdate'>
@@ -978,7 +946,8 @@ editBaseURL：编辑一行数据的BaseURL
     <#if manage.name == 'edit'>
     <#if managePermission.edit && manage.linePosition>
     <span name="${manage.desc}" id="${manage.buttonId}" v-else-if="permission.edit && display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"  type="text" @click="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:scope.row.${pkField} || scope.row.id,action:'edit',defId:'${bpmDataTemplate.defId}',
-				isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
+				isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', title: '${manage.title}' ,  dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}' })" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
+    isStartFlow:scope.row.isStartFlow,openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
     </#if>
     <#--复制-->
     <#elseif manage.name == 'copy'>
@@ -1032,7 +1001,9 @@ editBaseURL：编辑一行数据的BaseURL
     <#--明细-->
     <#elseif manage.name == 'detail' >
     <#if managePermission.detail && manage.linePosition>
-    <span name="${manage.desc}" id="${manage.buttonId}"  v-else-if="display('${manage.mpDisplay}')"  @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row);' size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
+    <span name="${manage.desc}" id="${manage.buttonId}"
+          v-else-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+          @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}",scope.row, null, false, false, scope.row, "${manage.afterScriptValue}", "${manage.dialogWidth}","${manage.dialogHeight}","${manage.title}" );' size="mini" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
     </#if>
 
     <#--url按钮-->
@@ -1050,11 +1021,13 @@ editBaseURL：编辑一行数据的BaseURL
     <#--js按钮-->
     <#elseif manage.name == 'js' >
     <#if manage.linePosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
-    <span name="${manage.desc}" id="${manage.buttonId}" v-else-if="display('${manage.mpDisplay}')"  @click='customEvilJS(scope.row,"${manage.jsValue}",{dialogWidth: "${manage.dialogWidth}",dialogHeight: "${manage.dialogHeight}",openType: "${manage.openType}"})' size="small" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
+    <span name="${manage.desc}" id="${manage.buttonId}"
+          v-else-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
+          @click='customEvilJS(scope.row,"${manage.jsValue}",{dialogWidth: "${manage.dialogWidth}",dialogHeight: "${manage.dialogHeight}",openType: "${manage.openType}"}, "${manage.afterScriptValue}")' size="small" plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
     </#if>
 
     <#elseif manage.name == 'startFlow' && manage.linePosition && managePermission.startFlow>
-    <span name="${manage.desc}" id="${manage.buttonId}" v-else-if="!scope.row.isStartFlow&& '${bpmDataTemplate.defId}'" @click='startFlow(scope.row.${pkField});'  plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
+    <span name="${manage.desc}" id="${manage.buttonId}" v-else-if="!scope.row.isStartFlow&& '${bpmDataTemplate.defId}' && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)" @click='startFlow(scope.row.${pkField});'  plain>{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</span>
 
     <#--更新数据-->
     <#elseif manage.name == 'batchUpdate'>
@@ -1113,7 +1086,7 @@ editBaseURL：编辑一行数据的BaseURL
     <el-button
             class="data-form-list__top-btn"
             type="${manage.theme!'default'}" v-show="showScriptButton&&showScriptButton.add" v-if="permission.add && display('${manage.mpDisplay}')" size="mini" @click="scriptClick('add','${manage.afterScriptValue}',{templateId:'${templateId}',id:'',action:'add',defId:'${bpmDataTemplate.defId}',isStartFlow:'',
-            openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}', initSubData: '${manage.initSubData}', isKanban: '${isKanban}'})" icon="el-icon-plus">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+            openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}', initSubData: '${manage.initSubData}', title: '${manage.title}', isKanban: '${isKanban}'})" icon="el-icon-plus">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
     </#if>
     <#--编辑-->
@@ -1121,20 +1094,23 @@ editBaseURL：编辑一行数据的BaseURL
     <#if managePermission.edit && manage.topPosition>
     <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}" v-show="scriptBeforeHandler('${manage.beforeScriptValue}',{})"
                v-if="permission.edit && display('${manage.mpDisplay}')"   @click="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:'',action:'edit',defId:'${bpmDataTemplate.defId}',
-							  isStartFlow:'',openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}', isKanban: '${isKanban}' })" size="mini" icon="el-icon-edit">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+							  isStartFlow:'',openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}' , title: '${manage.title}' , isKanban: '${isKanban}' })" size="mini" icon="el-icon-edit">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
     </#if>
     <#-- 删除 -->
     <#if manage.name == 'del'>
     <#if managePermission.del && manage.topPosition>
-    <el-button class="data-form-list__top-btn-del" type="${manage.theme!'danger'}" v-show="showScriptButton&&showScriptButton.del" v-if="permission.del && display('${manage.mpDisplay}')" size="mini" @click="scriptClick('deleted','${manage.afterScriptValue}')"  icon="el-icon-delete">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+    <el-button class="data-form-list__top-btn" type="${manage.theme!'danger'}" v-show="showScriptButton&&showScriptButton.del" v-if="permission.del && display('${manage.mpDisplay}')" size="mini" @click="scriptClick('deleted','${manage.afterScriptValue}')"  icon="el-icon-delete">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
     </#if>
 
     <#--明细-->
     <#if manage.name == 'detail' >
     <#if managePermission.detail && manage.topPosition>
-    <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}" v-if="display('${manage.mpDisplay}')"  @click="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:'',action:'get',defId:'',isStartFlow:'',openType:'${manage.openType}',quitAfterSaving:''})" size="mini">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+    <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}"
+               v-if="display('${manage.mpDisplay}')"
+               v-show="scriptBeforeHandler('${manage.beforeScriptValue}',{})"
+               @click="scriptClick('detail','${manage.afterScriptValue}',{templateId:'${templateId}',id:'',action:'get',defId:'',isStartFlow:'',openType:'${manage.openType}', title: '${manage.title}',quitAfterSaving:''})" size="mini">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
     </#if>
 
@@ -1183,7 +1159,7 @@ editBaseURL：编辑一行数据的BaseURL
     <#--批量新增-->
     <#if manage.name == 'batchSave'>
     <#if util.fieldPermissionValidation('batchSave', managePermission, manage.buttonId, '') >
-    <el-button  type="${manage.theme!'default'}" v-show="getButtonShowByJs('${manage.buttonId}', 'batchSave')" v-if="permission.add && display('${manage.mpDisplay}')" size="mini" @click="scriptClick('batchSave','${manage.afterScriptValue}',{templateId:'${templateId}',id:'${manage.buttonId}',customDialogjson:'${manage.customDialogjson}',action:'batchSave',defId:'${bpmDataTemplate.defId}',isStartFlow:'',
+    <el-button type="${manage.theme!'default'}" v-show="getButtonShowByJs('${manage.buttonId}', 'batchSave')" v-if="permission.add && display('${manage.mpDisplay}')" size="mini" @click="scriptClick('batchSave','${manage.afterScriptValue}',{templateId:'${templateId}',id:'${manage.buttonId}',customDialogjson:'${manage.customDialogjson}',action:'batchSave',defId:'${bpmDataTemplate.defId}',isStartFlow:'',
             openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" icon="el-icon-plus">${manage.desc}</el-button>
     <span style="display: inline-block;"><ht-batch-save-dialog ref="batchSaveDialog" @onConfirm="batchSaveConfirm" :custdialog="'${manage.customDialogjson}'" placeholder="" style="width: 100%"></ht-batch-save-dialog></span>
     </#if>
@@ -1221,6 +1197,7 @@ editBaseURL：编辑一行数据的BaseURL
     <#if manage.name == 'startFlow'>
     <#if managePermission.startFlow && manage.topPosition>
     <el-button class="data-form-list__top-btn" type="${manage.theme!'success'}" size="mini"
+               v-show="getButtonShowByJs('${manage.buttonId}', 'startFlow')"
                @click="startFlowByTopButton('${pkField}','${manage.afterScriptValue}','${templateId}','${bpmDataTemplate.defId}')"
                icon="el-icon-success">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
@@ -1282,21 +1259,12 @@ editBaseURL：编辑一行数据的BaseURL
     </#if>
     </#if>
 
-
-
-
-    <#-- 组件按钮 -->
-    <#if manage.name == 'moduleButton'>
-    <#if managePermission.moduleButton && manage.topPosition>
-    <component is="${manage.url}"  desc= "${manage.desc}"  @RefreshTable="search('find')"  v-if="display('${manage.mpDisplay}')"></component>
-    </#if>
-    </#if>
-
-
     <#-- js按钮 -->
     <#if manage.name == 'js' >
     <#if manage.topPosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
-    <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}" v-if="display('${manage.mpDisplay}')"  @click="scriptClick('js','${manage.afterScriptValue}',{jsValue:'${manage.jsValue}',dialogWidth:'${manage.dialogWidth}',dialogHeight:'${manage.dialogHeight}',openType:'${manage.openType}',needValidateSelect:'${manage.needValidateSelect}'})" size="mini">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
+    <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}"
+               v-if="display('${manage.mpDisplay}') && getButtonShowByJs('${manage.buttonId}', 'js')"
+               @click="scriptClick('js','${manage.afterScriptValue}',{jsValue:'${manage.jsValue}',dialogWidth:'${manage.dialogWidth}',dialogHeight:'${manage.dialogHeight}',openType:'${manage.openType}',needValidateSelect:'${manage.needValidateSelect}'})" size="mini">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
     </#if>
     </#if>
 
@@ -1809,7 +1777,7 @@ editBaseURL：编辑一行数据的BaseURL
         <ProcessRecordDialog ref="processRecordDialog" :instId="selectedInstId" :defId="selectedDefId" :taskId="selectedTaskId"></ProcessRecordDialog>
         <TaskToRevoke ref="taskToRevoke" :instId="selectedInstId" :taskId="selectedTaskId" :afterClose="()=>{search('find')}" />
         -->
-        <ht-flow-chart ref="taskImage" :defId="selectedDefId" :openView="true" :inst-id="selectedInstId"></ht-flow-chart>
+        <ht-flow-chart ref="taskImage" :defId="selectedDefId" :inst-id="selectedInstId"></ht-flow-chart>
 
         <process-record ref="processRecord" :inst-id="selectedInstId" :def-id="selectedDefId" :task-id="selectedTaskId"></process-record>
 
@@ -1965,7 +1933,6 @@ editBaseURL：编辑一行数据的BaseURL
                         </el-link>
                     <#elseif field.componentSetting>
                         <component is="${field.componentSetting}" :row="scope.row" :column="scope.column" :index="scope.$index"></component>
-
                     <#elseif field.urlType=='url'>
                         <el-link
                                 type="primary"
--
libgit2 0.21.2