@byteluck-fe/runtime-engine 2.0.17 → 2.0.18

package/dist/runtime-engine.js

@@ -11386,9 +11386,9 @@ function pp(r) {
     r.type === "conditions"
   );
 }
-const tr = (r, e) => {
-  const t = e.findIndex((a) => a.code === r.code);
-  t > -1 ? e[t].value = r.value : e.push(r);
+const tr = (r, e, t) => {
+  const a = e.findIndex((n) => n.code === r.code);
+  a > -1 ? e[a].value = t?.[0]?.code === r.code ? t?.[0]?.value : r.value : e.push(r);
 };
 function ze(r, e, t, a, n) {
   const s = a ?? [], i = [];
@@ -11400,7 +11400,7 @@ function ze(r, e, t, a, n) {
         t,
         a
       ).forEach((l) => {
-        i.includes(l.code) || tr(l, s);
+        i.includes(l.code) || tr(l, s, a);
       });
     else {
       const {
@@ -11414,7 +11414,7 @@ function ze(r, e, t, a, n) {
         if (r.inList(c) === void 0 ? p = r.getState(c) : p = r.getState(c, t), p = F(p), Me(d)) {
           if (d.fieldCode || (d.fieldCode = c), i.includes(d.fieldCode))
             return;
-          tr({ code: d.fieldCode, value: p }, s), i.push(d.fieldCode);
+          tr({ code: d.fieldCode, value: p }, s, a), i.push(d.fieldCode);
         } else
           Object.keys(d).map((h) => {
             const f = d[h];
@@ -11423,7 +11423,8 @@ function ze(r, e, t, a, n) {
                 code: f.fieldCode,
                 value: p[h]
               },
-              s
+              s,
+              a
             ), i.push(f.fieldCode));
           });
       });
@@ -13380,7 +13381,19 @@ function Lr(r, e) {
   });
 }
 function Jf(r, e) {
-  switch (r.type) {
+  switch (console.log(r, e, "params"), [
+    "caption",
+    "placeholder",
+    "captionTip",
+    "mobileRowCaption",
+    "content",
+    "placeholderStart",
+    "placeholderEnd",
+    "confirmMessage",
+    "regularRules"
+  ].forEach((n) => {
+    r.props?.hasOwnProperty(n) && (n === "regularRules" && (r.props[n].errMessage = e?.i18n?.[r?.id] ? e?.i18n?.[r?.id]?.[n]?.errMessage ?? r.props[n]?.errMessage : r.props[n]?.errMessage), r.props[n] = e?.i18n?.[r?.id]?.[n] ?? r.props?.[n]);
+  }), r.type) {
     case m.EMPLOYEE:
     case m.EMPLOYEE2:
       r.props.defaultValueType === "current" && (r.props.defaultValue = [e.store.state.userInfo.employee_id]);
@@ -13394,23 +13407,23 @@ function Jf(r, e) {
       break;
     case m.DATE_PICKER:
       if (r.props.setValueType === "now") {
-        const a = $f(r.props.dateType);
-        r.props.defaultValue = String(+new Date(a));
+        const n = $f(r.props.dateType);
+        r.props.defaultValue = String(+new Date(n));
       }
       break;
     case m.SUBTABLE:
       if (e.device === "mobile" || e.device === "desktop" && e.pageStatus === 5 && (r.props.serverPagination = !1), r.props.serverPagination === !0) {
-        const a = r.props?.datasourceBind?.dataCode, n = r.props.datasourceBind?.orders, s = r.props?.sortable ? r.props.headers.filter(
-          (i) => !zf.includes(
-            i?.children[0]?.fieldType
-          ) && i.children[0]?.props?.dataBind
-        ).map((i) => t(i)) : [];
+        const n = r.props?.datasourceBind?.dataCode, s = r.props.datasourceBind?.orders, i = r.props?.sortable ? r.props.headers.filter(
+          (o) => !zf.includes(
+            o?.children[0]?.fieldType
+          ) && o.children[0]?.props?.dataBind
+        ).map((o) => a(o)) : [];
         e.subtableDefinition.push({
-          subCode: a,
-          orders: n
+          subCode: n,
+          orders: s
         }), e.subtableDefinition.push({
-          subCode: a,
-          orders: s,
+          subCode: n,
+          orders: i,
           type: "sort"
         });
       }
@@ -13422,8 +13435,8 @@ function Jf(r, e) {
       r.props.optionConfig !== "custom" && (r.props.options = []);
       break;
   }
-  function t(a) {
-    return a.children[0].fieldType === Y.MONEY ? a.children[0].props.dataBind.amount.fieldCode : a.children[0].fieldType === Y.CALC ? a.children[0].props.dataBind.result.fieldCode : a.children[0].fieldType === Y.TIMESCOPE ? a.children[0].props.dataBind.min.fieldCode : a.children[0].props.dataBind.fieldCode;
+  function a(n) {
+    return n.children[0].fieldType === Y.MONEY ? n.children[0].props.dataBind.amount.fieldCode : n.children[0].fieldType === Y.CALC ? n.children[0].props.dataBind.result.fieldCode : n.children[0].fieldType === Y.TIMESCOPE ? n.children[0].props.dataBind.min.fieldCode : n.children[0].props.dataBind.fieldCode;
   }
 }
 const _n = (r) => {
@@ -25043,7 +25056,8 @@ function YS(r, e, t = {}, a) {
     isMultiOrganization: Xt,
     device: u,
     pageStatus: i,
-    subtableDefinition: Be
+    subtableDefinition: Be,
+    i18n: s.data?.content?.i18n?.local
   });
   const _t = new Gf(
     v.state.userInfo,

package/dist/src/utils/core/dynamicDefaultValue.d.ts

@@ -9,6 +9,7 @@ interface PARAMS {
         orders: any;
         type?: '' | 'sort' | 'filter';
     }[];
+    i18n: Object;
 }
 export declare function dynamicDefaultValue(params: PARAMS): void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@byteluck-fe/runtime-engine",
-	"version": "2.0.17",
+	"version": "2.0.18",
 	"description": "",
 	"type": "module",
 	"main": "./dist/runtime-engine.js",