From 6ac0670e7892a988cb253aa2071f8856f835df89 Mon Sep 17 00:00:00 2001 From: rizky Date: Sun, 18 Aug 2024 19:48:59 -0700 Subject: [PATCH] fix --- comps/form/field/FieldInput.tsx | 2 +- comps/form/field/table-edit/TableEdit.tsx | 10 +++--- comps/form/field/type/TypeToggle.tsx | 1 + comps/form/field/type/TypeUploadSingle.tsx | 38 ++++++++++++++-------- comps/list/TableList.tsx | 18 +++++++--- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/comps/form/field/FieldInput.tsx b/comps/form/field/FieldInput.tsx index 178d4ff..8c5bafe 100755 --- a/comps/form/field/FieldInput.tsx +++ b/comps/form/field/FieldInput.tsx @@ -150,7 +150,7 @@ export const FieldInput: FC<{ className={cx( "field-inner c-flex-1 c-flex c-items-center", field.focused && "focused", - disabled && "c-pointer-events-none", + arg.sub_type !== "upload" && disabled && "c-pointer-events-none", disabled && !["checkbox"].includes(arg.sub_type) && " c-bg-gray-50" diff --git a/comps/form/field/table-edit/TableEdit.tsx b/comps/form/field/table-edit/TableEdit.tsx index 07b29c9..e2521d9 100755 --- a/comps/form/field/table-edit/TableEdit.tsx +++ b/comps/form/field/table-edit/TableEdit.tsx @@ -82,17 +82,15 @@ export const TableEdit: FC<{ sortable: true, frozen: true, renderCell(arg: any) { - // return <>; const { props, tbl } = arg; return ( {child} - ); + ); }, }); } else { diff --git a/comps/form/field/type/TypeToggle.tsx b/comps/form/field/type/TypeToggle.tsx index 01b11f5..ae83202 100755 --- a/comps/form/field/type/TypeToggle.tsx +++ b/comps/form/field/type/TypeToggle.tsx @@ -69,6 +69,7 @@ export const FieldToggle: FC<{ checked={checked} className="c-sr-only" onChange={(e) => { + console.log("HHHH") const check = e.target.checked; if (check) { arg.opt_set_value({ diff --git a/comps/form/field/type/TypeUploadSingle.tsx b/comps/form/field/type/TypeUploadSingle.tsx index 0c64958..d0d825b 100755 --- a/comps/form/field/type/TypeUploadSingle.tsx +++ b/comps/form/field/type/TypeUploadSingle.tsx @@ -235,20 +235,30 @@ export const FieldUploadSingle: FC<{ ) : input.fase === "preview" ? (
-
{ - e.preventDefault(); - e.stopPropagation(); - if (confirm("Clear this file ?")) { - input.fase = "start"; - fm.data[field.name] = null; - fm.render(); - } - }} - className="c-flex c-flex-row c-items-center c-border c-px-2 c-rounded c-cursor-pointer hover:c-bg-red-100" - > - -
+ {!disabled ? ( + <> +
{ + if (!disabled) { + e.preventDefault(); + e.stopPropagation(); + if (confirm("Clear this file ?")) { + input.fase = "start"; + fm.data[field.name] = null; + fm.render(); + } + } + }} + className={cx( + "c-flex c-flex-row c-items-center c-border c-px-2 c-rounded c-cursor-pointer hover:c-bg-red-100" + )} + > + +
+ + ) : ( + <> + )}
) : ( <> diff --git a/comps/list/TableList.tsx b/comps/list/TableList.tsx index f9b3143..4d91924 100755 --- a/comps/list/TableList.tsx +++ b/comps/list/TableList.tsx @@ -761,6 +761,7 @@ export const TableList: FC = ({ } } + console.log('auo') if (document.getElementsByClassName("prasi-toaster").length === 0) { const elemDiv = document.createElement("div"); elemDiv.className = "prasi-toaster"; @@ -834,7 +835,10 @@ export const TableList: FC = ({ ref={(e) => { local.grid_ref = e?.element as any; }} - onScroll={(e) => local.paging.scroll(e.currentTarget)} + onScroll={(e) => { + console.log("scroll"); + local.paging.scroll(e.currentTarget); + }} selectedRows={EMPTY_SET} onSelectedCellChange={() => {}} onSelectedRowsChange={() => {}} @@ -909,14 +913,14 @@ export const TableList: FC = ({ - ), + ), } } /> )} - + ); } else if (mode === "list") { return ( @@ -931,7 +935,11 @@ export const TableList: FC = ({ } }} > - {toaster_el && createPortal(, toaster_el)} + {toaster_el && + createPortal( + , + toaster_el + )} {local.status !== "ready" ? (
@@ -1080,7 +1088,7 @@ const dataGridStyle = (local: { el: null | HTMLDivElement }) => { return css` .rdg { display: grid !important; - + .rdg-cell, .rdg-header-sort-name { display: flex;