Commit c92fb535f358acafd7402715a45e85c0e9445d46

Authored by 陈威
1 parent a324ac24
Exists in dev

新版ui的模板

backend/form/src/main/resources/template/form/pc/dataTemplateList_vue.ftl
... ... @@ -58,6 +58,7 @@ deleteBaseURL:删除一行数据的BaseURL
58 58 editBaseURL:编辑一行数据的BaseURL
59 59 -->
60 60  
  61 +
61 62 <#setting number_format="#">
62 63 <#assign displayFields=bpmDataTemplate.displayField?eval>
63 64 <#assign conditionFields=bpmDataTemplate.conditionField?eval>
... ... @@ -83,7 +84,6 @@ editBaseURL:编辑一行数据的BaseURL
83 84 <#assign templateAlias=bpmDataTemplate.alias>
84 85 <#assign pageSize=bpmDataTemplate.pageSize>
85 86 <#assign urlPre="$">
86   - <#assign tableActionFields=manageFields?filter(it -> managePermission[it.name] && it.name != 'add' && it.name != 'import' && it.name != 'export')>
87 87 </#noparse>
88 88  
89 89 <#--日期选择器 日期范围 日期时分秒 普通日期-->
... ... @@ -198,7 +198,7 @@ editBaseURL:编辑一行数据的BaseURL
198 198 <#if (field.dataType=="varchar") >
199 199 <#assign val="'"+val+"'" >
200 200 </#if>
201   - isTab
  201 +
202 202 <#if con_index==0>
203 203 <#assign rtn="value" + operate + val >
204 204 <#else>
... ... @@ -215,18 +215,6 @@ editBaseURL:编辑一行数据的BaseURL
215 215 <#if type==1>
216 216 <el-main class="table-main">
217 217  
218   - <#--查询条件-->
219   - <#if conditionFields?if_exists>
220   - <el-form ref="form" :model="searchForm" :inline="true">
221   - <div class="searchItemLeftCss">
222   - <#list conditionFields as field>
223   - <@genCondition field=field/>
224   - </#list>
225   - </div>
226   - <el-button size="mini" style="margin-left: 10px" class="themeColors" icon="el-icon-search" @click="search" style="height: 32px;">查询</el-button>
227   - <el-button size="mini" class="blurred-search-btn__item" icon="el-icon-refresh" @click="reset" style="height: 32px;">重置</el-button>
228   - </el-form>
229   - </#if>
230 218 <div id="printData" ref="printData" style="page-break-inside: avoid;">
231 219 <ht-table
232 220 ref="multipleTemplateTable"
... ... @@ -251,9 +239,9 @@ editBaseURL:编辑一行数据的BaseURL
251 239 :auto-fix="true"
252 240 :rowKey="getRowKey"
253 241 :isDataTemplateList="true"
  242 + :justShowSearch="true"
254 243 v-loading="multipleTemplateTableloading"
255 244 @filter-change="filterChange"
256   - :justShowSearch="true"
257 245 >
258 246 <template v-slot:toolbar>
259 247 <div class="top_btn_col">
... ... @@ -294,60 +282,10 @@ editBaseURL:编辑一行数据的BaseURL
294 282 class-name="right_menu"
295 283 align="${tableConfigure.opterateAlign}"
296 284 width="${tableConfigure.operateWidth}"
297   - v-if="!notPrint && showRightMenu">
  285 + v-if="!notPrint && showRightMenu"
  286 + >
