From e618c883d5fb849c9eb0fa9526feab7ac01e8875 Mon Sep 17 00:00:00 2001
From: rizky <rizky@avolut.com>
Date: Fri, 23 Aug 2024 02:05:32 -0700
Subject: [PATCH] fix

---
 comps/form/gen/gen-form/on-submit.ts | 17 ++++++++++-------
 comps/form/gen/on_load.ts            | 14 ++++++++------
 preset/login/utils/generate.ts       |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/comps/form/gen/gen-form/on-submit.ts b/comps/form/gen/gen-form/on-submit.ts
index ac287e2..b4b0aa6 100755
--- a/comps/form/gen/gen-form/on-submit.ts
+++ b/comps/form/gen/gen-form/on-submit.ts
@@ -10,7 +10,7 @@ export const genFormOnSubmit = ({
   rel_many,
 }: GenFormArgs) => {
   if (typeof table !== "string") {
-    throw new Error('woi')
+    throw new Error("woi");
   }
   result.on_submit = {
     mode: "raw",
@@ -18,12 +18,13 @@ export const genFormOnSubmit = ({
 async ({ form, error, fm }: IForm) => {
   let result = false;
   try {${
-    is_md &&
-    `\
+    is_md
+      ? `\
     if (typeof md !== "undefined") {
       fm.status = "saving";
       md.render();
     }`
+      : ""
   }
     const data = { ...form };
     const record = {} as Record<string, any>;
@@ -42,8 +43,8 @@ async ({ form, error, fm }: IForm) => {
       validateField(field, fm);
     }
 ${
-  is_md &&
-  `\
+  is_md
+    ? `\
     if (fm.error.list.length > 0) {
       if (typeof md !== "undefined") {
         fm.status = "ready";
@@ -51,6 +52,7 @@ ${
       }
       return false;
     }`
+    : ""
 }
 
     call_prasi_events("form", "before_save", [fm, data]);
@@ -149,8 +151,8 @@ ${
     call_prasi_events("form", "after_save", [fm, data]);
 
     ${
-      is_md &&
-      `if (typeof md !== "undefined") {
+      is_md
+        ? `if (typeof md !== "undefined") {
       fm.status = "ready";
       fm.data = form;
       md.selected = form;
@@ -167,6 +169,7 @@ ${
         fm.render();
       }
     }`
+        : ""
     }
   } catch (e) {
     console.error(e);
diff --git a/comps/form/gen/on_load.ts b/comps/form/gen/on_load.ts
index 8c64a57..2ee32df 100755
--- a/comps/form/gen/on_load.ts
+++ b/comps/form/gen/on_load.ts
@@ -56,22 +56,24 @@ ${
   ${opt?.before_load ? opt.before_load : `let id = raw_id`}
   let item = {};
   if (id){
-    //@ts-ignore
     const table = db[gen__table] as any;
-    //@ts-ignore
     const fields = parseGenField(gen__fields);
 
     if (Array.isArray(fields)) {
       const pk = fields.find((e) => e.is_pk);
+      //@ts-ignore
       if (pk && pk.type === "int") id = parseInt(id);
     }
 
-    let where = {
-      ${pk}: id,
-    };
-    
     try {
       const gen = generateSelect(fields);
+      const select = {
+        ...gen.select,
+      } as Prisma.${table}Select;
+      let where = {
+        id: id,
+      } as Prisma.${table}WhereInput;
+
       item = await table?.findFirst({
         where,
         select: gen.select,
diff --git a/preset/login/utils/generate.ts b/preset/login/utils/generate.ts
index 8da8ed7..937b7ff 100755
--- a/preset/login/utils/generate.ts
+++ b/preset/login/utils/generate.ts
@@ -20,7 +20,7 @@ export const generateLogin = async (
     (e: any) =>
       get(e, "component.id") !== "32550d01-42a3-4b15-a04a-2c2d5c3c8e67"
   );
-  form.edit.childs[0].edit.setProp("name", field.username)
+  form.edit.childs[0].edit.setProp("name", field.username);
   // form.edit.childs[1].edit.setProp("name", field.password)
   let rels = { ...rel };
   try {