@dignite-ng/expand.cms 0.0.52 → 0.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignite-ng/expand.cms",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "peerDependencies": {
     "@angular/common": "~18.1.0",
     "@angular/core": "~18.1.0"
@@ -9,14 +9,29 @@
     "pinyin-pro": "^3.19.6",
     "tslib": "^2.3.0"
   },
-  "allowedNonPeerDependencies":true,
+  "allowedNonPeerDependencies": true,
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "module": "fesm2022/dignite-ng-expand.cms.mjs",
+  "typings": "index.d.ts",
+  "exports": {
+    "./package.json": {
+      "default": "./package.json"
+    },
+    ".": {
+      "types": "./index.d.ts",
+      "esm2022": "./esm2022/dignite-ng-expand.cms.mjs",
+      "esm": "./esm2022/dignite-ng-expand.cms.mjs",
+      "default": "./fesm2022/dignite-ng-expand.cms.mjs"
+    },
+    "./config": {
+      "types": "./config/index.d.ts",
+      "esm2022": "./esm2022/config/dignite-ng-expand.cms-config.mjs",
+      "esm": "./esm2022/config/dignite-ng-expand.cms-config.mjs",
+      "default": "./fesm2022/dignite-ng-expand.cms-config.mjs"
+    }
   }
-}
-
-
-
-
+}

package/{src/public-api.ts → public-api.d.ts}

@@ -1,6 +1,2 @@
-/*
- * Public API Surface of cms
- */
-
-export * from './lib/cms.module';
-export * from './lib/components/dynamic-form';
+export * from './lib/cms.module';
+export * from './lib/components/dynamic-form';

package/config/ng-package.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  }
-}

package/config/src/cms-config.module.ts

@@ -1,12 +0,0 @@
-import { ModuleWithProviders, NgModule } from '@angular/core';
-import { CMS_ROUTE_PROVIDERS } from './providers/route.provider';
-
-@NgModule()
-export class CmsConfigModule {
-  static forRoot(): ModuleWithProviders<CmsConfigModule> {
-    return {
-      ngModule: CmsConfigModule,
-      providers: [CMS_ROUTE_PROVIDERS],
-    };
-  }
-}

package/config/src/components/domains/domains.component.html

@@ -1,17 +0,0 @@
-<form [formGroup]="newEntity" (keydown.enter)="$event.preventDefault()" [class]="{'was-validated':formValidation}" (submit)="SaveSubmit()">
-    
-    <div class="d-flex align-items-center justify-content-between">
-        <h2>{{'Cms::Domain'|abpLocalization}}</h2>
-        <button class="btn btn-primary btn-sm" type="submit"><i
-                class="me-1 fas fa-save"></i>{{'AbpUi::Save'|abpLocalization}}</button>
-    </div>
-    <hr class="my-3" />
-    <div class="mb-2">
-        <input type="text" class="form-control" formControlName="domainName">
-        <div class="text-danger invalid-feedback" *ngIf="domainNameInput.errors?.repetition">
-            {{domainNameInput.errors?.repetition}}
-        </div>
-        <div class="form-text">此处是填写域名的描述，需要一个字段统一配置域名多语言，</div>
-    </div>
-    <hr class="my-3" />
-</form>

package/config/src/components/domains/domains.component.spec.ts

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

package/config/src/components/domains/domains.component.ts

