From f4cec5c48fa94ff95d0aa57d4cb414b518fa3746 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Tue, 7 Jul 2020 12:08:36 -0500
Subject: [PATCH] some fix regarding multi-select
---
.../multi-select/multi-select.component.html | 12 ++++-----
.../select-label-template.directive.ts | 3 +--
.../data-grid/data-grid.component.scss | 3 ++-
src/app/app.component.html | 2 +-
.../grid-filter-demo.component.html | 25 +++++++++++--------
.../ng-select-demo.component.html | 10 ++++++--
.../ng-select-demo.component.ts | 7 +++---
7 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html
index 39f985b..f907a74 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html
@@ -18,12 +18,12 @@
-
-
+
+
+
+
+ ×
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts
index 1c0af77..55dc0a1 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts
@@ -1,10 +1,9 @@
-import { Directive, TemplateRef } from '@angular/core';
+import { Directive, TemplateRef, Input } from '@angular/core';
@Directive({
selector: '[psNgSelectLabel]'
})
export class SelectLabelTemplateDirective {
-
constructor(public template: TemplateRef) { }
}
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.scss b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.scss
index 54bb095..f8c69f8 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.scss
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.scss
@@ -1,9 +1,10 @@
:host .flex-container{
display: flex;
justify-content: space-between;
- align-items: baseline;
+ align-items: center;
}
:host .flex-item{
margin-right: 1px;
+ height: 100%;
}
\ No newline at end of file
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 9e70e1b..9a6dc95 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -29,7 +29,7 @@
-
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
index 041acd5..6abfc63 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
@@ -11,10 +11,10 @@
- ID
+ ID
- {{model.id}}
+ {{model.id}}