midsuit
/
prasi-lib
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
rizky 2024-07-18 03:31:47 -07:00
parent 4abf1c0699
commit 9b72c5c58d
2 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
comps/form/gen/fields.ts
View File

@ -21,22 +21,23 @@ export type GFCol = {
}; };
}; };
export const newField = async ( export const newField = async (
arg: GFCol, field: GFCol,
opt: { parent_table: string; value: Array<string>; on_change?: string }, opt: { parent_table: string; value: Array<string>; on_change?: string },
show_label: boolean show_label: boolean
) => { ) => {
let show = typeof show_label === "boolean" ? show_label : true; let show = typeof show_label === "boolean" ? show_label : true;
let type = "input"; let type = "input";
if (["int", "string", "text"].includes(arg.type)) { if (["int", "string", "text"].includes(field.type)) {
if (["int"].includes(arg.type)) { if (["int"].includes(field.type)) {
return createItem({ return createItem({
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type, type,
ext__required: field.optional ? "n" : "y",
sub_type: "number", sub_type: "number",
child: { child: {
childs: [], childs: [],
@ -52,9 +53,10 @@ export const newField = async (
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type, type,
ext__required: field.optional ? "n" : "y",
sub_type: "text", sub_type: "text",
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
child: { child: {
@ -67,14 +69,15 @@ export const newField = async (
}, },
}); });
} }
} else if (["boolean"].includes(arg.type)) { } else if (["boolean"].includes(field.type)) {
return createItem({ return createItem({
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
ext__required: field.optional ? "n" : "y",
type: "single-option", type: "single-option",
sub_type: "toogle", sub_type: "toogle",
ext__on_change: opt.on_change ext__on_change: opt.on_change
@ -83,15 +86,16 @@ export const newField = async (
}, },
}, },
}); });
} else if (["timestamptz", "date"].includes(arg.type)) { } else if (["timestamptz", "date"].includes(field.type)) {
return createItem({ return createItem({
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type: "date", type: "date",
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
ext__required: field.optional ? "n" : "y",
sub_type: "datetime", sub_type: "datetime",
child: { child: {
childs: [], childs: [],
@ -102,7 +106,7 @@ export const newField = async (
}, },
}, },
}); });
} else if (["has-many", "has-one"].includes(arg.type) && arg.relation) { } else if (["has-many", "has-one"].includes(field.type) && field.relation) {
const fields = parseGenField(opt.value); const fields = parseGenField(opt.value);
const res = generateSelect(fields); const res = generateSelect(fields);
@ -111,8 +115,8 @@ export const newField = async (
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type: "link", type: "link",
link_opt: [ link_opt: [
`({ `({
@ -138,14 +142,14 @@ export const newField = async (
const load = on_load_rel({ const load = on_load_rel({
pk: res.pk, pk: res.pk,
table: arg.relation.to.table, table: field.relation.to.table,
select: res.select, select: res.select,
pks: {}, pks: {},
type: arg.type === "has-many" ? "typeahead" : "dropdown", type: field.type === "has-many" ? "typeahead" : "dropdown",
}); });
if (["has-one"].includes(arg.type)) { if (["has-one"].includes(field.type)) {
const rel__gen_fields = JSON.stringify( const rel__gen_fields = JSON.stringify(
arg.relation?.fields.map((e) => { field.relation?.fields.map((e) => {
const v = (e as any).value; const v = (e as any).value;
return v; return v;
}) })
@ -154,32 +158,33 @@ export const newField = async (
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type: "single-option", type: "single-option",
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
sub_type: "dropdown", sub_type: "dropdown",
rel__gen_table: arg.name, rel__gen_table: field.name,
ext__required: field.optional ? "n" : "y",
rel__gen_fields: [rel__gen_fields, rel__gen_fields], rel__gen_fields: [rel__gen_fields, rel__gen_fields],
opt__on_load: [load], opt__on_load: [load],
opt__label: [ opt__label: [
gen_label({ gen_label({
pk: res.pk, pk: res.pk,
table: arg.name, table: field.name,
select: res.select, select: res.select,
}), }),
], ],
opt__get_value: [ opt__get_value: [
get_value({ get_value({
pk: res.pk, pk: res.pk,
table: arg.name, table: field.name,
select: res.select, select: res.select,
}), }),
], ],
opt__set_value: [ opt__set_value: [
set_value({ set_value({
pk: res.pk, pk: res.pk,
table: arg.name, table: field.name,
select: res.select, select: res.select,
}), }),
], ],
@ -195,7 +200,7 @@ export const newField = async (
} else { } else {
const result = genRelMany({ const result = genRelMany({
table_parent: opt.parent_table, table_parent: opt.parent_table,
arg, arg: field,
rel: fields, rel: fields,
}); });
@ -204,7 +209,7 @@ export const newField = async (
} }
let child: any = { childs: [] }; let child: any = { childs: [] };
const relation = const relation =
arg.relation?.fields.filter( field.relation?.fields.filter(
(e) => get(e, "name") !== opt.parent_table (e) => get(e, "name") !== opt.parent_table
) || []; ) || [];
let rel__gen_fields: any = JSON.stringify( let rel__gen_fields: any = JSON.stringify(
@ -215,13 +220,13 @@ export const newField = async (
); );
let sub_type = "typeahead"; let sub_type = "typeahead";
if (arg.relation?.fields?.length > 2) { if (field.relation?.fields?.length > 2) {
sub_type = "table-edit"; sub_type = "table-edit";
child = createItem({ child = createItem({
childs: await generateRelation( childs: await generateRelation(
{ {
rel__gen_fields: { value: rel__gen_fields }, rel__gen_fields: { value: rel__gen_fields },
rel__gen_table: { value: JSON.stringify(arg.name) }, rel__gen_table: { value: JSON.stringify(field.name) },
sub_type: { value: "'table-edit'" }, sub_type: { value: "'table-edit'" },
}, },
createItem({}), createItem({}),
@ -233,11 +238,11 @@ export const newField = async (
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
label: formatName(arg.name), label: formatName(field.name),
type: "multi-option", type: "multi-option",
sub_type, sub_type,
rel__gen_table: arg.name, rel__gen_table: field.name,
opt__on_load: [result.on_load], opt__on_load: [result.on_load],
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
opt__label: [result.get_label], opt__label: [result.get_label],
@ -260,9 +265,10 @@ export const newField = async (
component: { component: {
id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67", id: "32550d01-42a3-4b15-a04a-2c2d5c3c8e67",
props: { props: {
name: arg.name, name: field.name,
ext__show_label: show ? "y" : "n", ext__show_label: show ? "y" : "n",
label: formatName(arg.name), label: formatName(field.name),
ext__required: field.optional ? "n" : "y",
type, type,
sub_type: "text", sub_type: "text",
child: { child: {

14
comps/form/gen/gen-form.ts
View File

@ -38,7 +38,10 @@ export const generateForm = async (
} }
let is_md = !!_is_md; let is_md = !!_is_md;
if (typeof _is_md === "undefined") { if (typeof _is_md === "undefined") {
if (item.edit.parent?.item.edit.parent?.item.component?.id === "cb52075a-14ab-455a-9847-6f1d929a2a73") { if (
item.edit.parent?.item.edit.parent?.item.component?.id ===
"cb52075a-14ab-455a-9847-6f1d929a2a73"
) {
is_md = true; is_md = true;
} }
} }
@ -138,7 +141,6 @@ ${
// prisma create / update ga boleh ada record.${pk} // prisma create / update ga boleh ada record.${pk}
if (record) delete record.${pk}; if (record) delete record.${pk};
if (form.${pk}) { if (form.${pk}) {
await db.${table}.update({ await db.${table}.update({
where: { where: {
@ -250,14 +252,14 @@ type IForm = { form: any; error: Record<string, string>; fm: FMLocal }
`, `,
}; };
} }
const childs = []; const child_fields = [];
for (const item of fields.filter((e) => !e.is_pk)) { for (const item of fields.filter((e) => !e.is_pk)) {
let value = [] as Array<string>; let value = [] as Array<string>;
if (["has-one", "has-many"].includes(item.type)) { if (["has-one", "has-many"].includes(item.type)) {
value = get(item, "value.checked") as any; value = get(item, "value.checked") as any;
} }
const field = await newField(item, { parent_table: table, value }, true); const field = await newField(item, { parent_table: table, value }, true);
childs.push(field); child_fields.push(field);
} }
let submit = null; let submit = null;
if (typeof is_md === "boolean" && !is_md) if (typeof is_md === "boolean" && !is_md)
@ -470,7 +472,7 @@ type IForm = { form: any; error: Record<string, string>; fm: FMLocal }
gap: 0, gap: 0,
wrap: "flex-nowrap", wrap: "flex-nowrap",
}, },
childs, childs: child_fields,
}), }),
submit, submit,
].filter((e) => e), ].filter((e) => e),
@ -479,7 +481,7 @@ type IForm = { form: any; error: Record<string, string>; fm: FMLocal }
await item.edit.commit(); await item.edit.commit();
} else { } else {
set(data, "body.value", { ...data.body?.value, ...body_prop }); set(data, "body.value", { ...data.body?.value, ...body_prop });
set(data, "body.value.childs", childs); set(data, "body.value.childs", child_fields);
Object.keys(result).map((e) => { Object.keys(result).map((e) => {
set(data, e, result[e]); set(data, e, result[e]);
}); });