298 287 <template slot-scope="scope">
299   - <#noparse><#if managePermissionState == true> </#noparse>
300   - <#noparse>
301   - <#if tableActionFields?size lte 3>
302   - <#list tableActionFields as manage>
303   - <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
304   - </#list>
305   - <#else>
306   - <#list tableActionFields as manage>
307   - <#if manage_index lte 2>
308   - <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
309   - </#if>
310   - </#list>
311   -
312   - <el-popover ref="popoverRef" style="display: inline-block;" :append-to-body="true" placement="bottom" popper-class="table-action-popover"
313   - trigger="click">
314   - <div class="table-more-action" @click="setTimeout(() => document.querySelector('body').removeChild(document.querySelector('.el-popover')), 800)">
315   - <#list tableActionFields as manage>
316   - <#if manage_index gt 2>
317   - <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data />
318   - </#if>
319   - </#list>
320   - </div>
321   - <el-button size="mini" type="text" slot="reference" @click="">
322   - 更多
323   - </el-button>
324   - </el-popover>
325   - </#if>
326   - <#attempt>
327   - <@extend.row />
328   - <#recover>
329   - </#attempt>
330   - </#noparse>
331   - <#-- <el-dropdown v-if="filedList.length > 0"name="templateDropdown_" size="mini" class="template-dropdown" split-button trigger="click" placement="bottom">
332   -<div class="template-dropdown-item">
333   -<div v-if="false"></div>
334   -<#noparse>
335   -<#list manageFields as manage>
336   - <@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
337   -</#list>
338   -<div v-else class="not_children_dropdown" ></div>
339   -</#noparse>
340   -</div>
341   - <el-dropdown-menu slot="dropdown" v-if="filedList.length > 1">
342   - <el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);' plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>
343   - <#noparse>
344   -<#list manageFields as manage>
345   - <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
346   -</#list>
347   - </#noparse>
348   -</el-dropdown-menu>
349   -</el-dropdown> -->
350   - <#noparse> </#if > </#noparse>
  288 + <#noparse> </#if > </#noparse>
351 289 <#noparse>
352 290 <#list manageFields as manage>
353 291 <!-- 开关按钮 -->
... ... @@ -379,6 +317,72 @@ editBaseURL:编辑一行数据的BaseURL
379 317 </#if>
380 318 </#list>
381 319 </#noparse>
  320 + <#noparse><#if managePermissionState == true> </#noparse>
  321 +
  322 + <ht-button-container v-if="filedList.length > 0" :limit="3">
  323 + <template slot="defaultContent">
  324 + <div v-if="false"></div>
  325 + <#noparse>
  326 + <#list manageFields as manage>
  327 + <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
  328 + </#list>
  329 + </#noparse>
  330 + </template>
  331 + <template slot="moreContent">
  332 + <div v-if="false"></div>
  333 + <#noparse>
  334 + <#list manageFields as manage>
  335 + <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
  336 + </#list>
  337 + </#noparse>
  338 + </template>
  339 + </ht-button-container>
  340 +
  341 +
  342 +
  343 +
  344 + <#-- <ht-dropdown v-if="filedList.length > 0">-->
  345 + <#-- <div class="template-dropdown-item" slot="genFirstBtn">-->
  346 + <#-- <div v-if="false"></div>-->
  347 + <#-- <#noparse>-->
  348 + <#-- <#list manageFields as manage>-->
  349 + <#-- <@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>-->
  350 + <#-- </#list>-->
  351 + <#-- <div v-else class="not_children_dropdown" ></div>-->
  352 + <#-- </#noparse>-->
  353 + <#-- </div>-->
  354 +
  355 + <#-- <template slot="genManage" v-if="filedList.length > 1">-->
  356 + <#-- <el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);' plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>-->
  357 + <#-- <#noparse>-->
  358 + <#-- <#list manageFields as manage>-->
  359 + <#-- <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>-->
  360 + <#-- </#list>-->
  361 + <#-- </#noparse>-->
  362 + <#-- </template>-->
  363 + <#-- </ht-dropdown>-->
  364 +
  365 +
  366 + <#-- <el-dropdown v-if="filedList.length > 0"name="templateDropdown_" size="mini" class="template-dropdown" split-button trigger="click" placement="bottom">
  367 +<div class="template-dropdown-item">
  368 +<div v-if="false"></div>
  369 +<#noparse>
  370 +<#list manageFields as manage>
  371 + <@genFirstBtn manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
  372 +</#list>
  373 +<div v-else class="not_children_dropdown" ></div>
  374 +</#noparse>
  375 +</div>
  376 + <el-dropdown-menu slot="dropdown" v-if="filedList.length > 1">
  377 + <el-dropdown-item v-if='isJoinFlow=="true"' @click.native='complete(scope.row,taskType);' plain>{{$td('eip.common.taskDetails', '任务明细')}}</el-dropdown-item>
  378 + <#noparse>
  379 +<#list manageFields as manage>
  380 + <@genManage manage=manage managePermission=managePermission actionUrl=actionUrl data=data/>
  381 +</#list>
  382 + </#noparse>
  383 +</el-dropdown-menu>
  384 +</el-dropdown> -->
  385 +
