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

package/src/lib/components/admin/entries/create-or-edit-entries.component.html

@@ -1,137 +0,0 @@
-<form [formGroup]="formEntity">
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-body">
-                    <div class="mb-3">
-                        <div class="form-label">{{'Cms::Title' | abpLocalization}}</div>
-                        <input type="text" class="form-control" formControlName="title"
-                            (blur)="setTitleToSlugBlur($event)">
-                    </div>
-                    <ng-container *ngIf="isLoad">
-                        <ng-container *ngFor="let item of showEntryType?.fieldTabs;let i =index">
-                            <ng-container *ngFor="let el of item.fields;let i1 =index">
-                                <ng-container *ngIf="el&&formEntity">
-                                    <df-dynamic [fields]="el"
-                                        [selected]="entryInfo ? entryInfo.extraProperties[el.field.name] : ''"
-                                        [parentFiledName]="'extraProperties'"
-                                        [culture]="cultureInput.value"  [entity]="formEntity"></df-dynamic>
-                                </ng-container>
-                            </ng-container>
-                        </ng-container>
-                    </ng-container>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-body">
-                    <div class="mb-3">
-                        <div class="form-label">{{'Cms::Slug' | abpLocalization}}</div>
-                        <input type="text" class="form-control" formControlName="slug">
-                    </div>
-                    <div class="mb-3">
-                        <div class="form-label">{{'AbpUi::Languages' | abpLocalization}}</div>
-                        <select class="form-select form-select-multiple" formControlName="culture">
-                            <ng-container *ngFor="let item of languagesList;let i =index">
-                                <option [value]="item.cultureName">{{item.displayName}}</option>
-                            </ng-container>
-                        </select>
-                        <div class="text-danger" *ngIf="cultureInput.dirty">
-                            {{cultureInput?.errors?.repetition}}
-                        </div>
-                    </div>
-                    <div class="mb-3" *ngIf="sectionInfo.type===1">
-                        <label class="form-label" for="parentId">{{'Cms::ParentEntry' | abpLocalization}}</label>
-                        <select class="form-select " formControlName="parentId">
-                            <option value=""></option>
-                            <ng-container *ngFor="let item of entryList;let i =index">
-                                <option [value]="item.id">{{item.title}}</option>
-                                <ng-container *ngFor="let el of item.children">
-                                    <ng-container *ngTemplateOutlet="childTemplate; context: {
-                                        $implicit: {
-                                        value: el,
-                                        }
-                                    }"></ng-container>
-                                    <ng-template #childTemplate let-data>
-                                        <option [value]="data.value.id">
-                                            <ng-container *ngFor="let item of data.value.layer">--</ng-container>
-                                            {{data.value.title}}
-                                        </option>
-                                        <ng-container *ngFor="let el of data.value.children">
-                                            <ng-container *ngTemplateOutlet="childTemplate; context: {
-                                                $implicit: {
-                                                value: el,
-                                                }
-                                            }"></ng-container>
-                                        </ng-container>
-                                    </ng-template>
-                                </ng-container>
-                            </ng-container>
-                        </select>
-                    </div>
-                    <div class="mb-3">
-                        <label class="form-label" for="publishTime">{{'Cms::PublishTime' | abpLocalization}}</label>
-                        <input type="datetime-local" class="form-control" step="1" formControlName="publishTime">
-                    </div>
-                    <div class="mb-3" *ngIf="isEdit">
-                        <label class="form-label" for="Version">{{'Cms::Version' | abpLocalization}}</label>
-                        <ul class="list-group">
-                            <ng-container *ngFor="let item of AllVersionsList">
-                                <li
-                                    class="list-group-item flex-between d-flex align-items-center justify-content-between">
-                                    <div>
-                                        {{item.initialVersionId?(item.creationTime| date: 'YYYY/MM/dd HH:mm:s'):('Cms::InitialVersion' | abpLocalization)}}
-                                        <span class="badge text-bg-success ms-1"
-                                            *ngIf="item.isActivatedVersion">{{'Cms::IsActive' | abpLocalization}}</span>
-                                        <span class="badge text-bg-primary ms-1"
-                                            *ngIf="item.id === entryVersionId">{{'Cms::Editing' |
-                                            abpLocalization}}</span>
-                                    </div>
-                                    <div>
-                                        <div ngbDropdown class="d-inline-block">
-                                            <button type="button" class="btn btn-link-primary p-2 "
-                                                style="line-height: 0;" id="dropdownBasic1" ngbDropdownToggle>
-                                            </button>
-                                            <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                                                <button ngbDropdownItem type="button" *ngIf="!item.isActivatedVersion"
-                                                    (click)="ActivatedVersion(item.id)">
-                                                    <i class="fas fa-check me-1"></i>{{'Cms::IsActive' |
-                                                    abpLocalization}}
-                                                </button>
-                                                <button ngbDropdownItem type="button"
-                                                    routerLink="/cms/admin/entries/create"
-                                                    [queryParams]="{entryVersionId:item.id}">
-                                                    <i class="fas fa-plus me-1"></i>{{'Cms::NewVersion' |
-                                                    abpLocalization}}
-                                                </button>
-                                                <button ngbDropdownItem type="button" (click.stop)="toEditUrl(item.id)"
-                                                    *ngIf="item.id !== entryVersionId">
-                                                    <i class="fas fa-edit me-1"></i>{{'AbpUi::Edit' | abpLocalization}}
-                                                </button>
-                                                <button ngbDropdownItem type="button"
-                                                    (click.stop)="delectVersion(item.id)"
-                                                    *ngIf="item.initialVersionId&&!item.isActivatedVersion&&item.id !== entryVersionId">
-                                                    <i class="fas fa-trash me-1"></i>{{'AbpUi::Delete' |
-                                                    abpLocalization}}
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ng-container>
-                        </ul>
-                    </div>
-                    <div class="mb-3" *ngIf="entryInfo">
-                        <label class="form-label" for="versionNotes">{{'Cms::RevisionNotes' | abpLocalization}}</label>
-                        <textarea class="form-control" formControlName="versionNotes" rows="3"></textarea>
-                    </div>
-
-
-
-                </div>
-            </div>
-        </div>
-    </div>
-    <button type="submit" style="display: none;" #submitclick></button>
-</form>

