trithuc-mvc-react 1.6.9 → 1.6.11

package/components/DataManagement/EditorForm.jsx

@@ -20,12 +20,13 @@ function EditorForm({ fields, submitRef }) {
   const { tableName, selectedEditItem, setOpenEditorDialog, validationSchema } = useDataTable();
 
   const methods = useForm({ defaultValues: {}, resolver: yupResolver(validationSchema) });
+  const { setValue, getValues } = methods;
   const theme = useTheme();
   const downXl = useMediaQuery(theme.breakpoints.down("xl"));
   const elementSize = downXl ? "small" : "medium";
   useEffect(() => {
     if (selectedEditItem) {
-      methods.setValue("Id", selectedEditItem.Id);
+      setValue("Id", selectedEditItem.Id);
 
       fields.forEach(({ field, onChange, type, keyValue, keyValueLabel, defaultValue }) => {
         if (type == "autocomplete") {
@@ -33,14 +34,23 @@ function EditorForm({ fields, submitRef }) {
             [keyValue]: selectedEditItem[field]
           });
 
-          methods.setValue(field, selectedEditItem ? selectedEditItem[field] : defaultValue);
-          methods.setValue(keyValueLabel, selectedEditItem[keyValueLabel]);
+          setValue(field, selectedEditItem ? selectedEditItem[field] : defaultValue);
+          setValue(keyValueLabel, selectedEditItem[keyValueLabel]);
         } else if (type === "date") {
-          methods.setValue(field, selectedEditItem[field]);
+          setValue(field, selectedEditItem[field]);
         } else if (type === "file") {
-          methods.setValue(field, selectedEditItem[field] ? JSON.parse(selectedEditItem[field]) : []);
+          let fileValue = selectedEditItem[field] ? JSON.parse(selectedEditItem[field]) : [];
+          try {
+            if (typeof fileValue == "string") {
+              fileValue = JSON.parse(fileValue);
+            }
+          }
+          catch (e) {
+            fileValue = [];
+          }
+          setValue(field, fileValue);
         } else {
-          methods.setValue(field, selectedEditItem[field]);
+          setValue(field, selectedEditItem[field]);
         }
       });
     } else {
@@ -52,6 +62,7 @@ function EditorForm({ fields, submitRef }) {
         }
       });
     }
+
   }, [selectedEditItem]);
 
   const saveMutation = useMutation(saveDataToTable, {
@@ -116,7 +127,7 @@ function EditorForm({ fields, submitRef }) {
               keyValue,
               keyValueLabel,
               required,
-              disabled=false
+              disabled = false
             }) => {
               return (
                 <Grid item md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>

package/components/DataManagement/FormField.jsx

@@ -272,27 +272,18 @@ function FormField({
       );
     case "file":
       return (
-        <Controller
-          name={name}
-          control={control}
-          render={({ field, fieldState: { error } }) => {
-            return (
-              <>
-                <UploadMultipleFile  {...field} name="DinhKem" disabled={disabled} />
-              </>
-            );
-          }}
-        />
+        <UploadMultipleFile name={name} label={label} disabled={disabled} />
       );
     case "avatar":
       return (
         <Controller
           name={name}
           control={control}
+          disabled={disabled}
           render={({ field, fieldState: { error } }) => {
             return (
               <>
-                <RhfUploadAvatar name={"AnhDaiDien"} disabled={disabled}/>
+                <RhfUploadAvatar name={"AnhDaiDien"} disabled={disabled} />
               </>
             );
           }}

package/components/DataManagement/TableRowRender.jsx

@@ -78,7 +78,7 @@ export const TableRowRender = ({ index, row, selected, onSelect, onChangeStatus,
           </Tooltip>
         )}
         {canView && !tableActions?.some(({ permissionType }) => permissionType == "view") && (
-          <Tooltip title="Xem chi tiết modal">
+          <Tooltip title="Xem chi tiết">
             <IconButton onClick={() => onView(row)}>
               <RemoveRedEyeOutlinedIcon color="info" />
             </IconButton>

package/components/DataManagement/upload/UploadMultipleFile.jsx

@@ -1,4 +1,4 @@
-import { CardContent, CardHeader, FormHelperText, LinearProgress, Card } from "@mui/material";
+import { FormHelperText, LinearProgress } from "@mui/material";
 
 import { Controller, useFormContext } from "react-hook-form";
 import UploadMultiFile from "trithuc-mvc-react/components/DataManagement/upload/UploadMultiFile";
@@ -27,7 +27,6 @@ const UploadMultipleFile = ({ name, label, disabled }) => {
     const filteredItems = getValues(name).filter((_file) => _file.urlFile !== file.urlFile);
     setValue(name, filteredItems);
   };
-
   return (
     <Controller
       name={name}
@@ -42,8 +41,8 @@ const UploadMultipleFile = ({ name, label, disabled }) => {
               accept="*"
               files={field.value}
               onDrop={!disabled ? handleDrop : () => { }} // disabled lúc ở model view thì ko được chọn ảnh
-              onRemove={!disabled ?handleRemove : () => { }}
-              onRemoveAll={!disabled? handleRemoveAll: () => { }}
+              onRemove={!disabled ? handleRemove : () => { }}
+              onRemoveAll={!disabled ? handleRemoveAll : () => { }}
               error={Boolean(error)}
             />
             {isLoadingUpfile && <LinearProgress />}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"