Merge remote-tracking branch 'origin/develop' into develop

src/pages/categoryManage/directoryManage/components/addOrEditDec/index.tsx

@@ -57,19 +57,20 @@ const AddOrEditDec: React.FC<PropsType & selfPropsType> = ({
   const [hasPid, setHasPid] = useState(false); //是否有上级目录
   const [submitLoading, setSubmitLoading] = useState(false); //提交按钮的loading
   const [directoryOptions, setDirectoryOptions] = useState([]); //目录options
-  const id = editData?.id;
 
   useEffect(() => {
     if (isModalVisible) {
-      form.setFieldValue('type', editData.type);
-      form.setFieldValue('pid', editData.pid);
-      form.setFieldValue('directoryName', editData.directoryName);
-      onChangeType(editData.type);
+      if (editData) {
+        form.setFieldValue('type', editData.type);
+        form.setFieldValue('pid', editData.pid);
+        form.setFieldValue('directoryName', editData.directoryName);
+        onChangeType(editData.type);
 
-      if (editData.pid) {
-        setHasPid(true);
-      } else {
-        setHasPid(false);
+        if (editData.pid) {
+          setHasPid(true);
+        } else {
+          setHasPid(false);
+        }
       }
     }
   }, [isModalVisible]);
@@ -90,7 +91,7 @@ const AddOrEditDec: React.FC<PropsType & selfPropsType> = ({
     try {
       const res = await CategoryManageAPI.addOrEditDirectory({
         ...values,
-        id,
+        id: editData?.id,
         pid: hasPid ? values.pid : null,
       });
       res.code == '200' && message.success('新增成功');