@xuda.io/runtime-bundle 1.0.676 → 1.0.678

package/js/xuda-runtime-slim.js

@@ -3599,6 +3599,16 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         filterModelUserSql: _ds.progDataSource.filterModelUserSql,
       };
 
+      let _dataSourceFilterModelType = ds?.progDataSource?.dataSourceFilterModelType;
+
+      if (ds?.progDataSource?.dataSourceFilterModelTypeFx) {
+        const fx_ret = await func.expression.get(SESSION_ID, _ds.progDataSource.dataSourceFilterModelTypeFx, dataSourceSession, 'query');
+        _dataSourceFilterModelType = fx_ret.result;
+      }
+      if (!['query', 'index'].includes(_dataSourceFilterModelType)) {
+        return func.utils.debug_report(SESSION_ID, 'Data source', `Valid values for dataSourceFilterModelType are: "query" or "index" (${_dataSourceFilterModelType})`, 'E');
+      }
+
       _ds.v.raw_data = await func.db.get_query(
         SESSION_ID,
         _ds._dataSourceTableId,
@@ -3614,27 +3624,11 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         _ds?.progDataSource?.sortModel,
         null,
         filterModel,
-        _ds?.progDataSource?.dataSourceFilterModelType,
+        _dataSourceFilterModelType,
       );
 
       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,
