Merge pull request 'master' (#41) from master into pro

Reviewed-on: http://git.hchyun.com/clay/workflow-engine-web/pulls/41

flowable-engine-web/src/components/common/UserPicker.vue

@@ -21,7 +21,7 @@
                      @node-click="handleChange"
             >
               <div class="tree-node" slot-scope="{  node,data }" >
-                <div v-if="data.type === 0" style="display: flex;align-items: center;">
+                <div v-if="data.type === 0" style="display: flex;align-items: center;padding: 3px 0">
                   <el-avatar :src="data.avatar"></el-avatar>
                   {{ node.label }}
                 </div>
@@ -69,12 +69,6 @@ export default {
         return [];
       }
     },
-    selected: {
-      type: Array,
-      default: () => {
-        return [];
-      }
-    },
     multiple: { //是否多选
       default: true,
       type: Boolean
@@ -135,7 +129,6 @@ export default {
     },
     getList() {
       getUserTree(this.radio, this.chooseId).then(res => {
-        console.log('人员', res.data)
         // if (res.data) {
         if (this.selectItem.type === -1 || this.selectItem.type === -2) {
           this.dataList = res.data

flowable-engine-web/src/views/admin/layout/FormBaseSetting.vue

@@ -43,7 +43,7 @@
         <el-select v-model="setup.settings.notify.types" value-key="name"
                    placeholder="选择消息通知方式" style="width: 30%;"
                    size="medium" clearable multiple collapse-tags>
-          <el-option v-for="(wc, index) in notifyTypes" :label="wc.name" :key="index" :value="wc"></el-option>
+          <el-option v-for="(notify, index) in notifyTypes" :label="notify.name" :key="index" :value="notify.type"></el-option>
         </el-select>
         <el-input size="medium" v-model="setup.settings.notify.title" style="width: 68%; float:right;" placeholder="消息通知标题"></el-input>
       </el-form-item>

flowable-engine-web/src/views/common/operation/OperationRender.vue

@@ -182,55 +182,77 @@ export default {
       let state = operation.state
       let type = operation.operation
       //创建节点
-      if (state === 'CREATE') {
+      if (type === 'CREATE') {
         this.$set(operation, "icon", "el-icon-check")
         this.$set(operation, "color", "#0bbd87")
       }
-      //审批通过
+      if (type === 'OPINION') {
-      if (state === 'AGREE' || state === 'AUTO_PASS') {
+        //审批通过
-        this.$set(operation, "icon", "el-icon-check")
+        if (state === 'AGREE' || state === 'AUTO_PASS') {
-        this.$set(operation, "color", "#0bbd87")
+          this.$set(operation, "icon", "el-icon-check")
-        this.$set(operation, "remark", '  (已同意)')
+          this.$set(operation, "color", "#0bbd87")
-      }
+          this.$set(operation, "remark", '  (已同意)')
-      if (state === 'PASS'){
+        }
-        this.$set(operation, "icon", "el-icon-more")
+        if (state === 'PASS') {
-        this.$set(operation, "color", "#c0c4cc")
+          this.$set(operation, "icon", "el-icon-more")
-      }
+          this.$set(operation, "color", "#c0c4cc")
-      //审批处理中
+        }
-      if (state === 'RUNNING') {
+        //审批处理中
-        this.$set(operation, "icon", "el-icon-loading")
+        if (state === 'RUNNING') {
-        this.$set(operation, "color", "#f78f5f")
+          this.$set(operation, "icon", "el-icon-loading")
-        this.$set(operation, "remark",'  (处理中)')
+          this.$set(operation, "color", "#f78f5f")
-      }
+          this.$set(operation, "remark", '  (处理中)')
-      //回退
+        }
-      if (state === 'ROLLBACK') {
+        //回退
-        this.$set(operation, "icon", "el-icon-refresh")
+        if (state === 'ROLLBACK') {
-        this.$set(operation, "color", "#f78f5f")
+          this.$set(operation, "icon", "el-icon-refresh")
-        this.$set(operation, "remark", '  (回退成功)')
+          this.$set(operation, "color", "#f78f5f")
-      }
+          this.$set(operation, "remark", '  (回退成功)')
-      //抄送
+        }
-      if (type === 'CC') {
+        //拒绝操作
-        this.$set(operation, "icon", "el-icon-s-promotion")
+        if (state === 'REFUSE' || state === 'AUTO_REFUSE') {
-        this.$set(operation, "color", "#3395f8")
+          this.$set(operation, "icon", "el-icon-close")
-        this.$set(operation, "remark", '  (抄送成功)')
+          this.$set(operation, "color", "#f56c6c")
+          this.$set(operation, "remark", '  (拒绝)')
+        }
       }
       //评论
-      if (state === 'COMMENT') {
+      if (type === 'COMMENT') {
-        this.$set(operation, "icon", "el-icon-chat-dot-round")
+        //评论
-        this.$set(operation, "color", "#0bbd87")
+        if (state === 'COMMENT') {
-        this.$set(operation, "remark", '  (添加了评论)')
+          this.$set(operation, "icon", "el-icon-chat-dot-round")
+          this.$set(operation, "color", "#0bbd87")
+          this.$set(operation, "remark", '  (添加了评论)')
+        }
       }
-      //拒绝后评论
+      //触发器发送http请求
-      if (state === 'REFUSE' && type === 'COMMENT') {
+      if (type === 'TRIGGER_WEBHOOK') {
-        this.$set(operation, "icon", "el-icon-chat-dot-round")
+        this.$set(operation, "icon", "el-icon-share")
-        this.$set(operation, "color", "#f56c6c")
+        if (state === 'SUCCESS') {
-        this.$set(operation, "remark", '  (填写拒绝理由)')
+          this.$set(operation, "color", "#0bbd87")
+          this.$set(operation, "remark", '  (成功)')
+        } else if (state === 'RUNNING') {
+          this.$set(operation, "color", "#f78f5f")
+          this.$set(operation, "remark", '  (成功)')
+        } else {
+          this.$set(operation, "color", "#f56c6c")
+          this.$set(operation, "remark", '  (失败)')
+        }
       }
-      //拒绝操作
+
-      if ((state === 'REFUSE' || state === 'AUTO_REFUSE')&& type === 'OPINION') {
+      //触发器发送邮件
-        this.$set(operation, "icon", "el-icon-close")
+      if (type === 'TRIGGER_EMAIL') {
-        this.$set(operation, "color", "#f56c6c")
+        this.$set(operation, "icon", "el-icon-message")
-        this.$set(operation, "remark", '  (拒绝)')
+        if (state === 'SUCCESS') {
+          this.$set(operation, "color", "#0bbd87")
+          this.$set(operation, "remark", '  (成功)')
+        } else if (state === 'RUNNING') {
+          this.$set(operation, "color", "#f78f5f")
+          this.$set(operation, "remark", '  (成功)')
+        } else {
+          this.$set(operation, "color", "#f56c6c")
+          this.$set(operation, "remark", '  (失败)')
+        }
       }
       return operation;
     },
@@ -243,7 +265,8 @@ export default {
 /deep/ .el-card__body, .el-main {
   padding: 10px;
 }
-.avatar_name{
+
+.avatar_name {
   width: 45px;
   display: flex;
   flex-direction: column;
@@ -256,7 +279,8 @@ export default {
   bottom: 20px;
   right: 1px;
 }
-.username{
+
+.username {
   width: 45px;
   padding-top: 2px;
   text-align: center;

flowable-engine-web/src/views/common/process/nodes/Node.vue

@@ -43,7 +43,6 @@
       </div>
     </div>
     <user-picker v-if="selectUser.show" title="请选择系统用户" :multiple="selectUser.multiple" ref="userPicker"
-                 :selected="_userInfo"
                  @ok="selectedUser"/>
   </div>
 </template>
@@ -77,13 +76,6 @@ export default {
       default: ""
     },
     //节点内容区域文字
-    userInfo: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    //节点内容区域文字
     showAvatar: {
       type: Boolean,
       default: false
@@ -131,20 +123,14 @@ export default {
     },
   },
   data() {
-    return {}
+    return {
+      userInfo:[]
+    }
   },
   computed: {
     viewer() {
       return this.$store.state.diagramMode === 'viewer'
-    },
+    }
-    _userInfo: {
-      get() {
-        return this.userInfo
-      },
-      set(val) {
-        this.userInfo = val
-      }
-    },
   },
   methods: {
     selectedUser(select) {
@@ -157,8 +143,7 @@ export default {
         }
         userInfoList.push(userInfo)
       }
-      //todo 确认是会包错,邓洁处理
+      this.userInfo = userInfoList
-      this._userInfo = userInfoList
       this.$store.state.selectUserMap.set(this.$store.state.selectedNode.id, userInfoList)
     },
   }