@dignite-ng/expand.cms 0.0.51 → 0.0.52

package/config/src/proxy/dignite/travely/tours/models.ts

@@ -0,0 +1,77 @@
+import type { BookingTimeType } from './booking-time-type.enum';
+import type { Gps } from '../common/models';
+import type { PeriodType } from './period-type.enum';
+import type { ExtensibleEntityDto } from '@abp/ng.core';
+
+export interface BookingTimeConfiguration {
+  bookingTimeType: BookingTimeType;
+  availableDates: string[];
+  period: PeriodBooking;
+  availableTimeSlots: BookingTimeSlot[];
+}
+
+export interface BookingTimeSlot {
+  startTime?: string;
+  endTime?: string;
+}
+
+export interface Itinerary {
+  onTime?: string;
+  location: Gps;
+  address?: string;
+  description?: string;
+}
+
+export interface PeriodBooking {
+  periodType: PeriodType;
+  startDay: number;
+  endDay: number;
+}
+
+export interface RefundPolicy {
+  daysBeforeTour: number;
+  refundPercentage: number;
+}
+
+export interface TourDto extends TourListDto {
+  description?: string;
+  itineraries: Itinerary[];
+  includedServices?: string;
+  excludedServices?: string;
+  notes?: string;
+  refundPolicies: RefundPolicy[];
+  bookingTimeConfig: BookingTimeConfiguration;
+}
+
+export interface TourGuideLanguageDto {
+  tourId?: string;
+  language?: string;
+}
+
+export interface TourInCategoryDto {
+  tourId?: string;
+  categoryId?: string;
+}
+
+export interface TourListDto extends ExtensibleEntityDto<string> {
+  language?: string;
+  title?: string;
+  code?: string;
+  areaId?: string;
+  coverBlobName?: string;
+  promotionalVideo?: string;
+  categories: TourInCategoryDto[];
+  providedLanguages: TourGuideLanguageDto[];
+  advanceBookingDays: number;
+  currency?: string;
+  privateTourPrice?: number;
+  maxPrivateTourParticipants?: number;
+  groupTourAdultUnitPrice?: number;
+  groupTourChildUnitPrice?: number;
+  minGroupTourParticipants?: number;
+  maxGroupTourParticipants?: number;
+  totalViewCount: number;
+  totalOrderCount: number;
+  averageStarCount: number;
+  totalCommentCount: number;
+}

package/config/src/proxy/dignite/travely/tours/period-type.enum.ts

@@ -0,0 +1,9 @@
+import { mapEnumToOptions } from '@abp/ng.core';
+
+export enum PeriodType {
+  Yearly = 0,
+  Monthly = 1,
+  Weekly = 2,
+}
+
+export const periodTypeOptions = mapEnumToOptions(PeriodType);

package/config/src/proxy/dignite/travely/tours/tour-recommendation-rank.enum.ts

@@ -0,0 +1,12 @@
+import { mapEnumToOptions } from '@abp/ng.core';
+
+export enum TourRecommendationRank {
+  Rank0 = 0,
+  Rank1 = 1,
+  Rank2 = 2,
+  Rank3 = 3,
+  Rank4 = 4,
+  Rank5 = 5,
+}
+
+export const tourRecommendationRankOptions = mapEnumToOptions(TourRecommendationRank);

package/config/src/proxy/dignite/travely/tours/tourist-type.enum.ts

@@ -0,0 +1,8 @@
+import { mapEnumToOptions } from '@abp/ng.core';
+
+export enum TouristType {
+  Private = 1,
+  Group = 2,
+}
+
+export const touristTypeOptions = mapEnumToOptions(TouristType);

package/config/src/proxy/microsoft/asp-net-core/index.ts

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

package/config/src/proxy/microsoft/asp-net-core/mvc/index.ts

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

package/config/src/proxy/microsoft/asp-net-core/mvc/models.ts

@@ -0,0 +1,12 @@
+import type { EntityTagHeaderValue } from '../../net/http/headers/models';
+
+export interface ActionResult {
+}
+
+export interface FileResult extends ActionResult {
+  contentType?: string;
+  fileDownloadName?: string;
+  lastModified?: string;
+  entityTag: EntityTagHeaderValue;
+  enableRangeProcessing: boolean;
+}

