cloud-module-bpm 6.3.4 → 6.5.0

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.3.4",
+  "version": "6.5.0",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
   "private": false,
   "license": "MIT",
-  
   "scripts": {
     "serve": "vue-cli-service serve --port 8089 ",
     "build": "vue-cli-service build",
@@ -17,10 +16,10 @@
     "axios": "0.19.0",
     "babel-loader": "^8.0.6",
     "babel-polyfill": "^6.26.0",
-    "cloud-module-base": "6.3.2",
+    "cloud-module-base": "6.5.0",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.7",
     "less": "3.10.3",
     "less-loader": "^5.0.0",
     "moment": "^2.24.0",

package/packages/bpm-form-tools/bpm-form-tools.vue

@@ -89,8 +89,8 @@ export default {
       bpmBtn: {},
       ruleEngine: {
         businessId: '', //流程业务数据id
-        procInstId: undefined,//流程实例id
-        undoId:''//待办业务id
+        procInstId: undefined, //流程实例id
+        undoId: '' //待办业务id
       }
     };
   },
@@ -104,11 +104,13 @@ export default {
   created() {
     Object.assign(this.ruleEngine, { procDefKey: this.procDefKey });
     let id = MeritBPM.getUrlParameter('id') || '';
-    let undoId = MeritBPM.getUrlParameter('undoId') || '';//截取表单url中undoId, add by zhangyan,
+    let undoId = MeritBPM.getUrlParameter('undoId') || ''; //截取表单url中undoId, add by zhangyan,
+    let params = MeritBPM.getUrlParameter('params') || ''; // 截取路径中传入的参数
     //打开表单之前，触发外层的init事件。业务模块获取业务数据对象
     this.$emit('init', {
       id: id.replace('businessId', ''),
-      undoId: undoId.replace('undoId', ''),  //add by zhangyan
+      undoId: undoId.replace('undoId', ''), //add by zhangyan
+      params: params.replace('params', ''),
       callback: this.bpmInit
     });
   },
@@ -121,7 +123,7 @@ export default {
         this.MeritBPM.initRuleEngine(this);
       } else {
         this.ruleEngine.businessId = businessData.id;
-        this.ruleEngine.undoId = businessData.undoId;  //add by zhangyan
+        this.ruleEngine.undoId = businessData.undoId; //add by zhangyan
         this.MeritBPM.runRuleEngine(this, {}, {});
       }
     },
