rewrite border structure

myliang · Feb 13, 2019 · cde2244 · cde2244 · myliang · Feb 13, 2019
1 parent 02c8217
commit cde2244
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 226 deletions.
diff --git a/index.html b/index.html
@@ -12,13 +12,8 @@
       x.spreadsheet('#x-spreadsheet-demo')
         .loadData({
           freeze: [2, 2],
-          borders: [
-            [2, 0, 2, 0, 'all', 'thin', '#0366d6'],
-            [8, 8, 8, 8, 'all', 'thin', '#0366d6'],
-          ],
           styles: [
-            // { bgcolor: '#f4f5f8', wrapText: true, color: '#900b09', bbi: 0, bti: 0, bri: 0, bli: 0 },
-            { bgcolor: '#f4f5f8', wrapText: true, color: '#900b09' },
+            { bgcolor: '#f4f5f8', wrapText: true, color: '#900b09', bb: ['thin', '#0366d6'], bt: ['thin', '#0366d6'], br: ['thin', '#0366d6'], bl: ['thin', '#0366d6'] },
           ],
           merges: [
             [[2, 2], [3, 3]],

diff --git a/src/component/table.js b/src/component/table.js
@@ -57,35 +57,25 @@ function renderCell(rindex, cindex) {
   }
 }
 
-/*
 function renderCellBorder(cell, ri, ci) {
   const { draw, data } = this;
   if (cell && cell.si !== undefined) {
-    // console.log('cell:', cell, ri, ci);
     const style = data.getStyle(cell.si);
     if (style) {
       const {
-        bti, bri, bbi, bli,
+        bt, br, bb, bl,
       } = style;
-      // console.log('bti:', bti);
-      if (bti !== undefined || bri !== undefined
-        || bbi !== undefined || bli !== undefined) {
-        // console.log('::::::::::', ri, ci);
+      if (bt !== undefined || br !== undefined
+        || bb !== undefined || bl !== undefined) {
         const dbox = getDrawBox.call(this, ri, ci);
-        // console.log('ri:', ri, ',ci:', ci, 'style:', style, dbox);
-        dbox.setBorders(
-          data.getBorder(bti),
-          data.getBorder(bri),
-          data.getBorder(bbi),
-          data.getBorder(bli),
-        );
+        dbox.setBorders(bt, br, bb, bl);
         draw.strokeBorders(dbox);
       }
     }
   }
 }
-*/
 
+/*
 function renderCellBorder(ri, ci, bs) {
   const {
     bt, br, bb, bl,
@@ -98,6 +88,7 @@ function renderCellBorder(ri, ci, bs) {
     draw.strokeBorders(dbox);
   }
 }
+*/
 
 function renderContent(rowStart, rowLen, colStart, colLen, scrollOffset) {
   const { draw, data } = this;
@@ -109,8 +100,9 @@ function renderContent(rowStart, rowLen, colStart, colLen, scrollOffset) {
   const viewRangeIndexes = data.getViewRangeIndexes(rowStart, rowLen, colStart, colLen);
   data.eachCellsInView(viewRangeIndexes, (cell, ri, ci) => renderCell.call(this, ri, ci));
   data.eachMergesInView(viewRangeIndexes, (cell, ri, ci) => renderCell.call(this, ri, ci));
-  data.eachBordersInView(viewRangeIndexes, (ri, ci, bt, br, bb, bl) => {
-    renderCellBorder.call(this, ri, ci, bt, br, bb, bl);
+  data.eachCellsInView(viewRangeIndexes, (cell, ri, ci) => {
+    // renderCellBorder.call(this, ri, ci, bt, br, bb, bl);
+    renderCellBorder.call(this, cell, ri, ci);
   });
 
   /*