sasp-flow-render 1.1.18 → 1.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/assets/js/api/apiFlow.js

@@ -88,6 +88,15 @@ let objResult = {
         saveNodeInfoRelease:"/plFlowNodeController/saveNodeInfoRelease", //发布流程实例保存节点配置
     },
 
+    plFlowButton:{
+        url:"/plFlowButtonController",
+        add:"/plFlowButtonController/add",
+        find:"/plFlowButtonController/find",
+        getById:"/plFlowButtonController/getById",
+        update:"/plFlowButtonController/update",
+        delete:"/plFlowButtonController/delete",
+    },
+
     //流程节点配置
     plFlowInstNodeResult:{
         listNoPageByResult:"/flowInstNodeResultController/listNoPageByResult",

package/src/components/flowChart.vue

@@ -49,7 +49,7 @@
              instId:{type:String},
              nodeId:{type:String},
              linkProcId:{type:String,default:""},
-             isRelease:{type:String,default:"1"} //发布状态默认已发布
+             isRelease:{type:String,default:""} //发布状态默认已发布
         },
         data(){
           return {

package/src/components/flowInst/flowInstList.vue

@@ -161,6 +161,12 @@
                                            @click="deleteRowFlow(scope.row)"
                                            icon="el-icon-delete" type="danger">删除
                                 </el-button>
+                                <el-button
+                                    v-for="button in Object.values(diyButtonsObj)"
+                                    :key="button.id" size="small" :type="button.buttonColor" :icon="button.buttonIcon"
+                                    v-if="judeDiyButton(tabType,button,scope.row)"
+                                    @click="diyButtonOpt('list',scope.row, button)">{{button.showButtonName}}
+                                </el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -345,6 +351,13 @@
                 }
             },
 
