@xuda.io/runtime-bundle 1.0.739 → 1.0.741

package/js/xuda-runtime-bundle.js

@@ -27938,28 +27938,28 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   let _ds_0 = _session.DS_GLB[0];
 
   const _ds = func.utils.clean_returned_datasource(SESSION_ID, dsSessionP);
+
+  let obj = { ds: _ds, data: {}, props: _ds.in_parameters || {} };
   try {
     const row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
+    obj.data = _ds?.data_feed?.rows?.[row_idx];
+  } catch (error) {
+    // error normal if find_ROWID_idx fail
+  }
+  let SYS_GLOBAL_OBJ_REFS = _ds_0.data_system['SYS_GLOBAL_OBJ_REFS'];
 
-    let SYS_GLOBAL_OBJ_REFS = _ds_0.data_system['SYS_GLOBAL_OBJ_REFS'];
-
-    let obj = { ds: _ds, data: _ds?.data_feed?.rows?.[row_idx] || {}, props: _ds.in_parameters || {} };
-
-    if ($elm) {
-      const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
-      obj.attributes = attributes;
-      obj.xu_ui_id = $elm.attr('xu-ui-id');
-    }
+  if ($elm) {
+    const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
+    obj.attributes = attributes;
+    obj.xu_ui_id = $elm.attr('xu-ui-id');
+  }
 
-    if (!_.isEqual(SYS_GLOBAL_OBJ_REFS?.[ref_field_id] || {}, obj)) {
-      if (!SYS_GLOBAL_OBJ_REFS[ref_field_id]) {
-        SYS_GLOBAL_OBJ_REFS[ref_field_id] = {};
-      }
-      SYS_GLOBAL_OBJ_REFS[ref_field_id] = obj;
-      ret = true;
+  if (!_.isEqual(SYS_GLOBAL_OBJ_REFS?.[ref_field_id] || {}, obj)) {
+    if (!SYS_GLOBAL_OBJ_REFS[ref_field_id]) {
+      SYS_GLOBAL_OBJ_REFS[ref_field_id] = {};
     }
-  } catch (error) {
-    // error normal if find_ROWID_idx fail
+    SYS_GLOBAL_OBJ_REFS[ref_field_id] = obj;
+    ret = true;
   }
 
   return ret;
@@ -31238,7 +31238,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
             // console.log(key, val);
 
             if (key.substr(0, 6) === 'xu-exp' && key.substr(6, 1) === ':') {
-              if (val?.includes?.(val_field) || val?.includes?.(parameter_in_filed_id)) {
+              if (val?.includes?.('@' + val_field) || val?.includes?.('@' + parameter_in_filed_id)) {
                 attr.push(key);
               }
               return true;
@@ -31252,17 +31252,26 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
                 const classes_obj = _.isString(classes_string) ? JSON.parse(classes_string) : _.defaults(classes_string, {});
 
                 $.each(classes_obj, function (cla, cond) {
-                  if (cond.includes(val_field) || cond?.includes?.(parameter_in_filed_id)) {
-                    // attr.push("xuClass");
+                  if (cond.includes('@' + val_field) || cond?.includes?.('@' + parameter_in_filed_id)) {
                     attr.push('xu-class');
                     return false;
                   }
                 });
+                if (attr.length) {
+                  return false;
+                }
               } catch (e) {
                 console.warn('parse error:' + val);
               }
             }
-            // return attr;
+
+            if (key === 'xu-ui-plugin') {
+              const plugin_str = JSON.stringify(val);
+              if (plugin_str.includes('@' + val_field) || plugin_str?.includes?.('@' + parameter_in_filed_id)) {
+                attr.push(key);
+                return false;
+              }
+            }
           });
 
           const selector_id = $(this).data()?.xuData?.xu_id;
@@ -31909,8 +31918,10 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
             const params_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
             let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, params_obj.params_res, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds, params_obj.params_raw);
             ret = { $new_div: ret_panel };
-            $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
-            $container.data().xuData.xuPanelData = ret_panel.data();
+            if ($container.data().xuData) {
+              $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
+              $container.data().xuData.xuPanelData = ret_panel.data();
+            }
             return ret;
           }