382 386 <#-- <#noparse>-->
383 387 <#-- <#if (manageFields?size == 1) >-->
384 388 <#-- </#noparse>-->
... ... @@ -613,43 +617,53 @@ editBaseURL:编辑一行数据的BaseURL
613 617 <#--生成查询条件宏 -->
614 618 <#macro genCondition field>
615 619 <#assign content=field.controlContent>
616   - <el-form-item label="${field.cm}" style="padding-right:10px;" v-if="display('${field.mpDisplay}')" v-show="${!field.isShow}">
  620 + <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}">
617 621 <#if field.vf=="static" >
  622 + <#-- colPrefix如果是外部表,值是返回"",非外部表的话就会有一个前缀,所以这里直接用这个拼接就行 -->
618 623 <#switch field.ct>
619 624 <#case "onetext">
620 625 <#if field.ty == 'number'>
621   - <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>
  626 + <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>
622 627 <#else>
623   - <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>
  628 + <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>
624 629 </#if>
625 630 <#break>
626 631 <#-- 自定义对话框 -->
627 632 <#case "customDialog">
628 633 <#assign dg=content>
629   - <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}" />
  634 + <ht-custom-dialog
  635 + v-model="searchForm.${field.colPrefix!}${field.na}"
  636 + model-name="searchForm.${field.na}"
  637 + class="search-item search-custom-dialog"
  638 + isFromList="true"
  639 + ht-query="${field.colPrefix!}${field.na}"
  640 + special-query="${field.colPrefix!}${field.na}"
  641 + operation="${field.qt}"
  642 + :custdialog='${util.getCustDialogAttr(field.colPrefix,field)}'
  643 + permission="w"
  644 + <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if>
  645 + atter="searchForm.${field.colPrefix!}${field.na}">
  646 + </ht-custom-dialog>
630 647 <#break>
631 648 <#case "date"><#--日期选择器 -->
632 649 <@genQueryDate field=field/>
633 650 <#break>
634   - <#case "month"><#--月份选择器 -->
635   - <@genQueryMonth field=field/>
636   - <#break>
637 651 <#case "select"><#--下拉选项-->
638 652 <#assign options=content>
639 653 <div style="display:inline">
640 654 <#if util.getJsonByPath(field.option,'choiceType')=="dynamic">
641   - <#--<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>
642   - </el-select>-->
643   - <ht-select v-model="searchForm.${field.colPrefix!}${field.na}" model-name="searchForm.${field.colPrefix!}${field.na}"
644   - placeholder="${field.cm}"
645   - :ganged="${util.getSelectQuery(field.option,type!=1)}"
646   - permission="w">
  655 + <ht-select clearable filterable v-model="searchForm.${field.colPrefix!}${field.na}" model-name="searchForm.${field.colPrefix!}${field.na}"
  656 + class="search-item" ht-query="${field.colPrefix!}${field.na}" operation="${field.qt}"
  657 + <#if !field.isShow && field.validate?if_exists && field.validate?length gt 0> :validate="${field.validate}"</#if>
  658 + <#if field.cm?if_exists>:placeholder="$td('${'formTemplate.${bpmDataTemplate.alias}.search.${colPrefix}${field.na}'}', '${field.cm}')" </#if>
  659 + :ganged="${util.getSelectQuery(field.option,type!=1)}"
  660 + >
