diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss
index a0cf1f83e..5928b1607 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss
@@ -67,7 +67,7 @@
justify-content: space-between;
align-items: center;
height: 36px;
- width: 100px;
+ width: 202px;
border: 2px solid $control-border-color;
border-radius: 3px;
color: #8E8E8E;
@@ -76,4 +76,28 @@
.arrow-icon-down {
float: right;
}
+}
+
+.filter-tag {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 14px;
+ height: 28px;
+ width: 98px;
+ border-radius: 2px;
+
+ .wrapper {
+ margin-left: 10px;
+ padding: 0px 5px 0px 5px;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ background: #E7E7E7;
+ font-size: 14px;
+ height: 28px;
+ color: #000311;
+ letter-spacing: -0.22px;
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
index 941bd0dcb..c9ac5f37f 100644
--- a/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
@@ -128,22 +128,17 @@
-
- {{--
-
- Stock
+
+
+ @{{ filter.cond }}
+ Search
+ @{{ filter.column }}
+
+
+ @{{ filter.val }}
+
-
- Available
-
-
- --}}
-
- @{{ filter.cond }}
- Search
- @{{ filter.colum }}
- @{{ filter.val }}
-
+
@@ -152,7 +147,7 @@
|
-
+
|
@@ -175,6 +170,7 @@
data: () => ({
url: new URL(window.location.href),
currentSort: null,
+ massselection: [],
sortDesc: 'desc',
sortAsc: 'asc',
isActive: false,
@@ -442,7 +438,7 @@
var clean_uri = uri.substring(0, uri.indexOf("?")).trim();
- window.location.href = clean_uri+newParams;
+ window.location.href = clean_uri + newParams;
},
//make the filter array from url after being redirected
@@ -474,48 +470,17 @@
}
console.log(this.filters);
+ },
+
+ removeFilter(filter) {
+ for(i in this.filters) {
+ if(this.filters[i].col == filter.col && this.filters[i].cond == filter.cond && this.filters[i].val == filter.val) {
+ this.filters.splice(i, 1);
+
+ this.makeURL();
+ }
+ }
}
-
- // //Use the label to prevent the display of column name on the body
- // function makeTags() {
- // var filterRepeat = 0;
-
- // if(this.filters.length > 0)
- // for(var i = 0;i'+ col_label_tag +''+ this.filters[i].val +'';
-
- // sorted_col = this.filters[i].cond;
-
- // var apply_on_column = $('th[data-column-name="'+sorted_col+'"]').children('.icon');
-
- // if(this.filters[i].val == "asc") {
- // apply_on_column.addClass('sort-down-icon');
- // } else {
- // apply_on_column.addClass('sort-up-icon');
- // }
-
- // $('.filter-row-two').append(filter_card);
-
- // } else if(this.filters[i].column == "search") {
- // col_label_tag = "Search";
-
- // var filter_card = ''+ col_label_tag +''+ this.filters[i].val +'';
-
- // $('.filter-row-two').append(filter_card);
-
- // } else {
- // col_label_tag = $('li[data-name="'+this.filters[i].column+'"]').text().trim();
-
- // var filter_card = ''+ col_label_tag +''+ this.filters[i].val +'';
-
- // $('.filter-row-two').append(filter_card);
- // }
- // }
- // }
}
});