feat: modify setTableAndData with optional attribute

README.md

@@ -140,12 +140,6 @@ Please ensure you follow the coding standards used through-out the existing code
 - Indent with 4-spaces, no tabs.
 - Opening brace on same line as if/for/function and so on, closing brace on its own line.
 
-## Some collaborations
-<div >
-    <a href="https://wiki.seeedstudio.com/reTerminal-DM_intro_FUXA/" target="_blank" style="margin-right: 100px; line-height: 60px">
-        <img src="https://frangoteam.org/assets/images/seeed-studio2.png" alt="" style="vertical-align: top"></a>
-</div>
-
 ## Let us know!
 We’d be really happy if you send us your own shapes in order to collect a library to share it with others. Just send an email to [email protected] and do let us know if you have any questions or suggestions regarding our work.
 

client/dist/assets/i18n/en.json

@@ -1268,6 +1268,9 @@
     "script.sys-fnc-getHistoricalTag-text": "$getHistoricalTags(TagIds array, from msec., to msec.)",
     "script.sys-fnc-getHistoricalTag-tooltip":"get historical tags by milliseconds range: $getHistoricalTags([TagIds] as array, from as number, to as number)",
     "script.sys-fnc-getHistoricalTag-params":"'Tag Ids array', 'From msec.', 'To msec.'",
+    "script.sys-fnc-sendMessage-text": "$sendMessage(address, subject, message)",
+    "script.sys-fnc-sendMessage-tooltip": "System function to send Message (Mail): $sendMessage(address as string, subject as string, message as string)",
+    "script.sys-fnc-sendMessage-params": "'address', 'subject', 'message'",
 
     "script.template-chart-data-text": "Customized chart data",
     "script.template-chart-data-tooltip": "Code template of customized chart data to return",

client/dist/index.html

@@ -45,6 +45,6 @@
             </div>
         </div>
     </app-root>
-<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.0c0c5e165c7d6799.js" type="module"></script>
+<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.640abe7ec5bdb5c0.js" type="module"></script>
 
 </body></html>

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fuxa",
-  "version": "1.2.1-2041",
+  "version": "1.2.1-2043",
   "keywords": [],
   "author": "frangoteam <[email protected]>",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

client/src/app/gauges/controls/html-table/data-table/data-table.component.ts

@@ -374,7 +374,7 @@ export class DataTableComponent implements OnInit, AfterViewInit, OnDestroy {
         }
     }
 
-    private addRowDataToTable(dt: number, tagId: string, value: any) {
+    addRowDataToTable(dt: number, tagId: string, value: any) {
         let row = {};
         let timestapColumnId = null;
         let valueColumnId = null;
@@ -438,18 +438,22 @@ export class DataTableComponent implements OnInit, AfterViewInit, OnDestroy {
 
     setTableAndData(tableData: TableData) {
         this.setOfSourceTableData = true;
-        this.displayedColumns = tableData.columns.map(cln => cln.id);
-        this.columnsStyle = tableData.columns;
-        tableData.columns.forEach(clnData => {
-            let column = clnData;
-            column.fontSize = tableData.header?.fontSize;
-            column.color = column.color || tableData.header?.color;
-            column.background = column.background || tableData.header?.background;
-            column.width = column.width || 100;
-            column.align = column.align || TableCellAlignType.left;
-            this.columnsStyle[column.id] = column;
-        });
-        this.dataSource = new MatTableDataSource(tableData.rows);
+        if (tableData.columns) {
+            this.displayedColumns = tableData.columns.map(cln => cln.id);
+            this.columnsStyle = tableData.columns;
+            tableData.columns.forEach(clnData => {
+                let column = clnData;
+                column.fontSize = tableData.header?.fontSize;
+                column.color = column.color || tableData.header?.color;
+                column.background = column.background || tableData.header?.background;
+                column.width = column.width || 100;
+                column.align = column.align || TableCellAlignType.left;
+                this.columnsStyle[column.id] = column;
+            });
+        }
+        if (tableData.rows) {
+            this.dataSource = new MatTableDataSource(tableData.rows);
+        }
         this.bindTableControls();
     }
 
@@ -698,8 +702,8 @@ interface TableData {
     gridColor?: string;
     header?: TableDataHeaderStyle;
     rowStyle?: TableDataRowStyle;
-    columns: TableDataColumnData[];
-    rows: TableDataRow[];
+    columns?: TableDataColumnData[];
+    rows?: TableDataRow[];
 }
 
 interface TableDataPaginatorOptions {

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fuxa-server",
-  "version": "1.2.1-2041",
+  "version": "1.2.1-2043",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {