Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 9df38248fdc0531ac9b2d549d9a7b5dcd24e2baa
+  newTag: 393990de7d26cc323b33efc6b8eab5da4dcd5b48

src/pages/pilotTraining/courseManage/comp/addEditModal/index.tsx

@@ -45,8 +45,14 @@ const AddEditModal: React.FC<propType> = (props) => {
   const [courseAttributeSelect, setCourseAttributeSelect] = useState<number>(0);
   // 表单钩子
   const [form] = Form.useForm<ReqType>();
+  // 封面图文件
+  const [imageFileUrl, setImageFileUrl] = useState<string>();
+  // 视频文件
+  const [videoFileUrl, setVideoFileUrl] = useState<string>();
   // 关闭弹窗
   const handleCancel = () => {
+    setImageFileUrl(undefined);
+    setVideoFileUrl(undefined);
     form.resetFields();
     setCourseAttributeSelect(0);
     closed();
@@ -175,8 +181,13 @@ const AddEditModal: React.FC<propType> = (props) => {
               fileLength={1}
               fileSize={10}
               fileType={['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/bmp']}
-              onChange={(e) => form.setFieldValue('surfaceUrl', e[0].url)}
-              defaultFileList={data?.surfaceUrl ? [{ url: data?.surfaceUrl }] : []}
+              onChange={(e) => {
+                setImageFileUrl(e[0]?.url || undefined);
+                form.setFieldValue('surfaceUrl', e[0]?.url);
+              }}
+              defaultFileList={
+                imageFileUrl || data?.surfaceUrl ? [{ url: imageFileUrl || data?.surfaceUrl }] : []
+              }
             >
               <PlusOutlined />
             </Uploader>
@@ -210,8 +221,13 @@ const AddEditModal: React.FC<propType> = (props) => {
               fileLength={1}
               fileType={['video/mp4', 'video/avi', 'video/wmv', 'video/rmvb']}
               fileSize={512}
-              onChange={(e) => form.setFieldValue('videoUrl', e[0]?.url)}
-              defaultFileList={data?.videoUrl ? [{ url: data?.videoUrl }] : []}
+              onChange={(e) => {
+                setVideoFileUrl(e[0]?.url || undefined);
+                form.setFieldValue('videoUrl', e[0]?.url);
+              }}
+              defaultFileList={
+                videoFileUrl || data?.videoUrl ? [{ url: videoFileUrl || data?.videoUrl }] : []
+              }
             >
               <PlusOutlined />
             </Uploader>