@dignite-ng/expand.cms 0.0.33 → 0.0.35

package/lib/toolbar/toolbar-config.d.ts

@@ -0,0 +1,56 @@
+import { InjectionToken } from "@angular/core";
+import { ResolveFn } from "@angular/router";
+export declare const ActionGroup: {
+    Entries: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    Entries_Create: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    Entries_Edit: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    Fields: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    FieldsCreate: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    FieldsEdit: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    Sections: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+    SectionsCreateOrEdit: import("@abp/ng.theme.shared/extensions").ToolbarAction<any[]>[];
+};
+/**用于路由守卫增加工具栏按钮 */
+export declare const Cms_Default_Toolbar_Actions: {};
+/**
+ *
+ * @param 在identityExtensionsResolver方法中使用
+ *
+ * @param 在cms.module.ts中使用,
+    export class CmsModule {
+        static forChild(options: any = {}): ModuleWithProviders<CmsModule> {
+            return {
+                ngModule: CmsModule,
+                providers: [
+                    {
+                        provide: CMS_TOOLBAR_ACTION_CONTRIBUTORS,
+                        useValue: options.toolbarActionContributors,
+                        // useValue: identityToolbarActionContributors,
+                    },
+                    // IdentityExtensionsGuard,
+                ]
+            };
+        }
+        static forLazy(options: any = {}): NgModuleFactory<CmsModule> {
+            return new LazyModuleFactory(CmsModule.forChild(options));
+        }
+    }
+ *
+ *
+ */
+export declare const CMS_TOOLBAR_ACTION_CONTRIBUTORS: InjectionToken<any>;
+/**用于放在cms-routing.module.ts路由守卫中
+ *
+ *
+    const routes: Routes = [
+        {
+            path: 'demo',
+            canActivate: [AuthGuard, PermissionGuard],
+            resolve: [identityExtensionsResolver],
+            children: []
+        },
+    ]
+ *
+ *
+ */
+export declare const CmsExtensionsResolver: ResolveFn<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignite-ng/expand.cms",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "peerDependencies": {
     "@angular/common": "^16.2.0",
     "@angular/core": "^16.2.0",
@@ -13,9 +13,24 @@
   "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,10 +1,4 @@
-/*
- * Public API Surface of cms
- */
-
-export * from './lib/cms.module';
-// export * from './lib/cms-routing.module';
-export * from './lib/components/dynamic-form';
-// export * from './lib/proxy';
-export * from './lib/services/simple-reuse-strategy';
-export * from './lib/components/admin/domains';
+export * from './lib/cms.module';
+export * from './lib/components/dynamic-form';
+export * from './lib/services/simple-reuse-strategy';
+export * from './lib/components/admin/domains';

package/config/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/cms/config",
-  "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/enums/route-names.ts

@@ -1,8 +0,0 @@
-export const enum eCmsRouteNames {
-  Cms = 'Cms::Menu:Cms',
-  Entries = 'Cms::FormControl:Entry',
-  Settings = "Cms::Menu:Settings",
-  Fields = "Cms::Fields",
-  // Sites = "Cms::Sites",
-  Sections = "Cms::Sections",
-}

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 { eThemeSharedRouteNames } from '@abp/ng.theme.shared';
-import { SettingTabsService } from '@abp/ng.setting-management/config';
-import { DomainsComponent } from '@dignite-ng/expand.cms';
-// import { DomainsComponent } from '@dignite-ng/expand.cms';
-
-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',
-        order: 1,
-        requiredPolicy: 'CmsAdmin.Domain',
-        component: DomainsComponent,
-      },
-    ]);
-    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/sites',
-      //   name: eCmsRouteNames.Sites,
-      //   parentName:eCmsRouteNames.Settings,
-      //   iconClass: 'fas fa fa-globe ',
-      //   layout: eLayoutType.application,
-      //   order: 2,
-      //   requiredPolicy:'CmsAdmin.Site',
-      // },
-      {
-        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/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,108 +0,0 @@
-import {  NgModule} from '@angular/core';
-import { Routes, RouterModule} 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';
-
-
-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],
-})
-export class CmsRoutingModule {
-}

package/src/lib/cms.module.ts