package/config/src/proxy/microsoft/extensions/index.ts

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

package/config/src/proxy/microsoft/extensions/primitives/index.ts

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

package/config/src/proxy/microsoft/extensions/primitives/models.ts

@@ -0,0 +1,9 @@
+
+export interface StringSegment {
+  buffer?: string;
+  offset: number;
+  length: number;
+  value?: string;
+  hasValue: boolean;
+  item?: string;
+}

package/config/src/proxy/microsoft/index.ts

@@ -0,0 +1,4 @@
+import * as AspNetCore from './asp-net-core';
+import * as Extensions from './extensions';
+import * as Net from './net';
+export { AspNetCore, Extensions, Net };

package/config/src/proxy/microsoft/net/http/headers/index.ts

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

package/config/src/proxy/microsoft/net/http/headers/models.ts

@@ -0,0 +1,7 @@
+import type { StringSegment } from '../../../extensions/primitives/models';
+
+export interface EntityTagHeaderValue {
+  any: EntityTagHeaderValue;
+  tag: StringSegment;
+  isWeak: boolean;
+}

package/config/src/proxy/microsoft/net/http/index.ts

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

package/config/src/proxy/microsoft/net/index.ts

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

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

@@ -1,3 +1,3 @@
-export * from './enums';
-export * from './cms-config.module';
-export * from './providers';
+export * from './enums';
+export * from './cms-config.module';
+export * from './providers';

package/config/src/services/validators.service.ts

@@ -0,0 +1,80 @@
+import { LocalizationService } from '@abp/ng.core';
+import { ToasterService } from '@abp/ng.theme.shared';
+import { inject, Injectable } from '@angular/core';
+import { FormGroup, FormArray, FormControl, FormBuilder } from '@angular/forms';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ValidatorsService {
+
+  constructor() { }
+
+  private fb = inject(FormBuilder);
+  private toaster = inject(ToasterService);
+  private _LocalizationService = inject(LocalizationService);
+
+    /**检查表单- */
+    isCheckForm(input: any,module='AbpValidation') {
+      let keys = Object.keys(input);
+      for (let i = 0; i < keys.length; i++) {
+        const element = keys[i];
+        if (input[element] == false) {
+          let info = `"${this._LocalizationService.instant(`${module}::${element}`)}" `;
+          if (element.includes('.') && !element.includes('].')) {
+            let arr = element.split('.');
+            info=`"${this._LocalizationService.instant(`CmsKit::${arr[0]}`)}.${this._LocalizationService.instant(`CmsKit::${arr[1]}`)}"`
+          }
+          if (element.includes('].')) {
+            let arr = element.split('].');
+            let arrStart = arr[0].split('[');
+            info=`"${this._LocalizationService.instant(`CmsKit::${arrStart[0]}`)}[${arrStart[1]}].${this._LocalizationService.instant(`CmsKit::${arr[1]}`)}"`
+          }
+          info+= `${this._LocalizationService.instant(`AbpValidation::ThisFieldIsNotValid`)}`
+          //使用abp多语言提示
+          this.toaster.warn(info);
+          return true;
+        }
+      }
+      return false;
+    }
+
+
+  /**获取表单所有字段是否通过验证 */
+  getFormValidationStatus(formEntity: FormGroup | FormArray): { [key: string]: any } {
+    let validationStatus: { [key: string]: any } = {};
+
+    // 递归遍历表单组和表单控件集合
+    const traverseForm = (form: FormGroup | FormArray, prefix = '') => {
+      if (form instanceof FormGroup) {
+        Object.keys(form.controls).forEach(key => {
+          const control = form.controls[key];
+          const fullKey = prefix ? `${prefix}.${key}` : key;
+          if (control instanceof FormControl) {
+            validationStatus[fullKey] = control.valid;
+          } else if (control instanceof FormArray) {
+            traverseForm(control, fullKey);
+          } else if (control instanceof FormGroup) {
+            traverseForm(control, fullKey);
+          }
+        });
+      } else if (form instanceof FormArray) {
+        form.controls.forEach((control, index) => {
+          const fullKey = prefix ? `${prefix}[${index}]` : `[${index}]`;
+          if (control instanceof FormControl) {
+            validationStatus[fullKey] = control.valid;
+          } else if (control instanceof FormArray) {
+            traverseForm(control, fullKey);
+          } else if (control instanceof FormGroup) {
+            traverseForm(control, fullKey);
+          }
+        });
+      }
+    };
+
+    traverseForm(formEntity);
+
+    return validationStatus;
+  }
+
+}