647 661 </ht-select>
648 662 <#else>
649   - <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}">
650   - <el-option label="全部" value=""></el-option>
  663 + <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}">
  664 + <el-option :label="$td('${'formTemplate.${bpmDataTemplate.alias}.search.all'}', '全部')" value=""></el-option>
651 665 <#list field.controlContent as opt>
652   - <el-option label="${opt.value}" value="${opt.key}"></el-option>
  666 + <el-option label="${opt.value}" value="${opt.key}"></el-option>
653 667 </#list>
654 668 </el-select>
655 669 </#if>
... ... @@ -659,7 +673,7 @@ editBaseURL:编辑一行数据的BaseURL
659 673 <#assign dickey=util.getJsonByPath(field.controlContent,'alias')>
660 674 <#assign resultField=util.getJsonByPath(field.controlContent,'resultField')>
661 675 <div style="display:inline-block;" class="col-md-12">
662   - <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>
  676 + <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>
663 677 </div>
664 678 <#break>
665 679 <#case "radio"><#--单选按钮 -->
... ... @@ -667,14 +681,12 @@ editBaseURL:编辑一行数据的BaseURL
667 681 ${getCheckboxOrRadio(field)}
668 682 <#break>
669 683 <#default>
670   - <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>
  684 + <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>
671 685 <#break>
672 686 </#switch>
673 687 </#if>
674   - </el-form-item>
  688 + </ht-table-search-field>
675 689 </#macro>
676   -
677   -
678 690 <#noparse>
679 691 <#--管理列 以前的模板-->
680 692 <#macro genManageOld manage managePermission actionUrl data>
... ... @@ -682,13 +694,13 @@ editBaseURL:编辑一行数据的BaseURL
682 694 <#if manage.name == 'edit'>
683 695 <#if managePermission.edit>
684 696 <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}',
685   - 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>
  697 + 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>
686 698 </#if>
687 699 <#--复制-->
688 700 <#elseif manage.name == 'copy'>
689 701 <#if managePermission.copy>
690 702 <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>
691   - </#if>新增数据
  703 + </#if>
692 704 <#--打印明细 -->
693 705 <#elseif manage.name == 'printDetail'>
694 706 <#if managePermission.printDetail>
... ... @@ -712,7 +724,7 @@ editBaseURL:编辑一行数据的BaseURL
712 724 </#if>
713 725 <#--查询数据-->
714 726 <#elseif manage.name == 'searchData'>
715   - <#if managePermission.searchData>click
  727 + <#if managePermission.searchData>
716 728 <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>
717 729 </#if>
718 730  
... ... @@ -738,7 +750,8 @@ editBaseURL:编辑一行数据的BaseURL
738 750 <#--明细-->
739 751 <#elseif manage.name == 'detail' >
740 752 <#if managePermission.detail>
741   - <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>
  753 + <el-button id="${manage.buttonId}" type="text" v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  754 + @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>
742 755 </#if>
743 756 <#elseif manage.name == 'url' &&manage.type=='1'>
744 757 <#if util.fieldPermissionValidation('url', managePermission, manage.desc, manage.url, manage.urlParams)>
... ... @@ -772,7 +785,9 @@ editBaseURL:编辑一行数据的BaseURL
772 785 </#if>
773 786 <#elseif manage.name == 'js' >
774 787 <#if util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
775   - <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>
  788 + <el-button id="${manage.buttonId}" type="text"
  789 + v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  790 + @click='customEvilJS(scope.row,"${manage.jsValue}")' size="small" plain>{{$td('eip.common.js', '${manage.desc}')}}</el-button>
776 791 </#if>
777 792 <#else>
778 793 </#if>
... ... @@ -783,19 +798,9 @@ editBaseURL:编辑一行数据的BaseURL
783 798 <#--编辑-->
784 799 <#if manage.name == 'edit'>
785 800 <#if managePermission.edit && manage.linePosition>
786   - <!-- <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
  801 + <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
