From 6f8ad44d5ce82c9e509df9c9fdb756eaa3447781 Mon Sep 17 00:00:00 2001 From: pfh Date: Mon, 11 Jun 2018 16:58:32 +0800 Subject: [PATCH] set default border when add label without color --- .../src/label-piece/label-piece.component.js | 46 ------------------- .../label-piece/label-piece.component.js.map | 1 - .../src/label-piece/label-piece.component.ts | 1 + .../src/label-piece/label-piece.template.js | 8 ---- .../label-piece/label-piece.template.js.map | 1 - src/ui_ng/package.json | 2 +- 6 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 src/ui_ng/lib/src/label-piece/label-piece.component.js delete mode 100644 src/ui_ng/lib/src/label-piece/label-piece.component.js.map delete mode 100644 src/ui_ng/lib/src/label-piece/label-piece.template.js delete mode 100644 src/ui_ng/lib/src/label-piece/label-piece.template.js.map diff --git a/src/ui_ng/lib/src/label-piece/label-piece.component.js b/src/ui_ng/lib/src/label-piece/label-piece.component.js deleted file mode 100644 index b0c97dad3..000000000 --- a/src/ui_ng/lib/src/label-piece/label-piece.component.js +++ /dev/null @@ -1,46 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import { Component, Input } from '@angular/core'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import { LABEL_PIEICE_TEMPLATE, LABEL_PIEICE_STYLES } from './label-piece.template'; -var LabelPieceComponent = (function () { - function LabelPieceComponent() { - } - LabelPieceComponent.prototype.ngOnInit = function () { - }; - return LabelPieceComponent; -}()); -__decorate([ - Input(), - __metadata("design:type", Object) -], LabelPieceComponent.prototype, "label", void 0); -LabelPieceComponent = __decorate([ - Component({ - selector: 'hbr-label-piece', - styles: [LABEL_PIEICE_STYLES], - template: LABEL_PIEICE_TEMPLATE - }) -], LabelPieceComponent); -export { LabelPieceComponent }; -//# sourceMappingURL=label-piece.component.js.map \ No newline at end of file diff --git a/src/ui_ng/lib/src/label-piece/label-piece.component.js.map b/src/ui_ng/lib/src/label-piece/label-piece.component.js.map deleted file mode 100644 index c8c66a11c..000000000 --- a/src/ui_ng/lib/src/label-piece/label-piece.component.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["label-piece.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAAC;AACD,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,SAAA,EAAW,KAAA,EAAoC,MAAO,eAAA,CAAgB;AAI/E,OAAO,gCAAA,CAAiC;AACxC,OAAO,wCAAA,CAAyC;AAEhD,OAAO,EAAE,qBAAA,EAAuB,mBAAA,EAAoB,MAAO,wBAAA,CAAyB;AAUpF,IAAa,mBAAmB;IAAhC;IAaA,CAAC;IAFG,sCAAQ,GAAR;IACA,CAAC;IACL,0BAAC;AAAD,CAbA,AAaC,IAAA;AAJY;IAAR,KAAK,EAAE;;kDAAc;AATb,mBAAmB;IAN/B,SAAS,CAAC;QACP,QAAQ,EAAE,iBAAiB;QAC3B,MAAM,EAAE,CAAC,mBAAmB,CAAC;QAC7B,QAAQ,EAAE,qBAAqB;KAClC,CAAC;GAEW,mBAAmB,CAa/B;SAbY,mBAAmB","file":"label-piece.component.js","sourceRoot":""} \ No newline at end of file diff --git a/src/ui_ng/lib/src/label-piece/label-piece.component.ts b/src/ui_ng/lib/src/label-piece/label-piece.component.ts index b88164ecf..7083a0a1b 100644 --- a/src/ui_ng/lib/src/label-piece/label-piece.component.ts +++ b/src/ui_ng/lib/src/label-piece/label-piece.component.ts @@ -34,6 +34,7 @@ export class LabelPieceComponent implements OnInit, OnChanges { ngOnChanges(): void { if (this.label) { let color = this.label.color; + if (color === '') {color = '#FFFFFF'; } this.labelColor = LabelColor.find(data => data.color === color); } } diff --git a/src/ui_ng/lib/src/label-piece/label-piece.template.js b/src/ui_ng/lib/src/label-piece/label-piece.template.js deleted file mode 100644 index 089482cfc..000000000 --- a/src/ui_ng/lib/src/label-piece/label-piece.template.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Define template resources for filter component - */ -/** - * Define template resources for filter component - */ export var LABEL_PIEICE_TEMPLATE = "\n\n"; -export var LABEL_PIEICE_STYLES = "\n .label{border: none; color:#222;}\n .label clr-icon{ margin-right: 3px;}\n"; -//# sourceMappingURL=label-piece.template.js.map \ No newline at end of file diff --git a/src/ui_ng/lib/src/label-piece/label-piece.template.js.map b/src/ui_ng/lib/src/label-piece/label-piece.template.js.map deleted file mode 100644 index 956e105a2..000000000 --- a/src/ui_ng/lib/src/label-piece/label-piece.template.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["label-piece.template.ts"],"names":[],"mappings":"AAAA;;GAEG;AAFH,AAIA;;GAFG,CAEH,MAAM,CAAC,IAAM,qBAAqB,GAAW,uQAM5C,CAAC;AAEF,MAAM,CAAC,IAAM,mBAAmB,GAAW,mFAG1C,CAAC","file":"label-piece.template.js","sourceRoot":""} \ No newline at end of file diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 2ff970f9d..eff7b0aa1 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -49,7 +49,7 @@ "bootstrap": "4.0.0-alpha.5", "codelyzer": "~2.0.0-beta.4", "enhanced-resolve": "^3.0.0", - "harbor-ui": "^0.7.19-test-12", + "harbor-ui": "0.7.19-test-14", "jasmine-core": "2.4.1", "jasmine-spec-reporter": "2.5.0", "karma": "~1.7.0",