Merge pull request #105 from jumpserver/dev_beta

[Update] 修改pipe

Dockerfile

@@ -8,6 +8,6 @@ RUN npm run-script build
 
 
 FROM nginx:alpine
-COPY --from=stage-build /data/luan /opt/luna/
+COPY --from=stage-build /data/luna /opt/luna/
 COPY ./src/assets/i18n /opt/luna/i18n
 COPY nginx.conf /etc/nginx/conf.d/default.conf

src/app/elements/tree-filter/tree-filter.component.ts

-import {Component, OnInit, Pipe, PipeTransform} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
 
 import {LogService, TreeFilterService} from '@app/app.service';
 
 
-@Pipe({name: 'SearchFilter'})
-export class SearchFilter implements PipeTransform {
-  transform(value: any, input: string) {
-    if (input) {
-      input = input.toLowerCase();
-      return value.filter(function (el: any) {
-        // ToDo: search with a simple SQL like language, and a bug search a group's hosts
-        return JSON.stringify(el).toLowerCase().indexOf(input) > -1;
-      });
-    }
-    return value;
-  }
-}
-
 @Component({
   selector: 'elements-tree-filter',
   templateUrl: './tree-filter.component.html',
   styleUrls: ['./tree-filter.component.css'],
-  providers: [SearchFilter],
 })
 export class ElementTreeFilterComponent implements OnInit {
   searchControl: FormControl;

src/app/pipes/pipes.ts

 import {TransPipe} from './trans.pipe';
 import {UtcDatePipe} from './date.pipe';
 import {TruncatecharsPipe} from './truncatechars.pipe';
-import {SearchFilter} from '@app/elements/tree-filter/tree-filter.component';
+import {SearchFilter} from './search.pipe';
 
 export const Pipes = [
   UtcDatePipe,

src/app/pipes/search.pipe.ts

+import {Pipe, PipeTransform} from '@angular/core';
+
+
+@Pipe({name: 'SearchFilter'})
+export class SearchFilter implements PipeTransform {
+  transform(value: any, input: string) {
+    if (input) {
+      input = input.toLowerCase();
+      return value.filter(function (el: any) {
+        // ToDo: search with a simple SQL like language, and a bug search a group's hosts
+        return JSON.stringify(el).toLowerCase().indexOf(input) > -1;
+      });
+    }
+    return value;
+  }
+}