diff --git a/packages/common/business_components/src/ui/select/index.tsx b/packages/common/business_components/src/ui/select/index.tsx index 72f304caa..370ee52e8 100644 --- a/packages/common/business_components/src/ui/select/index.tsx +++ b/packages/common/business_components/src/ui/select/index.tsx @@ -7,12 +7,8 @@ const styles = { marginLeft : '2rem', display : 'flex' } as React.CSSProperties, - selectStyle : { - marginLeft: '1rem', - width:'8rem' - } as React.CSSProperties, labelStyle : { - margin:'0.8rem 0.8rem 0.8rem 0.8rem', + margin:'0.8rem 0.8rem 0.8rem 1rem', fontSize: '10px', } as React.CSSProperties } @@ -22,14 +18,14 @@ interface SelectBox1 { val:string } -function SelectBox(props: {label : string, selectArray: SelectBox1[]}){ - const placeHolder = props.selectArray.length > 0 ? props.selectArray[0].text : ""; +function SelectBox(props: {label : string, selectArray: SelectBox1[], styleClassName : string, styleSelect : React.CSSProperties}){ + const placeHolder = props.selectArray?.[0]?.text ?? ""; return ( -
+
{props.label && } - + diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 058d28673..c1d048a1f 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -1,22 +1,27 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@common/components"; -import { type TableUpperProps } from '../../../../../../apps/wr/app/store/publicReuseFaciltyInsert/index'; import UiPageNations from "./uiPageNations"; -interface UiTableProps { - headName: string; +type UiTableProps = { + headName: React.ReactNode|undefined; publicReuseFacility: { [key: string]: string | number | boolean }[]; - headlist: TableUpperProps[]; + headlist: UiHeadProps[]; pageSize: number; total: number; children: React.ReactNode|undefined; } +type UiHeadProps={ + id:string; + title:string; + +} export function UiTable({ publicReuseFacility, headlist,pageSize , total, children,headName}: UiTableProps) { const cur = 1; + return ( <> -

{headName}

+ {headName?headName:<>} {children? <>{children}: