修改我的资产草稿

src/App.js

@@ -159,6 +159,19 @@ export class App extends React.Component {
       );
     }
 
+    if( message === 'assetMange') {
+      return (
+        <AppContext.Provider value={{
+          env: hostParams?.env,
+          user: hostParams?.user,
+          setGlobalState,
+          onGlobalStateChange
+        }}>
+          <AssetManage myAssets={hostParams?.myAssets} />
+        </AppContext.Provider>
+      );
+    }
+
     return (
       <AppContext.Provider value={{
         env: hostParams?.env,

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

@@ -38,6 +38,7 @@ function updateTreeData(list, key, children) {
 }
 
 const AssetManageTree = (props) => {
+  console.log('AssetManageTreeProps',props);
 
   const MENU_ID = 'asset-manage-tree';
 
@@ -45,7 +46,7 @@ const AssetManageTree = (props) => {
     id: MENU_ID,
   });
 
-  const { checkable = false, onSelect, className, onCheck, tableId, reference=AssetManageReference, onDirectoryChange, centerId, metadataIds } = props; 
+  const { checkable = false, onSelect, className, onCheck, tableId, reference=AssetManageReference, onDirectoryChange, centerId, metadataIds,myAssets} = props; 
   const [ keyword, setKeyword ] = useState('');
   const [ loading, setLoading ] = useState(false);
   const [ treeData, setTreeData ] = useState([]);
@@ -802,20 +803,28 @@ const AssetManageTree = (props) => {
             (templates??[]).map((item, index) => <Select.Option key={index} value={item.type}>{item.name}</Select.Option>)
           }
           </Select>
-          <Tooltip title="新增目录">
-            <PlusOutlined className={(currentDir?.resourceType==='custom')?'disable': 'default'} onClick={addDir} style={{ fontSize:16,cursor: (currentDirType==='custom')?'not-allowed':'pointer' }}/>
-          </Tooltip>
-          <Tooltip title="刷新目录">
-            <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer' }} />
-          </Tooltip>
-          <Tooltip title="导入目录">
-            <ImportOutlined className={(currentDirType==='custom')?'disable': 'default'} onClick={importDir} style={{ fontSize:16,cursor:(currentDirType==='custom')?'not-allowed':'pointer' }} />
-          </Tooltip>
-          <Dropdown overlay={exportMenu} placement="bottomCenter" >
-            <Tooltip title="导出目录">
-              <ExportOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} />
+          {myAssets ? (
+            <Tooltip title="刷新目录">
+              <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer' }} />
             </Tooltip>
-          </Dropdown>
+          ) : (
+            <>
+              <Tooltip title="新增目录">
+                <PlusOutlined className={(currentDir?.resourceType==='custom')?'disable': 'default'} onClick={addDir} style={{ fontSize:16,cursor: (currentDirType==='custom')?'not-allowed':'pointer' }}/>
+              </Tooltip>
+              <Tooltip title="刷新目录">
+                <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer' }} />
+              </Tooltip>
+              <Tooltip title="导入目录">
+                <ImportOutlined className={(currentDirType==='custom')?'disable': 'default'} onClick={importDir} style={{ fontSize:16,cursor:(currentDirType==='custom')?'not-allowed':'pointer' }} />
+              </Tooltip>
+              <Dropdown overlay={exportMenu} placement="bottomCenter" >
+                <Tooltip title="导出目录">
+                  <ExportOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} />
+                </Tooltip>
+              </Dropdown>
+            </>
+          )}
           {/* <Tooltip title="自定义目录">
             <SettingOutlined className='default' onClick={customDir} style={{ fontSize:16,cursor:'pointer' }} />
           </Tooltip> */}

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

@@ -130,8 +130,9 @@ const ResizeableHeaderCell = props => {
 };
 
 const AssetTable = (props) => {
-
-  const { className, nodeId, nodeType, nodeLevel, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference, onFullScreenChange } = props;
+  console.log('AssetTableProps',props);
+  
+  const { className, nodeId, nodeType, nodeLevel, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference, onFullScreenChange,myAssets } = props;
 
   const MENU_ID = 'asset-table';
 
@@ -563,6 +564,7 @@ const AssetTable = (props) => {
       keyword: encodeURIComponent(keyword),
       orderName: sorter?.column?.title??'',
       order: order,
+      filterByMyPermission: myAssets
     };
 
     if (reference !== AssetRecycleReference) {
@@ -1074,7 +1076,13 @@ const AssetTable = (props) => {
           borderBottom: '1px solid rgb(239, 239, 239)',
         }}
       > 
-        <Space size={15}>
+    <Space size={15}>
+      {myAssets ? (
+        // 当 myAssets 为 true 时，只显示可见列设置按钮
+        <Button onClick={onFilterElementClick}>可见列设置</Button>
+      ) : (
+        // 当 myAssets 为 false 时，显示所有按钮
+        <>
           { 
             //栏目和自定义目录 不允许新增资产
             // (reference===AssetManageReference && nodeLevel!==1 && nodeType!=='custom') && <Button onClick={addAsset}>新增</Button>
@@ -1112,24 +1120,10 @@ const AssetTable = (props) => {
           }
 
           {
-            // (reference===AssetBrowseReference||reference===ResourceBrowseReference) &&
-            //   <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产目录':''}>
-            //     <Button onClick={onStartFlowClick} disabled={(checkedKeys||[]).length===0} >申请</Button>
-            //   </Tooltip>
-          }
-
-          {
             (compact && reference!==AssetRecycleReference) ? <Dropdown overlay={moreMenu} placement="bottomCenter"> 
               <Button>其他操作</Button>
             </Dropdown> : <React.Fragment>
               {
-                // (reference===AssetManageReference) &&
-                //   <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产目录':''}>
-                //     <Button onClick={onStartFlowClick} disabled={(checkedKeys||[]).length===0} >申请</Button>
-                //   </Tooltip>
-              }
-
-              {
                 (reference!==AssetRecycleReference) &&
                   <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产目录':''}>
                     <Button onClick={subscriptAsset} disabled={(checkedKeys||[]).length===0} >订阅</Button>
@@ -1157,27 +1151,23 @@ const AssetTable = (props) => {
               <Button onClick={onFilterElementClick}>可见列设置</Button>
             </React.Fragment>
           }
-          {/* {
-            (reference!==AssetRecycleReference && isSzseEnv) && <Checkbox onChange={onRecursiveChange} checked={!recursive}>仅显示当前目录</Checkbox>
-          } */}
-        </Space>
-        <Space>
-          {/* {
-            (reference!==AssetRecycleReference) && <Checkbox onChange={onFullSearchChange} checked={fullSearch}>全部数据</Checkbox>
-          } */}
-          <Search 
-            placeholder="请输入资产目录要素值" 
-            allowClear 
-            onSearch={onSearchInputChange} 
-            enterButton
-            style={{ width: inputWidth }}
-          />
-          {
-            (reference!==AssetRecycleReference) && <Tooltip title={fullScreen?'取消全屏':'全屏'}>
-              <Button onClick={onFullScreenClick} icon={fullScreen?<CancelFullScreenSvg style={{ width: 20, height: 20 }} />:<FullScreenSvg style={{ width: 20, height: 20 }} />} type='text'></Button>
-            </Tooltip>
-          }
-        </Space>
+        </>
+      )}
+    </Space>
+    <Space>
+      <Search 
+        placeholder="请输入资产目录要素值" 
+        allowClear 
+        onSearch={onSearchInputChange} 
+        enterButton
+        style={{ width: inputWidth }}
+      />
+      {
+        (reference!==AssetRecycleReference) && <Tooltip title={fullScreen?'取消全屏':'全屏'}>
+          <Button onClick={onFullScreenClick} icon={fullScreen?<CancelFullScreenSvg style={{ width: 20, height: 20 }} />:<FullScreenSvg style={{ width: 20, height: 20 }} />} type='text'></Button>
+        </Tooltip>
+      }
+    </Space>
       </div>
       <div
         className='p-3'