@xuda.io/xuda-worker-bundle-min 1.3.278 → 1.3.280

package/index.js

@@ -2323,17 +2323,19 @@ func.datasource.render_fields_dataset = async function (
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
-  var v = _ds.v;
 
-  const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+  const _progFields = await get_merge_progFields_with_dynamic_fields(
+    SESSION_ID,
+    dsSessionP
+  );
 
-  if (!_view_obj.progFields) {
+  if (!_progFields) {
     return;
   }
 
   const get_value = async (field_id, value) => {
     let view_field_obj = func.common.find_item_by_key(
-      _view_obj.progFields,
+      _progFields,
       "field_id",
       field_id
     );
@@ -2386,7 +2388,7 @@ func.datasource.render_fields_dataset = async function (
   let data_feed = (_ds.data_feed.rows[_ds.currentRecordId] = {});
   _ds.dataset_alias = {};
 
-  for await (const val of _view_obj.progFields) {
+  for await (const val of _progFields) {
     try {
       var fieldId = val.data.field_id;
 
@@ -2463,15 +2465,18 @@ func.datasource.render_fields_form = async function (
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var v = _ds.v;
 
-  const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+  const _progFields = await get_merge_progFields_with_dynamic_fields(
+    SESSION_ID,
+    dsSessionP
+  );
 
-  if (!_view_obj.progFields) {
+  if (!_progFields) {
     return;
   }
 
   const get_value = async (field_id, value) => {
     let view_field_obj = func.common.find_item_by_key(
-      _view_obj.progFields,
+      _progFields,
       "field_id",
       field_id
     );
@@ -2531,7 +2536,7 @@ func.datasource.render_fields_form = async function (
   if (!_ds.data_feed.rows[data.id]) _ds.data_feed.rows[data.id] = {};
   _ds.dataset_alias = {};
 
-  for await (const val of _view_obj.progFields) {
+  for await (const val of _progFields) {
     try {
       var fieldId = val.data.field_id;
 
@@ -2853,24 +2858,7 @@ func.datasource.get_field_init_count = async function (
             );
             break;
           }
-          // if (
-          //   !glb.REFERENCE_LESS_FUNCTIONS.includes(trigger_obj.data.action) &&
-          //   !trigger_obj.data.name.value
-          // ) {
-          //   func.utils.debug_report(
-          //     SESSION_ID,
-          //     "_ds.get_field_init_count",
-          //     "Error initiating event for field:" +
-          //       fieldId +
-          //       " prog:" +
-          //       _ds.v.viewSourceDesc +
-          //       " row:" +
-          //       rowIdP +
-          //       " reason:missing reference",
-          //     "E"
-          //   );
-          //   break;
-          // }
+
           if (trigger_obj.data.enabled) {
             SESSION_OBJ[SESSION_ID].DS_GLB[
               dataSourceSession
@@ -3672,9 +3660,12 @@ func.datasource.get_value = async function (
   org_dsSessionP
 ) {
   const return_value = async (field_id, value) => {
-    const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+    const _progFields = await get_merge_progFields_with_dynamic_fields(
+      SESSION_ID,
+      dsSessionP
+    );
     let view_field_obj = func.common.find_item_by_key(
-      _view_obj.progFields,
+      _progFields,
       "field_id",
       field_id
     );
@@ -3729,8 +3720,6 @@ func.datasource.get_value = async function (
     if (ret.value && typeof ret.value === "string" && ret.type !== "exp") {
       if (/"/.test(ret.value) && ret.value.indexOf("\\") === -1)
         ret.value = ret.value.replace(/"/g, '"');
-      // if (/"/.test(ret.value) && ret.value.indexOf("\\") === -1)
-      //   ret.value = ret.value.replace(/"/g, '\\"');
     }
 
     return {
@@ -4220,14 +4209,10 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   var view = _.cloneDeep(
     await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id)
   );
-  // var tree = _.cloneDeep(
-  //   await func.utils.TREE_OBJ.get(SESSION_ID, args.prog_id)
-  // );
 
   _ds.v.dataSourceSrcType = view.dataSourceSrcType;
   _ds.v.viewExitExp = view.dataSourceExitScript;
 
-  // if (view.progFields) v.progFields = view.progFields;
   if (view.progDataSource) _ds.v.progDataSource = view.progDataSource;
 
   _ds.v.viewIndex = view?.progDataSource?.dataSourceIndexesObj;
@@ -4245,9 +4230,6 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   _ds.v.viewSourceProp = tree_ret.menuType;
   if (view.progEvents) _ds.v.progEvents = view.progEvents;
 
-  // _ds._progDataSource_fields = func.expression.parse(
-  //   JSON.stringify(_ds.v.progDataSource)
-  // );
   _ds._progDataSource_fields = [];
   if (_ds.v.progDataSource) {
     let ret = func.expression.parse(JSON.stringify(_ds.v.progDataSource));
@@ -4365,6 +4347,25 @@ func.datasource.add_dynamic_field_to_dataset = function (
       fieldType: val ? toType(val) : "string",
     },
   });
+};
+const get_merge_progFields_with_dynamic_fields = async function (
+  SESSION_ID,
+  dsSessionP
+) {
+  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
+  const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+
+  var ret_arr = _view_obj.progFields;
+
+  _view_obj.dynamic_fields.forEach((field) => {
+    if (ret_arr.some((e) => e.data.field_id === field.data.field_id)) {
+      return;
+    }
+
+    ret_arr.push(field);
+  });
+
+  return ret_arr;
 };
  func.utils = {};
 

package/package.json

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