Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/sys-setting/components/system-logs/system-logs.component.ts

@@ -55,9 +55,8 @@ export class SystemLogsComponent implements OnInit {
         title: '登录时间',
         type: 'string',
         ui: {
-          widget: 'item-date',
+          widget: 'sl-from-to-search',
           format: 'yyyy-MM-dd HH:mm:ss',
-          placeholder: '请选择',
           nzShowTime: true,
           visibleIf: {
             expand: (value: boolean) => value
@@ -85,8 +84,8 @@ export class SystemLogsComponent implements OnInit {
     if (this.sf) {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
-        endTime: this.sf.value.time?.end ? dateTimePickerUtil.format(this.sf.value.time?.end, 'yyyy-MM-dd HH:mm:ss') : null,
-        startTime: this.sf.value.time?.start ? dateTimePickerUtil.format(this.sf.value.time?.start, 'yyyy-MM-dd HH:mm:ss') : null
+        endTime: this.sf.value.time?.[1] || null,
+        startTime: this.sf.value.time?.[0] || null
       });
     }
     return requestOptions;

src/app/routes/sys-setting/components/user-logs/user-logs.component.ts

@@ -68,7 +68,7 @@ export class UserLogsComponent implements OnInit {
         title: '登录时间',
         type: 'string',
         ui: {
-          widget: 'item-date',
+          widget: 'sl-from-to-search',
           format: 'yyyy-MM-dd HH:mm:ss',
           placeholder: '请选择',
           nzShowTime: true,
@@ -100,8 +100,8 @@ export class UserLogsComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         time: {
-          start: this.sf.value.time?.start ? dateTimePickerUtil.format(this.sf.value.time?.start, 'yyyy-MM-dd HH:mm:ss') : null,
-          end: this.sf.value.time?.end ? dateTimePickerUtil.format(this.sf.value.time?.end, 'yyyy-MM-dd HH:mm:ss') : null
+          start: this.sf.value.time?.[0] || null,
+          end: this.sf.value.time?.[1] || null
         }
       });
     }

src/app/routes/sys-setting/components/version-logs/version-logs.component.ts

@@ -61,12 +61,11 @@ export class VersionLogsComponent implements OnInit {
           placeholder: '请输入'
         }
       },
-      createTime: {
+      time: {
         title: '发布时间',
         type: 'string',
         ui: {
-          widget: 'date',
-          mode: 'range',
+          widget: 'sl-from-to-search',
           format: 'yyyy-MM-dd',
           visibleIf: {
             expand: (value: boolean) => value
@@ -97,8 +96,8 @@ export class VersionLogsComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         publishTime: {
-          start: this.sf.value.time?.start ? dateTimePickerUtil.format(this.sf.value.time?.start, 'yyyy-MM-dd HH:mm:ss') : null,
-          end: this.sf.value.time?.end ? dateTimePickerUtil.format(this.sf.value.time?.end, 'yyyy-MM-dd HH:mm:ss') : null
+          start: this.sf.value.time?.[0] ||  null,
+          end: this.sf.value.time?.[1] ||  null
         }
       });
     }

src/app/shared/widget/from-to-search/from-to-search.widget.html

@@ -1,21 +1,11 @@
 <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">
   <ng-container *ngIf="type === 'date'">
-    <div style="display: flex">
-      <nz-date-picker
-        [nzMode]="mode"
-        [nzFormat]="displayFormat"
-        [(ngModel)]="startDate"
-        (ngModelChange)="onChange($event)"
-        nzPlaceHolder="开始时间"
-      ></nz-date-picker>
+    <div style="justify-content: space-between;display: flex;align-items: center;">
+      <nz-date-picker [nzMode]="mode" [nzFormat]="displayFormat" [(ngModel)]="startDate"
+        (ngModelChange)="onChange($event)" nzPlaceHolder="开始时间" style="min-width: 45%;"></nz-date-picker>
       <span style="padding: 4px">-</span>
-      <nz-date-picker
-        [nzMode]="mode"
-        [nzFormat]="displayFormat"
-        [(ngModel)]="endDate"
-        (ngModelChange)="onChange($event)"
-        nzPlaceHolder="结束时间"
-      ></nz-date-picker>
+      <nz-date-picker [nzMode]="mode" [nzFormat]="displayFormat" [(ngModel)]="endDate"
+        (ngModelChange)="onChange($event)" nzPlaceHolder="结束时间" style="min-width: 45%;"></nz-date-picker>
     </div>
   </ng-container>
-</sf-item-wrap>
+</sf-item-wrap>

src/app/shared/widget/from-to-search/from-to-search.widget.spec.ts

@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SLFromToSearchWidget } from './from-to-search.widget';
-
-describe('SLFromToSearchWidget', () => {
-  let component: SLFromToSearchWidget;
-  let fixture: ComponentFixture<SLFromToSearchWidget>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [SLFromToSearchWidget],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SLFromToSearchWidget);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});