package/ng-package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignite-ng/expand.cms",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "peerDependencies": {
     "@angular/common": "~18.1.0",
     "@angular/core": "~18.1.0"
@@ -9,29 +9,14 @@
     "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/lib/cms-routing.module.ts

@@ -0,0 +1,102 @@
+import {  NgModule} from '@angular/core';
+import { Routes, RouterModule} from '@angular/router';
+import {
+  CreateComponent,
+  CreateFieldComponent,
+  CreateOrEditComponent,
+  EditComponent,
+  EditFieldComponent,
+  EntriesComponent,
+  FieldsComponent,
+  SectionsComponent,
+} from './components';
+import {
+  AuthGuard,
+  PermissionGuard,
+} from '@abp/ng.core';
+import { appentStyle } from './services/appent-content';
+import { Extensions_Props_Action_Token_Resolver } from './resolvers/extensions-props-action-token.resolver';
+
+
+const routes: Routes = [
+  {
+    path: 'admin',
+    canActivate: [AuthGuard, PermissionGuard],
+    resolve: [Extensions_Props_Action_Token_Resolver, 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: '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

@@ -0,0 +1,109 @@
+import { NgModule, NgModuleFactory, ModuleWithProviders, inject } 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,
+  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 { 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 { Toolbar_Action_Contributors, Entity_Action_Contributors, Entity_Props_Contributors } from './resolvers/extensions-props-action-token.resolver';
+
+@NgModule({
+  declarations: [
+    EntriesComponent,
+    FieldsComponent,
+    SectionsComponent,
+    FieldGroupComponent,
+    CreateFieldComponent,
+    EditFieldComponent,
+    CreateOrEditFieldComponent,
+    CreateOrEditComponent,
+    CreateComponent,
+    EditComponent,
+    CreateOrEditEntriesComponent,
+    TableConfigComponent,
+    TableControlComponent,
+    MatrixConfigComponent,
+    MatrixControlComponent,
+    EntryConfigComponent,
+    EntryControlComponent,
+    
+  ],
+  imports: [
+    CoreModule,
+    ThemeSharedModule,
+    FormsModule,
+    CmsRoutingModule,
+    NgbNavModule,
+    NgbAccordionModule,
+    NgbDropdownModule,
+    PageModule,
+    NzSelectModule,
+    DynamicFormModule.forRoot({
+      cmsFieldControlGroup: [...FieldControlGroup, ...fielFieldControlGroup, ...ckEditorFieldControlGroup]
+    }),
+  ],
+  exports: [
+    TableConfigComponent,
+    TableControlComponent,
+    MatrixConfigComponent,
+    MatrixControlComponent,
+    EntryConfigComponent,
+    EntryControlComponent,
+  ],
+  providers: [
+  ],
+
+})
+export class CmsModule {
+
+  static forChild(options: any = {}): ModuleWithProviders<CmsModule> {
+    return {
+      ngModule: CmsModule,
+      providers: [
+        {
+          provide: Toolbar_Action_Contributors,
+          useValue: options.toolbarActionContributors,
+        },
+        {
+          provide: Entity_Action_Contributors,
+          useValue: options.entityActionContributors,
+        },
+        {
+          provide: Entity_Props_Contributors,
+          useValue: options.entityPropContributors,
+        },
+      ],
+    };
+  }
+  static forLazy(options: any = {}): NgModuleFactory<CmsModule> {
+    return new LazyModuleFactory(CmsModule.forChild(options));
+  }
+}

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

@@ -0,0 +1,137 @@
+<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>
+                    <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" *ngIf="SectionSelect.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 entryTypesList;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-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: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 === 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

@@ -0,0 +1 @@
+::ng-deep .create-or-edit-entry-page{.dignite_page{height:calc(100vh - 32px - 53px - 40px);overflow:auto;background:transparent}.form-control,.form-select{padding:.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}}