barsa-novin-ray-core 2.0.96 → 2.0.98

package/fesm2022/barsa-novin-ray-core.mjs

@@ -1399,6 +1399,7 @@ var TableHeaderWidthMode;
     TableHeaderWidthMode[TableHeaderWidthMode["FitToRowContent"] = 1] = "FitToRowContent";
     TableHeaderWidthMode[TableHeaderWidthMode["FitToContainer"] = 2] = "FitToContainer";
     TableHeaderWidthMode[TableHeaderWidthMode["FreeColumnSize"] = 3] = "FreeColumnSize";
+    TableHeaderWidthMode[TableHeaderWidthMode["ColumnWidth"] = 4] = "ColumnWidth";
 })(TableHeaderWidthMode || (TableHeaderWidthMode = {}));
 function setTableThWidth(tableHeaderMode, columns, thList, renderer2) {
     let propName = '';
@@ -1412,8 +1413,11 @@ function setTableThWidth(tableHeaderMode, columns, thList, renderer2) {
         case TableHeaderWidthMode.FreeColumnSize:
             propName = '$Width';
             break;
+        case TableHeaderWidthMode.ColumnWidth:
+            propName = '$ColumnWidth';
+            break;
     }
-    thList.forEach((c, i) => renderer2.setStyle(c, 'width', columns[i].$IsImageOricon ? '42px' : columns[i][propName]));
+    thList.forEach((c, i) => renderer2.setStyle(c, 'width', columns[i].$IsImageOricon && i < thList.length - 1 ? '42px' : columns[i][propName]));
 }
 function calculateColumnContent(columns, moDataList) {
     columns.forEach((column) => {
@@ -1430,8 +1434,12 @@ function calculateColumnWidth(container, columns, moDataList, disableContextMenu
     return { columns: [...columns], contextMenuWidth };
 }
 function setColumnCaptionWidth(column) {
+    if (column.$ColumnWidthNum) {
+        return column.$ColumnWidthNum;
+    }
     const colCaptionWidth = measureText(column.Alias) + 16 + 10;
-    column.$ColumnWidth = `${Math.ceil(colCaptionWidth)}px`;
+    column.$ColumnWidthNum = Math.ceil(colCaptionWidth);
+    column.$ColumnWidth = `${column.$ColumnWidthNum}px`;
     return colCaptionWidth;
 }
 function setColumnWidthByMaxMoContentWidth(moDataList, column) {
@@ -1453,25 +1461,36 @@ function calculateFreeColumnSize(columns) {
     let allColWidth = 0;
     const visibleColumns = columns.filter((c) => !c.Hidden);
     visibleColumns.forEach((col, index) => {
-        const w = col.Width && col.Width > 0 ? col.Width : setColumnCaptionWidth(col);
+        const x = setColumnCaptionWidth(col);
+        const w = col.Width && col.Width > 0 ? col.Width : x;
         allColWidth += w;
         col.$Width = index === visibleColumns.length - 1 ? '100%' : `${w}px`;
     });
     return [...columns];
 }
 function calculateColumnWidthFitToContainer(container, canView, disableContextMenuOverflow, contextMenuItems, columns) {
-    const containerWidth = container.clientWidth;
+    let hasDefinedWidth = true;
+    let containerWidth = columns.map((c) => c.Width).reduce((a, b) => a + b, 0);
+    if (containerWidth === 0) {
+        containerWidth = container.clientWidth;
+        hasDefinedWidth = false;
+    }
     let allColWidth = 0;
     const isMobile = getDeviceIsMobile();
-    columns
-        .filter((c) => !c.Hidden)
-        .forEach((col, index) => {
-        const w = col.Width && col.Width > 0 ? col.Width : setColumnCaptionWidth(col);
+    let remainPercent = 0;
+    const lCols = columns.filter((c, i) => !c.Hidden && !(i === 0 && c.FieldTypeId === 41));
+    lCols.forEach((col, index) => {
+        // اگر فیلد از نوع رنگ نبود و ستون اول هم نبود
+        const x = setColumnCaptionWidth(col);
+        const w = col.Width && col.Width > 0 ? col.Width : x;
         allColWidth += w;
         const percent = (w / containerWidth) * 100;
-        col.$FitContainerWidth = isMobile ? '100%' : `${percent}%`;
-        if (index === columns.length - 1) {
-            col.$FitContainerWidth = isMobile ? '100%' : 'auto';
+        col.$FitContainerWidth = isMobile || col.Width === 0 ? '100%' : `${percent}%`;
+        if (index === lCols.length - 1 && !hasDefinedWidth) {
+            col.$FitContainerWidth = 100 - remainPercent + '%';
+        }
+        else {
+            remainPercent += percent;
         }
     });
     // const canViewButtonWidth = canView ? 40 : 0;
@@ -3379,11 +3398,19 @@ class PortalService {
             }, 5000);
         }));
     }
+    ReportExecuteById(reportId) {
+        const ulvParams = this._getUlvParamsBy('', reportId);
+        return from(this._reportExecutePromise(ulvParams));
+    }
     ReportExecute(reportName) {
         return from(this.ReportExecutePromise(reportName));
     }
     ReportExecutePromise(reportName) {
-        const ulvParams = {
+        const ulvParams = this._getUlvParamsBy(reportName);
+        return this._reportExecutePromise(ulvParams);
+    }
+    _getUlvParamsBy(reportName, reportId) {
+        return {
             Flags: {
                 Data: 'True',
                 Extra: 'False',
@@ -3392,8 +3419,11 @@ class PortalService {
                 // General:"False", // ulvmainctrl does not craete ui control raise error
             },
             ReportName: reportName,
+            ReportId: reportId,
             UsageEnum: 'SystemContainer'
         };
+    }
+    _reportExecutePromise(ulvParams) {
         return new Promise((resolve, reject) => {
             BarsaApi.Bw.ExecuteReport({ ulvParams }, (result) => {
                 resolve(result.Data);
@@ -3657,7 +3687,7 @@ class PortalService {
     }
     get loginRoute$() {
         return this.portalData$.pipe(map((portalData) => {
-            const loginPage = portalData?.ChildPageList.MoDataList.find((c) => c.IsLoginRoute);
+            const loginPage = portalData?.ChildPageList.MoDataList.find((c) => c.IsLoginRoute === 'True');
             return loginPage?.Route || 'login';
         }));
     }