package/src/lib/components/admin/entries/create-or-edit-entries.component.spec.ts

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

package/src/lib/components/admin/entries/create-or-edit-entries.component.ts

@@ -1,216 +0,0 @@
-import { ConfigStateService, LocalizationService } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-import { Component, ElementRef, inject, Input, ViewChild } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-import { Router } from '@angular/router';
-import { DatePipe, Location } from '@angular/common';
-import { CmsApiService } from '../../../services';
-import { SectionAdminService } from '../../../proxy/dignite/cms/admin/sections';
-import { EntryAdminService } from '../../../proxy/dignite/cms/admin/entries';
-
-@Component({
-  selector: 'cms-create-or-edit-entries',
-  templateUrl: './create-or-edit-entries.component.html',
-  styleUrls: ['./create-or-edit-entries.component.scss'],
-})
-export class CreateOrEditEntriesComponent {
-  private toaster = inject(ToasterService);
-  public _location = inject(Location);
-  private configState = inject(ConfigStateService);
-  private _SectionAdminService = inject(SectionAdminService);
-  private _EntryAdminService = inject(EntryAdminService);
-  private datePipe = inject(DatePipe);
-  private _LocalizationService = inject(LocalizationService);
-  private router = inject(Router);
-  private _CmsApiService = inject(CmsApiService);
-
-  /**语言列表 */
-  languagesList: any[] = [];
-  /**条目列表-选择上级条目 */
-  entryList: any[] = [];
-  /**条目信息 */
-  entryInfo: any = '';
-  /**版本信息 */
-  sectionInfo: any = '';
-  /**需要展示的b板块下条目类型 */
-  showEntryType: any = '';
-  /**版本条目id */
-  entryVersionId: any = '';
-  /**版本列表 */
-  AllVersionsList: any[] = [];
-
-  @Input() isEdit: boolean = false;
-
-  @Input() sectionId: string = '';
-  @Input() entryTypeId: string = '';
-  @Input() public set select(v: any) {
-    this.entryVersionId = v.id;
-    this.entryInfo = v;
-  }
-
-  formEntity: FormGroup | undefined;
-  @Input() set entity(value: FormGroup | undefined) {
-    this.formEntity = value;
-    if (value) {
-      let languages = this.configState.getDeep('localization.languages');
-      this.languagesList = languages;
-      this.loadData();
-    }
-  }
-  /**是否加载完成 */
-  isLoad: boolean = false;
-
-  /**语言控件 */
-  get cultureInput(): FormControl {
-    return this.formEntity?.get('culture') as FormControl;
-  }
-
-  /**获取提交按钮替身，用于真实触发表单提交 */
-  @ViewChild('submitclick', { static: true }) submitclick: ElementRef;
-
-  /**加载数据 */
-  async loadData() {
-    if (this.sectionId) {
-      await this.getSectionInfo();
-      await this.getEntryList();
-    }
-    this.cultureInput.disable();
-    let repetition = await this.cultureAsyncValidator();
-    if (repetition) this.cultureInput.setErrors(repetition);
-    if (this.entryInfo) {
-      await this.getAllVersionsList();
-      this.formEntity.patchValue({
-        entryTypeId: this.entryInfo.entryTypeId,
-        publishTime: this.datePipe.transform(this.entryInfo.publishTime, 'yyyy-MM-dd HH:mm:ss'),
-        title: this.entryInfo.title,
-        slug: this.entryInfo.slug,
-        parentId: this.entryInfo.parentId,
-        versionNotes: this.entryInfo.versionNotes,
-        initialVersionId: this.entryInfo.id,
-      });
-    } else {
-      this.formEntity.patchValue({
-        entryTypeId: this.entryTypeId,
-        publishTime: this.datePipe.transform(new Date(), 'yyyy-MM-dd HH:mm:ss'),
-      });
-    }
-    this.isLoad = true;
-    setTimeout(() => {
-      this.submitclick?.nativeElement.click();
-    }, 0);
-  }
-
-  /**定义自定义异步验证 */
-  cultureAsyncValidator() {
-    return new Promise(resolve => {
-      let culture = this.cultureInput.value;
-      if (culture == this.entryInfo?.culture || this.sectionInfo.type !== 0) return resolve(null);
-      this._EntryAdminService
-        .cultureExistWithSingleSection({
-          culture: culture,
-          sectionId: this.sectionId,
-          entryTypeId: this.entryTypeId,
-        })
-        .subscribe(res => {
-          if (res) {
-            resolve({
-              repetition: this._LocalizationService.instant(
-                `Cms::EntriesAlreadyExistEntryType`,
-                '',
-                this.languagesList.find(el => el.cultureName == culture).displayName
-              ),
-            });
-          } else {
-            resolve(null);
-          }
-        });
-    });
-  }
-
-  /**获取板块信息 */
-  getSectionInfo() {
-    return new Promise((resolve, reject) => {
-      this._SectionAdminService.get(this.sectionId).subscribe(res => {
-        this.showEntryType = res.entryTypes.find(el => el.id == this.entryTypeId);
-        this.sectionInfo = res;
-        resolve(res);
-      });
-    });
-  }
-  /**获取板块下所有条目 */
-  getEntryList() {
-    return new Promise((resolve, rejects) => {
-      this._EntryAdminService
-        .getList({
-          sectionId: this.sectionId,
-          maxResultCount: 1000,
-          culture: this.cultureInput.value,
-        })
-        .subscribe((res: any) => {
-          let entryList = res.items.filter(el => el.id !== this.entryInfo?.id);
-          let parentList = entryList.filter(el => !el.parentId);
-          parentList.forEach(el => {
-            let layer: number = 0;
-            el.layer = new Array(layer);
-            el.children = this.groupByParentId(entryList, el.id, layer + 1);
-          });
-          this.entryList = parentList;
-          resolve(res);
-        });
-    });
-  }
-  /**对数组按照父子关系进行分组 */
-  groupByParentId(arr, id = '', layer) {
-    let result = [];
-    result = arr.filter(el => el.parentId == id);
-    result.forEach(el => {
-      el.layer = new Array(layer);
-      el.children = this.groupByParentId(arr, el.id, layer + 1);
-    });
-    return result;
-  }
-  /**标题转化别名 */
-  setTitleToSlugBlur(event) {
-    let val = event.target.value;
-    let slug = this.formEntity.get('slug');
-    let pinyinstr = '';
-    if (slug.value) return;
-    pinyinstr = this._CmsApiService.chineseToPinyin(val);
-    this.formEntity.patchValue({
-      slug: pinyinstr || val,
-    });
-  }
-
-  /**获取条目版本列表 */
-  getAllVersionsList() {
-    return new Promise((resolve, rejects) => {
-      this._EntryAdminService.getAllVersions(this.entryInfo.id).subscribe(res => {
-        this.AllVersionsList = res.items;
-        resolve(res);
-      });
-    });
-  }
-
-  /**激活 */
-  ActivatedVersion(VersionId) {
-    this._EntryAdminService.activate(VersionId).subscribe(res => {
-      this.AllVersionsList.forEach(el => {
-        el.isActivatedVersion = el.id === VersionId;
-      });
-      return;
-    });
-  }
-  /**编辑版本 */
-  toEditUrl(id) {
-    this.router.navigateByUrl('', { skipLocationChange: true }).then(() => {
-      this.router.navigate([`/cms/admin/entries/${id}/edit`]);
-    });
-  }
-  /**删除版本 */
-  delectVersion(vid) {
-    this._EntryAdminService.delete(vid).subscribe(res => {
-      this.toaster.success(this._LocalizationService.instant(`AbpUi::DeletedSuccessfully`));
-      this.getAllVersionsList();
-    });
-  }
-}

package/src/lib/components/admin/entries/create-or-update-entry-input-base.ts

@@ -1,26 +0,0 @@
-import { FormGroup, Validators } from "@angular/forms";
-
-export class CreateOrUpdateEntryInputBase {
-
-    /**条目id */
-    entryTypeId: any = ['']
-    /**标题 */
-    title: any = ['', [Validators.required]]
-    /**别名 */
-    slug: any = ['', [Validators.required]]
-    /**语言 */
-    culture: any = ['']
-    /**是否是草稿 */
-    draft: any = ['', []]
-    /**发布时间 */
-    publishTime: any = ['', [Validators.required]]
-    /**上级目录 */
-    parentId: any = [null]
-    /**修订说明 */
-    versionNotes: any = [null]
-    /**版本 */
-    initialVersionId: any = [null]
-    extraProperties: FormGroup | undefined = new FormGroup({})
-    constructor() { }
-}
-

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

@@ -1,16 +0,0 @@
-<abp-page [title]="'Cms::New'| abpLocalization" [toolbar]="true">
-    <form class="row g-3 needs-validation" [formGroup]="formEntity" (keydown.enter)="$event.preventDefault()"
-        [class]="{'was-validated':formValidation}" (submit)="save()">
-        <button type="submit" style="display: none;" #submitclick></button>
-        <ng-container *ngIf="formEntity">
-            <ng-container *ngIf="entryVersionId; else elseTemplate">
-                <cms-create-or-edit-entries [sectionId]="sectionId" [entryTypeId]="entryTypeId"  [select]="entryInfo"  [entity]="formEntity"></cms-create-or-edit-entries>
-            </ng-container>
-            <ng-template #elseTemplate>
-                <cms-create-or-edit-entries [sectionId]="sectionId" [entryTypeId]="entryTypeId" [entity]="formEntity"></cms-create-or-edit-entries>
-            </ng-template>
-        </ng-container>
-
-    </form>
-
-</abp-page>

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

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

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

