@lambo-design/workflow-approve 1.0.0-beta.19 → 1.0.0-beta.20

package/src/styles/css/index.less

@@ -38,12 +38,13 @@
   max-width: 130px; /* 限制文本宽度 */
 }
 
-.portrait-lambo-indicator-card{
+.portrait-lambo-indicator-card {
   height: 100%;
   position: relative;
   overflow-y: auto;
   margin-bottom: -10px;
 }
+
 .portrait-lambo-indicator-card::-webkit-scrollbar {
   width: 5px;
   height: 5px;
@@ -53,6 +54,7 @@
   background: linear-gradient(to bottom right, #bbbbbb 0%, #bbbbbb 100%);
   border-radius: 5px;
 }
+
 .header-text {
   display: flex;
   font-size: 18px;
@@ -90,6 +92,7 @@
 .draw-enter, .draw-leave-to {
   height: 0;
 }
+
 .attach-name-style {
   margin-bottom: -5px;
   white-space: nowrap;
@@ -115,21 +118,25 @@
   top: 50%;
   transform: translateX(0)
 }
-.icon-class{
+
+.icon-class {
   margin-top: 18px;
 }
-.attach-card{
-  border:solid;
+
+.attach-card {
+  border: solid;
   border-width: thin;
   border-color: #f1f1f1;
   width: auto;
   border-radius: 10px;
   margin: 10px 0 10px 10px
 }
-.attach-avatar{
+
+.attach-avatar {
   margin-right: 5px;
   zoom: 150%
 }
+
 .arrow {
   display: flex;
   justify-content: center;
@@ -144,7 +151,7 @@
   margin: 0 1vh 0 -2vh;
 }
 
-.cicle{
+.cicle {
   margin-left: 12px;
   width: 15px;
   height: 15px;
@@ -211,21 +218,66 @@
   zoom: 150%
 }
 
-.urging{
+.urging {
   margin-top: -3px;
   font-size: small;
 }
 
-.attach{
+.attach {
   margin-top: -3px;
   font-size: small;
   margin-left: 130px
 }
 
-.portrait-audit-date-style{
+.portrait-audit-date-style {
   white-space: nowrap;
   max-width: 100px;
   margin-top: 5px;
   font-size: 12px;
   color: #808695;
 }
+
+.notes-div {
+  text-align: right;
+}
+
+.notes-done-task {
+  display: inline-block;
+  width: 70px;
+  height: 25px;
+  font-size: 12px;
+  text-align: center;
+  padding-top: 3px;
+  border: 1px solid black;
+  border-radius: 5px;
+  margin-left: 10px;
+  margin-right: 10px;
+  background-color: rgb(218, 246, 209);
+}
+
+.notes-todo-task {
+  display: inline-block;
+  width: 70px;
+  height: 25px;
+  font-size: 12px;
+  text-align: center;
+  padding-top: 3px;
+  border: 1px solid black;
+  border-radius: 5px;
+  margin-left: 10px;
+  margin-right: 10px;
+  background-color: rgb(258, 227, 180);
+}
+
+.notes-none-task {
+  display: inline-block;
+  width: 70px;
+  height: 25px;
+  font-size: 12px;
+  text-align: center;
+  padding-top: 3px;
+  border: 1px solid black;
+  border-radius: 5px;
+  margin-left: 10px;
+  margin-right: 10px;
+}

package/src/workflow-diagram.vue

@@ -5,6 +5,11 @@
       <Panel name="0">
         流程跟踪图
         <div slot="content">
+          <div class="notes-div">
+            <span class="notes-done-task">已办结点</span>
+            <span class="notes-todo-task">当前结点</span>
+            <span class="notes-none-task">未办结点</span>
+          </div>
           <div class="containers" :style="'height: '+canvasHeight+ 'px'">
             <div class="canvas" ref="canvas"></div>
           </div>
@@ -49,12 +54,12 @@
             <i-col span="12" offset="0">
               <FormItem label="审批结果：">
                 <Tag color="success" v-if="item.auditResult == '30'">通过</Tag>
-                <Tag color="error" v-else-if="item.auditResult == '40'">驳回到上一节点</Tag>
+                <Tag color="error" v-else-if="item.auditResult == '40'">驳回上一节点</Tag>
                 <Tag color="error" v-else-if="item.auditResult=='50'">驳回到原点</Tag>
                 <Tag color="error" v-else-if="item.auditResult=='51'">流程终止</Tag>
                 <Tag color="error" v-else-if="item.auditResult == '60'">撤回</Tag>
-                <Tag color="success" v-else-if="item.auditResult == '80'">跳转到指定节点</Tag>
-                <Tag color="success" v-else-if="item.auditResult == '90'">驳回到指定节点</Tag>
+                <Tag color="success" v-else-if="item.auditResult == '80'">跳转指定节点</Tag>
+                <Tag color="error" v-else-if="item.auditResult == '90'">驳回指定节点</Tag>
                 <Tag color="success" v-else>待审核</Tag>
               </FormItem>
             </i-col>
@@ -268,16 +273,20 @@ export default {
       canvas.zoom("fit-viewport", "auto");
       var eventBus = this.bpmnViewer.get("eventBus");
       var dones = this.tableData;
-      eventBus.on('element.click', function (evt) {
+      // eventBus.on('element.click', function (evt) {
+      eventBus.on('element.hover', function (evt) {
         self.detailDones = [];
         for (var item of dones) {
           if (item.taskNode == evt.element.id) {
             self.detailDones.push(item);
-            self.showDetail = true;
-            self.$emit("showTaskNode", item);
-            break;
+            // self.showDetail = true;
+            // self.$emit("showTaskNode", item);
+            // break;
           }
         }
+        if(self.detailDones.length > 0) {
+          self.showDetail = true;
+        }
       });
 
       for (var k in doneLightSet) {