@dignite-ng/expand.cms 2.0.0-rc.10 → 2.0.0-rc.12

package/src/lib/components/admin/entries/edit.component.ts

@@ -1,134 +0,0 @@
-/* eslint-disable @angular-eslint/use-lifecycle-interface */
-
-import { EXTENSIONS_IDENTIFIER } from '@abp/ng.components/extensible';
-import { LocalizationService } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-import { DatePipe, Location } from '@angular/common';
-import { Component, OnInit, inject, ViewChild, ElementRef } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
-// import { EntryAdminService } from '../../../proxy/admin/entries';
-import { ECmsComponent } from '../../../enums';
-import { UpdateListService } from '@dignite-ng/expand.core';
-import { CreateOrUpdateEntryInputBase } from './create-or-update-entry-input-base';
-import { ValidatorsService } from '@dignite-ng/expand.core';
-import { finalize } from 'rxjs';
-import { EntryAdminService } from '../../../proxy/dignite/cms/admin/entries';
-
-@Component({
-  selector: 'cms-edit',
-  templateUrl: './edit.component.html',
-  styleUrls: ['./edit.component.scss'],
-  providers: [
-    {
-      provide: EXTENSIONS_IDENTIFIER,
-      useValue: ECmsComponent.Entries_Edit,
-    },
-  ],
-})
-export class EditComponent implements OnInit {
-  private fb = inject(FormBuilder);
-  private _updateListService = inject(UpdateListService);
-  private toaster = inject(ToasterService);
-  public _location = inject(Location);
-  private route = inject(ActivatedRoute);
-  private _EntryAdminService = inject(EntryAdminService);
-  private _LocalizationService = inject(LocalizationService);
-  private _ValidatorsService = inject(ValidatorsService);
-  private datePipe = inject(DatePipe);
-
-  /**获取提交按钮替身，用于真实触发表单提交 */
-  @ViewChild('submitclick', { static: true }) submitclick: ElementRef;
-
-  /**表单验证状态
-   * {
-   *  title:true,
-   * }
-   */
-  formValidation: any = '';
-  /**表单实体 */
-  formEntity: FormGroup | undefined;
-  /**语言 */
-  cultureName: string = '';
-  /**条目类型id */
-  entryTypeId: string = '';
-  /**版块id */
-  sectionId: string = '';
-  /**条目版本id */
-  entryVersionId: string = '';
-  /**条目id */
-  entrieId: string = '';
-  /**条目信息 */
-  entryInfo: any = '';
-
-  /**是否草稿控件*/
-  get draftInput() {
-    return this.formEntity?.get('draft') as FormControl;
-  }
-  /**语言控件 */
-  get cultureInput(): FormControl {
-    return this.formEntity?.get('culture') as FormControl;
-  }
-
-  async ngOnInit(): Promise<void> {
-    let params = this.route.snapshot.params;
-    this.entrieId = params.entrieId;
-    this.formEntity = this.fb.group(new CreateOrUpdateEntryInputBase());
-    await this.getEntryInfo();
-    this.cultureInput.patchValue(this.cultureName);
-
-  }
-  /**获取条目信息 */
-  getEntryInfo() {
-    return new Promise((resolve, rejects) => {
-      this._EntryAdminService.get(this.entrieId).subscribe(res => {
-        this.cultureName = res.culture;
-        this.entryTypeId = res.entryTypeId;
-        this.sectionId = res.sectionId;
-        this.entryInfo = res;
-        resolve(res);
-      });
-    });
-  }
-
-  /**提交 */
-  save() {
-    let input = this.formEntity?.value;
-    input.culture = this.cultureName;
-    input.publishTime = new Date(
-      new Date(input.publishTime).getTime() + 8 * 60 * 60 * 1000
-    ).toISOString();
-    input.concurrencyStamp = this.entryInfo.concurrencyStamp;
-    this.formValidation = this._ValidatorsService.getFormValidationStatus(this.formEntity);
-    if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms')){
-      this.isSubmit = false;
-      return this.cultureInput.disable();
-    }
-    
-    if (!this.formEntity.valid) return;
-    this._EntryAdminService
-      .update(this.entryInfo.id, input)
-      .pipe(finalize(() => {
-        this.isSubmit = false;
-      }))
-      .subscribe(res => {
-        this.toaster.success(this._LocalizationService.instant(`AbpUi::SavedSuccessfully`));
-        this.backTo();
-        this._updateListService.updateList();
-      });
-  }
-  isSubmit: boolean = false;
-  /**点击提交 */
-  clickSubmit(type) {
-    if (this.isSubmit) return;
-    this.isSubmit = true;
-    this.draftInput.patchValue(type);
-    this.cultureInput.enable();
-    this.submitclick?.nativeElement?.click();
-  }
-
-  /**返回上一页 */
-  backTo() {
-    this._location.back();
-  }
-}

