@sankhyalabs/sankhyablocks 10.0.28 → 10.0.29

package/dist/cjs/{SnkMultiSelectionListDataSource-9f97b14d.js → SnkMultiSelectionListDataSource-decf3728.js}

@@ -204,41 +204,35 @@ class CommonsExporter {
     return this.columnsState;
   }
   async buildColumnsMetadata(gridColumns) {
-    var _a, _b, _c;
+    var _a;
     const columnsMetadata = [];
+    const searchPlusDescriptionIds = this.collectSearchPlusDescriptionIds(gridColumns);
     for (const column of gridColumns) {
+      if (this.isHiddenColumn(column)) {
+        continue;
+      }
       /**
-       * TODO: Analisar e criar uma melhor forma de tratar essa validação do "RECDESP".
+       * A grid adiciona uma coluna auxiliar para a descrição de campos SEARCHPLUS
+       * (ex.: "ENTITYNAME.DESCRIPTIONFIELD"). A descrição já é emitida ao processar
+       * o próprio SEARCHPLUS, então pulamos a auxiliar para evitar duplicar a coluna.
        */
-      if (column.hidden && column.name !== "RECDESP") {
+      if (searchPlusDescriptionIds.has(column.name)) {
         continue;
       }
       const fieldData = (_a = this.dataUnit) === null || _a === void 0 ? void 0 : _a.getField(column.name);
       const customFormatter = await this.grid.getCustomValueFormatter(column.name);
-      const isUserInterfaceSEARCH = (fieldData === null || fieldData === void 0 ? void 0 : fieldData.userInterface) === UnitMetadata.UserInterface.SEARCH;
-      const widthColumnDefault = 60;
-      const labelColumn = isUserInterfaceSEARCH ? "Cód. " : column.label;
-      let descriptionColumn = undefined;
+      const isSearchField = this.isSearchUserInterface(fieldData);
+      const labelColumn = isSearchField ? "Cód. " : column.label;
       let columnData = {
         id: column.name,
         label: labelColumn,
-        width: isUserInterfaceSEARCH ? (labelColumn.length * this.DEFAULT_FONT_SIZE) : column.width,
+        width: isSearchField ? (labelColumn.length * this.DEFAULT_FONT_SIZE) : column.width,
         type: fieldData === null || fieldData === void 0 ? void 0 : fieldData.dataType,
         userInterface: fieldData === null || fieldData === void 0 ? void 0 : fieldData.userInterface,
         customFormatter
       };
-      if (isUserInterfaceSEARCH && ((_b = fieldData === null || fieldData === void 0 ? void 0 : fieldData.properties) === null || _b === void 0 ? void 0 : _b.DESCRIPTIONFIELD) != undefined) {
-        const labelDescription = (_c = fieldData === null || fieldData === void 0 ? void 0 : fieldData.properties) === null || _c === void 0 ? void 0 : _c.DESCRIPTIONENTITY;
-        const mergedFrom = fieldData.properties.mergedFrom;
-        const descriptionField = `${fieldData.properties.ENTITYNAME}.${fieldData.properties.DESCRIPTIONFIELD}`;
-        descriptionColumn = {
-          id: `${mergedFrom ? (mergedFrom + ".") : ""}${descriptionField}`,
-          label: labelDescription,
-          width: isUserInterfaceSEARCH && labelDescription ? (labelDescription.length * this.DEFAULT_FONT_SIZE - widthColumnDefault) : column.width,
-          type: core.DataType.TEXT,
-          userInterface: UnitMetadata.UserInterface.LONGTEXT,
-          descriptionFrom: fieldData.name
-        };
+      let descriptionColumn = isSearchField ? this.buildDescriptionColumn(fieldData, column) : undefined;
+      if (descriptionColumn) {
         const newWidth = this.getWidthByMetaData(column === null || column === void 0 ? void 0 : column.width, columnData === null || columnData === void 0 ? void 0 : columnData.width, descriptionColumn === null || descriptionColumn === void 0 ? void 0 : descriptionColumn.width);
         columnData = Object.assign(Object.assign({}, columnData), { width: newWidth === null || newWidth === void 0 ? void 0 : newWidth.codWidth });
         descriptionColumn = Object.assign(Object.assign({}, descriptionColumn), { width: newWidth === null || newWidth === void 0 ? void 0 : newWidth.descWidth, label: (descriptionColumn === null || descriptionColumn === void 0 ? void 0 : descriptionColumn.label) || (column === null || column === void 0 ? void 0 : column.label) });
@@ -249,6 +243,59 @@ class CommonsExporter {
     }
     return columnsMetadata || [];
   }
+  collectSearchPlusDescriptionIds(gridColumns) {
+    var _a;
+    const descriptionIds = new Set();
+    for (const column of gridColumns) {
+      if (this.isHiddenColumn(column)) {
+        continue;
+      }
+      const fieldData = (_a = this.dataUnit) === null || _a === void 0 ? void 0 : _a.getField(column.name);
+      if (!this.isSearchUserInterface(fieldData)) {
+        continue;
+      }
+      const descriptionId = this.buildDescriptionColumnId(fieldData);
+      if (descriptionId) {
+        descriptionIds.add(descriptionId);
+      }
+    }
+    return descriptionIds;
+  }
+  /**
+   * TODO: Analisar e criar uma melhor forma de tratar essa validação do "RECDESP".
+   */
+  isHiddenColumn(column) {
+    return column.hidden && column.name !== "RECDESP";
+  }
+  isSearchUserInterface(fieldData) {
+    return (fieldData === null || fieldData === void 0 ? void 0 : fieldData.userInterface) === UnitMetadata.UserInterface.SEARCH
+      || (fieldData === null || fieldData === void 0 ? void 0 : fieldData.userInterface) === UnitMetadata.UserInterface.SEARCHPLUS;
+  }
+  buildDescriptionColumnId(fieldData) {
+    const properties = fieldData === null || fieldData === void 0 ? void 0 : fieldData.properties;
+    if ((properties === null || properties === void 0 ? void 0 : properties.DESCRIPTIONFIELD) == undefined) {
+      return undefined;
+    }
+    const descriptionField = `${properties.ENTITYNAME}.${properties.DESCRIPTIONFIELD}`;
+    return properties.mergedFrom ? `${properties.mergedFrom}.${descriptionField}` : descriptionField;
+  }
+  buildDescriptionColumn(fieldData, column) {
+    var _a;
+    const id = this.buildDescriptionColumnId(fieldData);
+    if (!id) {
+      return undefined;
+    }
+    const labelDescription = (_a = fieldData === null || fieldData === void 0 ? void 0 : fieldData.properties) === null || _a === void 0 ? void 0 : _a.DESCRIPTIONENTITY;
+    const widthColumnDefault = 60;
+    return {
+      id,
+      label: labelDescription,
+      width: labelDescription ? (labelDescription.length * this.DEFAULT_FONT_SIZE - widthColumnDefault) : column.width,
+      type: core.DataType.TEXT,
+      userInterface: UnitMetadata.UserInterface.LONGTEXT,
+      descriptionFrom: fieldData.name
+    };
+  }
   getWidthByMetaData(maxWidth, widthCod, widthDescription) {
     const totalCurrentWidth = widthCod + widthDescription;
     const codPercentage = widthCod / totalCurrentWidth;

package/dist/cjs/snk-grid.cjs.entry.js

@@ -8,7 +8,7 @@ const DataUnit = require('@sankhyalabs/core/dist/dataunit/DataUnit');
 const utils = require('@sankhyalabs/ezui/dist/collection/utils');
 require('./DataFetcher-21f8c2dc.js');
 require('./ISave-f926fe9e.js');
-const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-9f97b14d.js');
+const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-decf3728.js');
 const index$1 = require('./index-e3e39724.js');
 require('@sankhyalabs/ezui/dist/collection/utils/constants');
 require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');

package/dist/cjs/snk-simple-crud.cjs.entry.js

@@ -9,7 +9,7 @@ const constants = require('./constants-6d82e405.js');
 const taskbarElements = require('./taskbar-elements-f3ecbf5c.js');
 require('./DataFetcher-21f8c2dc.js');
 require('./ISave-f926fe9e.js');
-const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-9f97b14d.js');
+const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-decf3728.js');
 const index$1 = require('./index-e3e39724.js');
 require('@sankhyalabs/ezui/dist/collection/utils/constants');
 require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');