@@ -1,109 +0,0 @@
-import { Component, inject, OnInit } from '@angular/core';
-import { AbstractControl, FormControl, FormGroup, FormsModule, ValidationErrors } from '@angular/forms';
-import {  Observable  } from 'rxjs';
-import { CoreModule, LocalizationService } from '@abp/ng.core';
-import { ThemeSharedModule, ToasterService } from '@abp/ng.theme.shared';
-import { DomainAdminService } from '../../proxy/admin/domains';
-import { ValidatorsService } from '../../services/validators.service';
-
-@Component({
-  selector: 'cms-domains',
-  templateUrl: './domains.component.html',
-  styleUrls: ['./domains.component.scss'],
-  standalone: true,
-  imports: [
-    CoreModule,
-    ThemeSharedModule,
-    FormsModule,
-  ]
-})
-export class DomainsComponent implements OnInit{
-
-  private toaster = inject(ToasterService)
-  private _DomainAdminService = inject(DomainAdminService);
-  private _LocalizationService = inject(LocalizationService);
-
-  /**表单实体 */
-  newEntity: FormGroup | undefined;
-
-  /**domain详情 */
-  domainInfo:any=''
-  get domainNameInput() {
-    return this.newEntity.get('domainName')
-  }
-
-
-
- async ngOnInit(): Promise<void> {
-    //Called after the constructor, initializing input properties, and the first call to ngOnChanges.
-    //Add 'implements OnInit' to the class.
-  
-    this.newEntity = new FormGroup({
-      domainName: new FormControl('', {
-        asyncValidators: this.repetitionAsyncValidator(),
-        updateOn: 'blur'
-      })
-    })
-    await this.getDomainsBound()
-
-  }
-
-  /**用于获取已绑定的域名 */
-  getDomainsBound(){
-    return new Promise((resolve,rejects)=>{
-      this._DomainAdminService.getBound().subscribe(res=>{
-        this.domainNameInput.patchValue(res?.domainName||'')
-        this.domainInfo=res
-        resolve(res)
-      })
-    })
-  }
-
-  //检验域名是否已经绑定
-  repetitionAsyncValidator() {
-    return (ctrl: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
-      return new Promise(resolve => {
-        let domainNameInput = this.domainNameInput.value
-        if (!domainNameInput) {
-          resolve(null);
-          return
-        }
-        if (this.domainInfo?.domainName===domainNameInput) {
-          resolve(null);
-          return
-        }
-        var patt = /^(?!-)[A-Za-z0-9-]{1,63}(?<!-)\.[A-Za-z]{2,6}$/;
-        if(!patt.test(domainNameInput)){
-          resolve({ repetition: this._LocalizationService.instant(`AbpValidation::ThisFieldMustMatchTheRegularExpression{0}`, patt.toString()) });
-          return
-        }
-        this._DomainAdminService.nameExists(domainNameInput).subscribe(res => {
-          if (res) {
-            resolve({ repetition: this._LocalizationService.instant(`Cms::DomainName{0}AlreadyExist`, ctrl.value) });
-          } else {
-            resolve(null);
-          }
-        })
-      });
-    };
-  }
-
-  private _ValidatorsService = inject(ValidatorsService);
-  /**表单验证状态
-   * {
-   *  title:true,
-   * }
-   */
-  formValidation: any = '';
-
-  /**保存 */
-  SaveSubmit() {
-    let input = this.newEntity.value
-    this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-    if (this._ValidatorsService.isCheckForm(this.formValidation,'Cms')) return;
-    this._DomainAdminService.update(input).subscribe(async(res)=>{
-      this.toaster.success(this._LocalizationService.instant(`AbpUi::SavedSuccessfully`));
-      await this.getDomainsBound()
-    })
-  }
-}

package/config/src/components/site-language/site-language.component.html

@@ -1,31 +0,0 @@
-<form [formGroup]="newEntity" (keydown.enter)="$event.preventDefault()" (submit)="SaveSubmit()">
-    <div class="d-flex align-items-center justify-content-between">
-        <h2>{{eCmsRouteNames.SiteLanguage|abpLocalization}}</h2>
-        <button class="btn btn-primary btn-sm" type="submit"><i
-                class="me-1 fas fa-save"></i>{{'AbpUi::保存'|abpLocalization}}</button>
-    </div>
-    <hr class="my-3" />
-    <div class="mb-2">
-        <label class="form-label" for="title">{{'Travely::Language' | abpLocalization}}</label>
-        <ul class="list-group">
-            <ng-container *ngFor="let item of languagesSystem;let i=index">
-                <li class="list-group-item d-flex align-items-center justify-content-between">
-                    <div class="form-check">
-                        <input class="form-check-input" type="checkbox" value="" id="Languages{{i}}"
-                            [checked]="item.ischecked" (change)="setLanguagesChange($event,item)" />
-                        <label class="form-check-label" for="Languages{{i}}">
-                            {{item.displayName}}
-                        </label>
-                    </div>
-                    <ng-container *ngIf="item.ischecked">
-                        <div class="text-primary fs-5" type="button" *ngIf="item.isDefault">
-                            {{'Travely::Default'|abpLocalization}}</div>
-                        <div class="text-muted fs-5" type="button" (click.stop)="setDefault(item)"
-                            *ngIf="!item.isDefault">{{'Travely::SetDefault'|abpLocalization}}</div>
-                    </ng-container>
-                </li>
-            </ng-container>
-        </ul>
-    </div>
-    <hr class="my-3" />
-</form>