-          _ds?.progDataSource?.dataSourceFilterModelType,
-        );
+        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;
       } else {
         _ds.rows_found = _ds?.v?.raw_data?.rows?.length || 0;
@@ -11510,24 +11504,6 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
         .filter(function () {
           // // look if the changed field include in the calling in parameters
           let parameter_in_filed_id;
-          // const _$callingContainer = $(this).data()?.xuData?.paramsP?.$callingContainerP;
-          // if (_$callingContainer) {
-          //   const _source_xuAttributes = _$callingContainer.data()?.xuAttributes;
-          //   if (_source_xuAttributes) {
-          //     for (const [attr, value] of Object.entries(_source_xuAttributes)) {
-          //       if (value && typeof value === 'string' && value.includes(val_field)) {
-          //         const pattern = /xu-exp:(\w+)/;
-          //         const match = attr.match(pattern);
-          //         if (match) {
-          //           parameter_in_filed_id = attr.split(':')[1];
-          //         } else {
-          //           parameter_in_filed_id = attr;
-          //         }
-          //         break;
-          //       }
-          //     }
-          //   }
-          // }
 
           let attr = [];
 
@@ -12305,7 +12281,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
     'xu-bind': async function ($elm, val) {
       if (is_skeleton) return;
 
-      // let view_field_id = val.value;
       let val_is_reference_field = false;
 
       let _prog_id = $elm.data().xuData.paramsP.prog_id;
@@ -12399,17 +12374,9 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
           return await func.datasource.update(SESSION_ID, datasource_changes);
         }
 
-        // update array for checkbox that not in xu-for
+        // update array for radio that not in xu-for
         if (field_prop.props.fieldType === 'array' && $elm.attr('type') === 'radio' && val_is_reference_field) {
-          let arr_value_before_cast = _.clone((await func.datasource.get_value(SESSION_ID, bind_field_id, _dsP, _ds.currentRecordId)).ret.value);
           let value_from_getter = bind.getter($elm[0]);
-          // let value;
-          // if (arr_value_before_cast.includes(value_from_getter)) {
-          //   value = arr_value_before_cast.filter((item) => !_.isEqual(item, value_from_getter));
-          // } else {
-          //   arr_value_before_cast.push(value_from_getter);
-          //   value = arr_value_before_cast;
-          // }
 
           let datasource_changes = {
             [_dsP]: {
@@ -12870,6 +12837,11 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
       const trigger = val.key.split('xu-on:')[1].toLowerCase();
       $elm.on(trigger, async function (evt) {
         for await (const [key, val] of Object.entries($elm.data().xuAttributes['xu-on:' + evt.type])) {
+          if (!_.isEmpty(val.props.condition)) {
+            const expCond = await func.expression.get(SESSION_ID, val.props.condition, paramsP.dsSessionP, 'condition', paramsP.recordid); // execute expression
+            if (!expCond.result) continue;
+          }
+
           if (val.event_modifiers && evt[val.event_modifiers]) {
             evt[val.event_modifiers]();
           }

package/js/xuda-runtime-slim.min.es.js

@@ -3600,6 +3600,16 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         filterModelUserSql: _ds.progDataSource.filterModelUserSql,
       };
 
+      let _dataSourceFilterModelType = ds?.progDataSource?.dataSourceFilterModelType;
+
+      if (ds?.progDataSource?.dataSourceFilterModelTypeFx) {
+        const fx_ret = await func.expression.get(SESSION_ID, _ds.progDataSource.dataSourceFilterModelTypeFx, dataSourceSession, 'query');
+        _dataSourceFilterModelType = fx_ret.result;
+      }
+      if (!['query', 'index'].includes(_dataSourceFilterModelType)) {
+        return func.utils.debug_report(SESSION_ID, 'Data source', `Valid values for dataSourceFilterModelType are: "query" or "index" (${_dataSourceFilterModelType})`, 'E');
+      }
+
       _ds.v.raw_data = await func.db.get_query(
         SESSION_ID,
         _ds._dataSourceTableId,
@@ -3615,27 +3625,11 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         _ds?.progDataSource?.sortModel,
         null,
         filterModel,
-        _ds?.progDataSource?.dataSourceFilterModelType,
+        _dataSourceFilterModelType,
       );
 
       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,
-          _ds?.progDataSource?.dataSourceFilterModelType,
-        );
+        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;
       } else {
         _ds.rows_found = _ds?.v?.raw_data?.rows?.length || 0;
@@ -9232,24 +9226,6 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
         .filter(function () {
           // // look if the changed field include in the calling in parameters
           let parameter_in_filed_id;
-          // const _$callingContainer = $(this).data()?.xuData?.paramsP?.$callingContainerP;
-          // if (_$callingContainer) {
-          //   const _source_xuAttributes = _$callingContainer.data()?.xuAttributes;
-          //   if (_source_xuAttributes) {
-          //     for (const [attr, value] of Object.entries(_source_xuAttributes)) {
-          //       if (value && typeof value === 'string' && value.includes(val_field)) {
-          //         const pattern = /xu-exp:(\w+)/;
-          //         const match = attr.match(pattern);
-          //         if (match) {
-          //           parameter_in_filed_id = attr.split(':')[1];
-          //         } else {
-          //           parameter_in_filed_id = attr;
-          //         }
-          //         break;
-          //       }
-          //     }
-          //   }
-          // }
 
           let attr = [];
 
@@ -10027,7 +10003,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
     'xu-bind': async function ($elm, val) {
       if (is_skeleton) return;
 
-      // let view_field_id = val.value;
       let val_is_reference_field = false;
 
       let _prog_id = $elm.data().xuData.paramsP.prog_id;
@@ -10121,17 +10096,9 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
           return await func.datasource.update(SESSION_ID, datasource_changes);
         }
 
-        // update array for checkbox that not in xu-for
+        // update array for radio that not in xu-for
         if (field_prop.props.fieldType === 'array' && $elm.attr('type') === 'radio' && val_is_reference_field) {
-          let arr_value_before_cast = _.clone((await func.datasource.get_value(SESSION_ID, bind_field_id, _dsP, _ds.currentRecordId)).ret.value);
           let value_from_getter = bind.getter($elm[0]);
-          // let value;
-          // if (arr_value_before_cast.includes(value_from_getter)) {
-          //   value = arr_value_before_cast.filter((item) => !_.isEqual(item, value_from_getter));
-          // } else {
-          //   arr_value_before_cast.push(value_from_getter);
-          //   value = arr_value_before_cast;
-          // }
 
           let datasource_changes = {
             [_dsP]: {
@@ -10592,6 +10559,11 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
       const trigger = val.key.split('xu-on:')[1].toLowerCase();
       $elm.on(trigger, async function (evt) {
         for await (const [key, val] of Object.entries($elm.data().xuAttributes['xu-on:' + evt.type])) {
+          if (!_.isEmpty(val.props.condition)) {
+            const expCond = await func.expression.get(SESSION_ID, val.props.condition, paramsP.dsSessionP, 'condition', paramsP.recordid); // execute expression
+            if (!expCond.result) continue;
+          }
+
           if (val.event_modifiers && evt[val.event_modifiers]) {
             evt[val.event_modifiers]();
           }