+            // 自定义按钮窗口回调函数
+            openDiyButtonEvent: {
+                type: Function, default() {
+
+                }
+            },
+
             // 打开修改窗口回调函数
             openUpdateFlowForm: {
                 type: Function, default() {
@@ -399,6 +412,7 @@
             downloadTemplate: {type: Function, default: null},
             getFormDataByDataIds: {type: Function, default: null},
             flowDefineByFlowId: {type: Object, default: () => ({})},
+            diyButtonsObj: {type: Object, default: () => ({})}, // 自定义按钮对象
         },
         data() {
 
@@ -517,6 +531,7 @@
             this.init();
             this.getListButton();
             this.initWorkStageTurnOn();
+            this.getCurrentWidth();
             if (this.showModel === "card") {
                 this.checkScreenWidth();
                 window.addEventListener('resize', () => { //监听浏览器窗口大小改变
@@ -643,6 +658,25 @@
                 }
             },
 
+            getCurrentWidth() {
+                Object.values(this.diyButtonsObj).forEach(item => {
+                    if(item.position === 'list' && item.buttonSign.indexOf(this.tabType) > -1) {
+                        this.currentOptColumnWidth += 100;
+                    }
+                })
+            },
+
+            judeDiyButton(tabType, button, row) {
+                if(tabType === 'pending') {
+                    return button.position === 'list' && button.nodeId === row.currentNode;
+                }
+                return button.position === 'list' && button.buttonSign.indexOf(tabType) > -1;
+            },
+
+            diyButtonOpt(type,row, button) {
+                this.openDiyButtonEvent(type,row, button);
+            },
+
             /**
              * 判断列表操作按钮显示
              */

package/src/components/flowInst/flowInstTab.vue

@@ -52,6 +52,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="150"
                                 :show-model="showModel"
                                 :start-node-key-obj="startNodeKeyObj"
@@ -60,6 +61,7 @@
                                 :open-add-flow-form="openAddFlowForm"
                                 :open-update-flow-form="openUpdateFlowForm"
                                 :open-batch-update-flow-form="openBatchUpdateFlowForm"
+                                :open-diy-button-event="openDiyButtonEvent"
                                 :formImpMethod="formImpMethod"
                                 :flowImpParamObj="flowImpParamObj"
                                 :downloadTemplate="downloadTemplate"
@@ -81,6 +83,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 :show-model="showModel"
                                 :start-node-key-obj="startNodeKeyObj"
@@ -90,6 +93,7 @@
                                 :open-flow-chart="openFlowChart"
                                 :open-flow-record="openFlowRecord"
                                 :open-update-flow-form="openUpdateFlowForm"
+                                :open-diy-button-event="openDiyButtonEvent"
                                 :open-batch-update-flow-form="openBatchUpdateFlowForm"
                                 :openNewBatchUpdateFlowForm="openNewBatchUpdateFlowForm"
                                 @setDataValue="setDataValue"
@@ -111,11 +115,13 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 @initTabNum="initTabNum"
                                 :show-model="showModel"
                                 :start-node-key-obj="startNodeKeyObj"
                                 :flow-version-node-obj="flowVersionNodeObj"
+                                :open-diy-button-event="openDiyButtonEvent"
                                 :open-flow-chart="openFlowChart"
                                 :open-flow-record="openFlowRecord"
                                 :open-view-flow-form="openViewFlowForm"
@@ -137,6 +143,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 @initTabNum="initTabNum"
                                 :show-model="showModel"
@@ -144,6 +151,7 @@
                                 :flow-version-node-obj="flowVersionNodeObj"
                                 :open-flow-record="openFlowRecord"
                                 :open-view-flow-form="openViewFlowForm"
+                                :open-diy-button-event="openDiyButtonEvent"
                 >
                 </flow-inst-list>
             </el-tab-pane>
@@ -162,6 +170,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 @initTabNum="initTabNum"
                                 :show-model="showModel"
@@ -169,6 +178,7 @@
                                 :flow-version-node-obj="flowVersionNodeObj"
                                 :open-flow-record="openFlowRecord"
                                 :open-view-flow-form="openViewFlowForm"
+                                :open-diy-button-event="openDiyButtonEvent"
                 >
                 </flow-inst-list>
             </el-tab-pane>
@@ -187,6 +197,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 @initTabNum="initTabNum"
                                 :show-model="showModel"
@@ -194,6 +205,7 @@
                                 :flow-version-node-obj="flowVersionNodeObj"
                                 :open-flow-record="openFlowRecord"
                                 :open-view-flow-form="openViewFlowForm"
+                                :open-diy-button-event="openDiyButtonEvent"
                 >
                 </flow-inst-list>
             </el-tab-pane>
@@ -211,6 +223,7 @@
                                 :flow-node-id-to-info="flowNodeIdToInfo"
                                 :flow-node-name-obj="flowNodeNameObj"
                                 :node-list-button-obj="nodeListButtonObj"
+                                :diy-buttons-obj="diyButtonsObj"
                                 :opt-column-width="optColumnWidth"
                                 :show-model="showModel"
                                 :start-node-key-obj="startNodeKeyObj"
@@ -219,6 +232,7 @@
                                 :open-flow-record="openFlowRecord"
                                 :open-view-flow-form="openViewFlowForm"
                                 :inst-query-power="dataPermis"
+                                :open-diy-button-event="openDiyButtonEvent"
                 >
                 </flow-inst-list>
             </el-tab-pane>
@@ -252,6 +266,12 @@
 
             <div slot="footer" style="height:31px;" class="dialog-footer">
                 <div v-if="!formSearchObj.isNewSelectBatchDeal">
+                    <el-button
+                        v-for="button in Object.values(diyButtonsObj)"
+                        :key="button.id" size="small" :type="button.buttonColor" :icon="button.buttonIcon"
+                        v-if="judeDiyButton(tabActive,button)"
+                        @click="openDiyButtonEvent('table','', button)">{{button.showButtonName}}
+                    </el-button>
                     <el-button v-for="btn in formBtnArr" @click="btn.method" :disabled="isDisabled[btn.btnType]?false:true"
                                v-show="btn.show && ((formInfo.opt != 'view') || (formInfo.opt=='view' && btn.isView))"
                                :key="btn.btnType"
@@ -982,6 +1002,7 @@
                 total: 0, //总条数
                 pageSize: 50, //每页多少条
                 flowEventScriptByFlowId: {},
+                diyButtonsObj: {} // 自定义按钮对象
             }
         },
         watch:{
@@ -2907,6 +2928,7 @@
                                     this.allNodeInfo[item.id] = item;
                                     // 行按钮
                                     let listButton = JSON.parse(item.listButton || "[]") || [];
+                                    listButton = listButton.filter(item => !item.buttonId);
                                     listButton.forEach(button => {
                                         button.showName = button.showName ? button.showName : this.listButtonObj[button.type];
                                     });
@@ -2914,6 +2936,7 @@
 
                                     // 表单按钮
                                     let formButton = JSON.parse(item.formButton || "[]") || [];
+                                    formButton = formButton.filter(item => !item.buttonId);
                                     formButton.forEach(button => {
                                         button.showName = button.showName ? button.showName : this.formButtonObj[button.type];
                                     });
@@ -2921,6 +2944,13 @@
                                     this.nodeFormButtonObj[item.id] = this.sortButtonArr(formButton);
                                     this.nodeFormBtnObj[item.id] = this.formatterFormButton(formButton);
 
+                                    // 自定义按钮
+                                    if(item.plFlowButtons !== null) {
+                                        item.plFlowButtons.forEach(button => {
+                                            this.diyButtonsObj[button.id] = button;
+                                        })
+                                    }
+
                                     let width = 0;
                                     (this.nodeListButtonObj[item.id] || []).forEach(item => {
                                         let nameLength = item.showName.length;
@@ -3338,7 +3368,39 @@
                 return result;
             },
 
+            // 自定义按钮窗口回调函数
+            openDiyButtonEvent(type,row, button) {
+                let formData = {};
+                if(this.getFormInfo){
+                    formData = this.getFormInfo();
+                }
+                if(type === 'list') {
+                    this.execDiyBtnScripts(type,row,button.funcBody);
+                }else {
+                    this.execDiyBtnScripts(type,formData,button.funcBody);
+                }
+            },
+
+            judeDiyButton(tabActive,button) {
+                if(tabActive === 'pending') {
+                    return button.position === 'table' && button.nodeId === this.currentInst.currentNode;
+                }
+                return button.position === 'table' && button.buttonSign.indexOf(tabActive) > -1;
+            },
 
+            execDiyBtnScripts(type,data,fnBody) {
+                try {
+                    fnBody = this.replaceUrl(fnBody);
+                    fnBody = fnBody.replace(/\\'/g, "'").replace(/&quot;/g, "\"");
+                    if(type === 'list') {
+                        new Function('vm,rowData,Ajax', fnBody)(this,data,AjaxUtil);
+                    }else {
+                        new Function('vm,formData,Ajax', fnBody)(this,data,AjaxUtil);
+                    }
+                } catch (e) {
+                    console.log("自定义按钮事件执行错误！", e);
+                }
+            },
 
             /**
              * 执行工作流新版本事件规则