package/config/src/components/site-language/site-language.component.spec.ts

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

package/config/src/components/site-language/site-language.component.ts

@@ -1,117 +0,0 @@
-import { LocalizationService,CoreModule, ConfigStateService } from '@abp/ng.core';
-import { Component, inject, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators,FormsModule } from '@angular/forms';
-// import { SiteLanguagesService } from '../../../services/site-languages.service';
-import { SiteAdminService } from '../../proxy/dignite/cms/admin/sites';
-import { eCmsRouteNames } from '../../enums';
-import {  Observable  } from 'rxjs';
-import { ThemeSharedModule, ToasterService } from '@abp/ng.theme.shared';
-// import { SiteAdminService } from '../../../../proxy/dignite/cms/admin/sites';
-
-@Component({
-  selector: 'app-site-language',
-  templateUrl: './site-language.component.html',
-  styleUrls: ['./site-language.component.scss'],
-  standalone: true,
-  imports: [
-    CoreModule,
-    ThemeSharedModule,
-    FormsModule,
-  ]
-})
-export class SiteLanguageComponent implements OnInit{
-
-  private fb = inject(FormBuilder)
-  private toaster = inject(ToasterService)
-  private _LocalizationService = inject(LocalizationService);
-  private configState = inject(ConfigStateService)
-  private _SiteAdminService = inject(SiteAdminService);
-  // private SiteLanguagesService = inject(SiteLanguagesService);
-  eCmsRouteNames=eCmsRouteNames;
-
-
-  /**表单实体 */
-  newEntity: FormGroup | undefined;
-
-  /**系统语言 */
-  languagesSystem: any[] = []
-
-
-
-
-  async ngOnInit(): Promise<void> {
-    //Called after the constructor, initializing input properties, and the first call to ngOnChanges.
-    //Add 'implements OnInit' to the class.
-    //获取所有语言 */
-    let languagesSystem = this.configState.getDeep('localization.languages')
-    languagesSystem.map(el => {
-      el.ischecked = false;
-      el.isDefault = false;
-    })
-    this.languagesSystem = languagesSystem
-    this.newEntity = this.fb.group({
-      defaultLanguage: ['', [Validators.required]],
-      allLanguages: [[], [Validators.required]],
-    })
-    await this.getSiteLanguageSettings()
-
-  }
-
-  /**获取配置的默认语言与选中语言 */
-  getSiteLanguageSettings() {
-    return new Promise((resolve, rejects) => {
-      this._SiteAdminService.get().subscribe((res) => {
-        this.newEntity.patchValue({
-          defaultLanguage: res.defaultLanguage,
-          allLanguages: res.allLanguages
-        })
-        this.languagesSystem.forEach((el) => {
-          el.ischecked = res.allLanguages.includes(el.cultureName)
-          el.isDefault = el.cultureName === res.defaultLanguage
-        })
-        resolve(true)
-      })
-    })
-  }
-
-  /**语言改变 */
-  setLanguagesChange(event, item) {
-    let checked = event.target.checked
-    item.ischecked = checked
-    this.setFromLangguages()
-  }
-
-  /**设置默认语言 */
-  setDefault(items) {
-    this.languagesSystem.forEach(el => {
-      el.isDefault = false
-    })
-    items.isDefault = true
-    this.newEntity.patchValue({
-      defaultLanguage: items.cultureName
-    })
-    this.setFromLangguages()
-  }
-  /**设置表单中的语言 */
-  setFromLangguages() {
-    let languagesSelect = this.languagesSystem.filter(el => el.ischecked == true).map(el => el.cultureName)
-    this.newEntity.patchValue({
-      allLanguages: languagesSelect
-    })
-    if (languagesSelect.length == 0) {
-      this.languagesSystem.forEach(el => {
-        el.isDefault = false
-      })
-    }
-  }
-  /**保存 */
-  SaveSubmit() {
-    let input = this.newEntity.value
-    this._SiteAdminService.update({
-      ...input
-    }).subscribe((res => {
-      this.toaster.success(this._LocalizationService.instant(`AbpUi::SavedSuccessfully`));
-      this.getSiteLanguageSettings()
-    }))
-  }
-}

