资产目录问题

src/view/Manage/AssetManage/Component/UpdateDirectoryModal.jsx

@@ -25,7 +25,7 @@ const UpdateDirectoryModal = (props) => {
       setDir(null);
       form.resetFields();
      
-      if (action!=='add' && (dirId||'')!=='') {
+      if ((dirId||'')!=='') {
         getDirectory();
       }
     }
@@ -42,7 +42,10 @@ const UpdateDirectoryModal = (props) => {
       },
       callback: data => {
         setDir(data);
-        form.setFieldsValue({ code: data?.code, name: data?.name||'', order: data?.order||'', desc: data?.desc||'', remarks: data?.remarks||'' });
+
+        if (action !== 'add') {
+          form.setFieldsValue({ code: data?.code, name: data?.name||'', desc: data?.desc||'', remarks: data?.remarks||'', resourceType: data?.resourceType });
+        }
       }
     })
   }
@@ -57,9 +60,9 @@ const UpdateDirectoryModal = (props) => {
         data: { 
           code: row.code,
           name: row.name,
-          order: row.order,
           desc: row.desc,
           remarks: row.remarks,
+          resourceType: row.resourceType
         }
       };
 
@@ -160,8 +163,7 @@ const UpdateDirectoryModal = (props) => {
     >
       <Form {...formItemLayout} form={form} onValuesChange={onValuesChange}>
         {
-          action==='add' && <React.Fragment>
-            <Form.Item 
+          action==='add' && <Form.Item 
             label="类型"
             name="type"
             rules={[{ required: true, message: '必填项' }]}
@@ -171,8 +173,9 @@ const UpdateDirectoryModal = (props) => {
               <Radio value='directory' disabled={ dirId===null }>目录</Radio>
             </Radio.Group>
           </Form.Item>
+        }
         {
-              isThemeAdd && <Form.Item 
+          ((action==='add'&&isThemeAdd) || (action!=='add'&&dir?.resourceType)) && <Form.Item 
             label="资产类型"
             name="resourceType"
             rules={[{ required: true, message: '必填项' }]}
@@ -186,8 +189,6 @@ const UpdateDirectoryModal = (props) => {
             </Select>
           </Form.Item> 
         }
-          </React.Fragment> 
-        }
         <Form.Item 
           label="编号"
           name="code"
@@ -202,13 +203,6 @@ const UpdateDirectoryModal = (props) => {
         >
           <Input placeholder="请输入名称" />
         </Form.Item>
-        <Form.Item
-          label="权重"
-          name="order"
-          rules={[{ required: true, message: '必填项' }]}
-        >
-          <InputNumber min={1} max={999} style={{ width:'100%' }} placeholder="请输入权重(1-999)" />
-        </Form.Item>
         {
           action !== 'add' && (
             <Form.Item