@@ -1,108 +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,
-  MatrixConfigComponent,
-  MatrixControlComponent,
-  TableConfigComponent,
-  TableControlComponent,
-  EntryConfigComponent,
-  EntryControlComponent,
-  FieldControlGroup
-} from './components';
-import {
-  NgbDropdownModule,
-  NgbNavModule,
-  NgbAccordionModule,
-} from '@ng-bootstrap/ng-bootstrap';
-import { FormsModule } from '@angular/forms';
-import { PageModule } from '@abp/ng.components/page';
-import { CMS_TOOLBAR_ACTION_CONTRIBUTORS } from './toolbar';
-import { NzSelectModule } from 'ng-zorro-antd/select';
-import { DynamicFormModule } from '@dignite-ng/expand.dynamic-form';
-import { fielFieldControlGroup } from '@dignite-ng/expand.file-explorer';
-import { ckEditorFieldControlGroup } from '@dignite-ng/expand.ck-editor';
-import { DomainsComponent } from './components/admin/domains/domains.component';
-import { SettingTabsService } from '@abp/ng.setting-management/config';
-
-@NgModule({
-  declarations: [
-    EntriesComponent,
-    FieldsComponent,
-    // SitesComponent,
-    SectionsComponent,
-    FieldGroupComponent,
-    CreateFieldComponent,
-    EditFieldComponent,
-    CreateOrEditFieldComponent,
-    CreateOrEditComponent,
-    CreateComponent,
-    EditComponent,
-    CreateOrEditEntriesComponent,
-    TableConfigComponent,
-    TableControlComponent,
-    MatrixConfigComponent,
-    MatrixControlComponent,
-    EntryConfigComponent,
-    EntryControlComponent,
-    DomainsComponent,
-  ],
-  imports: [
-    CoreModule,
-    ThemeSharedModule,
-    CmsRoutingModule,
-    FormsModule,
-    NgbNavModule,
-    NgbAccordionModule,
-    NgbDropdownModule,
-    PageModule,
-    NzSelectModule,
-    DynamicFormModule.forRoot({
-      cmsFieldControlGroup: [...FieldControlGroup, ...fielFieldControlGroup, ...ckEditorFieldControlGroup]
-    }),
-  ],
-  exports: [
-    TableConfigComponent,
-    TableControlComponent,
-    MatrixConfigComponent,
-    MatrixControlComponent,
-    EntryConfigComponent,
-    EntryControlComponent,
-    DomainsComponent
-  ],
-  providers: [
-  ],
-
-})
-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/domains/domains.component.html

@@ -1,19 +0,0 @@
-<form [formGroup]="newEntity" (ngSubmit)="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">
-        <!-- <label class="form-label" for="title">{{'Cms::Domain' | abpLocalization}}</label> -->
-        <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/src/lib/components/admin/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/src/lib/components/admin/domains/domains.component.ts

@@ -1,99 +0,0 @@
-import { Component, inject } from '@angular/core';
-import { AbstractControl, FormControl, FormGroup, ValidationErrors } from '@angular/forms';
-import {  Observable  } from 'rxjs';
-import { DomainAdminService } from '../../../proxy/admin/domains';
-import { LocalizationService } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-
-@Component({
-  selector: 'cms-domains',
-  templateUrl: './domains.component.html',
-  styleUrls: ['./domains.component.scss']
-})
-export class DomainsComponent {
-
-  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()) });
-          console.log(this.newEntity,'newEntity');
-          return
-        }
-
-
-        this._DomainAdminService.nameExists(domainNameInput).subscribe(res => {
-          if (res) {
-            resolve({ repetition: this._LocalizationService.instant(`Cms::DomainName{0}AlreadyExist`, ctrl.value) });
-          } else {
-            resolve(null);
-          }
-        })
-      });
-    };
-  }
-
-  /**保存 */
-  SaveSubmit() {
-    let input = this.newEntity.value
-    console.log(input, '保存');
-    this._DomainAdminService.update(input).subscribe(async(res)=>{
-      this.toaster.success(this._LocalizationService.instant(`AbpUi::保存成功`));
-      await this.getDomainsBound()
-    })
-  }
-
-  
-}

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

@@ -1 +0,0 @@
-export * from './domains.component'