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

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

@@ -1,394 +0,0 @@
-import { EXTENSIONS_IDENTIFIER } from '@abp/ng.components/extensible';
-import {
-  ListService,
-  LIST_QUERY_DEBOUNCE_TIME,
-  ConfigStateService,
-  LocalizationService,
-  PagedResultDto,
-  ABP,
-} from '@abp/ng.core';
-import { ToasterService, ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
-import { ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import { Router } from '@angular/router';
-import { ColumnMode } from '@swimlane/ngx-datatable';
-import { finalize } from 'rxjs';
-import { ECmsComponent } from '../../../enums';
-import { UpdateListService } from '@dignite-ng/expand.core';
-import {
-  EntryAdminService,
-  EntryDto,
-  GetEntriesInput,
-} from '../../../proxy/dignite/cms/admin/entries';
-import { SectionAdminService } from '../../../proxy/dignite/cms/admin/sections';
-import { entryStatusOptions } from '../../../proxy/dignite/cms/entries';
-import { RegionalizationService } from '../../../proxy/dignite/abp/regionalization-management';
-import { SectionType } from '../../../proxy/dignite/cms/sections';
-import { moveItemInArray } from '@angular/cdk/drag-drop';
-import { FormAdminService } from '../../../proxy/dignite/cms/admin/dynamic-forms';
-import { FieldAdminService } from '../../../proxy/dignite/cms/admin/fields';
-declare var $: any;
-
-@Component({
-  selector: 'cms-entries',
-  templateUrl: './entries.component.html',
-  styleUrls: ['./entries.component.scss'],
-  providers: [
-    ListService,
-    // Provide this token if you want a different debounce time.
-    // Default is 300. Cannot be 0. Any value below 100 is not recommended.
-    { provide: LIST_QUERY_DEBOUNCE_TIME, useValue: 500 },
-    {
-      provide: EXTENSIONS_IDENTIFIER,
-      useValue: ECmsComponent.Entries,
-    },
-  ],
-})
-export class EntriesComponent implements OnInit {
-  constructor(
-    private _EntryAdminService: EntryAdminService,
-    private _SectionAdminService: SectionAdminService,
-    private toaster: ToasterService,
-    private confirmation: ConfirmationService,
-    private configState: ConfigStateService,
-    private router: Router,
-    private _LocalizationService: LocalizationService,
-    private _FormAdminService: FormAdminService,
-    private _FieldAdminService: FieldAdminService,
-    private cdRef: ChangeDetectorRef
-  ) {}
-
-  private fb = inject(FormBuilder);
-  private _UpdateListService = inject(UpdateListService);
-  public readonly list = inject(ListService<GetEntriesInput>);
-
-  /**板块类型 */
-  SectionType = SectionType;
-
-  ngOnInit(): void {
-    this.getPageDate();
-    this._UpdateListService.updateListEvent.subscribe(() => {
-      this.list.get();
-    });
-  }
-
-  /**站点下的版块 */
-  SiteOfSectionList: any[any] = [];
-
-  /**版块下的语言列表 */
-  sectionLanguagesList: any[any] = [];
-  /**版块下的条目类型列表 */
-  entryTypeList: any[any] = [];
-  /**状态编码 */
-  _entryStatusOptions = entryStatusOptions;
-
-  /**获取页面数据 */
-  async getPageDate() {
-    await this.getDynamicFormType();
-    await this.getSiteOfSectionList();
-    await this.getSectionLanguagesList();
-    this.hookToQuery();
-  }
-  /**需要查询的动态表单类型 */
-  enableSearchTypeList: any[] = [];
-  /**需要查询的动态表单字段 */
-  enableSearchFieldList: any[] = [];
-  /**不需要展示的动态表单类型 */
-  disableshowinTypeList: any[] = ['Table', 'FileExplorer', 'Matrix'];
-  /**需要展示的动态列表字段 */
-  showinFieldList: any[] = [];
-  /**获取动态表单类型 */
-  getDynamicFormType() {
-    return new Promise((resolve, rejects) => {
-      this._FormAdminService.getFormControls().subscribe((res:any) => {
-        // this.dynamicFormTypeList = res.items;
-        this.enableSearchTypeList = res.items.filter(el => el.enableSearch).map(el => el.name);
-        console.log(this.enableSearchTypeList, 'enableSearchList');
-        resolve(res.items);
-      });
-    });
-  }
-
-  /**切换板块 */
-  async sectionIdChange() {
-    this.getSectionOfEntryType();
-    await this.getSectionLanguagesList();
-    this.resetData();
-  }
-  /**切换语言 */
-  async cultureChange() {
-    this.resetData();
-  }
-
-  /**获取站点下的版块 */
-  getSiteOfSectionList() {
-    return new Promise((resolve, rejects) => {
-      this._SectionAdminService
-        .getList({
-          maxResultCount: 1000,
-        })
-        .subscribe(async (res:any) => {
-          this.SiteOfSectionList = res.items;
-          this.filters.sectionId = res.items[0]?.id || '';
-          await this.getSectionOfEntryType();
-          resolve(res.items);
-        });
-    });
-  }
-  /**表单 */
-  enablegearchFormEntity: FormGroup | undefined = this.fb.group({
-    extraProperties: this.fb.group({}),
-  });
-
-  get extraPropertiesInput() {
-    return this.enablegearchFormEntity?.get('extraProperties') as FormGroup;
-  }
-
-  /**设置筛选条件 */
-  setfiltersValue() {
-    return new Promise((resolve, rejects) => {
-      let extraProperties = this.extraPropertiesInput.value;
-      let inputs:any[] = [];
-      for (const key in extraProperties) {
-        const element = extraProperties[key];
-        if ( Array.isArray(element)?element.length>0?element:null:element) {
-          inputs.push({
-            name:key,
-            value: Array.isArray(element)?element.join(','):element
-          });
-        }
-      }
-      this.filters.queryingByFieldsJson =inputs.length>0? JSON.stringify(inputs):'';
-      resolve(true);
-    });
-  }
-
-  async listget() {
-    await this.setfiltersValue();
-    this.list.get();
-    // this.filters.
-  }
-
-  /**站点下板块的类型 */
-  SiteOfSectionType: any = SectionType.Single;
-
-  /**获取版块下的条目类型 */
-  async getSectionOfEntryType() {
-    // let sectionId = this.filtersForm.get('sectionId').value;
-    let sectionId = this.filters.sectionId;
-   let SectionInfo:any= await this.getSectionInfo(sectionId);
-    let _entryTypeList = SectionInfo?.entryTypes || [];
-    console.log(_entryTypeList,'_entryTypeList');
-    
-    // let _entryTypeList = this.SiteOfSectionList.find(el => el.id == sectionId)?.entryTypes || [];
-    this.entryTypeList = _entryTypeList;
-    //选择板块的类型SectionType
-    this.SiteOfSectionType = this.SiteOfSectionList.find(el => el.id == sectionId)?.type;
-    if (this.SiteOfSectionType == SectionType.Structure) {
-      this.maxResultCount = 1000;
-    } else {
-      this.maxResultCount = 10;
-    }
-    console.log(_entryTypeList, 'entryTypeList');
-
-    if (_entryTypeList.length === 1) {
-      this.filters.entryTypeId = this.entryTypeList[0].id;
-      // 初始化数组
-      this.enableSearchFieldList = [];
-      this.showinFieldList = [];
-      // 使用for...of替代forEach来处理异步
-      for (const el of _entryTypeList) {
-        for (const el1 of el.fieldTabs) {
-          for (const el2 of el1.fields) {
-            // el2.field = await this.getDynamicFormEntity(el2.fieldId);
-            if (el2.enableSearch && this.enableSearchTypeList.includes(el2.field.formControlName)) {
-              this.enableSearchFieldList.push({
-                ...el2,
-                field: {
-                  formControlName: el2.field.formControlName,
-                  formConfiguration: el2.field.formConfiguration,
-                  name: el2.field.name,
-                },
-              });
-            }
-            if (el2.showInList && !this.disableshowinTypeList.includes(el2.field.formControlName)) {
-              this.showinFieldList.push(el2);
-            }
-          }
-        }
-      }
-     
-    }
-  }
-  async abpInitss(){
-    await this.setfiltersValue();
-  }
-  /**获取板块详情 */
-  getSectionInfo(ids) {
-    return new Promise((resolve, rejects) => {
-      this._SectionAdminService.get(ids).subscribe(res => {
-        resolve(res);
-      });
-    });
-  }
-  /**获取字段详情 */
-  getDynamicFormEntity(fieldId: string) {
-    return new Promise((resolve, rejects) => {
-      this._FieldAdminService.get(fieldId).subscribe(res => {
-        resolve(res);
-      });
-    });
-  }
-
-  private config = inject(ConfigStateService);
-  private _RegionalizationService = inject(RegionalizationService);
-  /**获取版块下的语言列表 */
-  getSectionLanguagesList() {
-    return new Promise(async (resolve, rejects) => {
-      //获取所有语言 */
-      let languagesSystem = this.configState.getDeep('localization.languages');
-      //获取系统默认语言 */
-      let DefaultLanguage = this.config.getSetting('Abp.Regionalization.DefaultCultureName');
-
-      const configCmsSiteLanguages = this.config.getSetting('Cms.Site.Languages');
-      if (!configCmsSiteLanguages) {
-        await this.getSiteSettingsLanguages();
-      }
-      const LanguagesSite =
-        (configCmsSiteLanguages ? configCmsSiteLanguages.split(',') : '') ||
-        this.SiteSettingsAdminLanguages;
-      let LanguagesArray = languagesSystem.filter(el => LanguagesSite.includes(el.cultureName));
-      //获取当前选择的语言
-      let nowculture = this.filters.culture;
-      // let nowculture = this.filtersForm.get('culture').value;
-      //当前选择的语言，是否在版块的的语言列表中
-      let isexist = LanguagesArray.find(el => el.cultureName == nowculture);
-      this.filters.culture = nowculture
-        ? isexist
-          ? nowculture
-          : DefaultLanguage
-        : DefaultLanguage;
-      this.sectionLanguagesList = LanguagesArray;
-      resolve(LanguagesArray);
-    });
-  }
-
-  /**站点设置语言 */
-  SiteSettingsAdminLanguages: any[] = [];
-  /**
-   * 获取站点设置语言
-   */
-  getSiteSettingsLanguages() {
-    return new Promise((resolve, rejects) => {
-      this._RegionalizationService.get().subscribe(res => {
-        this.SiteSettingsAdminLanguages = res.availableCultureNames;
-        resolve(res);
-      });
-    });
-  }
-
-  resetData() {
-    this.filters = {
-      sectionId: this.filters.sectionId,
-      culture: this.filters.culture,
-    } as GetEntriesInput;
-    this.list.filter = '';
-    this.list.maxResultCount = this.maxResultCount;
-    this.list.page = 0;
-    this.data.items = [];
-    this.list.get();
-  }
-
-  /**新增-单个 */
-  createEntriesBtn() {
-    this.router.navigate(['/cms/admin/entries/create'], {
-      queryParams: {
-        cultureName: this.filters.culture,
-        sectionId: this.filters.sectionId,
-        entryTypeId: this.entryTypeList[0].id,
-      },
-    });
-  }
-  createCopyEntriesBtn() {
-    this.router.navigate(['/cms/admin/entries/create-copy'], {
-      queryParams: {
-        cultureName: this.filters.culture,
-        sectionId: this.filters.sectionId,
-        entryTypeId: this.entryTypeList[0].id,
-      },
-    });
-  }
-
-  /**列表相关 */
-  ColumnMode = ColumnMode;
-  data: PagedResultDto<EntryDto>|any = {
-    items: [],
-    totalCount: 0,
-  };
-
-  filters = {} as GetEntriesInput;
-
-  maxResultCount = 10;
-
-  hookToQuery() {
-    const getData = (query: ABP.PageQueryParams) =>
-      this._EntryAdminService.getList({
-        ...query,
-        ...this.filters,
-        maxResultCount: this.maxResultCount,
-      });
-    const setData = (list: PagedResultDto<EntryDto>|any) => {
-      if (this.SiteOfSectionType == SectionType.Structure) {
-        list.items = list.items.sort((a, b) => {
-          return a.order - b.order;
-        });
-      }
-      this.data = list;
-    };
-    this.list.hookToQuery(getData).subscribe(setData);
-  }
-
-  /**删除条目 */
-  deletefield(row: any) {
-    this.confirmation
-      .warn(row.displayName, this._LocalizationService.instant(`AbpUi::ItemWillBeDeletedMessage`))
-      .subscribe((status: Confirmation.Status) => {
-        if (status == 'confirm') {
-          this._EntryAdminService
-            .delete(row.id)
-            .pipe(finalize(() => {}))
-            .subscribe(res => {
-              this.toaster.success(this._LocalizationService.instant(`AbpUi::DeletedSuccessfully`));
-              this.list.get();
-            });
-        }
-      });
-  }
-
-  drop(event: any) {
-    let previousId:any = this.data.items[event.previousIndex].id;
-    moveItemInArray(this.data.items, event.previousIndex, event.currentIndex);
-    this._EntryAdminService
-      .move(previousId, {
-        order: event.currentIndex,
-      })
-      .pipe(
-        finalize(() => {
-          this.list.get();
-        })
-      )
-      .subscribe(
-        res => {},
-        err => {}
-      );
-    // moveItemInArray(this.rows, event.previousIndex, event.currentIndex);
-    // this.rows = [...this.rows];
-  }
-
-  isexpanded: boolean = false;
-  /**高级筛选切换 */
-  expandedChange(event) {
-    console.log(event, 'event');
-    this.isexpanded = event;
-  }
-}

package/src/lib/components/admin/entries/index.ts

@@ -1,4 +0,0 @@
-export * from './entries.component'
-export * from './create.component'
-export * from './edit.component'
-export * from './create-or-edit-entries.component'

package/src/lib/components/admin/fields/create-field.component.html

@@ -1,12 +0,0 @@
-<form  [formGroup]="newEntity" (keydown.enter)="$event.preventDefault()" [class]="{'was-validated':formValidation}" (submit)="save()">
-    <abp-page [title]="'Cms::CreateField' | abpLocalization" [toolbar]="true">
-        <div class="create-field-page">
-            <button form-type="submit" style="display: none;" #submitclick></button>
-            <div class="card">
-                <div class="card-body">
-                    <cms-create-or-edit-field [Entity]="newEntity"></cms-create-or-edit-field>
-                </div>
-            </div>
-        </div>
-    </abp-page>
-</form>

package/src/lib/components/admin/fields/create-field.component.scss

@@ -1 +0,0 @@
-::ng-deep .create-field-page{.dignite_page{height:calc(100vh - 32px - 53px - 40px);overflow:auto}.form-control,.form-select{padding:.475rem 1.25rem}}

package/src/lib/components/admin/fields/create-field.component.spec.ts

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

package/src/lib/components/admin/fields/create-field.component.ts

@@ -1,85 +0,0 @@
-import { EXTENSIONS_IDENTIFIER } from '@abp/ng.components/extensible';
-import { LocalizationService } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-import { Location } from '@angular/common';
-import { Component, inject, ViewChild, ElementRef } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import { CmsApiService } from '../../../services';
-import { ECmsComponent } from '../../../enums';
-import { UpdateListService } from '@dignite-ng/expand.core';
-import { CreateOrUpdateFieldInputBase } from './create-or-update-field-input-base';
-import { ValidatorsService } from '@dignite-ng/expand.core';
-import { finalize } from 'rxjs';
-import { FieldAdminService } from '../../../proxy/dignite/cms/admin/fields';
-
-@Component({
-  selector: 'cms-create-field',
-  templateUrl: './create-field.component.html',
-  styleUrls: ['./create-field.component.scss'],
-  providers: [
-    {
-      provide: EXTENSIONS_IDENTIFIER,
-      useValue: ECmsComponent.FieldsCreate,
-    },
-  ],
-})
-export class CreateFieldComponent {
-  constructor(
-    private fb: FormBuilder,
-    public _FieldAdminService: FieldAdminService,
-    private toaster: ToasterService,
-    public _location: Location,
-    public _LocalizationService: LocalizationService,
-    public _CmsApiService: CmsApiService
-  ) {}
-  private _UpdateListService = inject(UpdateListService);
-
-  /**表单实体 */
-  newEntity: FormGroup | undefined;
-
-  /**获取提交按钮替身，用于真实触发表单提交 */
-  @ViewChild('submitclick', { static: true }) submitclick: ElementRef;
-
-  ngOnInit(): void {
-    //Called after the constructor, initializing input properties, and the first call to ngOnChanges.
-    //Add 'implements OnInit' to the class.
-    this.newEntity = this.fb.group(new CreateOrUpdateFieldInputBase());
-  }
-
-  /**触发提交按钮 */
-  submitclickBtn() {
-    this.submitclick.nativeElement.click();
-  }
-  isSubmit: boolean = false;
-
-  private _ValidatorsService = inject(ValidatorsService);
-  /**表单验证状态
-   * {
-   *  title:true,
-   * }
-   */
-  formValidation: any = '';
-
-  /**保存表单 */
-  save() {
-    this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-    if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms')) return;
-    let input = this.newEntity.value;
-    if (this.isSubmit) return;
-    this.isSubmit = true;
-    if (!this.newEntity.valid) return;
-    this._FieldAdminService
-      .create(input)
-      .pipe(
-        finalize(() => {
-          this.isSubmit = false;
-        })
-      )
-      .subscribe(res => {
-        this.toaster.success(this._LocalizationService.instant(`AbpUi::SavedSuccessfully`));
-        this._location.back();
-        this._UpdateListService.updateList();
-      });
-  }
-
-}

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

@@ -1,39 +0,0 @@
-<form [formGroup]="_Entity">
-    <button type="submit" style="display: none;" #submitclick></button>
-    <div class="mb-3">
-        <label class="form-label" for="groupId">{{'Cms::FieldGroup' | abpLocalization}}</label>
-        <select class="form-select" formControlName="groupId">
-            <option value="">{{'Cms::OptionalGrouping' | abpLocalization}}</option>
-            <ng-container *ngFor="let item of _FieldAbstractsService.fieldGroupList">
-                <option [value]="item.id">{{item.name}}</option>
-            </ng-container>
-        </select>
-    </div>
-    <div class="mb-3">
-        <label class="form-label" for="displayName">{{'DigniteAbpForms::FieldDisplayName' | abpLocalization}}</label>
-        <input type="text" class="form-control" formControlName="displayName" required (blur)="disPlayNameInputBlur($event)">
-    </div>
-    <div class="mb-3">
-        <label class="form-label" for="name">{{'DigniteAbpForms::FieldName' | abpLocalization}}</label>
-        <input type="text" class="form-control" formControlName="name" (input)="nameInputBlur($event)">
-        <div class="text-danger invalid-feedback" *ngIf="nameInput.errors?.repetition">
-            {{nameInput.errors?.repetition}}
-        </div>
-        <small class="form-text text-muted d-block ">{{'DigniteAbpForms::FieldNameHelpText' | abpLocalization}}</small>
-    </div>
-    <div class="mb-3">
-        <label class="form-label" for="description">{{'Cms::Description' | abpLocalization}}</label>
-        <input type="text" class="form-control" formControlName="description">
-    </div>
-    <div class="mb-3">
-        <label class="form-label" for="formControlName">{{'Cms::FieldType' | abpLocalization}}</label>
-        <select class="form-select" formControlName="formControlName" (change)="formControlNameChange($event)">
-            <ng-container *ngFor="let item of _FieldAbstractsService.fromControlList;let i =index">
-                <option [value]="item.name">{{item.displayName|abpLocalization}}</option>
-            </ng-container>
-        </select>
-    </div>
-    <ng-container *ngIf="_Entity.value.formControlName&&_Entity"> 
-        <df-dynamic [type]="_Entity.value.formControlName" [selected]="_selected" [entity]="_Entity" ></df-dynamic>
-    </ng-container>
-</form>

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

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