sasp-flow-render 1.0.1 → 1.0.2

package/README.md

@@ -0,0 +1,37 @@
+
+## 模块安装
+```shell
+npm install sasp-flow-render -S  // 这里版本号视具体情况定，一般情况都采用最高版本。
+```
+
+## 主项目main.js配置
+``` javascript
+import SaspFlowRender from 'sasp-flow-render';
+
+Vue.use(SaspFlowRender, {
+    SERVICE_URL: JAVA_URL || ""
+});
+JAVA_URL是指请求后端请求的地址，例如：http://localhost:10003，注意最后不要加/
+
+插件安装完成后，表单组件自动注册了全局组件flow-inst-view（流程实例页面）
+在智慧流程后台完成页面配置后，可以复制流程ID，使用该流程ID调用flow-inst-view组件即可渲染页面。
+```
+
+## flow-inst-view组件使用说明示例
+```
+[comment]: <> (#### 组件入参数说明)
+
+[comment]: <> (参数名称 | 参数说明 | 参数标准)
+
+[comment]: <> (loginUser | 登录用户 | 用于鉴定数据归属，Object，示例:{id:"1",userName:"张三"}，必须传入id:用户标识，userName:用户名称)
+
+[comment]: <> (flowId | 流程ID（必须传入） | 流程后台配置的资源ID，String)
+
+[comment]: <> (initFormInfo | 初始化表单的方法 | 可根据响应参数进行表单的渲染配置
+
+[comment]: <> (saveFormInfo | 保存表单的方法 | 需要在保存完成后返回flowDataId(表单ID, 以便于进行表单于流程的数据绑定) 
+
+[comment]: <> (slot="formInfo" | 自定义插槽 | 将表单的渲染页面嵌入至流程中 | 例: 插入 table-form-render 组件, 渲染时需要传入以下参数:
+              tableviewId: 表单ID, dataId: 数据ID, formOperate: 当前状态, flowFieldStatus: 流程使用时表单各字段显示、隐藏、修改、查看状态
+
+```

package/index.js

@@ -13,6 +13,7 @@ import CustomRenderer from './src/views/popup/js/controls/CustomRenderer';
 import translations from './src/views/popup/js/translations/translations';
 import apiFlow from './src/assets/js/api/apiFlow';
 import flowGlobal from './src/assets/js/global/flowGlobal';
