@xuda.io/xuda-worker-bundle 1.3.2529 → 1.3.2531

package/index.js

@@ -2031,6 +2031,36 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         _dataSourceFilterModelType,
       );
 
+      if (_dataSourceFilterModelType === 'index' && _ds?.progDataSource?.sortModel) {
+        function sortByKeys(array, sortConfig) {
+          return array.sort((a, b) => {
+            for (let config of sortConfig) {
+              const key = config.field_id;
+              const direction = config.sort_dir === 'desc' ? -1 : 1;
+
+              const valA = a.value[key];
+              const valB = b.value[key];
+
+              // Handle numeric comparison
+              if (typeof valA === 'number' && typeof valB === 'number') {
+                if (valA !== valB) {
+                  return (valA - valB) * direction;
+                }
+              }
+              // Handle string comparison
+              else if (typeof valA === 'string' && typeof valB === 'string') {
+                if (valA !== valB) {
+                  return valA.localeCompare(valB) * direction;
+                }
+              }
+            }
+            return 0;
+          });
+        }
+        const sorted = sortByKeys(_ds.v.raw_data.rows, _ds.progDataSource.sortModel);
+        _ds.v.raw_data.rows = sorted;
+      }
+
       if (_ds?.progDataSource?.dataSourceLimit) {
         const ret_rows_found = await func.db.get_query(SESSION_ID, _ds._dataSourceTableId, _ds.v.couchView, dataSourceSession, _ds.viewSourceDesc, 'datasource table', prog_obj.progDataSource.dataSourceReduce, null, null, true, null, null, null, filterModel, _dataSourceFilterModelType);
         _ds.rows_found = ret_rows_found?.rows?.[0]?.value || 0;
@@ -2049,17 +2079,8 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = [];
       }
 
-      // let _KEY = 0;
-      // for (const _VAL of data) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      //   _KEY++;
-      // }
-
       _ds.rows_found = data?.length || 0;
 
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
       let _KEY = 0;
       for (const _VAL of data) {
         _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
@@ -2074,13 +2095,7 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = {};
       }
 
-      // for (let [_KEY, _VAL] of Object.keys(data)) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      // }
       _ds.rows_found = Object.keys(data)?.length || 0;
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
 
       for (let [_KEY, _VAL] of Object.keys(data)) {
         _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
@@ -2095,21 +2110,6 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = '';
       }
 
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
-
-      // let _KEY = 0;
-      // let arr = data.split(",");
-      // for (const _VAL of arr) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      //   _KEY++;
-      // }
-      // _ds.rows_found = arr?.length || 0;
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
-
       let _KEY = 0;
       let arr = data.split(',');
       for (const _VAL of arr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle",
-  "version": "1.3.2529",
+  "version": "1.3.2531",
   "description": "xuda framework",
   "main": "index.js",
   "scripts": {