@@ -141,7 +143,9 @@ export default {
         var bpmVersion = _this.ruleEngine.runtime.mainForm.bpmVersion;
         var businessId = _this.ruleEngine.businessId;
         axios['bpm-engine']
-          .post('/api/engine/bpm/process/version/' + businessId + '/' + bpmVersion)
+          .post(
+            '/api/engine/bpm/process/version/' + businessId + '/' + bpmVersion
+          )
           .then(function(res) {
             if (res.data.isDifferent == 'NoBusinessData') {
               _this.$alert('业务数据不存在!', '警告', {
@@ -150,11 +154,15 @@ export default {
                 callback: action => {}
               });
             } else if (res.data.isDifferent) {
-              _this.$alert('数据已被' + res.data.lockUserName + '修改!', '警告', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                callback: action => {}
-              });
+              _this.$alert(
+                '数据已被' + res.data.lockUserName + '修改!',
+                '警告',
+                {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  callback: action => {}
+                }
+              );
             } else {
               //业务应用保存数据的方法，保存后回调方法
               _this.$emit('save', _this.bpmSaveAfter);
@@ -178,7 +186,10 @@ export default {
       if (this.bpmBtn.id == 'bpmSaveOrUpdateBtn') {
         this.$message.success(_this.$t('base.operation.save_success'));
       }
-      if (this.ruleEngine.procInstId == undefined || this.ruleEngine.procInstId == '') {
+      if (
+        this.ruleEngine.procInstId == undefined ||
+        this.ruleEngine.procInstId == ''
+      ) {
         this.MeritBPM.startProcess(this, this.bpmBtn, function(params) {
           _this.bpmBtn.isSave = '1';
           _this.MeritBPM.doSend(_this, _this.bpmBtn);

package/packages/bpm-grid-buttons/bpm-grid-buttons.vue

@@ -2,6 +2,7 @@
   <el-col :span="7" class="cloud-bpm-grid-buttons">
     <el-button
       v-if="MeritBPM.procCreatePermit"
+      :disabled="isDisabledAddButton"
       class="cloud-bpm-grid-button"
       type="primary"
       icon="el-icon-plus"
@@ -85,6 +86,15 @@ export default {
     isShowButton: {
       type: Boolean,
       default: true
+    },
+    isDisabledAddButton: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    params: {
+      type: String,
+      required: false
     }
   },
   computed: {
@@ -126,7 +136,7 @@ export default {
     },
     //流程新建方法
     createBpm() {
-      MeritBPM.create(this, this.procDefKey, {});
+      MeritBPM.create(this, this.procDefKey, { params: this.params });
     },
     //删除流程方法
     deleteBpm() {

package/packages/bpm-grid-buttons-new/bpm-grid-buttons-new.vue

@@ -2,6 +2,7 @@
   <el-col :span="7" class="cloud-bpm-grid-buttons">
     <el-button
       v-if="MeritBPM.procCreatePermit"
+      :disabled="isDisabledAddButton"
       class="cloud-bpm-grid-button"
       type="primary"
       icon="el-icon-plus"
@@ -111,6 +112,15 @@ export default {
     isShowButton: {
       type: Boolean,
       default: true
+    },
+    isDisabledAddButton: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    params: {
+      type: String,
+      required: false
     }
   },
   computed: {
@@ -159,7 +169,7 @@ export default {
     },
     //流程新建方法
     createBpm() {
-      MeritBPM.create(this, this.procDefKey, {});
+      MeritBPM.create(this, this.procDefKey, { params: this.params });
     },
     //删除流程方法
     deleteBpm() {

package/packages/bpm-jump-dialog/bpm-jump-dialog.vue

@@ -3,7 +3,7 @@
     <el-dialog
       :title="opt.title"
       :visible.sync="dialogVisible"
-      width="650px"
+      width="700px"
       top="8vh"
       @open="openDialog"
       :before-close="handleClose"
@@ -14,22 +14,30 @@
       <el-form>
         <div style="padding: 10px 0px 30px 0px">
           <el-row>
-            <el-col :span="8" style="padding-right:140px">
+            <el-col :span="8" style="text-align: left">
               {{ $t('bpm.jump.choice_activity') }}
             </el-col>
-          </el-row>
-          <el-row type="flex" justify="center">
-            <span style="padding-right:5px;line-height:2.5;">
+            <el-col :span="16">
+             <span style="padding-right:5px;line-height:2.5;">
               {{ $t('bpm.jump.activity_name') }}
             </span>
-            <el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
+              <el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+              </el-select>
+            </el-col>
           </el-row>
+          <!--<el-row type="flex" justify="center">-->
+            <!--<span style="padding-right:5px;line-height:2.5;">-->
+              <!--{{ $t('bpm.jump.activity_name') }}-->
+            <!--</span>-->
+            <!--<el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">-->
+              <!--<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>-->
+            <!--</el-select>-->
+          <!--</el-row>-->
         </div>
         <div>
-          <el-row>
-            <el-col :span="8" style="padding-right:140px">{{ $t('bpm.jump.for_personnel') }}</el-col>
+          <el-row style="text-align: left">
+            <el-col :span="8">{{ $t('bpm.jump.for_personnel') }}</el-col>
           </el-row>
           <el-table
             :data="initialTableData"
@@ -53,8 +61,8 @@
           </el-table>
         </div>
         <div style="padding: 20px 0px 0px 0px">
-          <el-row>
-            <el-col :span="8" style="padding-right:140px">{{ $t('bpm.jump.selected_personnel_list') }}</el-col>
+          <el-row style="text-align: left">
+            <el-col :span="8">{{ $t('bpm.jump.selected_personnel_list') }}</el-col>
           </el-row>
           <el-table :data="selectTableData" tooltip-effect="dark" stripe height="150" @row-click="handleRowClick">
             <el-table-column width="55"></el-table-column>
@@ -70,7 +78,6 @@
           </el-table>
         </div>
       </el-form>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">{{ $t('base.button.cancel') }}</el-button>
         <el-button type="primary" @click="handleSave">{{ $t('base.button.ok') }}</el-button>

package/packages/bpm-jump-latest-dialog/bpm-jump-latest-dialog.vue

@@ -12,7 +12,7 @@
       class="jumpDialog"
     >
       <el-container>
-        <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;">
+        <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;background: #e8ecf3">
           <el-container>
             <el-aside style="height:456px;width: 35%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
               <v-tree />
@@ -21,7 +21,7 @@
             <el-main style="height:456px; width: 45%; padding: 0px; margin-left: 2px;">
               <div class="selected-grid">
                 <el-row>
-                  <el-col style="padding:7px;padding-right:290px;">
+                  <el-col style="text-align: left;padding: 7px 7px 0 7px">
                     {{ $t('bpm.jump.choice_activity') }}
                   </el-col>
                 </el-row>
@@ -34,7 +34,7 @@
                   </el-col>
                 </el-row>
                 <el-row>
-                  <el-col style="padding:7px;padding-right:290px;">{{ $t('bpm.jump.for_personnel') }}</el-col>
+                  <el-col style="text-align: left;padding: 7px 7px 0 7px">{{ $t('bpm.jump.for_personnel') }}</el-col>
                 </el-row>
                 <el-table
                   :data="initialTableData"
@@ -100,7 +100,7 @@
             <el-row style="float:left;padding:7px;">
               {{ $t('bpm.jump.selected_personnel_list') }}
             </el-row>
-            <el-table :data="selectTableData" :height="tableHeight + 111" @row-click="handleRowClick">
+            <el-table :data="selectTableData" :height="tableHeight + 85" @row-click="handleRowClick">
               <el-table-column prop="name" :label="$t('bpm.jump.name')"> 
                 <template slot-scope="scope">
                       <div :title="scope.row.name" class="cell-hidden">
@@ -172,7 +172,7 @@ export default {
       pageSize: 10,
       pagerCount: 5,
       total: 10,
-      tableHeight: 315,
+      tableHeight: 300,
       maxHeight: '483px',
       //默认参数
       opt: {

package/packages/bpm-opinion-dialog/bpm-opinion.vue

@@ -203,7 +203,7 @@ export default {
         this.procOpinion.content = opinion;
         return;
       }
-      if (this.procOpinion.content.length < 255) {
+      if (this.procOpinion.content.length + opinion.length < 200) {
         this.procOpinion.content += ';' + opinion;
         return;
       }
@@ -211,11 +211,12 @@ export default {
     //关闭人员选择对话框
     handleClose() {
       this.procOpinion.content = undefined;
+      this.$refs.procOpinion.resetFields();
       this.$emit('dialog-close', this.dialogVisible);
     },
     handleSave() {
       let _this = this;
-      if (_this.procOpinion.content.length > 255) {
+      if (_this.procOpinion.content.length > 200) {
         return this.$message.error(
           _this.$t('bpm.opinion.opinion_content_beyond')
         );

package/packages/bpm-send-read-dialog/SelectedGrid.vue

@@ -58,7 +58,7 @@ export default {
   },
   data() {
     return {
-      tableHeight: 426,
+      tableHeight: 400,
       tableData: [],
       currentPage: 1,
       pagesize: 10,

package/packages/bpm-send-read-dialog/SourceGrid.vue

@@ -112,7 +112,7 @@ export default {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
       multipleSelection: [],
-      tableHeight: 375,
+      tableHeight: 355,
       currentPage: 1,
       pageSize: 10,
       pagerCount: 5,

package/packages/bpm-send-read-dialog/bpm-next-node.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;">
+    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;background: #e8ecf3">
       <el-container>
         <el-aside style="height:456px;width: 40%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
           <v-tree :opt="nextNode" />

package/packages/bpm-user-select-dialog/SelectedGrid.vue

@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      tableHeight: 375,
+      tableHeight: 355,
       tableData: [],
       currentPage: 1,
       pagesize: 10,

package/packages/bpm-user-select-dialog/SourceGrid.vue

@@ -116,7 +116,7 @@ export default {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
       multipleSelection: [],
-      tableHeight: 375,
+      tableHeight: 355,
       currentPage: 1,
       pageSize: 10,
       pagerCount: 5,

package/packages/bpm-user-select-dialog/bpm-next-node.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-container>
-    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;">
+  <el-container style="background: #e8ecf3">
+    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;background-color: #e8ecf3">
       <el-container>
         <el-aside style="height:456px;width: 40%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
           <v-tree :opt="nextNode" />

package/packages/bpm-user-select-dialog/bpm-user-select.vue

@@ -11,7 +11,7 @@
       :close-on-click-modal="false"
       append-to-body
     >
-      <el-tabs v-model="activeNodeName">
+      <el-tabs v-model="activeNodeName" style="padding: 0 20px 20px 20px!important">
         <el-tab-pane v-for="nextNode in nextNodes" :label="nextNode.taskName" :name="nextNode.taskDeKey" :key="nextNode.taskDeKey">
           <v-bpm-next-node :nextNode="nextNode"></v-bpm-next-node>
         </el-tab-pane>
@@ -100,9 +100,4 @@ export default {
     }
   }
 };
-</script>
-<style>
-/* .el-dialog__body {
-  padding: 0px 20px 30px 20px ;
-} */
-</style>
+</script>

package/packages/utils/merit-bpm.js

@@ -18,13 +18,16 @@ var MeritBPM = {
  */
 MeritBPM.create = function(that, procDefKey, params, callback) {
   axios['bpm-engine']
-    .post('/api/engine/bpm/ruleengine/init/' + procDefKey, params)
+    .post('/api/engine/bpm/ruleengine/init/' + procDefKey, {})
     .then(function(res) {
       if (res.success) {
         if (typeof callback == 'function') {
           callback(res);
         } else if (res.data != null) {
           let url = res.data.runtime.formLink;
+          if (params.params != null && params.params != '') {
+            url = url + '&params=' + params.params;
+          }
           // var iTop = (window.screen.availHeight - 30 - 700) / 2;
           // var iLeft = (window.screen.availWidth - 10 - 900) / 2;
           // var features =
@@ -100,7 +103,6 @@ MeritBPM.open = function(that, params, callback) {
  *      callback : function(res){ 执行流程相关操作 }
  */
 MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
-  console.log('runzhang' + that);
   let bpmVars = that.getBpmVar(bpmBtn);
   if (typeof bpmBtn == 'object') {
     bpmVars.bpmOperName = bpmBtn.name || ''; //【流程内置变量名】
@@ -273,6 +275,9 @@ MeritBPM.startProcess = function(that, bpmBtn, callback) {
         bpmVars
       )
       .then(function(res) {
+        if (res.data == undefined || res.data == null) {
+          return;
+        }
         Object.assign(that.ruleEngine, res.data);
         MeritBPM.runRuleEngine(that, bpmBtn, callback);
       });