+import flowInstView from './src/views/flowInstView';
 import {isAxiosFormData, SaspModuleUtil} from "sasp-base";
 /**
  * 注册复合视图组件
@@ -37,7 +38,8 @@ import flowResRouter from "./src/views/menuRouter/flowResRouter.vue";
 let components = [
     flowInstTab,
     flowMenuRouter,
-    userSelect
+    userSelect,
+    flowInstView
 ];
 
 /**
@@ -77,7 +79,9 @@ let initAxios = (Vue, props) => {
 const install = function (Vue, opts = {}) {
     SaspModuleUtil.registerModuleName(Vue, "flow");
 
+    Vue.prototype.USE_SASP_FLOW = true; // 说明安装了流程插件，我们使用此参数作为表单对接的依据
     Vue.use(flowInstall, opts);
+    Vue.use(flowGlobal, opts);
 
     initAxios(Vue, opts);
     initViewData(Vue, opts);

package/package.json

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

package/src/assets/js/global/flowGlobal.js

@@ -1,6 +1,7 @@
-import axios from 'axios/index';
+// import axios from 'axios/index';
 import flow from "../api/apiFlow";
 let apiFlow = flow.apis;
+let axios = null;
 
 export default {
     name: "FLOW_GLOBAL",
@@ -8,6 +9,10 @@ export default {
     OBJ_FLOW_DEFINE: {}, // 流程定义信息
     OBJ_FLOW_NODES: {}, // 流程节点信息
 
+    install(Vue,opts){
+        axios = opts.axios;
+    },
+
     /**
      * 根据ID获取流程定义信息
      * @param id

package/src/components/flowInst/flowInstList.vue

@@ -38,7 +38,7 @@
                     </el-form-item>
                     <el-form-item label="启动时间" v-if="isShow('processed,finished,rescinded,discontinue,flowQuery')">
                         <el-date-picker v-model="crud.searchForm.startTime" type="daterange" value-format="yyyy-MM-dd"
-                                        style="width: 240px;"
+                                        style="width: 240px;" align="center"
                                         range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
                         </el-date-picker>
                     </el-form-item>
@@ -112,24 +112,28 @@
                         </el-table-column>
                         <el-table-column label="操作" align="center" :width="currentOptColumnWidth">
                             <template slot-scope="scope">
-                                <el-button
-                                        v-for="buttonObj in nodeListButtonObj[scope.row.currentNode || (flowVersionNodeObj[scope.row.version][startNodeKeyObj[scope.row.version]] || {}).id] || []"
-                                        :key="buttonObj.type" size="small" type="primary"
-                                        v-if="judgeListButton(tabType,buttonObj.type)"
-                                        @click="listButtonOpt(buttonObj.type,scope.row)"
-                                        :icon="buttonIcon[buttonObj.type]" :type="buttonType[buttonObj.type]">
-                                    {{buttonObj.showName}}
-                                </el-button>
-                                <el-button v-if="scope.row.currentNode == 'end'" size="small"
-                                           @click="listButtonOpt('view',scope.row)"
-                                           icon="el-icon-view" type="primary">
-                                    查看
-                                </el-button>
-                                <el-button v-if="scope.row.currentNode == 'end'" size="small"
-                                           @click="listButtonOpt('flowRecord',scope.row)"
-                                           icon="saspiconfont pl-icon-liuchengtu" type="primary">
-                                    流转记录
-                                </el-button>
+                                <template v-if="(nodeListButtonObj[scope.row.currentNode || (flowVersionNodeObj[scope.row.version][startNodeKeyObj[scope.row.version]] || {}).id] || []).length > 0">
+                                    <el-button
+                                            v-for="buttonObj in nodeListButtonObj[scope.row.currentNode || (flowVersionNodeObj[scope.row.version][startNodeKeyObj[scope.row.version]] || {}).id] || []"
+                                            :key="buttonObj.type" size="small" type="primary"
+                                            v-if="judgeListButton(tabType,buttonObj.type)"
+                                            @click="listButtonOpt(buttonObj.type,scope.row)"
+                                            :icon="buttonIcon[buttonObj.type]" :type="buttonType[buttonObj.type]">
+                                        {{buttonObj.showName}}
+                                    </el-button>
+                                </template>
+                                <template v-else>
+                                    <el-button size="small"
+                                               @click="listButtonOpt('view',scope.row)"
+                                               icon="el-icon-view" type="primary">
+                                        查看
+                                    </el-button>
+                                    <el-button size="small"
+                                               @click="listButtonOpt('flowRecord',scope.row)"
+                                               icon="saspiconfont pl-icon-liuchengtu" type="primary">
+                                        流转记录
+                                    </el-button>
+                                </template>
                             </template>
                         </el-table-column>
                     </el-table>

package/src/components/flowInst/flowInstTab.vue

@@ -467,7 +467,7 @@
         },
         props: {
             flowId: {type: String, default: ''},
-            operateRootArr: {type: Array},
+            operateRootArr: {type: Array,default:null},
             flowobj: {type: Object},
             defaultTab: {type: String},
             settingData:{type: Object,default:()=>{return {};}},
@@ -740,6 +740,7 @@
                 showModel: "list",//默认风格  list：列表card：卡片
                 showInfo: "",//展示信息 flow：流程信息 form：表单信息
                 operateType: {},
+                resourceTabOpts: ['draft','pending','processed','rescinded','finished','discontinue','flowQuery'],
                 tabTypeObj: {},//标签页对象
                 numberObj: {draft: 0, pending: 0, processed: 0, rescinded: 0, finished: 0, discontinue: 0},//标签内容数量对象
                 flowChartDialogVisible: false,
@@ -888,7 +889,7 @@
             this.isShowAgentSet = false;
             this.loginUser = this.CACHE_GLOBAL.getLoginUser();
             this.userDept = this.CACHE_GLOBAL.getLoginDept();
-            // this.initResource();
+            this.initTabOpts(); // 初始化外部选项卡权限
 
             this.getFlowInfo().then(res => {
                 this.initSuccess = true;
@@ -1185,7 +1186,7 @@
                 //     background: 'rgba(0, 0, 0, 0.7)'
                 // })
 
-                this.saveDataFunc().then(resData => {
+                this.saveDataFunc('draft').then(resData => {
                     this.tabCrudSearch();
 
                     this.flowInstDataDialog = false;
@@ -1207,6 +1208,7 @@
                         if(result && result.then){
                             result.then(res => {
                                 if(!res){
+                                    this.isDisabled['nextStep'] = true;
                                     return;
                                 }
                                 if(typeof res !== 'object'){
@@ -1389,7 +1391,7 @@
 
                 this.isDisabled['nextStep'] = false;
                 this.flowParams = {};
-                this.saveDataFunc().then(flowParams => {
+                this.saveDataFunc('nextStep').then(flowParams => {
                     this.flowParams = JSON.parse(JSON.stringify(flowParams));
                     let instId = flowParams.flowInstId;
                     this.$set(this.formInfo,"opt","update");
@@ -1925,6 +1927,9 @@
                         let fieldId = summaryNameId[fieldName];
                         if (fieldName && dataObj.hasOwnProperty(fieldId)) {
                             let replaceVal = dataObj[fieldId];
+                            if(dataObj[fieldId + "_SASP_SYS_DATA"]){
+                                replaceVal = dataObj[fieldId+ "_SASP_SYS_DATA"];
+                            }
                             if(dataObj[fieldId + "_sequence"]){ // 自增序列
                                 replaceVal = dataObj[fieldId + "_sequence"];
                             }
@@ -2187,6 +2192,15 @@
                                 this.operateType[item.type] = true;
                             }
                         })
+                        let activeArr = [];
+                        Object.keys(this.operateType).forEach(key => {
+                            if(this.operateType[key] && this.resourceTabOpts.indexOf(key) > -1){
+                                activeArr.push(key);
+                            }
+                        })
+                        if(activeArr.length > 0 && activeArr.indexOf("pending") == -1){
+                            this.tabActive = activeArr[0];
+                        }
                         this.showModel = flowobj.showModel;
                         this.showInfo = flowobj.showInfo;
                         let formType = flowobj.formType;
@@ -2663,13 +2677,13 @@
                 }
             },
             tabShow(val) {
-                return this.operateType[val];
+                return (this.resourceTabOpts.indexOf(val) > -1) && (this.operateType[val]);
+            },
+            initTabOpts() {// 初始化外部选项卡的权限
+                if(this.operateRootArr){
+                    this.resourceTabOpts = this.operateRootArr;
+                }
             },
-            // async initResource() {//处理资源池信息
-            //     (this.flowData.operateRootArr || []).forEach(item => {
-            //         this.$set(this.operateType, item.powerCode, true)
-            //     });
-            // },
 
             initflowObj() {//处理流程定义对象
                 let tabSetting = JSON.parse(this.flowDefine.tabSetting);

package/src/components/flowRoamRecords.vue

@@ -360,9 +360,10 @@
                                     assignee = assignee.substring(0,assignee.lastIndexOf("stop"));
                                     item.taskStatus = "stop";
                                 }
-                                let signDataArr = assignee.split("_");
-                                if(signDataArr.length == 3 && assignee.indexOf("_") == 0){ // 加签数据
-                                    let mainTaskId = signDataArr[2];
+                                let taskId = item.taskId;
+                                if(variables[taskId + '_PassignTask']){ // 加签数据
+                                    let mainTaskId = variables[taskId + '_PassignTask'];
+                                    let signDataArr = assignee.split("_");
                                     assignee = signDataArr[1];
                                     if(!addSignObj[mainTaskId]){
                                         addSignObj[mainTaskId] = [item];

package/src/views/flowInstView.vue

@@ -1,5 +1,6 @@
 <template>
     <flow-inst-tab :flow-id="useFlowId" :userArr="userArr" :userMap="userMap"
+                   :operateRootArr="operateArr" :dataPermis="dataPermis"
                    :initFormInfo="initFormInfo" :saveFormInfo="saveFormInfo" :class='flowViewMainClass'>
         <template slot="formInfo">
             <slot name="formInfo"></slot>
@@ -15,6 +16,8 @@
         props:{
             loginUser:{type:Object,default:null}, // 登录用户
             flowId:{type:String},
+            dataPermis:{type:String,default:''},
+            operateArr:{type:Array,default:null},
             initFormInfo:{type: Function,default:null}, // 添加修改打开表单时执行的事件
             saveFormInfo:{type: Function,default:null}, // 保存表单时执行的事件
         },

package/src/views/popup/event/compoment/system/info.txt

@@ -0,0 +1 @@
+系统组件