This commit is contained in:
rizky 2024-07-28 20:36:48 -07:00
parent 0a133e08a1
commit ea3ccce6b5
3 changed files with 10 additions and 8 deletions

View File

@ -42,7 +42,7 @@ export const newField = async (
name: field.name,
label: formatName(field.name),
type,
ext__required: field.optional ? "n" : "y",
ext__required: opt.is_from_table_edit || field.optional ? "n" : "y",
sub_type: "number",
child: {
childs: [],
@ -308,7 +308,7 @@ return (React.createElement(React.Fragment, null,
let sub_type = "typeahead";
if (field.relation?.fields.filter((e) => !e.is_pk)?.length >= 2) {
sub_type = "table-edit";
sub_type = "table-edit";
child = createItem({
childs: await generateRelation(
{

View File

@ -176,7 +176,9 @@ export const formInit = (fm: FMLocal, props: FMProps) => {
toast.dismiss();
if (!success) {
const count = Object.keys(fm.error.list).length;
const errors = Object.keys(fm.error.list);
const count = errors.length;
console.log(fm.error.list);
toast.error(
<div className="c-flex c-text-red-600 c-items-center">
<AlertTriangle className="c-h-4 c-w-4 c-mr-1" />

View File

@ -117,7 +117,7 @@ const genList = async (opt: GenOpt) => {
}
lines[lines.length - 1].childs.push(
createItem({
component: {
component: {
id: "7ce18cbd-02d5-4aff-9acb-150d3a75e34e",
props: {
name: field.name,
@ -129,11 +129,11 @@ const genList = async (opt: GenOpt) => {
},
adv: {
js: `\
<div {...props} className={cx(props.className, \`s-\${_item.edit.parent.item.id}\` , "list-field")}>
<div {...props} className={cx(props.className, \`s-\${_item?.edit?.parent?.item?.id}\` , "list-field")}>
<FormatValue value={row[name]} name={name} gen_fields={gen__fields} />
</div>`,
jsBuilt: `\
render(React.createElement("div", Object.assign({}, props, { className: cx(props.className, \`s-\${_item.edit.parent.item.id}\` , "") }),React.createElement(FormatValue, { value: row[name], name: name, gen_fields: gen__fields })));
render(React.createElement("div", Object.assign({}, props, { className: cx(props.className, \`s-\${_item?.edit?.parent?.item?.id}\` , "") }),React.createElement(FormatValue, { value: row[name], name: name, gen_fields: gen__fields })));
`,
},
}),
@ -204,11 +204,11 @@ const genTable = async (opt: GenOpt) => {
},
adv: {
js: `\
<div {...props} className={cx(props.className, \`s-\${_item.edit.parent.item.id}\` , "table-col")}>
<div {...props} className={cx(props.className, \`s-\${_item?.edit?.parent?.item?.id}\` , "table-col")}>
<FormatValue value={col.value} name={col.name} gen_fields={gen__fields} ${tree_depth} />
</div>`,
jsBuilt: `\
render(React.createElement("div", Object.assign({}, props, { className: cx(props.className, \`s-\${_item.edit.parent.item.id}\` , "") }),React.createElement(FormatValue, { value: col.value, name: col.name, gen_fields: gen__fields, ${tree_depth_built} })));
render(React.createElement("div", Object.assign({}, props, { className: cx(props.className, \`s-\${_item?.edit?.parent?.item?.id}\` , "") }),React.createElement(FormatValue, { value: col.value, name: col.name, gen_fields: gen__fields, ${tree_depth_built} })));
`,
},
}),