package/src/lib/components/admin/entries/entries.component.html

@@ -1,225 +0,0 @@
-<abp-page [title]="'Cms::Entries' | abpLocalization" [toolbar]="true">
-    <abp-page-toolbar-container *ngIf="entryTypeList.length < 1" class="col "></abp-page-toolbar-container>
-    <abp-page-toolbar-container *ngIf="entryTypeList.length > 1" class="col ">
-        <div class="row justify-content-end mx-0 gap-2" *abpPermission="'CmsAdmin.Entry.Create'">
-            <div class="col-auto px-0 pt-0">
-                <div ngbDropdown class="d-inline-block">
-                    <button type="button" class="btn btn-primary btn-sm ms-2" id="dropdownBasic1" ngbDropdownToggle>
-                        <i class="fa fa-plus pe-1" aria-hidden="true"></i>{{'Cms::New' | abpLocalization}}
-                    </button>
-                    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                        <ng-container *ngFor="let item of entryTypeList">
-                            <button ngbDropdownItem [routerLink]="['/cms/admin/entries/create']"
-                                [queryParams]="{cultureName: filters.culture,sectionId:filters.sectionId,entryTypeId:item.id}">{{item.displayName}}</button>
-                        </ng-container>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </abp-page-toolbar-container>
-    <div id="sites-page" class="sites-page">
-        <div class="card">
-            <div class="card-body ">
-                <div class="row align-items-end">
-                    <div class="mb-3 col-3">
-                        <label class="form-label">{{'Cms::Sections' | abpLocalization}}：</label>
-                        <select class="form-select col-auto" [(ngModel)]="filters.sectionId"
-                            (change)="sectionIdChange()">
-                            <ng-container *ngFor="let item of SiteOfSectionList">
-                                <option [value]="item.id">{{item.displayName}}</option>
-                            </ng-container>
-                        </select>
-                    </div>
-                    <div class="mb-3 col-3">
-                        <label class="form-label">{{'AbpUi::Languages' | abpLocalization}}：</label>
-                        <select class="form-select col-auto" [(ngModel)]="filters.culture" (change)="cultureChange()">
-                            <ng-container *ngFor="let item of sectionLanguagesList">
-                                <option [value]="item.cultureName">{{item.displayName}}</option>
-                            </ng-container>
-                        </select>
-                    </div>
-                    <div class="mb-3 col-6">
-                        <div class="input-group">
-                            <input type="text" class="form-control" [(ngModel)]="filters.filter"
-                                [placeholder]="'Cms::PagerSearch'|abpLocalization" />
-                            <button type="button" class="btn btn-primary" (click)="listget()">
-                                <i class="bi bi-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                @if(filters.culture&&enablegearchFormEntity&&enableSearchFieldList.length>0){
-                    
-
-                <div id="entries-advanced-form" class="entries-advanced-form " [hidden]="isexpanded"
-                    (abpInit)="abpInitss()">
-                    <form [formGroup]="enablegearchFormEntity">
-                        <div class="row align-items-end">
-                            <ng-container *ngFor="let el of enableSearchFieldList">
-                                <ng-container *ngIf="el.field&&enablegearchFormEntity&&el.enableSearch">
-                                    <div class="col-3">
-                                        <df-dynamic [fields]="el" [parentFiledName]="'extraProperties'"
-                                            [culture]="filters.culture" [entity]="enablegearchFormEntity"></df-dynamic>
-                                    </div>
-                                </ng-container>
-                            </ng-container>
-                            <div class="col-6 mb-3 ">
-                                <button type="button" class="btn btn-primary" (click)="listget()">
-                                    <span>{{ 'AbpUi::Refresh' | abpLocalization }}</span>
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-                }
-            </div>
-        </div>
-
-
-
-        <div class="card mb-0">
-            <div class="card-body p-0">
-                @if(SiteOfSectionType!==SectionType.Structure){
-                <div class="table-responsive table-fixed-header">
-                    <ngx-datatable class="material " [rows]="data.items" [list]="list" [columnMode]="ColumnMode.force"
-                        [headerHeight]="50" [footerHeight]="50" rowHeight="auto" [virtualization]="false"
-                        [externalPaging]="true" [count]="data.totalCount" [scrollbarH]="true">
-                        <ngx-datatable-column [name]="'Cms::Title' | abpLocalization" prop="title" [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                {{ value }}
-                            </ng-template>
-                        </ngx-datatable-column>
-                        <ngx-datatable-column [name]="'Cms::EntryType' | abpLocalization" prop="entryTypeId"
-                            [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                <ng-container *ngFor="let item of entryTypeList">
-                                    <ng-container *ngIf="item.id === value">{{item.displayName}}</ng-container>
-                                </ng-container>
-                            </ng-template>
-                        </ngx-datatable-column>
-                        <ngx-datatable-column [name]="'Cms::Slug' | abpLocalization" prop="slug" [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                {{ value }}
-                            </ng-template>
-                        </ngx-datatable-column>
-                        <ngx-datatable-column [name]="'Cms::Status' | abpLocalization" prop="status" [width]="80"
-                            [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                <ng-container *ngFor="let item of _entryStatusOptions">
-                                    <ng-container *ngIf="item.value=== value">{{ 'Cms::Enum:EntryStatus:'+item.key |
-                                        abpLocalization }}</ng-container>
-                                </ng-container>
-                            </ng-template>
-                        </ngx-datatable-column>
-                        @for (item of showinFieldList; track $index) {
-                        <ngx-datatable-column [name]="'Cms::'+item.displayName | abpLocalization"
-                            [prop]="item?.field?.name" [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                {{row?.extraProperties[item.field.name]}}
-                            </ng-template>
-                        </ngx-datatable-column>
-                        }
-                        <ngx-datatable-column [name]="'Cms::PublishTime' | abpLocalization" prop="publishTime"
-                            [width]="190" [sortable]="false">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                {{value | shortDateTime }}
-                            </ng-template>
-                        </ngx-datatable-column>
-                        <ngx-datatable-column [sortable]="false" [name]="'AbpUi::Actions' | abpLocalization"
-                            [frozenLeft]="true" [width]="110" [maxWidth]="110">
-                            <ng-template let-row="row" let-value="value" ngx-datatable-cell-template>
-                                <div ngbDropdown container="body">
-                                    <button type="button" class="btn btn-primary btn-sm" ngbDropdownToggle>
-                                        <i class="me-1 fa fa-cog"></i> {{'AbpUi::Actions' | abpLocalization}}
-                                    </button>
-                                    <div ngbDropdownMenu>
-                                        <button ngbDropdownItem
-                                            routerLink="/cms/admin/entries/{{row.id}}/edit">{{'AbpUi::Edit' |
-                                            abpLocalization}}</button>
-                                        <button ngbDropdownItem (click)="deletefield(row)">{{'AbpUi::Delete' |
-                                            abpLocalization}}</button>
-                                    </div>
-                                </div>
-                            </ng-template>
-                        </ngx-datatable-column>
-
-                    </ngx-datatable>
-                </div>
-                }
-
-                @if(SiteOfSectionType===SectionType.Structure){
-                <div class="table-responsive table-fixed-header">
-                    <table class="table overflow-nowrap mb-0" cdkDropList (cdkDropListDropped)="drop($event)">
-                        <thead>
-                            <tr>
-                                <th class="sticky-left-card-bg">{{'AbpUi::Actions' | abpLocalization}}</th>
-                                <th>{{'Cms::Title' | abpLocalization}}</th>
-                                <th>{{'Cms::EntryType' | abpLocalization}}</th>
-                                <th>{{'Cms::Slug' | abpLocalization}}</th>
-                                <th>{{'Cms::Status' | abpLocalization}}</th>
-
-                                @for (item of showinFieldList; track $index) {
-                                <th>{{'Cms::'+item.displayName | abpLocalization}}</th>
-                                }
-                                <th>{{'Cms::PublishTime' | abpLocalization}}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr *ngFor="let item of data.items" cdkDrag>
-                                <td class="sticky-left-card-bg">
-                                    <div ngbDropdown container="body">
-                                        <button type="button" class="btn btn-primary btn-sm" ngbDropdownToggle>
-                                            <i class="me-1 fa fa-cog"></i> {{'AbpUi::Actions' | abpLocalization}}
-                                        </button>
-                                        <div ngbDropdownMenu>
-                                            <button ngbDropdownItem
-                                                routerLink="/cms/admin/entries/{{item.id}}/edit">{{'AbpUi::Edit' |
-                                                abpLocalization}}</button>
-                                            <button ngbDropdownItem (click)="deletefield(item)">{{'AbpUi::Delete' |
-                                                abpLocalization}}</button>
-                                        </div>
-                                    </div>
-                                </td>
-                                <td class="white-space-normal">{{item.title}}</td>
-                                <td>
-                                    <ng-container *ngFor="let item1 of entryTypeList">
-                                        <ng-container
-                                            *ngIf="item1.id === item.entryTypeId">{{item1.displayName}}</ng-container>
-                                    </ng-container>
-                                </td>
-                                <td>{{item.slug}}</td>
-                                <td>
-                                    <ng-container *ngFor="let item2 of _entryStatusOptions">
-                                        <ng-container *ngIf="item.status=== item2.value">{{
-                                            'Cms::Enum:EntryStatus:'+item2.key |
-                                            abpLocalization }}</ng-container>
-                                    </ng-container>
-                                </td>
-                                @for (item1 of showinFieldList; track $index) {
-                                <td>{{item?.extraProperties[item1?.field?.name]}}</td>
-                                }
-                                <td>{{item.publishTime | shortDateTime }}</td>
-                            </tr>
-                        </tbody>
-                        @if(data.items.length === 0){
-                        <div class="text-muted p-2">
-                            {{ 'Cms::NoDataAvailableInDatatable' | abpLocalization}}
-                        </div>
-                        }
-                    </table>
-                </div>
-                <div class="card-footer py-2">
-                    <small class="text-muted"> {{data.totalCount}} {{ 'Cms::Total' | abpLocalization}}</small>
-                </div>
-                }
-
-            </div>
-        </div>
-
-
-
-
-
-
-    </div>
-</abp-page>

package/src/lib/components/admin/entries/entries.component.scss

@@ -1,109 +0,0 @@
-::ng-deep.sites-page {
-    .dignite_page {
-        background: transparent
-    }
-
-    .list-group-flush>.list-group-item:first-child {
-        border-top-width: var(--bs-list-group-border-width)
-    }
-
-    .card-header {
-        input {
-            flex: 2 1 auto
-        }
-
-        .form-select {
-            padding: .475rem 3.75rem .475rem 1.25rem
-        }
-    }
-
-    .morentr {
-        border: 2px solid transparent
-    }
-
-    .borderdrag {
-        border: 2px solid var(--ck-color-selector-column-resizer-hover) !important
-    }
-
-    .borderdragtd {
-        background-color: var(--ck-color-selector-column-resizer-hover) !important
-    }
-
-    .testtr {
-        border-color: transparent;
-
-        td {
-            padding: 2px
-        }
-    }
-
-    .testtr:hover {
-        background-color: transparent
-    }
-}
-
-.cdk-drag-preview {
-    display: table;
-    box-sizing: border-box;
-    border-radius: 4px;
-    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12)
-}
-
-.cdk-drag-placeholder {
-    opacity: 0
-}
-
-.cdk-drag-animating {
-    transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
-}
-
-.example-box:last-child {
-    border: 0
-}
-
-.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder) {
-    transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
-}
-
-::ng-deep.sites-modal-form {
-    .form-control {
-        padding: .4rem 1.25rem
-    }
-}
-
-.white-space-normal {
-    white-space: normal;
-    min-width: 150px;
-}
-
-.overflow-nowrap {
-    overflow: auto;
-    white-space: nowrap;
-}
-
-::ng-deep .sites-page {
-
-    .table {
-        th {
-            padding-left: 1rem !important;
-            padding-right: 1rem !important;
-        }
-
-        td {
-            padding: 0.875rem 1rem !important;
-        }
-
-        .sticky-left-card-bg {
-            position: sticky;
-            left: 0;
-            background: var(--bs-card-bg);
-        }
-    }
-    .entries-advanced-form{
-        transition: all 0.3s linear;
-    }
-    // .entries-advanced-form.show{
-    //     display: block;
-    //     height: auto;
-    // }
-}

package/src/lib/components/admin/entries/entries.component.spec.ts

@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EntriesComponent } from './entries.component';
-
-describe('EntriesComponent', () => {
-  let component: EntriesComponent;
-  let fixture: ComponentFixture<EntriesComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [EntriesComponent]
-    });
-    fixture = TestBed.createComponent(EntriesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});