787 802 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}',
788   - 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> -->
789   - <el-button v-if="permission.edit && display('${manage.mpDisplay}')" type="text"
790   - @click='operating("${templateId}",scope.row.${pkField},"edit","${bpmDataTemplate.defId}",scope.row.isStartFlow,"${manage.openType}");'
791   - :plain="true" size="mini" <#if manage.beforeScript>
792   - v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
793   - </#if>
794   - <#if manage.afterScript>
795   - v-after-script="{script: '${manage.afterScript}', row: scope.row}"
796   - </#if>
797   - >${manage.desc}
798   - </el-button>
  803 + 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>
799 804 </#if>
800 805 <#--复制-->
801 806 <#elseif manage.name == 'copy'>
... ... @@ -805,25 +810,12 @@ editBaseURL:编辑一行数据的BaseURL
805 810 <#--打印明细 -->
806 811 <#elseif manage.name == 'printDetail'>
807 812 <#if managePermission.printDetail && manage.linePosition>
808   - <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>
  813 + <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>
809 814 </#if>
810 815 <#--删除-->
811 816 <#elseif manage.name == 'del' && manage.linePosition>
812 817 <#if managePermission.del>
813   - <!-- <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> -->
814   - <el-button
815   - type="text"
816   - v-if="permission.del && display('${manage.mpDisplay}')"
817   - @click='del(scope.row.${pkField});'
818   - size="mini" plain
819   - <#if manage.beforeScript>
820   - v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
821   - </#if>
822   - <#if manage.afterScript>
823   - v-after-script="{script: '${manage.afterScript}', row: scope.row}"
824   - </#if>
825   - >${manage.desc}</el-button>
826   -
  818 + <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>
827 819 </#if>
828 820  
829 821 <#--新增流程-->
... ... @@ -870,20 +862,9 @@ editBaseURL:编辑一行数据的BaseURL
870 862 <#--明细-->
871 863 <#elseif manage.name == 'detail' >
872 864 <#if managePermission.detail && manage.linePosition>
873   - <!-- <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> -->
874   - <el-button
875   - type="text"
876   - v-if="display('${manage.mpDisplay}')"
877   - @click='operating("${templateId}",scope.row.${pkField},"get","","","${manage.openType}");'
878   - size="mini"
879   - plain
880   - <#if manage.beforeScript>scriptClick
881   - v-before-script="{script: '${manage.beforeScript}', row: scope.row}"
882   - </#if>
883   - <#if manage.afterScript>
884   - v-after-script="{script: '${manage.afterScript}', row: scope.row}"
885   - </#if>
886   - >${manage.desc}</el-button>
  865 + <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
  866 + v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  867 + @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>
887 868 </#if>
888 869  
889 870 <#--url按钮-->
... ... @@ -893,20 +874,6 @@ editBaseURL:编辑一行数据的BaseURL
893 874 @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>
894 875 </#if>
895 876  
896   -
897   - <#--组件按钮-->
898   - <#elseif manage.name == 'moduleButton'>
899   - <#if managePermission.moduleButton && manage.linePosition>
900   - <component
901   - is="${manage.url}"
902   - :row="scope.row"
903   - :column="scope.column"
904   - :index="scope.$index"
905   - desc= "${manage.desc}"
906   - @RefreshTable="search('find')"
907   - v-if="display('${manage.mpDisplay}') "
908   - ></component>
909   - </#if>
910 877 <#--表单修改记录-->
911 878 <#elseif manage.name == 'record' >
912 879 <#if managePermission.record && manage.linePosition>
... ... @@ -916,12 +883,13 @@ editBaseURL:编辑一行数据的BaseURL
916 883 <#--js按钮-->
917 884 <#elseif manage.name == 'js' >
918 885 <#if manage.linePosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
919   - <!-- <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> -->
920   - <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>
  886 + <el-dropdown-item name="${manage.desc}" id="${manage.buttonId}"
  887 + v-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  888 + @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>