package/config/src/enums/route-names.ts

@@ -1,8 +0,0 @@
-export  enum eCmsRouteNames {
-  Cms = 'Cms::Menu:Cms',
-  Entries = 'Cms::FormControl:Entry',
-  Settings = "Cms::Menu:Settings",
-  Fields = "Cms::Fields",
-  Sections = "Cms::Sections",
-  SiteLanguage="Cms::DisplayName:Cms.Site.Languages",
-}

package/config/src/providers/route.provider.ts

@@ -1,82 +0,0 @@
-import { eLayoutType, RoutesService } from '@abp/ng.core';
-import { APP_INITIALIZER } from '@angular/core';
-import { eCmsRouteNames } from '../enums/route-names';
-import { SettingTabsService } from '@abp/ng.setting-management/config';
-import { DomainsComponent } from '../components/domains/domains.component';
-import { SiteLanguageComponent } from '../components/site-language/site-language.component';
-
-
-
-
-
-export const CMS_ROUTE_PROVIDERS = [
-  {
-    provide: APP_INITIALIZER,
-    useFactory: configureRoutes,
-    deps: [RoutesService, SettingTabsService],
-    multi: true,
-  },
-];
-
-
-export function configureRoutes(routesService: RoutesService, settingTabs: SettingTabsService) {
-  return () => {
-    settingTabs.add([
-      {
-        name: 'Cms::Domain',
-        requiredPolicy: 'CmsAdmin.Domain',
-        component: DomainsComponent,
-      },
-      {
-        name: eCmsRouteNames.SiteLanguage,
-        requiredPolicy: 'TravelyAdmin.SiteSetting',
-        component: SiteLanguageComponent, 
-      },
-    ]);
-    routesService.add([
-      {
-        path: '/cms',
-        name: eCmsRouteNames.Cms,
-        iconClass: 'bi-archive-fill',
-        layout: eLayoutType.application,
-        requiredPolicy: 'CmsAdmin.Entry || CmsAdmin.Field || CmsAdmin.Site || CmsAdmin.Section',
-      },
-      {
-        path: '/cms/admin/entries',
-        name: eCmsRouteNames.Entries,
-        parentName: eCmsRouteNames.Cms,
-        iconClass: 'bi-file-earmark-text-fill',
-        layout: eLayoutType.application,
-        requiredPolicy: 'CmsAdmin.Entry',
-      },
-      {
-        path: '',
-        name: eCmsRouteNames.Settings,
-        parentName: eCmsRouteNames.Cms,
-        iconClass: 'fas fa fa-cog',
-        layout: eLayoutType.application,
-        requiredPolicy: 'CmsAdmin.Field  || CmsAdmin.Section',
-      },
-      {
-        path: '/cms/admin/fields',
-        name: eCmsRouteNames.Fields,
-        parentName: eCmsRouteNames.Settings,
-        iconClass: 'bi-file-earmark-text-fill',
-        layout: eLayoutType.application,
-        order: 1,
-        requiredPolicy: 'CmsAdmin.Field',
-      },
-      {
-        path: '/cms/admin/sections',
-        name: eCmsRouteNames.Sections,
-        parentName: eCmsRouteNames.Settings,
-        iconClass: 'bi bi-menu-button-wide-fill',
-        layout: eLayoutType.application,
-        order: 3,
-        requiredPolicy: 'CmsAdmin.Section',
-      },
-      
-
-    ]);
-  };
-}

package/config/src/proxy/admin/domains/domain-admin.service.ts

