doway-coms 2.2.26 → 2.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.2.26",
+  "version": "2.2.27",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGantt/src/index.vue

@@ -105,7 +105,7 @@
             :key="loopItem.id"
             :name="'gantt-bar'+loopItem.taskId"
             :id="'gantt-bar'+loopItem.id"
-            class="gantt-bar"
+            :class="loopItem.type=='schedule'?'gantt-schedule':'gantt-ord'"
             @mouseenter="ganttBarMouseEnter($event, loopItem, rowIndex)"
             @mouseleave="ganttBarMouseLeave($event, loopItem)"
             :style="{
@@ -423,26 +423,26 @@ export default {
           );
           this.rows[i].items[j]["width"] = tempWidth;
 
-          for (let k = 0; k < this.rows[i].items[j].nodes.length; k++) {
-            let nodeDiffMiniutes = moment(
-              this.rows[i].items[j].nodes[k].start
-            ).diff(moment(minDateTime), "minutes");
-            let nodeTempLeft = XEUtils.divide(
-              XEUtils.multiply(this.colWidth, nodeDiffMiniutes),
-              splitMinutes
-            );
-            this.rows[i].items[j].nodes[k]["left"] = nodeTempLeft;
-            //计算宽度
-            let nodeOrdMinutes = moment(this.rows[i].items[j].nodes[k].end).diff(
-              moment(this.rows[i].items[j].nodes[k].start),
-              "minutes"
-            );
-            let nodeTempWidth = XEUtils.divide(
-              XEUtils.multiply(this.colWidth, nodeOrdMinutes),
-              splitMinutes
-            );
-            this.rows[i].items[j].nodes[k]["width"] = nodeTempWidth;
-          }
+          // for (let k = 0; k < this.rows[i].items[j].nodes.length; k++) {
+          //   let nodeDiffMiniutes = moment(
+          //     this.rows[i].items[j].nodes[k].start
+          //   ).diff(moment(minDateTime), "minutes");
+          //   let nodeTempLeft = XEUtils.divide(
+          //     XEUtils.multiply(this.colWidth, nodeDiffMiniutes),
+          //     splitMinutes
+          //   );
+          //   this.rows[i].items[j].nodes[k]["left"] = nodeTempLeft;
+          //   //计算宽度
+          //   let nodeOrdMinutes = moment(this.rows[i].items[j].nodes[k].end).diff(
+          //     moment(this.rows[i].items[j].nodes[k].start),
+          //     "minutes"
+          //   );
+          //   let nodeTempWidth = XEUtils.divide(
+          //     XEUtils.multiply(this.colWidth, nodeOrdMinutes),
+          //     splitMinutes
+          //   );
+          //   this.rows[i].items[j].nodes[k]["width"] = nodeTempWidth;
+          // }
         }
       }
       this.lineHeight = this.rows.length * 40;
@@ -519,18 +519,23 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-.gantt-bar {
+.gantt-schedule {
   position: absolute;
   top: 0px;
   z-index: 2;
   // float:left;
   height: 40px;
-  cursor: pointer;
+  // cursor: pointer;
   // overflow: hidden;
   border-radius: 5px;
 }
-.gantt-bar :hover {
-  background-color: darkgrey;
+// .gantt-schedule :hover {
+//   background-color: darkgrey;
+// }
+.gantt-ord {
+  position: relative;
+  z-index: 3;
+  cursor: pointer;
 }
 
 .gantt-line-area {