@dignite-ng/expand.cms 0.0.20 → 0.0.22

package/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/cms",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  }
-}

package/src/lib/cms-routing.module.ts

@@ -1,111 +0,0 @@
-import {  NgModule} from '@angular/core';
-import { Routes, RouterModule, RouteReuseStrategy} from '@angular/router';
-import {
-  CreateComponent,
-  CreateFieldComponent,
-  CreateOrEditComponent,
-  EditComponent,
-  EditFieldComponent,
-  EntriesComponent,
-  FieldsComponent,
-  SectionsComponent,
-  SitesComponent,
-} from './components';
-import {
-  AuthGuard,
-  PermissionGuard,
-} from '@abp/ng.core';
-import { CmsExtensionsResolver } from './toolbar';
-import { appentStyle } from './services/appent-content';
-import { SimpleReuseStrategy } from './services';
-
-
-const routes: Routes = [
-  {
-    path: 'admin',
-    canActivate: [AuthGuard, PermissionGuard],
-    resolve: [CmsExtensionsResolver, appentStyle],
-    children: [
-      {
-        path: 'entries',
-
-        children: [
-          {
-            path: '',
-            component: EntriesComponent,
-            data: { keep: true }
-          },
-          {
-            path: 'create',
-            component: CreateComponent,
-          },
-          {
-            path: ':entrieId/edit',
-            component: EditComponent,
-          },
-        ],
-      },
-      {
-        path: '',
-        children: [
-          {
-            path: 'fields',
-            children: [
-              {
-                path: '',
-                component: FieldsComponent,
-                data: { keep: true }
-              },
-              {
-                path: 'create',
-                component: CreateFieldComponent,
-              },
-              {
-                path: ':id/edit',
-                component: EditFieldComponent,
-              },
-            ],
-          },
-          {
-            path: 'sites',
-            component: SitesComponent,
-            data: { keep: true }
-          },
-          {
-            path: 'sections',
-            children: [
-              {
-                path: '',
-                data: { keep: true },
-                component: SectionsComponent,
-              },
-              {
-                path: ':sectionsId/entry-types',
-                children: [
-                  {
-                    path: 'create',
-                    component: CreateOrEditComponent,
-                  },
-                  {
-                    path: ':entryTypesId/edit',
-                    component: CreateOrEditComponent,
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      },
-    ],
-  },
-];
-
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-  providers:[
-  ]
-})
-export class CmsRoutingModule {
-}

package/src/lib/cms.module.ts

@@ -1,119 +0,0 @@
-import { NgModule, NgModuleFactory, ModuleWithProviders } from '@angular/core';
-import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
-import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { CmsRoutingModule } from './cms-routing.module';
-import {
-  CreateComponent,
-  CreateFieldComponent,
-  CreateOrEditComponent,
-  CreateOrEditEntriesComponent,
-  CreateOrEditFieldComponent,
-  EditComponent,
-  EditFieldComponent,
-  EntriesComponent,
-  FieldGroupComponent,
-  FieldsComponent,
-  SectionsComponent,
-  SitesComponent,
-
-} from './components';
-import {
-  MatrixConfigComponent,
-  MatrixControlComponent,
-  TableConfigComponent,
-  TableControlComponent,
-  EntryConfigComponent,
-  EntryControlComponent,
-  FieldControlGroup
-} from "./components/dynamic-form";
-import { DateAdapter } from '@abp/ng.theme.shared/extensions';
-import {
-  NgbDateAdapter,
-  NgbDropdownModule,
-  NgbNavModule,
-  NgbAccordionModule,
-} from '@ng-bootstrap/ng-bootstrap';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { PageModule } from '@abp/ng.components/page';
-import { CommercialUiConfigModule } from '@volo/abp.commercial.ng.ui/config';
-import { CMS_TOOLBAR_ACTION_CONTRIBUTORS } from './toolbar';
-import { NzSelectModule } from 'ng-zorro-antd/select';
-import {  DynamicFormModule } from '@dignite-ng/expand.dynamic-form';
-import { NzTableModule } from 'ng-zorro-antd/table';
-import {ScrollingModule} from '@angular/cdk/scrolling';
-import { RouteReuseStrategy } from '@angular/router';
-import { SimpleReuseStrategy } from './services/simple-reuse-strategy';
-
-@NgModule({
-  declarations: [
-    EntriesComponent,
-    FieldsComponent,
-    SitesComponent,
-    SectionsComponent,
-    FieldGroupComponent,
-    CreateFieldComponent,
-    EditFieldComponent,
-    CreateOrEditFieldComponent,
-    CreateOrEditComponent,
-    CreateComponent,
-    EditComponent,
-    CreateOrEditEntriesComponent,
-    TableConfigComponent,
-    TableControlComponent,
-    MatrixConfigComponent,
-    MatrixControlComponent,
-    EntryConfigComponent,
-    EntryControlComponent,
-  ],
-  imports: [
-    CoreModule,
-    ThemeSharedModule,
-    CmsRoutingModule,
-    NgbDropdownModule,
-    FormsModule,
-    ReactiveFormsModule,
-    NgxValidateCoreModule,
-    NgbNavModule,
-    NgbAccordionModule,
-    DragDropModule,
-    PageModule,
-    CommercialUiConfigModule,
-    NzSelectModule,
-    NzTableModule,
-    ScrollingModule,
-    DynamicFormModule.forRoot({
-      cmsFieldControlGroup: FieldControlGroup
-    }),
-  ],
-  exports: [
-    TableConfigComponent,
-    TableControlComponent,
-    MatrixConfigComponent,
-    MatrixControlComponent,
-    EntryConfigComponent,
-    EntryControlComponent,
-  ],
-  providers: [
-    { provide: NgbDateAdapter, useClass: DateAdapter },
-    { provide: RouteReuseStrategy, useClass: SimpleReuseStrategy },
-  ],
-
-})
-export class CmsModule {
-  static forChild(options: any = {}): ModuleWithProviders<CmsModule> {
-    return {
-      ngModule: CmsModule,
-      providers: [
-        {
-          provide: CMS_TOOLBAR_ACTION_CONTRIBUTORS,
-          useValue: options.toolbarActionContributors,
-        },
-      ],
-    };
-  }
-  static forLazy(options: any = {}): NgModuleFactory<CmsModule> {
-    return new LazyModuleFactory(CmsModule.forChild(options));
-  }
-}

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

@@ -1,115 +0,0 @@
-<div class="create-or-edit-entry-page" [formGroup]="_entity">
-    <div class="container ">
-        <div class="row">
-            <div class="col-md-8 ">
-                <div class="card  p-2">
-                    <div class="mb-2">
-                        <label class="form-label" for="title">{{'Cms::Title' | abpLocalization}}</label>
-                        <input type="text" class="form-control" (blur)="setTitleToSlugBlur($event)"
-                            formControlName="title">
-                    </div>
-                    <template #FormDynamicRef></template>
-                    <ng-container *ngFor="let item of entryTypesItem?.fieldTabs;let i =index">
-                        <ng-container *ngFor="let el of item.fields;let i1 =index">
-                            <ng-container *ngIf="el&&_entity">
-                                <df-dynamic [entity]="_entity" [fields]="el"
-                                    [selected]="entrySelect ? entrySelect.extraProperties[el.field.name] : ''"
-                                    [parentFiledName]="'extraProperties'" [culture]="cultureinput.value" ></df-dynamic>
-
-
-                            </ng-container>
-                        </ng-container>
-                    </ng-container>
-                </div>
-            </div>
-            <div class="col-md-4 ">
-                <div class="card mb-0 p-2">
-                    <div class="mb-2">
-                        <label class="form-label" for="slug">{{'Cms::Slug' | abpLocalization}}</label>
-                        <input type="text" class="form-control" formControlName="slug">
-                        <div class="text-danger invalid-feedback" *ngIf="sluginput.errors?.repetition">
-                            {{sluginput.errors?.repetition}}
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <label class="form-label" for="culture">{{'AbpUi::Languages' | abpLocalization}}</label>
-                        <select class="form-select" formControlName="culture">
-                            <ng-container *ngFor="let item of languagesList;let i =index">
-                                <option [value]="item.cultureName">{{item.displayName}}</option>
-                            </ng-container>
-                        </select>
-                        <input type="text" formControlName="culture_shadow"
-                            style="position: absolute;z-index: -1;opacity: 0;">
-                        <div class="text-danger invalid-feedback" *ngIf="culture_shadowInput.errors?.repetition">
-                            {{culture_shadowInput.errors?.repetition}}
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <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 entryTypesList;let i =index">
-                                <option [value]="item.id">{{item.displayName}}</option>
-                            </ng-container>
-                        </select>
-                    </div>
-                    <div class="mb-2">
-                        <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-2" *ngIf="isEdit">
-                        <label class="form-label" for="publishTime">{{'Cms::Version' | abpLocalization}}</label>
-                        <ul class="list-group">
-                            <ng-container *ngFor="let item of AllVersionsList">
-                                <li class="list-group-item flex-between">
-                                    <div>
-                                        {{item.initialVersionId?(item.creationTime| date: 'YYYY/MM/dd HH:m: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 === RevisionEntryId">{{'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]="{RevisionEntryId: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 !== RevisionEntryId">
-                                                    <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 !== RevisionEntryId">
-                                                    <i class="fas fa-trash me-1"></i>{{'AbpUi::Delete' |
-                                                    abpLocalization}}
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ng-container>
-                        </ul>
-                    </div>
-                    <div class="mb-2">
-                        <label class="form-label" for="versionNotes">{{'Cms::RevisionNotes' | abpLocalization}}</label>
-                        <textarea class="form-control" formControlName="versionNotes" rows="3"></textarea>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

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

@@ -1,25 +0,0 @@
-::ng-deep .create-or-edit-entry-page {
-    .dignite_page {
-        height: calc(100vh - 32px - 53px - 40px);
-        overflow: auto;
-        background: transparent;
-    }
-
-    .form-control,
-    .form-select {
-        padding: 0.475rem 1.25rem;
-    }
-    .cursor-move{
-        cursor: move;
-    }
-    .bordernNavs{
-        border: var(--bs-border-width) solid var(--lpx-border-color);
-        padding-left: inherit;
-        padding-right: inherit;
-    }
-    .flex-between{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-}

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,287 +0,0 @@
-import { ConfigStateService, LocalizationService } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-import { AfterContentInit, Component, Input, QueryList, ViewChild, ViewChildren, ViewContainerRef, inject } from '@angular/core';
-import { AbstractControl, FormBuilder, FormControl, FormGroup, ValidationErrors, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EntryAdminService } from '../../../proxy/admin/entries';
-import { SectionAdminService } from '../../../proxy/admin/sections';
-import { Observable } from 'rxjs';
-import { DatePipe, Location } from '@angular/common';
-import { CmsApiService } from '../../../services';
-import { CreateDynamicComponentsService } from '@dignite-ng/expand.dynamic-form';
-
-@Component({
-  selector: 'cms-create-or-edit-entries',
-  templateUrl: './create-or-edit-entries.component.html',
-  styleUrls: ['./create-or-edit-entries.component.scss']
-})
-export class CreateOrEditEntriesComponent implements AfterContentInit {
-
-
-  constructor(
-    private toaster: ToasterService,
-    public _location: Location,
-    private configState: ConfigStateService,
-    private _SectionAdminService: SectionAdminService,
-    private _EntryAdminService: EntryAdminService,
-    private datePipe: DatePipe,
-    private _LocalizationService: LocalizationService,
-    private router: Router,
-    private _CmsApiService: CmsApiService,
-  ) { }
-
-
-  /**语言 */
-  cultureName: string = ''
-  /**条目id */
-  entryTypeId: string = ''
-
-  /**新建版本的版本id，同条目id */
-  RevisionEntryId: any = ''
-  /**选择的条目项 */
-  entryTypesItem: any = ''
-  /**版块id */
-  sectionId: string = ''
-  /**版块详情 */
-  SectionSelect: any = ''
-  /**语言列表 */
-  languagesList: any[] = []
-  /**条目类型列表-用于选择上级条目 */
-  entryTypesList: any[] = []
-  /**版本列表 */
-  AllVersionsList: any[] = []
-
-  /**是否是编辑 */
-  @Input() isEdit = false
-
-  /**来自父组件的传值 */
-  FromParentQueryParams: any = ''
-  @Input()
-  public set ParentQueryParams(v: any) {
-    if (v) {
-      this.FromParentQueryParams = v;
-    }
-  }
-
-  /**表单实体 */
-  _entity: FormGroup | undefined
-  @Input()
-  public set entity(v: any) {
-    if (v) {
-      this._entity = v;
-    }
-  }
-  /**指定id的条目信息 */
-  entrySelect: any = ''
-  @Input()
-  public set parentEntrySelect(v: any) {
-    if (v) {
-      let V_extraProperties = this._CmsApiService.deepClone(this.convertExtraProperties(v.extraProperties))
-      v.extraProperties = V_extraProperties
-      this.entrySelect = v;
-    }
-  }
-  /**将对象中的ExtraProperties赋值到extraProperties */
-  convertExtraProperties(obj) {
-    for (let key in obj) {
-      if (Array.isArray(obj[key])) {
-        obj[key].forEach(item => {
-          if (item.hasOwnProperty('ExtraProperties')) {
-            item['extraProperties'] = item['ExtraProperties'];
-          }
-        });
-      }
-    }
-    return obj;
-  }
-
-  /**别名表单实体 */
-  get sluginput() {
-    return this._entity.get('slug')
-  }
-  /**语言表单实体 */
-  get cultureinput() {
-    return this._entity.get('culture')
-  }
-  /**语言表单实体影子 */
-  get culture_shadowInput() {
-    return this._entity.get('culture_shadow')
-  }
-
-  /**extraProperties配置表单实体 */
-  get extraProperties() {
-    return this._entity.get('extraProperties') as FormGroup
-  }
-  async ngAfterContentInit(): Promise<void> {
-    //Called after ngOnInit when the component's or directive's content has been initialized.
-    //Add 'implements AfterContentInit' to the class.
-    let queryParams = this.FromParentQueryParams
-    if (this._entity && this.FromParentQueryParams) {
-      this._entity.setControl('slug', new FormControl('', {
-        validators: Validators.required,
-        asyncValidators: this.repetitionAsyncValidator(),
-        updateOn: 'blur'
-      }))
-      this._entity.setControl('culture_shadow', new FormControl('', {
-        validators: [Validators.required],
-        asyncValidators: this.cultureAsyncValidator_test(),
-      }))
-      this._entity.get('culture').disable();
-      if (queryParams.RevisionEntryId && this.entrySelect) {
-        this.RevisionEntryId = queryParams.RevisionEntryId
-        this.setEntryconfig(this.entrySelect);
-      } else {
-        this.setEntryconfig(queryParams);
-      }
-      if (this.sectionId) await this.getSectionSelect();
-      if (this.RevisionEntryId) await this.getAllVersionsList()
-
-    }
-
-
-  }
-
-  /**表单控件模板-动态表单配置组件 */
-  @ViewChildren('FormDynamicontrolRef', { read: ViewContainerRef }) FormDynamicontrolRef: QueryList<ViewContainerRef>;
-
-  // private _CreateDynamicComponentsService = inject(CreateDynamicComponentsService)
-
-
-
-
-  /**定义自定义异步验证 */
-  cultureAsyncValidator_test() {
-    return (ctrl: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
-      return new Promise(resolve => {
-        let subculture = this._entity?.get('culture').value
-        if (subculture == this.entrySelect?.culture || this.SectionSelect.type !== 0) {
-          resolve(null);
-          return
-        }
-        this._EntryAdminService.cultureExistWithSingleSection({
-          culture: subculture,
-          sectionId: this.sectionId,
-          entryTypeId: this.entryTypeId
-        }).subscribe(res => {
-          if (res) {
-            resolve({ repetition: this._LocalizationService.instant(`Cms::EntriesAlreadyExistEntryType`, this.entryTypesItem.displayName, this.languagesList.find(el => el.cultureName == subculture).displayName) });
-          } else {
-            resolve(null);
-          }
-        })
-      });
-    };
-  }
-
-
-  /**  
- * 设置条目详情  
- * @param {object} source - 数据源对象  
- */
-  setEntryconfig(source: any) {
-    this.entryTypeId = source.entryTypeId;
-    this.cultureName = source.culture || source.cultureName;
-    this.sectionId = source.sectionId;
-  }
-  time: number = 0
-
-  /**定义自定义异步验证 */
-  repetitionAsyncValidator() {
-    return (ctrl: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
-      return new Promise(resolve => {
-        let subslug = this._entity?.get('slug').value
-        if (subslug == this.entrySelect?.slug) {
-          resolve(null);
-          return
-        }
-        this._EntryAdminService.slugExists({
-          culture: this.cultureName,
-          sectionId: this.sectionId,
-          slug: subslug
-        }).subscribe(res => {
-          if (res) {
-            resolve({ repetition: this._LocalizationService.instant(`Cms::EntrySlug{0}AlreadyExist`, ctrl.value) });
-          } else {
-            resolve(null);
-          }
-        })
-      });
-    };
-  }
-
-
-
-  /**获取版块详情 */
-  getSectionSelect() {
-    return new Promise((resolve, rejects) => {
-      this._SectionAdminService.get(this.sectionId).subscribe(async (res) => {
-        let languages = this.configState.getDeep('localization.languages')
-        this.languagesList = languages.filter(el => res?.site?.languages.some(elr => elr.cultureName == el.cultureName))
-        let entryTypesItem = res.entryTypes.find(el => el.id == this.entryTypeId)
-        this.SectionSelect = res
-        this.entryTypesItem = entryTypesItem
-        this.entryTypesList = res.entryTypes.filter(el => el.id == this.entryTypeId)
-        this._entity.patchValue({
-          ...this.entrySelect,
-          initialVersionId: this.entrySelect?.initialVersionId || this.RevisionEntryId || '',
-          culture: this.cultureName,
-          culture_shadow: this.cultureName,
-          entryTypeId: this.entryTypeId,
-          publishTime: this.datePipe.transform(new Date(), 'yyyy-MM-dd HH:mm:ss'),
-        })
-        resolve(true)
-      })
-    })
-  }
-
-  /**获取条目版本列表 */
-  getAllVersionsList() {
-    return new Promise((resolve, rejects) => {
-
-      this._EntryAdminService.getAllVersions(this.RevisionEntryId).subscribe(res => {
-        this.AllVersionsList = res.items
-        resolve(res)
-      })
-    })
-  }
-
-  /**标题转化别名 */
-  setTitleToSlugBlur(event) {
-    let val = event.target.value
-    let slug = this._entity.get('slug')
-    let pinyinstr = ''
-    if (slug.value) return
-    pinyinstr = this._CmsApiService.chineseToPinyin(val)
-    this._entity.patchValue({
-      slug: pinyinstr || val
-    })
-  }
-  /**使用Unicode编码范围判断是否是中文字符 */
-  isChinese(str) {
-    return /^[\u4e00-\u9fa5]+$/.test(str);
-  }
-
-  /**激活 */
-  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::SuccessfullyDeleted`));
-      this.getAllVersionsList()
-    })
-  }
-
-}