@dignite-ng/expand.cms 0.0.50 → 0.0.51

package/fesm2022/dignite-ng-expand.cms.mjs

@@ -460,21 +460,23 @@ class ValidatorsService {
         this._LocalizationService = inject(LocalizationService);
     }
     /**检查表单- */
-    isCheckForm(input) {
+    /**检查表单- */
+    isCheckForm(input, 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(`CmsKit::${element}`)} 字段`;
+                let info = `"${this._LocalizationService.instant(`${module}::${element}`)}" `;
                 if (element.includes('.') && !element.includes('].')) {
                     let arr = element.split('.');
-                    info = `请检查 ${this._LocalizationService.instant(`Cms::${arr[0]}`)} 的 ${this._LocalizationService.instant(`Cms::${arr[1]}`)}字段`;
+                    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(`Cms::${arrStart[0]}`)}[${arrStart[1]}] 的 ${this._LocalizationService.instant(`Cms::${arr[1]}`)}字段`;
+                    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;
@@ -1120,12 +1122,12 @@ class CreateComponent {
         if (!this.isSubmit)
             return;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (!this.newEntity.valid)
             return;
         this._EntryAdminService.create(input).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._location.back();
             this._updateListService.updateList();
         });
@@ -1212,12 +1214,12 @@ class EditComponent {
         if (!this.isSubmit)
             return;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (!this.newEntity.valid)
             return;
         this._EntryAdminService.update(this.entrySelect.id, input).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this.backTo();
             this._updateListService.updateList();
         });
@@ -1359,14 +1361,14 @@ class FieldGroupComponent {
         let input = this.createForm.value;
         this.modalBusy = true;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.createForm);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         this._FieldGroupAdminService.create(input).pipe(finalize$1(() => {
             this.modalBusy = false;
             this.createGroupOpen = false;
             this.formValidation = '';
         })).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._FieldAbstractsService.getfieldGroupList();
         });
     }
@@ -1375,14 +1377,14 @@ class FieldGroupComponent {
         let input = this.editGroupForm.value;
         this.modalBusy = true;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.createForm);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         this._FieldGroupAdminService.update(this.fieldGroupId, input).pipe(finalize$1(() => {
             this.modalBusy = false;
             this.editGroupOpen = false;
             this.formValidation = '';
         })).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._FieldAbstractsService.getfieldGroupList();
         });
     }
@@ -1663,12 +1665,12 @@ class CreateFieldComponent {
         let input = this.newEntity.value;
         // if (!this.isSubmit) return;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (!this.newEntity.valid)
             return;
         this._FieldAdminService.create(input).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._location.back();
             this._UpdateListService.updateList();
         });
@@ -1749,12 +1751,12 @@ class EditFieldComponent {
         if (!this.isSubmit)
             return;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (!this.newEntity.valid)
             return;
         this._FieldAdminService.update(this.fieldId, input).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._location.back();
             this._UpdateListService.updateList();
         });
@@ -1900,7 +1902,7 @@ class SectionsComponent {
     createSave() {
         let input = this.createOrEditForm.value;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.createOrEditForm);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (!this.createOrEditForm.valid)
             return;
@@ -1912,7 +1914,7 @@ class SectionsComponent {
             this.visibleOpen = false;
         }))
             .subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this.list.get();
         });
     }
@@ -1921,7 +1923,7 @@ class SectionsComponent {
             let input = this.createOrEditForm.value;
             input.concurrencyStamp = this.selected.concurrencyStamp;
             this.formValidation = this._ValidatorsService.getFormValidationStatus(this.createOrEditForm);
-            if (this._ValidatorsService.isCheckForm(this.formValidation))
+            if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
                 return;
             if (!this.createOrEditForm.valid)
                 return;
@@ -1933,7 +1935,7 @@ class SectionsComponent {
                 this.visibleOpen = false;
             }))
                 .subscribe(res => {
-                this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+                this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
                 this.list.get();
             });
         }, 100);
@@ -2404,11 +2406,11 @@ class CreateOrEditComponent {
     save() {
         let input = this.newEntity.value;
         this.formValidation = this._ValidatorsService.getFormValidationStatus(this.newEntity);
-        if (this._ValidatorsService.isCheckForm(this.formValidation))
+        if (this._ValidatorsService.isCheckForm(this.formValidation, 'Cms'))
             return;
         if (this.entryTypesSelect) {
             this._EntryTypeAdminService.update(this.entryTypesSelect.id, input).subscribe(res => {
-                this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+                this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
                 this._location.back();
                 this._UpdateListService.updateList();
             });
@@ -2416,7 +2418,7 @@ class CreateOrEditComponent {
         }
         input.sectionId = this.sectionId;
         this._EntryTypeAdminService.create(input).subscribe(res => {
-            this.toaster.success(this._LocalizationService.instant(`CmsKit::SavedSuccessfully`));
+            this.toaster.success(this._LocalizationService.instant(`AbpUi::SuccessfullyDeleted`));
             this._location.back();
             this._UpdateListService.updateList();
         });