@@ -1,38 +0,0 @@
-import type { DomainDto, UpdateDomainInput } from './models';
-import { RestService, Rest } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class DomainAdminService {
-  apiName = 'CmsAdmin';
-  
-
-  getBound = (config?: Partial<Rest.Config>) =>
-    this.restService.request<any, DomainDto>({
-      method: 'GET',
-      url: '/api/cms-admin/domains/bound',
-    },
-    { apiName: this.apiName,...config });
-  
-
-  nameExists = (domainName: string, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, boolean>({
-      method: 'GET',
-      url: '/api/cms-admin/domains/name-exists',
-      params: { domainName },
-    },
-    { apiName: this.apiName,...config });
-  
-
-  update = (input: UpdateDomainInput, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, DomainDto>({
-      method: 'POST',
-      url: '/api/cms-admin/domains',
-      body: input,
-    },
-    { apiName: this.apiName,...config });
-
-  constructor(private restService: RestService) {}
-}

package/config/src/proxy/admin/domains/models.ts

@@ -1,9 +0,0 @@
-import type { CreationAuditedEntityDto } from '@abp/ng.core';
-
-export interface DomainDto extends CreationAuditedEntityDto<string> {
-  domainName?: string;
-}
-
-export interface UpdateDomainInput {
-  domainName: string;
-}

package/config/src/proxy/dignite/abp/data/index.ts

@@ -1 +0,0 @@
-export * from './models';

package/config/src/proxy/dignite/abp/data/models.ts

@@ -1,4 +0,0 @@
-
-export interface CustomizableObject {
-  extraProperties: Record<string, object>;
-}

package/config/src/proxy/dignite/abp/index.ts

@@ -1,2 +0,0 @@
-import * as Data from './data';
-export { Data };

package/config/src/proxy/dignite/cms/admin/domains/domain-admin.service.ts

@@ -1,47 +0,0 @@
-import type { DomainDto, UpdateDomainInput } from './models';
-import { RestService, Rest } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class DomainAdminService {
-  apiName = 'CmsAdmin';
-  
-
-  findByName = (domainName: string, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, DomainDto>({
-      method: 'GET',
-      url: '/api/cms-admin/domains/find-by-name',
-      params: { domainName },
-    },
-    { apiName: this.apiName,...config });
-  
-
-  getBound = (config?: Partial<Rest.Config>) =>
-    this.restService.request<any, DomainDto>({
-      method: 'GET',
-      url: '/api/cms-admin/domains/bound',
-    },
-    { apiName: this.apiName,...config });
-  
-
-  nameExists = (domainName: string, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, boolean>({
-      method: 'GET',
-      url: '/api/cms-admin/domains/name-exists',
-      params: { domainName },
-    },
-    { apiName: this.apiName,...config });
-  
-
-  update = (input: UpdateDomainInput, config?: Partial<Rest.Config>) =>
-    this.restService.request<any, DomainDto>({
-      method: 'POST',
-      url: '/api/cms-admin/domains',
-      body: input,
-    },
-    { apiName: this.apiName,...config });
-
-  constructor(private restService: RestService) {}
-}

package/config/src/proxy/dignite/cms/admin/domains/index.ts

@@ -1,2 +0,0 @@
-export * from './domain-admin.service';
-export * from './models';

package/config/src/proxy/dignite/cms/admin/dynamic-forms/form-admin.service.ts

@@ -1,21 +0,0 @@
-import type { FormControlDto } from './models';
-import { RestService, Rest } from '@abp/ng.core';
-import type { ListResultDto } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class FormAdminService {
-  apiName = 'CmsAdmin';
-  
-
-  getFormControls = (config?: Partial<Rest.Config>) =>
-    this.restService.request<any, ListResultDto<FormControlDto>>({
-      method: 'GET',
-      url: '/api/cms-admin/dynamic-forms/forms',
-    },
-    { apiName: this.apiName,...config });
-
-  constructor(private restService: RestService) {}
-}

package/config/src/proxy/dignite/cms/admin/dynamic-forms/models.ts

@@ -1,5 +0,0 @@
-
-export interface FormControlDto {
-  name?: string;
-  displayName?: string;
-}