Merge pull request #59 from bindable-ui/table-status-drag

Table status drag
bindable-ui · Jun 17, 2020 · c8a1378 · c8a1378
2 parents d33a26f + 41f8618
commit c8a1378
Showing 7 changed files with 492 additions and 483 deletions.
diff --git a/dev-app/app.html b/dev-app/app.html
@@ -51,7 +51,7 @@
                     <c-nav-horizontal-item
                         position="right"
                         href="https://github.com/bindable-ui/bindable"
-                        title="v1.2.1"
+                        title="v1.2.2"
                     ></c-nav-horizontal-item>
                 </c-nav-horizontal>
             </l-box>

diff --git a/dev-app/routes/components/forms/checkbox-radio-container/properties/index.html b/dev-app/routes/components/forms/checkbox-radio-container/properties/index.html
@@ -65,8 +65,6 @@
                             <c-form-checkbox id="second2">Second</c-form-checkbox>
                         </c-form-checkbox-radio-container>
                     </l-grid>
-                    <div>
-                    </div>
                 </c-code-sample>
             </l-stack>
         </div>

diff --git a/dev-app/routes/components/tables/table/views-and-view-models/index.html b/dev-app/routes/components/tables/table/views-and-view-models/index.html
diff --git a/dev-app/routes/components/tables/table/views-and-view-models/index.ts b/dev-app/routes/components/tables/table/views-and-view-models/index.ts
@@ -36,6 +36,38 @@ export class TableViews {
     public toggleCols;
     public toggleData;
 
+    public tableActionsSample = {
+        getColClass: (row, col) => {
+            let cls = col._class || '';
+            /* istanbul ignore else */
+            if (col.colHeadName === 'drag') {
+                cls += ` ${row._status}`;
+            }
+            return cls;
+        },
+
+        getBarColor: (row, col) => {
+            const color = row._barColor || '';
+            return color;
+        },
+    };
+
+    public tableActionsSample2 = {
+        getColClass: (row, col) => {
+            let cls = col._class || '';
+            /* istanbul ignore else */
+            if (col.colHeadName === 'dragCheck') {
+                cls += ` ${row._status}`;
+            }
+            return cls;
+        },
+
+        getBarColor: (row, col) => {
+            const color = row._barColor || '';
+            return color;
+        },
+    };
+
     constructor(public dialogService: DialogService) {
         this.tableCols = [
             {
@@ -519,6 +551,8 @@ export class TableViews {
                 ship: 'M. Falcon',
             },
             {
+                _barColor: 'var(--c_subFourMain)',
+                _status: 'bar',
                 gender: 'Male',
                 ship: 'Tie Fighter',
             },
@@ -588,6 +622,8 @@ export class TableViews {
                 ship: 'M. Falcon',
             },
             {
+                _barColor: 'var(--c_subFourMain)',
+                _status: 'bar',
                 dragCheck: false,
                 gender: 'Male',
                 order: 3,
@@ -712,7 +748,7 @@ export class TableViews {
 
                 self.dragCheckData = sortDropData(data, row, self.dragCheckData, 'order');
             },
-        }
+        };
     }
 
     public testModal() {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bindable-ui/bindable",
   "description": "An Aurelia component library",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/bindable-ui/bindable"

diff --git a/src/components/utilities/c-drag-handle/c-drag-handle.html b/src/components/utilities/c-drag-handle/c-drag-handle.html
@@ -13,6 +13,7 @@
         <l-icon
             icon="draggable"
             color="var(--c_gray)"
+            spacing="4px"
             size.bind="size"
         ></l-icon>
     </span>