资产详情内容上移

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

@@ -977,7 +977,42 @@ const AssetAction = (props) => {
       }}
     >
       <Spin spinning={loading}>
-        <div className='flex' style={{ justifyContent: 'right' }}>
+        {
+          (action!=='add' && (id||'')!=='') && <div> 
+            <div className='mb-3'>
+              <Descriptions column={1}>
+                <Descriptions.Item 
+                  label={<div className='title-text' style={{ textAlign: 'right', width: 90 }}>资产目录路径</div>} 
+                  style={{ paddingBottom: 0 }}
+                >
+                  <div className='flex' style={{ flexDirection: 'column' }}>
+                  {
+                    (assetPaths||[]).map((item, key) => {
+                      return (
+                        <a key={key} onClick={() => { jumpToPath(item); }}>
+                          <span>{item?.dataAssetName||''}</span>
+                        </a>                        
+                      );
+                    })
+                  }
+                  </div>
+                </Descriptions.Item>
+              </Descriptions>
+            </div>
+          </div>  
+        }
+    
+        <Form form={form} onValuesChange={onValuesChange}>
+          <div className='flex mb-3' style={{ justifyContent: 'space-between', alignItems: 'center' }}>
+            <Radio.Group buttonStyle='solid' value={currentAttribute} onChange={(e) => {
+              setCurrentAttribute(e.target.value)
+            }}>
+            {
+              (attributes??[]).map((item,key) => (
+                <Radio.Button key={key} value={item}>{item}</Radio.Button>
+              ))
+            }
+            </Radio.Group>
             <Space>
               {
                 (!readonly && (reference===AssetManageReference||canEdit)) && <React.Fragment>
@@ -1021,48 +1056,6 @@ const AssetAction = (props) => {
             </Space>
           </div>
           {
-          (action!=='add' && (id||'')!=='') && <div> 
-            <div className='pl-common py-compact-common'>
-              <Descriptions column={1}>
-                <Descriptions.Item 
-                  label={<div className='title-text' style={{ textAlign: 'right', width: 90 }}>资产目录路径</div>} 
-                  style={{ paddingBottom: 0 }}
-                >
-                  <div className='flex' style={{ flexDirection: 'column' }}>
-                  {
-                    (assetPaths||[]).map((item, key) => {
-                      return (
-                        <a key={key} onClick={() => { jumpToPath(item); }}>
-                          <span>{item?.dataAssetName||''}</span>
-                        </a>                        
-                      );
-                    })
-                  }
-                  </div>
-                </Descriptions.Item>
-              </Descriptions>
-            </div>
-          </div>  
-        }
-
-      {/* <div
-        style={{
-          flex: 1,
-          overflow: 'auto',
-        }}
-      > */}
-    
-        <Form form={form} onValuesChange={onValuesChange}>
-          <Radio.Group buttonStyle='solid' className='mb-3' value={currentAttribute} onChange={(e) => {
-            setCurrentAttribute(e.target.value)
-          }}>
-          {
-            (attributes??[]).map((item,key) => (
-              <Radio.Button key={key} value={item}>{item}</Radio.Button>
-            ))
-          }
-          </Radio.Group>
-          {
             attributes?.map((attribute, index) => {
               return <div key={index} style={{ display: (attribute===currentAttribute)?'':'none' }}>
                 <Descriptions column={1} bordered>
@@ -1136,7 +1129,6 @@ const AssetAction = (props) => {
         </Form>
 
       </Spin>
-      {/* </div>   */}
       
       <div>
       <Divider orientation='left'>字段级资产目录信息</Divider>

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

@@ -15,6 +15,7 @@ const AssetDetailDrawer = (props) => {
       width='80%'
       placement="right"
       closable={ true }
+      bodyStyle={{ padding: '15px' }}
       destroyOnClose
       onClose={() => {
         onCancel && onCancel();