@xuda.io/runtime-bundle 1.0.992 → 1.0.994

package/js/xuda-runtime-bundle.js

@@ -32240,28 +32240,28 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
           .attr('xu-ui-id', $elm.attr('xu-ui-id'))
           .appendTo(tmp_$div)
           .hide();
-        // was true before
-        if ($elm.data().xuData.xurender_node) {
-          $xurender.data({
-            xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
-            xuData: $elm.data().xuData.xurender_node.data().xuData || {},
-          });
-        } else {
-          // default new state
-
-          $xurender.data({
-            xuAttributes: $elm.data().xuAttributes || {},
-            xuData: $elm.data().xuData || {},
-          });
-          const original_data_obj = {
-            nodeP: _.cloneDeep($elm.data().xuData.node_org),
-            paramsP: $elm.data().xuData.paramsP,
-            $container: $elm.clone(true),
-            parent_infoP: parent_infoP,
-          };
+        // // was true before
+        // if ($elm.data().xuData.xurender_node) {
+        //   $xurender.data({
+        //     xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
+        //     xuData: $elm.data().xuData.xurender_node.data().xuData || {},
+        //   });
+        // } else {
+        // default new state
+
+        $xurender.data({
+          xuAttributes: $elm.data().xuAttributes || {},
+          xuData: $elm.data().xuData || {},
+        });
+        const original_data_obj = {
+          nodeP: _.cloneDeep($elm.data().xuData.node_org),
+          paramsP: $elm.data().xuData.paramsP,
+          $container: $elm.clone(true),
+          parent_infoP: parent_infoP,
+        };
 
-          $xurender.data().xuData.original_data_obj = original_data_obj;
-        }
+        $xurender.data().xuData.original_data_obj = original_data_obj;
+        // }
         $elm.replaceWith(tmp_$div.children());
         func.events.delete_job(SESSION_ID, jobNoP);
         // }
@@ -32515,9 +32515,10 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
       CLIENT_ACTIVITY_TS = Date.now();
       const trigger = val.key.split('xu-on:')[1].toLowerCase();
       $elm.on(trigger, async function (evt) {
-        if (_.isEmpty($elm.data().xuAttributes)) return;
+        const _$elm = $(evt.currentTarget);
+        if (_.isEmpty(_$elm.data().xuAttributes)) return;
 
-        for await (const [key, val] of Object.entries($elm.data().xuAttributes['xu-on:' + evt.type])) {
+        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;
@@ -32540,7 +32541,7 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
 
               if (!val2.data.enabled) continue; // added Jul 3, 25 - condition validate on execution
 
-              func.events.add_to_queue(SESSION_ID, 'element event', val2.id, evt.type, val2.data.action, val2.data.name, null, $elm.attr('xu-ui-id'), null, evt, null, null, null, paramsP.dsSessionP, null, null, null, evt.type, val2.data.name, null, null, val2, null, null, null, null, null, null);
+              func.events.add_to_queue(SESSION_ID, 'element event', val2.id, evt.type, val2.data.action, val2.data.name, null, _$elm.attr('xu-ui-id'), null, evt, null, null, null, paramsP.dsSessionP, null, null, null, evt.type, val2.data.name, null, null, val2, null, null, null, null, null, null);
             }
           }
         }