From 5901e3247965fda94222d5e3fdb6f4f8ad8168a9 Mon Sep 17 00:00:00 2001 From: rizrmd Date: Wed, 19 Feb 2025 13:28:04 +0000 Subject: [PATCH] checkpoint --- comps/form/field/type/TypeDropdown.tsx | 14 +++++++------- comps/list/ExportExcel.tsx | 1 - comps/ui/typeahead.tsx | 26 ++++++++++++++------------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/comps/form/field/type/TypeDropdown.tsx b/comps/form/field/type/TypeDropdown.tsx index 731a7dc..6b98f90 100755 --- a/comps/form/field/type/TypeDropdown.tsx +++ b/comps/form/field/type/TypeDropdown.tsx @@ -26,11 +26,11 @@ export const TypeDropdown: FC<{ if (Array.isArray(res)) { const list: any = res.map((e: any, idx: number) => { return { - label: arg.opt_get_label(e, "list", { + label: arg.opt_get_label?.(e, "list", { prev: res[idx - 1], next: res[idx + 1], }), - tag: arg.opt_get_label(e, "label"), + tag: arg.opt_get_label?.(e, "label"), value: e.value, data: e.data, }; @@ -48,7 +48,7 @@ export const TypeDropdown: FC<{ let f = list.find((ex: any) => ex.value === v); if (!f) { - arg.opt_set_value({ + arg.opt_set_value?.({ fm, name: field.name, type: field.type, @@ -75,7 +75,7 @@ export const TypeDropdown: FC<{ if (field.type === "single-option") { if (!value && local.options.length > 0) { - arg.opt_set_value({ + arg.opt_set_value?.({ fm, name: field.name, type: field.type, @@ -83,7 +83,7 @@ export const TypeDropdown: FC<{ selected: [local.options[0]?.value], }); } else if (value) { - arg.opt_set_value({ + arg.opt_set_value?.({ fm, name: field.name, type: field.type, @@ -191,7 +191,7 @@ export const TypeDropdown: FC<{ popupClassName={popupClassName} onSelect={({ search, item }) => { if (item) { - arg.opt_set_value({ + arg.opt_set_value?.({ fm, name: field.name, type: field.type, @@ -226,7 +226,7 @@ export const TypeDropdown: FC<{ note="dropdown" popupClassName={popupClassName} onChange={(values) => { - arg.opt_set_value({ + arg.opt_set_value?.({ fm, name: field.name, type: field.type, diff --git a/comps/list/ExportExcel.tsx b/comps/list/ExportExcel.tsx index 2c0f57b..b253752 100755 --- a/comps/list/ExportExcel.tsx +++ b/comps/list/ExportExcel.tsx @@ -27,7 +27,6 @@ export const ExportExcel: FC<{ const workbook = new ExcelJS.Workbook(); const worksheet = workbook.addWorksheet("Sheet 1"); - console.log(data); const columns = getAllKeys(data); worksheet.addRow(columns); diff --git a/comps/ui/typeahead.tsx b/comps/ui/typeahead.tsx index 9d369f6..41df7f8 100755 --- a/comps/ui/typeahead.tsx +++ b/comps/ui/typeahead.tsx @@ -42,7 +42,7 @@ export const Typeahead: FC<{ onChange, className, popupClassName, - disabledSearch + disabledSearch, }) => { const local = useLocal({ value: [] as string[], @@ -309,21 +309,23 @@ export const Typeahead: FC<{ } } - const valueLabel = local.value?.map((value) => { - if (local.mode === "single") { - const item = options.find((item) => item.value === value); + const valueLabel = local.value + ?.map((value) => { + if (local.mode === "single") { + const item = options.find((item) => item.value === value); - if (!local.open && !allow_new) { - local.select = item || null; + if (!local.open && !allow_new) { + local.select = item || null; - local.search.input = item?.tag || item?.label || ""; + local.search.input = item?.tag || item?.label || ""; + } + return item; } - return item; - } - const item = local.options.find((e) => e.value === value); - return item; - }); + const item = local.options.find((e) => e.value === value); + return item; + }) + .filter((e) => e); let inputval = local.search.input;