921 889 </#if>
922 890  
923 891 <#elseif manage.name == 'startFlow' && manage.linePosition && managePermission.startFlow>
924   - <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>
  892 + <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>
925 893  
926 894 <#--更新数据-->
927 895 <#elseif manage.name == 'batchUpdate'>
... ... @@ -978,7 +946,8 @@ editBaseURL:编辑一行数据的BaseURL
978 946 <#if manage.name == 'edit'>
979 947 <#if managePermission.edit && manage.linePosition>
980 948 <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}',
981   - 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>
  949 + 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>
  950 + 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>
982 951 </#if>
983 952 <#--复制-->
984 953 <#elseif manage.name == 'copy'>
... ... @@ -1032,7 +1001,9 @@ editBaseURL:编辑一行数据的BaseURL
1032 1001 <#--明细-->
1033 1002 <#elseif manage.name == 'detail' >
1034 1003 <#if managePermission.detail && manage.linePosition>
1035   - <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>
  1004 + <span name="${manage.desc}" id="${manage.buttonId}"
  1005 + v-else-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  1006 + @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>
1036 1007 </#if>
1037 1008  
1038 1009 <#--url按钮-->
... ... @@ -1050,11 +1021,13 @@ editBaseURL:编辑一行数据的BaseURL
1050 1021 <#--js按钮-->
1051 1022 <#elseif manage.name == 'js' >
1052 1023 <#if manage.linePosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
1053   - <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>
  1024 + <span name="${manage.desc}" id="${manage.buttonId}"
  1025 + v-else-if="display('${manage.mpDisplay}') && scriptBeforeHandler('${manage.beforeScriptValue}',scope.row)"
  1026 + @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>
1054 1027 </#if>
1055 1028  
1056 1029 <#elseif manage.name == 'startFlow' && manage.linePosition && managePermission.startFlow>
1057   - <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>
  1030 + <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>
1058 1031  
1059 1032 <#--更新数据-->
1060 1033 <#elseif manage.name == 'batchUpdate'>
... ... @@ -1113,7 +1086,7 @@ editBaseURL:编辑一行数据的BaseURL
1113 1086 <el-button
1114 1087 class="data-form-list__top-btn"
1115 1088 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:'',
1116   - 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>
  1089 + 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>
1117 1090 </#if>
1118 1091 </#if>
1119 1092 <#--编辑-->
... ... @@ -1121,20 +1094,23 @@ editBaseURL:编辑一行数据的BaseURL
1121 1094 <#if managePermission.edit && manage.topPosition>
1122 1095 <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}" v-show="scriptBeforeHandler('${manage.beforeScriptValue}',{})"
1123 1096 v-if="permission.edit && display('${manage.mpDisplay}')" @click="scriptClick('edit','${manage.afterScriptValue}',{templateId:'${templateId}',id:'',action:'edit',defId:'${bpmDataTemplate.defId}',
1124   - 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>
  1097 + 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>
1125 1098 </#if>
1126 1099 </#if>
1127 1100 <#-- 删除 -->
1128 1101 <#if manage.name == 'del'>
1129 1102 <#if managePermission.del && manage.topPosition>
1130   - <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>
  1103 + <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>
1131 1104 </#if>
1132 1105 </#if>
1133 1106  
1134 1107 <#--明细-->
1135 1108 <#if manage.name == 'detail' >
1136 1109 <#if managePermission.detail && manage.topPosition>
1137   - <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>
  1110 + <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}"
  1111 + v-if="display('${manage.mpDisplay}')"
  1112 + v-show="scriptBeforeHandler('${manage.beforeScriptValue}',{})"
  1113 + @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>
1138 1114 </#if>
1139 1115 </#if>
1140 1116  
... ... @@ -1183,7 +1159,7 @@ editBaseURL:编辑一行数据的BaseURL
1183 1159 <#--批量新增-->
1184 1160 <#if manage.name == 'batchSave'>
1185 1161 <#if util.fieldPermissionValidation('batchSave', managePermission, manage.buttonId, '') >
1186   - <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:'',
  1162 + <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:'',