@@ -1,130 +0,0 @@
-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 { CreateOrUpdateEntryInputBase } from './create-or-update-entry-input-base';
-import { ValidatorsService, UpdateListService } from '@dignite-ng/expand.core';
-import { finalize } from 'rxjs';
-import { EntryAdminService } from '../../../proxy/dignite/cms/admin/entries';
-
-@Component({
-  selector: 'cms-create',
-  templateUrl: './create.component.html',
-  styleUrls: ['./create.component.scss'],
-  providers: [
-    {
-      provide: EXTENSIONS_IDENTIFIER,
-      useValue: ECmsComponent.Entries_Create,
-    },
-  ],
-})
-export class CreateComponent 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);
-
-  /**获取提交按钮替身，用于真实触发表单提交 */
-  @ViewChild('submitclick', { static: true }) submitclick: ElementRef;
-
-  /**表单验证状态
-   * {
-   *  title:true,
-   * }
-   */
-  formValidation: any = '';
-  /**表单实体 */
-  formEntity: FormGroup | undefined;
-  /**语言 */
-  cultureName: string = '';
-  /**条目类型id */
-  entryTypeId: string = '';
-  /**版块id */
-  sectionId: string = '';
-  /**条目版本id */
-  entryVersionId: 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 queryParams = this.route.snapshot.queryParams;
-
-    this.cultureName = queryParams.cultureName;
-    this.entryTypeId = queryParams.entryTypeId;
-    this.sectionId = queryParams.sectionId;
-    this.entryVersionId = queryParams.entryVersionId;
-    this.formEntity = this.fb.group(new CreateOrUpdateEntryInputBase());
-    if (this.entryVersionId) await this.getEntryInfo();
-    this.cultureInput.patchValue(this.cultureName);
-  }
-
-  /**获取条目信息 */
-  getEntryInfo() {
-    return new Promise((resolve, rejects) => {
-      this._EntryAdminService.get(this.entryVersionId).subscribe(res => {
-        this.cultureName = res.culture;
-        this.entryTypeId = res.entryTypeId;
-        this.sectionId = res.sectionId;
-        this.entryInfo = res;
-        resolve(res);
-      });
-    });
-  }
-  /**提交 */
-  save() {
-    this.formValidation = this._ValidatorsService.getFormValidationStatus(this.formEntity);
-    
-    if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms')){
-      this.isSubmit = false;
-      return this.cultureInput.disable();
-    }
-    let input = this.formEntity?.value;
-    input.culture = this.cultureName;
-    input.publishTime = new Date(
-      new Date(input.publishTime).getTime() + 8 * 60 * 60 * 1000
-    ).toISOString();
-    if (!this.formEntity.valid) return;
-    this._EntryAdminService
-      .create(input)
-      .pipe(finalize(() => {
-        this.isSubmit = false;
-      }))
-      .subscribe(res => {
-        this.toaster.success(this._LocalizationService.instant(`AbpUi::SavedSuccessfully`));
-        this._location.back();
-        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/edit.component.html

@@ -1,9 +0,0 @@
-<abp-page [title]="'Cms::Edit'| abpLocalization" [toolbar]="true">
-    <form class="row g-3 needs-validation" [formGroup]="formEntity" (keydown.enter)="$event.preventDefault()"
-        [class]="{'was-validated':formValidation}" (submit)="save()">
-        <button type="submit" style="display: none;" #submitclick></button>
-        <ng-container *ngIf="formEntity&&entryInfo">
-                <cms-create-or-edit-entries  [sectionId]="sectionId" [entryTypeId]="entryTypeId" [isEdit]="true" [select]="entryInfo"  [entity]="formEntity"></cms-create-or-edit-entries>
-        </ng-container>
-    </form>
-</abp-page>

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

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