@zeedhi/common 1.89.0 → 1.90.0

package/dist/zd-common.esm.js

@@ -5723,41 +5723,13 @@ FormatterParserProvider.registerFormatter('column_ZdSelect', ({ column, value, r
     if (!Object.keys(currentRow).length)
         return typeof value === 'object' ? '' : value;
     const textColumn = formatterDataText || dataText;
-    if (textColumn) {
-        if (typeof textColumn === 'string') {
-            return currentRow[textColumn] || value;
-        }
-        const dataTextNames = [];
-        const masks = [];
-        textColumn.forEach((text) => {
-            if (typeof text === 'string') {
-                dataTextNames.push(text);
-                masks.push('');
-            }
-            else {
-                dataTextNames.push(text.name);
-                if (Accessor.isAccessorDefinition(text.mask)) {
-                    const [controller, accessor] = Accessor.getAccessor(text.mask);
-                    masks.push(Loader.getInstance(controller)[accessor]);
-                }
-                else {
-                    masks.push(text.mask);
-                }
-            }
-        });
-        return dataTextNames.reduce((result, columnName, index) => {
-            const rowCell = currentRow[columnName];
-            if (rowCell !== undefined && rowCell !== null) {
-                const separator = index > 0 ? (dataTextSeparator || ' | ') : '';
-                const mask = masks[index];
-                const maskValue = typeof mask === 'function' ? mask(rowCell) : mask;
-                const masked = masks[index] ? Mask.getValueWithMask(rowCell, maskValue) : rowCell;
-                return result + separator + masked;
-            }
-            return result;
-        }, '');
+    if (!textColumn)
+        return value;
+    if (typeof textColumn === 'string') {
+        return currentRow[textColumn] || value;
     }
-    return value;
+    const formatterFn = FormatterParserProvider.getFormatter('ZdSelect');
+    return formatterFn(currentRow, { dataText: textColumn, dataTextSeparator });
 });
 FormatterParserProvider.registerFormatter('column_ZdSelectMultiple', ({ column, value, row, componentProps, }) => {
     if (!value || !Array.isArray(value) || value.length === 0)
@@ -9959,29 +9931,11 @@ class SelectMultiple extends Select {
         if (!value || value.length === 0) {
             return [];
         }
-        const dataTextNames = [];
-        const masks = [];
-        this.dataText.forEach((text) => {
-            if (typeof text === 'string') {
-                dataTextNames.push(text);
-                masks.push('');
-            }
-            else {
-                dataTextNames.push(text.name);
-                masks.push(text.mask);
-            }
-        });
+        const selectFormatter = FormatterParserProvider.getFormatter('ZdSelect');
         const formattedValue = value.map((row) => {
             const isDisabled = this.dataDisabled && row[this.dataDisabled];
             const formattedRow = { value: row[this.dataValue], disabled: isDisabled, originalRow: row };
-            formattedRow.text = dataTextNames.reduce((result, columnName, index) => {
-                if (row[columnName]) {
-                    const separator = index > 0 ? this.dataTextSeparator : '';
-                    const masked = masks[index] ? Mask.getValueWithMask(row[columnName], masks[index]) : row[columnName];
-                    return result + separator + masked;
-                }
-                return result;
-            }, '');
+            formattedRow.text = selectFormatter(row, this);
             return formattedRow;
         });
         return formattedValue;

package/dist/zd-common.umd.js

@@ -5730,41 +5730,13 @@
       if (!Object.keys(currentRow).length)
           return typeof value === 'object' ? '' : value;
       const textColumn = formatterDataText || dataText;
-      if (textColumn) {
-          if (typeof textColumn === 'string') {
-              return currentRow[textColumn] || value;
-          }
-          const dataTextNames = [];
-          const masks = [];
-          textColumn.forEach((text) => {
-              if (typeof text === 'string') {
-                  dataTextNames.push(text);
-                  masks.push('');
-              }
-              else {
-                  dataTextNames.push(text.name);
-                  if (core.Accessor.isAccessorDefinition(text.mask)) {
-                      const [controller, accessor] = core.Accessor.getAccessor(text.mask);
-                      masks.push(core.Loader.getInstance(controller)[accessor]);
-                  }
-                  else {
-                      masks.push(text.mask);
-                  }
-              }
-          });
-          return dataTextNames.reduce((result, columnName, index) => {
-              const rowCell = currentRow[columnName];
-              if (rowCell !== undefined && rowCell !== null) {
-                  const separator = index > 0 ? (dataTextSeparator || ' | ') : '';
-                  const mask = masks[index];
-                  const maskValue = typeof mask === 'function' ? mask(rowCell) : mask;
-                  const masked = masks[index] ? core.Mask.getValueWithMask(rowCell, maskValue) : rowCell;
-                  return result + separator + masked;
-              }
-              return result;
-          }, '');
+      if (!textColumn)
+          return value;
+      if (typeof textColumn === 'string') {
+          return currentRow[textColumn] || value;
       }
-      return value;
+      const formatterFn = core.FormatterParserProvider.getFormatter('ZdSelect');
+      return formatterFn(currentRow, { dataText: textColumn, dataTextSeparator });
   });
   core.FormatterParserProvider.registerFormatter('column_ZdSelectMultiple', ({ column, value, row, componentProps, }) => {
       if (!value || !Array.isArray(value) || value.length === 0)
@@ -9966,29 +9938,11 @@
           if (!value || value.length === 0) {
               return [];
           }
-          const dataTextNames = [];
-          const masks = [];
-          this.dataText.forEach((text) => {
-              if (typeof text === 'string') {
-                  dataTextNames.push(text);
-                  masks.push('');
-              }
-              else {
-                  dataTextNames.push(text.name);
-                  masks.push(text.mask);
-              }
-          });
+          const selectFormatter = core.FormatterParserProvider.getFormatter('ZdSelect');
           const formattedValue = value.map((row) => {
               const isDisabled = this.dataDisabled && row[this.dataDisabled];
               const formattedRow = { value: row[this.dataValue], disabled: isDisabled, originalRow: row };
-              formattedRow.text = dataTextNames.reduce((result, columnName, index) => {
-                  if (row[columnName]) {
-                      const separator = index > 0 ? this.dataTextSeparator : '';
-                      const masked = masks[index] ? core.Mask.getValueWithMask(row[columnName], masks[index]) : row[columnName];
-                      return result + separator + masked;
-                  }
-                  return result;
-              }, '');
+              formattedRow.text = selectFormatter(row, this);
               return formattedRow;
           });
           return formattedValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.89.0",
+  "version": "1.90.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "338bd948c7d990ff8ca1c26470b5da2220f10730"
+  "gitHead": "87d5d71b724457ce1332c43f6b0809d02d27d1b0"
 }

package/types/components/zd-grid/grid-column.d.ts

@@ -26,10 +26,6 @@ export declare class GridColumn extends Column implements IGridColumn {
         events?: import("..").IComponentEvents<import("@zeedhi/core").IEventParam<any>> | undefined;
         directives?: import("..").IComponentDirectives | undefined;
         isVisible?: string | boolean | undefined;
-        /**
-         * Creates a new Grid Column.
-         * @param props Grid column properties
-         */
         dark?: boolean | undefined;
         light?: boolean | undefined;
         keyMap?: import("@zeedhi/core").IKeyMap<import("@zeedhi/core").IEventParam<any>> | undefined;