Merge commit '7c03f04078e289e9c252ce7edd4df8ea3892800c' into iipbs/wr/dev

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 (
-    <div style={styles.selectBoxDiv}>
+    <div className={props.styleClassName+" flex"} >
       {props.label && <Label style={styles.labelStyle}>{props.label}</Label>}
-      <Select style={styles.selectStyle}>
-        <SelectTrigger style={styles.selectStyle} className="w-[180px]">
+      <Select>
+        <SelectTrigger style={props.styleSelect} className="">
           <SelectValue placeholder={placeHolder} />
         </SelectTrigger>
         <SelectContent>

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 (
       <>
-      <p>{headName}</p>
+      {headName?headName:<></>}
         <Table>
           <TableHeader>
             {children? <>{children}</>:<TableRow>