Bläddra i källkod

Merge branch 'dev'

zhangyu 4 år sedan
förälder
incheckning
da4e8981eb
1 ändrade filer med 3 tillägg och 3 borttagningar
  1. 3 3
      src/views/relation/relationShip/index.vue

+ 3 - 3
src/views/relation/relationShip/index.vue

@@ -506,9 +506,9 @@
 
       objectSpanMethod({row, column, rowIndex, columnIndex}) {
         if (column.property === 'Name') return this.mergeAction('Name', rowIndex, column);
-        if (column.property === 'LocalID' && row.LocalID != undefined) return this.mergeAction('LocalID', rowIndex, column);
-        if (column.property === 'LocalName' && row.LocalName != undefined) return this.mergeAction('LocalName', rowIndex, column);
-        if (column.property === 'CADID' && row.CADID != undefined) return this.mergeAction('CADID', rowIndex, column);
+        // if (column.property === 'LocalID' && row.LocalID != undefined) return this.mergeAction('LocalID', rowIndex, column);
+        // if (column.property === 'LocalName' && row.LocalName != undefined) return this.mergeAction('LocalName', rowIndex, column);
+        // if (column.property === 'CADID' && row.CADID != undefined) return this.mergeAction('CADID', rowIndex, column);
         if (column.property === 'btn') return this.mergeAction('Name', rowIndex, column);
       },
       mergeAction(val, rowIndex, colData) {