imm-element-ui 1.3.8 → 1.3.9

package/fesm2022/imm-element-ui.mjs

@@ -1238,8 +1238,8 @@ const _fieldUtils = {
             return '';
         }
         if (_fieldUtils.isISO8601(raw)) {
-            const dateFormat = field.datePickerProps?.showTime ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd';
-            return datePipe.transform(raw, dateFormat, 'GMT') || raw;
+            const datePipeFormat = field.datePickerProps?.datePipeFormat ?? 'yyyy-MM-dd';
+            return datePipe.transform(raw, datePipeFormat, 'GMT') || raw;
         }
         if (!stringMode && field?.datePickerProps?.selectionMode == 'range' && raw.includes('~')) {
             const [start, end] = raw.split('~');
@@ -2091,6 +2091,7 @@ class DatePickerComponent {
                 this.props = this.field().datePickerProps;
                 this.handleHookChange();
                 this.handleDisabled();
+                this.handleDatePipeFormat();
             }
         });
         effect(() => {
@@ -2147,6 +2148,47 @@ class DatePickerComponent {
             throw new Error('Invalid date format. Expected yyyy-MM-dd hh:mm:ss');
         }
     }
+    handleDatePipeFormat() {
+        this.props.datePipeFormat = this.convertPrimeNgToDatePipeFormat(this.props.dateFormat);
+        if (!this.props.showTime)
+            return;
+        const timeSeparator = this.props.timeSeparator ?? ':';
+        const timeFormat = `HH${timeSeparator}mm${timeSeparator}ss`;
+        this.props.datePipeFormat += ` ${timeFormat}`;
+    }
+    convertPrimeNgToDatePipeFormat(primeNgFormat) {
+        if (!primeNgFormat)
+            return 'yyyy-MM-dd';
+        const formatMap = {
+            d: 'd',
+            dd: 'dd',
+            m: 'M',
+            mm: 'MM',
+            M: 'MMM',
+            MM: 'MMMM',
+            y: 'yy',
+            yy: 'yyyy',
+        };
+        const commonFormats = {
+            'mm/dd/yy': 'MM/dd/yyyy',
+            'dd/mm/yy': 'dd/MM/yyyy',
+            'yy-mm-dd': 'yyyy-MM-dd',
+            'dd-mm-yy': 'dd-MM-yyyy',
+            'mm-dd-yy': 'MM-dd-yyyy',
+        };
+        if (commonFormats[primeNgFormat]) {
+            return commonFormats[primeNgFormat];
+        }
+        // 替换转义字符
+        let result = primeNgFormat.replace(/'([^']*)'/g, (match, p1) => {
+            return `'${p1}'`;
+        });
+        // 替换格式标记
+        result = result.replace(/[a-zA-Z]+/g, (match) => {
+            return formatMap[match] || match;
+        });
+        return result;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DatePickerComponent, deps: [{ token: ActionService }, { token: i0.Renderer2 }, { token: i1$2.DatePipe }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: DatePickerComponent, isStandalone: true, selector: "form-datepicker", inputs: { field: { classPropertyName: "field", publicName: "field", isSignal: true, isRequired: false, transformFunction: null } }, providers: [DatePipe], viewQueries: [{ propertyName: "datePicker", first: true, predicate: DatePicker, descendants: true }, { propertyName: "datePickerRef", first: true, predicate: DatePicker, descendants: true, read: ElementRef }], ngImport: i0, template: `<p-datepicker
 		[id]="field()?.uuid"
@@ -4443,7 +4485,7 @@ const _gridUtils = {
             if (item.hasOwnProperty('i18nKey')) {
                 let headerName = i18n.fanyi(item.i18nKey);
                 cols = { ...item, headerName };
-                delete cols.i18nKey;
+                // delete cols.i18nKey;
             }
             else {
                 cols = { ...item };
@@ -6391,16 +6433,23 @@ const _searchUitls = {
         }
         return columnFilters?.filter((columnFilter) => !cascadeClearList.includes(columnFilter.columnField));
     },
-    extractSearchItems(columnDefs, searchItems = []) {
+    extractSearchItems(columnDefs, i18n, searchItems = []) {
         columnDefs?.forEach((col) => {
             if (col.children) {
-                this.extractSearchItems(col.children, searchItems);
+                this.extractSearchItems(col.children, i18n, searchItems);
             }
             else {
                 if (!col.search) {
                     return;
                 }
-                let searchItem = { field: col.field, label: col.headerName || col.field, filterType: col.searchType, filter: true };
+                let label;
+                if (col.hasOwnProperty('i18nKey')) {
+                    label = i18n.fanyi(col.i18nKey);
+                }
+                else {
+                    label = col.headerName || col.field;
+                }
+                let searchItem = { field: col.field, label, filterType: col.searchType, filter: true };
                 if (col.searchType == 'date') {
                     searchItem.format = col.searchFormat ?? 'yy-mm-dd';
                 }
@@ -6855,7 +6904,7 @@ class SearchComponent {
         effect(() => {
             const columnDefs = this.gridOptions()?.columnDefs;
             this.visible = this.gridOptions()?.showSearch ?? true;
-            this.searchItems = searchUtils.extractSearchItems(columnDefs);
+            this.searchItems = searchUtils.extractSearchItems(columnDefs, this.i18n);
             this.sortOptions = columnDefs.map((columnDef) => ({ key: columnDef.field, label: columnDef.headerName }));
         }, { allowSignalWrites: true });
         effect(() => {