sasp-flow-render 1.1.1 → 1.1.3

package/index.js

@@ -13,6 +13,8 @@ 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 axios from 'axios';
+import qs from "qs";
 import flowInstView from './src/views/flowInstView';
 import {isAxiosFormData, SaspModuleUtil} from "sasp-base";
 /**
@@ -43,32 +45,22 @@ let components = [
 ];
 
 let createAxiosIfNotExists = (Vue,props) => {
-    let newAxios = (props || {}).axios;
-    if (!newAxios) {
-        if(Vue.prototype.shareAxios){
-            (props || {}).axios = Vue.prototype.shareAxios;
-            return;
+    let newAxios = axios.create({
+        baseURL:window.FLOW_RENDER_URL,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+    })
+    newAxios.defaults.transformRequest = [];
+    newAxios.defaults.transformRequest.push(
+        function (data) {
+            return data;
         }
-        newAxios = axios.create({
-            baseURL:(props || {}).SERVICE_URL,
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                common: {
-                    Authorization: (localStorage["Authorization" + (window.projectSuffix || "")] || "")
-                }
-            },
-            transformRequest: [
-                function (data) {
-                    return data;
-                }
-            ],
-        })
-        newAxios.all = axios.all;
-        newAxios.spread = axios.spread;
-        Vue.prototype.axios = newAxios;
-        Vue.prototype.shareAxios = newAxios;
-        (props || {}).axios = newAxios;
-    }
+    )
+    newAxios.all = axios.all;
+    newAxios.spread = axios.spread;
+    Vue.prototype.saspFlowAxios = newAxios;
+    (props || {}).saspFlowAxios = newAxios;
 }
 
 /**
@@ -77,17 +69,14 @@ let createAxiosIfNotExists = (Vue,props) => {
  * @param props
  */
 let initAxios = (Vue, props) => {
-    let axios = (props || {}).axios;
-    if (!axios) {
-        return;
-    }
-
+    let axios = (props || {}).saspFlowAxios;
     // 添加请求拦截器
     axios.interceptors.request.use(function (config) {
-        if ((config.headers["Content-Type"] != 'multipart/form-data') && isAxiosFormData((config.url))) {
+        // if ((config.headers["Content-Type"] != 'multipart/form-data') && isAxiosFormData((config.url))) {
+        if (config.headers["Content-Type"] != 'multipart/form-data') {
             config = Object.assign({}, config);
             config.headers = Object.assign({}, config.headers || {}, {
-                "Is-Sasp-Qs": true,
+                // "Is-Sasp-Qs": true,
                 "Content-Type": "application/x-www-form-urlencoded"
             });
         }
@@ -103,12 +92,25 @@ let initAxios = (Vue, props) => {
         }
         return config;
     });
+    axios.defaults.transformRequest = axios.defaults.transformRequest || [];
+    axios.defaults.transformRequest.push(
+        function (data) {
+            if (data && typeof data === "string") { // 本项目的所有请求都通过qs转换实现
+                try {
+                    data = JSON.parse(data);
+                } catch (e) {
+                    console.error(e);
+                }
+            }
+            return qs.stringify(data);
+        }
+    );
 };
 
 const install = function (Vue, opts = {}) {
     SaspModuleUtil.registerModuleName(Vue, "flow");
-
-    // createAxiosIfNotExists(Vue,opts);
+    window.FLOW_RENDER_URL = opts.SERVICE_URL || window.JAVA_URL;
+    createAxiosIfNotExists(Vue,opts);
 
     Vue.prototype.USE_SASP_FLOW = true; // 说明安装了流程插件，我们使用此参数作为表单对接的依据
     Vue.use(flowInstall, opts);
@@ -120,7 +122,7 @@ const install = function (Vue, opts = {}) {
     components.forEach(component => {
         Vue.component(component.name, component);
     });
-    loadFlowEventPlugin.installAll(Vue);
+    loadFlowEventPlugin.installAll(Vue, opts);
 };
 
 export default {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"
@@ -12,6 +12,7 @@
     "camunda-bpmn-moddle": "^4.4.0",
     "diagram-js": "^6.6.1",
     "diagram-js-minimap": "^2.0.3",
+    "qs": "^6.5.2",
     "sasp-base": "2.5.4"
   },
   "browserslist": [

package/router.js

@@ -1,7 +1,6 @@
 export default {
     menus: [
         {path: 'flowInstTab', component: () => import("./src/components/flowInst/flowInstTab.vue")},
-        {path: 'messageMould', component: () => import("./src/components/messageMould/messageMould.vue")},
         {path: 'flowInstTab', component: () => import("./src/components/flowInst/flowInstTab.vue")},
         {path: 'flowMenuRouter/:resourceId', component: () => import("./src/views/menuRouter/flowMenuRouter.vue")},
     ],

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

@@ -145,6 +145,8 @@ let objResult = {
 
         changeDealer:"/plFlowInstController/changeDealer", // 切换当前任务处理人
         forceEnd:"/plFlowInstController/forceEnd", // 强制办结
+        recoverExceptionFlow:"/plFlowInstController/recoverExceptionFlow", // 恢复异常流程
+        reStartFlow:"/plFlowInstController/reStartFlow" //重启办结状态下的流程
     },
 
     plFlowSetting:{
@@ -187,6 +189,7 @@ let objResult = {
         add:"/plFlowDomainController/add",
         update:"/plFlowDomainController/update",
         delete:"/plFlowDomainController/delete",
+        findRealUrl:"/plFlowDomainController/findRealUrl",
     },
     plFlowInterface:{
         url:"/plFlowInterfaceController",
@@ -216,6 +219,14 @@ let objResult = {
         delete:"/plFlowCss/delete",
         getById:"/plFlowCss/getById",
     },
+    operationLog: {
+        url:"/operationLogController",
+        find:"/operationLogController/find",
+        getById:"/operationLogController/getById"
+    },
+    flowEngine: {
+        saveDataFlowDrafts: "/flowEngine/saveDataFlowDrafts",
+    }
 };
 
 import {SaspModuleUtil} from "sasp-base";

package/src/assets/js/global/cacheGlobal.js

@@ -15,7 +15,7 @@ export default {
     LOCK_USER_INFO:[], //锁定用户信息
     ARR_ALL_POS_USER_INFO:[], //所有组织岗位用户信息（包含已锁定）
     install(Vue,opts){
-        axios = opts.axios;
+        axios = opts.saspFlowAxios;
     },
 
     clearCache(){
@@ -40,10 +40,14 @@ export default {
         setLocalJSON('LOGINUSER', user);
     },
     setLoginToken(token) {
-        setLocalJSON('USERTOKEN', "pl_token_" + token);
-
-        localStorage["Authorization" + (window.projectSuffix || "")] = "pl_token_" + token;
-        axios.defaults.headers.common["Authorization"] = "pl_token_" + token;
+        let customToken = window.customToken;
+        if(!customToken) {
+            customToken = "pl_token_";
+        }
+        setLocalJSON('USERTOKEN', customToken + token);
+
+        localStorage["Authorization" + (window.projectSuffix || "")] = customToken + token;
+        axios.defaults.headers.common["Authorization"] = customToken + token;
     },
 
     clearLoginToken(token) { // 登陆前清空登录认证token

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

@@ -10,7 +10,7 @@ export default {
     OBJ_FLOW_NODES: {}, // 流程节点信息
 
     install(Vue,opts){
-        axios = opts.axios;
+        axios = opts.saspFlowAxios;
     },
 
     /**

package/src/assets/js/global/flowUserGlobal.js

@@ -5,7 +5,7 @@ export default {
     name: "FLOW_USER_GLOBAL",
 
     install(Vue,opts){
-        axios = opts.axios;
+        axios = opts.saspFlowAxios;
     },
     clearLoginToken(){
         setLocalJSON('USERTOKEN', "");
@@ -13,9 +13,13 @@ export default {
         axios.defaults.headers.common["Authorization"] = "";
     },
     setLoginToken(token){
-        setLocalJSON('USERTOKEN', "pl_token_" + token);
-        localStorage["Authorization" + (window.projectSuffix || "")] = "pl_token_" + token;
-        axios.defaults.headers.common["Authorization"] = "pl_token_" + token;
+        let customToken = window.customToken;
+        if(!customToken) {
+            customToken = "pl_token_";
+        }
+        setLocalJSON('USERTOKEN', customToken + token);
+        localStorage["Authorization" + (window.projectSuffix || "")] = customToken + token;
+        axios.defaults.headers.common["Authorization"] = customToken + token;
     },
 
     getLoginUser() {
@@ -32,4 +36,4 @@ export default {
         localStorage["Authorization" + (window.projectSuffix || "")] = "";
         axios.defaults.headers.common["Authorization"] = "";
     },
-}
+}

package/src/components/flowChart.vue

@@ -128,7 +128,7 @@
                         this.setNodeColor();
                     })
                 };
-                this.axios.post(this.api.plFlowDefine.getFlowDraw,{flowId: this.flowId,linkProcId:this.linkProcId,isRelease:this.isRelease}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowDefine.getFlowDraw,{flowId: this.flowId,linkProcId:this.linkProcId,isRelease:this.isRelease}).then(res => {
                     if(res && res.data){
                         if(res.data.operateObj){
                             loadBpmn(res.data.operateObj || '');
@@ -153,16 +153,16 @@
                     return;
                 }
                 if(this.nodeId){
-                    this.axios.post(this.api.plFlowNode.getById,{"id":this.nodeId}).then(resNode => {
+                    this.saspFlowAxios.post(this.api.plFlowNode.getById,{"id":this.nodeId}).then(resNode => {
                         let result = resNode.data.nodeLinkId;
                         let canvas = this.viewer.get('canvas');
                         canvas.addMarker(result,"current-node-class");
                         this.setAnnotation(result);
                     })
                 }else{
-                    this.axios.post(this.api.plFlowInst.getById,{"id":this.instId}).then(res => {
+                    this.saspFlowAxios.post(this.api.plFlowInst.getById,{"id":this.instId}).then(res => {
                         let currentNode = res.data.currentNode;
-                        this.axios.post(this.api.plFlowNode.getById,{"id":currentNode}).then(resNode => {
+                        this.saspFlowAxios.post(this.api.plFlowNode.getById,{"id":currentNode}).then(resNode => {
                             let result = resNode.data.nodeLinkId;
                             let canvas = this.viewer.get('canvas');
                             canvas.addMarker(result,"current-node-class");

package/src/components/flowInst/flowInstList.vue

@@ -52,10 +52,32 @@
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" round
                                    @click="openAddFlowForm()">新增
                         </el-button>
-                        <el-button type="danger" icon="el-icon-circle-close" size="small" round @click="deleteFlow()">
-                            删除
-                        </el-button>
-                        <!--                        <el-button type="warning" icon="saspiconfont liuchengtu1" size="small" round>流程图</el-button>-->
+                        <el-button type="danger" icon="el-icon-circle-close" size="small" round @click="deleteFlow()">删除</el-button>
+                        <div style="display: inline-block" v-if='flowImpParamObj.downloadModel'>
+                            <el-popover style="margin-left: 10px;margin-right: 10px;"
+                                        placement="bottom" width="200" trigger="click" >
+                                <el-upload
+                                    class=""
+                                    ref="flowInstUploadFileRef"
+                                    :auto-upload="false"
+                                    :file-list="flowAboutFileList"
+                                    :action="flowImpParamObj.impUrl"
+                                    :limit="1"
+                                    accept=".xlsx,.xls"
+                                    :on-exceed="limitFile"
+                                    :on-change="onChangeFile"
+                                    :before-upload="beforeUploadFile"
+                                    :http-request="uploadFileMethod">
+                                    <el-button type="primary" size="small" slot="trigger">选取导入文件</el-button>
+                                    <el-button type="success" size="small" style="margin-left: 12px" @click="beginImp">导入</el-button>
+                                </el-upload>
+                                <el-button type="warning" size="small" round icon="el-icon-bottom-left" slot="reference">导入</el-button>
+                            </el-popover>
+                            <el-button round size="small" :type="flowImpParamObj.downloadModelObj.buttonColor" :icon="flowImpParamObj.downloadModelObj.icon"
+                                       :circle="flowImpParamObj.downloadModelObj.isCircle" :plain="flowImpParamObj.downloadModelObj.isPlain"
+                                       @click="downloadTemplate">{{flowImpParamObj.downloadModelObj.showName || '模版下载'}}
+                            </el-button>
+                        </div>
                     </div>
                     <el-button type="primary" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
                                @click="openFlowBatchPendingDialog">批量处理
@@ -363,8 +385,10 @@
             },
             userMap:{type: Object,default:()=>{return {};}},
 
-            instQueryPower:{type:String,default:""}
-
+            instQueryPower:{type:String,default:""},
+            formImpMethod: {type: Function, default(){}},
+            flowImpParamObj: {type: Object, default: () => ({})},
+            downloadTemplate: {type: Function, default: null},
         },
         data() {
 
@@ -473,8 +497,9 @@
                 flowFormId: "",
                 formDefineKey: "",
                 title: "",
-                formSettingVisible:false,
-                flowSortOrder:""
+                formSettingVisible: false,
+                flowSortOrder: "",
+                flowAboutFileList: [],
             }
         },
         created() {
@@ -502,7 +527,7 @@
              * 打开相关的智能建表
              */
             showFormSetting(){
-                this.axios.post(this.api.plPageInfo.find,{ flowId: this.flowDefine.id }).then(res => {
+                this.saspFlowAxios.post(this.api.plPageInfo.find,{ flowId: this.flowDefine.id }).then(res => {
                     let pageInfo = (res.data || [])[0] || {};
                     this.pageName = pageInfo.pageName || "";
                     this.flowFormId = pageInfo.formId;
@@ -533,7 +558,11 @@
 
             init() {
                 this.crud.searchForm["flowId"] = this.flowDefine.id;
+                this.$set(this.crud.searchForm,"currentNode","");
                 let flowStatus = this.flowStatusObj[this.tabType];
+                if(!flowStatus && flowStatus != 0){
+                    flowStatus = "";
+                }
                 this.crud.searchForm["nodeType"] = this.tabType;
                 if (this.tabType == "draft") {
                     this.crud.searchForm["created"] = this.loginUser.id;
@@ -782,7 +811,7 @@
                         flowInstIds += "," + row.id;
                         dataIds += "," + row.dataId;
                     });
-                    this.axios.post(this.api.plFlowInst.deleteFlowInst, {
+                    this.saspFlowAxios.post(this.api.plFlowInst.deleteFlowInst, {
                         flowInstIds: flowInstIds.substring(1),
                         flowId: this.flowDefine.id,
                         dataIds: dataIds.substring(1)
@@ -882,7 +911,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    this.axios.post(this.api.plFlowInst.delete, {
+                    this.saspFlowAxios.post(this.api.plFlowInst.delete, {
                         ids: row.id
                     }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
@@ -894,7 +923,88 @@
                         }
                     })
                 })
-            }
+            },
+
+            // 导入bug单相关的流程数据
+            beginImp() {
+                if (this.flowAboutFileList.length === 0) {
+                    this.$message.error("请选择需要导入的文件！");
+                    return;
+                }
+                this.$confirm('是否确定导入模板数据？', '确认信息', {
+                    distinguishCancelAndClose: true,
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消'
+                }).then(() => {
+                    this.$refs.flowInstUploadFileRef.submit();
+                })
+            },
+
+            limitFile(files) {
+                let file = files[0];
+                let fileSuffix = file.name.substring(file.name.lastIndexOf("."), file.name.length);
+                if (fileSuffix !== '.xls' && fileSuffix !== '.xlsx') {
+                    this.$message.error('不支持' + fileSuffix + '文件类型！');
+                    this.$refs.flowInstUploadFileRef.clearFiles();
+                } else {
+                    let fileData = {
+                        name: file.name,
+                        percentage: 0,
+                        raw: file,
+                        size: file.size,
+                        status: 'ready',
+                        uid: file.uid
+                    };
+                    this.flowAboutFileList = [fileData];
+                }
+            },
+
+            onChangeFile(file, fileList) {
+                let fileSuffix = file.name.substring(file.name.lastIndexOf("."), file.name.length);
+                if (fileSuffix !== '.xls' && fileSuffix !== '.xlsx') {
+                    this.$message.error('不支持' + fileSuffix + '文件类型！');
+                    this.$refs.flowInstUploadFileRef.clearFiles();
+                } else {
+                    this.flowAboutFileList = fileList;
+                }
+            },
+
+            beforeUploadFile(file) {
+                let fileSuffix = file.name.substring(file.name.lastIndexOf("."), file.name.length);
+                if (fileSuffix !== '.xls' && fileSuffix !== '.xlsx') {
+                    this.$message.error('不支持' + fileSuffix + '文件类型！');
+                    return false;
+                }
+                return true;
+            },
+
+            uploadFileMethod(val) {
+                if (!this.loginUser.id) {
+                    return this.$message({type: "warning", message: "缺失userId参数，请在地址栏用?拼接userId参数"});
+                }
+                this.formImpMethod(val).then(res => {
+                    if (res && res.data && res.data.operateSuccess) {
+                        let resData = res.data.operateObj;
+                        // console.log('resData',resData);
+                        this.saspFlowAxios.post(this.api.flowEngine.saveDataFlowDrafts, {
+                            flowId: this.flowDefine.id,
+                            userCode: this.loginUser.id || "",
+                            dataIds: resData.join(",")
+                        }).then(res => {
+                            // console.log('流程草稿启用',res);
+                            if (res && res.data && res.data.requestStatus === "1") {
+                                this.$message({type: "success", message: "导入成功！"});
+                                this.crud.search();
+                                this.$emit("initTabNum");
+                            }else {
+                                this.$message({type: "warning", message: res.data.errorInfo});
+                            }
+                        });
+                    } else {
+                        this.$message({type: "error", message: "导入失败！"});
+                    }
+                });
+            },
         }
     }
 </script>