1187 1163 openType:'${manage.openType}', quitAfterSaving: '${manage.quitAfterSaving}', dialogWidth: '${manage.dialogWidth}', dialogHeight: '${manage.dialogHeight}'})" icon="el-icon-plus">${manage.desc}</el-button>
1188 1164 <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>
1189 1165 </#if>
... ... @@ -1221,6 +1197,7 @@ editBaseURL:编辑一行数据的BaseURL
1221 1197 <#if manage.name == 'startFlow'>
1222 1198 <#if managePermission.startFlow && manage.topPosition>
1223 1199 <el-button class="data-form-list__top-btn" type="${manage.theme!'success'}" size="mini"
  1200 + v-show="getButtonShowByJs('${manage.buttonId}', 'startFlow')"
1224 1201 @click="startFlowByTopButton('${pkField}','${manage.afterScriptValue}','${templateId}','${bpmDataTemplate.defId}')"
1225 1202 icon="el-icon-success">{{$td('${"formTemplate.${bpmDataTemplate.alias}.button.${manage.name}${manage.btnKey}"}', '${manage.desc}')}}</el-button>
1226 1203 </#if>
... ... @@ -1282,21 +1259,12 @@ editBaseURL:编辑一行数据的BaseURL
1282 1259 </#if>
1283 1260 </#if>
1284 1261  
1285   -
1286   -
1287   -
1288   - <#-- 组件按钮 -->
1289   - <#if manage.name == 'moduleButton'>
1290   - <#if managePermission.moduleButton && manage.topPosition>
1291   - <component is="${manage.url}" desc= "${manage.desc}" @RefreshTable="search('find')" v-if="display('${manage.mpDisplay}')"></component>
1292   - </#if>
1293   - </#if>
1294   -
1295   -
1296 1262 <#-- js按钮 -->
1297 1263 <#if manage.name == 'js' >
1298 1264 <#if manage.topPosition && util.fieldPermissionValidation('js', managePermission, manage.desc, manage.jsValue)>
1299   - <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>
  1265 + <el-button class="data-form-list__top-btn" type="${manage.theme!'primary'}"
  1266 + v-if="display('${manage.mpDisplay}') && getButtonShowByJs('${manage.buttonId}', 'js')"
  1267 + @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>
1300 1268 </#if>
1301 1269 </#if>
1302 1270  
... ... @@ -1809,7 +1777,7 @@ editBaseURL:编辑一行数据的BaseURL
1809 1777 <ProcessRecordDialog ref="processRecordDialog" :instId="selectedInstId" :defId="selectedDefId" :taskId="selectedTaskId"></ProcessRecordDialog>
1810 1778 <TaskToRevoke ref="taskToRevoke" :instId="selectedInstId" :taskId="selectedTaskId" :afterClose="()=>{search('find')}" />
1811 1779 -->
1812   - <ht-flow-chart ref="taskImage" :defId="selectedDefId" :openView="true" :inst-id="selectedInstId"></ht-flow-chart>
  1780 + <ht-flow-chart ref="taskImage" :defId="selectedDefId" :inst-id="selectedInstId"></ht-flow-chart>
1813 1781  
1814 1782 <process-record ref="processRecord" :inst-id="selectedInstId" :def-id="selectedDefId" :task-id="selectedTaskId"></process-record>
1815 1783  
... ... @@ -1965,7 +1933,6 @@ editBaseURL:编辑一行数据的BaseURL
1965 1933 </el-link>
1966 1934 <#elseif field.componentSetting>
1967 1935 <component is="${field.componentSetting}" :row="scope.row" :column="scope.column" :index="scope.$index"></component>
1968   -
1969 1936 <#elseif field.urlType=='url'>
1970 1937 <el-link
1971 1938 type="primary"
... ...