@xuda.io/xuda-worker-bundle-min 1.3.287 → 1.3.289

package/index.js

@@ -2324,10 +2324,7 @@ func.datasource.render_fields_dataset = async function (
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
 
-  const _progFields = await get_merge_progFields_with_dynamic_fields(
-    SESSION_ID,
-    dataSourceSession
-  );
+  const _progFields = await get_progFields(SESSION_ID, dataSourceSession);
 
   if (!_progFields) {
     return;
@@ -2465,10 +2462,7 @@ func.datasource.render_fields_form = async function (
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var v = _ds.v;
 
-  const _progFields = await get_merge_progFields_with_dynamic_fields(
-    SESSION_ID,
-    dataSourceSession
-  );
+  const _progFields = await get_progFields(SESSION_ID, dataSourceSession);
 
   if (!_progFields) {
     return;
@@ -3660,10 +3654,7 @@ func.datasource.get_value = async function (
   org_dsSessionP
 ) {
   const return_value = async (field_id, value) => {
-    const _progFields = await get_merge_progFields_with_dynamic_fields(
-      SESSION_ID,
-      dsSessionP
-    );
+    const _progFields = await get_progFields(SESSION_ID, dsSessionP);
     let view_field_obj = func.common.find_item_by_key(
       _progFields,
       "field_id",
@@ -3730,6 +3721,30 @@ func.datasource.get_value = async function (
       found: typeof value !== "undefined",
     };
   };
+  const return_dynamic_value = async (field_id, value) => {
+    let view_field_obj = _ds.dynamic_fields[field_id];
+    var fieldType = view_field_obj?.props?.fieldType || "string";
+    var fieldProp = view_field_obj?.props;
+
+    let ret = {
+      value: fieldProp.value,
+      type: fieldType,
+      prop: fieldProp,
+    };
+
+    if (ret.value && typeof ret.value === "string" && ret.type !== "exp") {
+      if (/"/.test(ret.value) && ret.value.indexOf("\\") === -1)
+        ret.value = ret.value.replace(/"/g, '"');
+    }
+
+    return {
+      ret,
+      dsSessionP,
+      fieldIdP: field_id,
+      currentRecordId: _ds.currentRecordId,
+      found: typeof value !== "undefined",
+    };
+  };
   const return_value_parameters = async (field_id, value) => {
     let ret = {
       value: await func.common.get_cast_val(
@@ -3864,27 +3879,20 @@ func.datasource.get_value = async function (
   if (fieldIdP.substr(0, 1) === "_") {
     if (_ds.alias) _field_id = _ds.alias[fieldIdP];
   }
-  // search in dataset
-  // if (
-  //   _ds.renderType &&
-  //   _ds.renderType !== "grid" &&
-  //   _ds.renderType !== "form"
-  // ) {
-  //   if (typeof _ds?.dataset_new?.[_field_id] !== "undefined") {
-  //     return await return_value(_field_id, _ds.dataset_new[_field_id]);
-  //   }
-  //   return await search_in_parameters(fieldIdP);
-  // }
 
-  if (
-    !org_dsSessionP &&
-    recordId &&
-    typeof _ds.data_feed?.rows?.[recordId]?.[_field_id] !== "undefined"
-  ) {
-    return await return_value(
-      _field_id,
-      _ds.data_feed.rows[recordId][_field_id]
-    );
+  if (!org_dsSessionP && recordId) {
+    if (typeof _ds.data_feed?.rows?.[recordId]?.[_field_id] !== "undefined") {
+      return await return_value(
+        _field_id,
+        _ds.data_feed.rows[recordId][_field_id]
+      );
+    }
+    if (typeof _ds?.dynamic_fields?.[_field_id] !== "undefined") {
+      return await return_dynamic_value(
+        _field_id,
+        _ds.dynamic_fields[_field_id]
+      );
+    }
   }
 
   if (
@@ -3896,6 +3904,9 @@ func.datasource.get_value = async function (
       _ds.data_feed.rows[_ds.currentRecordId][_field_id]
     );
   }
+  if (typeof _ds?.dynamic_fields?.[_field_id] !== "undefined") {
+    return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
+  }
 
   return await search_in_parameters(fieldIdP);
 };
@@ -4316,7 +4327,7 @@ func.datasource.get_pre_init_fields = function (
   return; // inactive 021617
 }; // temporary inactive, init preformed on the first round
 
-func.datasource.add_dynamic_field_to_data_feed = function (
+func.datasource.add_dynamic_field_to_ds = function (
   SESSION_ID,
   dsSessionP,
   key,
@@ -4324,12 +4335,8 @@ func.datasource.add_dynamic_field_to_data_feed = function (
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
   if (!_ds.dynamic_fields) {
-    _ds.dynamic_fields = [];
+    _ds.dynamic_fields = {};
   }
-  _ds.data_feed.rows[_ds.currentRecordId][key] = val;
-
-  // todo: check duplicates
-  if (_ds.dynamic_fields.some((e) => e.data.field_id === key)) return;
 
   const toType = function (obj) {
     return {}.toString
@@ -4338,7 +4345,7 @@ func.datasource.add_dynamic_field_to_data_feed = function (
       .toLowerCase();
   };
 
-  _ds.dynamic_fields.push({
+  _ds.dynamic_fields[key] = {
     id: crypto.randomUUID(),
     data: {
       type: "virtual",
@@ -4347,26 +4354,57 @@ func.datasource.add_dynamic_field_to_data_feed = function (
     props: {
       fieldType: val ? toType(val) : "string",
     },
-  });
+    value: val,
+  };
 };
-const get_merge_progFields_with_dynamic_fields = async function (
-  SESSION_ID,
-  dsSessionP
-) {
+// func.datasource.add_dynamic_field_to_data_feed = function (
+//   SESSION_ID,
+//   dsSessionP,
+//   key,
+//   val
+// ) {
+//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
+//   if (!_ds.dynamic_fields) {
+//     _ds.dynamic_fields = [];
+//   }
+//   _ds.data_feed.rows[_ds.currentRecordId][key] = val;
+
+//   // todo: check duplicates
+//   if (_ds.dynamic_fields.some((e) => e.data.field_id === key)) return;
+
+//   const toType = function (obj) {
+//     return {}.toString
+//       .call(obj)
+//       .match(/\s([a-zA-Z]+)/)[1]
+//       .toLowerCase();
+//   };
+
+//   _ds.dynamic_fields.push({
+//     id: crypto.randomUUID(),
+//     data: {
+//       type: "virtual",
+//       field_id: key,
+//     },
+//     props: {
+//       fieldType: val ? toType(val) : "string",
+//     },
+//   });
+// };
+const get_progFields = 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);
+  return _view_obj.progFields;
+  // var ret_arr = _view_obj.progFields;
 
-  var ret_arr = _view_obj.progFields;
-
-  _ds?.dynamic_fields?.forEach((field) => {
-    if (ret_arr.some((e) => e.data.field_id === field.data.field_id)) {
-      return;
-    }
+  // _ds?.dynamic_fields?.forEach((field) => {
+  //   if (ret_arr.some((e) => e.data.field_id === field.data.field_id)) {
+  //     return;
+  //   }
 
-    ret_arr.push(field);
-  });
+  //   ret_arr.push(field);
+  // });
 
-  return ret_arr;
+  // return ret_arr;
 };
  func.utils = {};
 

package/package.json

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