Commit defa4eaa by zhaochengxiang

bug fix

parent f7aed40f
...@@ -19,7 +19,7 @@ import { AssetDirectorySubject } from './AssetDirectory'; ...@@ -19,7 +19,7 @@ import { AssetDirectorySubject } from './AssetDirectory';
export const AssetActionSubject = new Subject(); export const AssetActionSubject = new Subject();
const AssetAction = (props) => { const AssetAction = (props) => {
const { id, dirId, action, terms, readOnly = false, form, onMetadataChange, onElementsChange, reference = AssetManageReference } = props; const { id, dirId, action, terms, readOnly = false, previewAble = false, form, onMetadataChange, onElementsChange, reference = AssetManageReference } = props;
const [ currentAction, setCurrentAction ] = useState(action); const [ currentAction, setCurrentAction ] = useState(action);
const [ assetParams, setAssetParams ] = useState({ assets: {}, attributes: [], attributesFoldMap: {} }); const [ assetParams, setAssetParams ] = useState({ assets: {}, attributes: [], attributesFoldMap: {} });
...@@ -430,7 +430,7 @@ const AssetAction = (props) => { ...@@ -430,7 +430,7 @@ const AssetAction = (props) => {
</div> </div>
} }
{ {
(!loading && assets?.allowButtons && ((assets?.allowButtons||[]).findIndex(item => item==='preview') === -1)) ? <div className='m-1'>暂无权限</div> : <React.Fragment> (!previewAble && !loading && assets?.allowButtons && (assets?.allowButtons||[]).findIndex(item => item==='preview') === -1) ? <div className='m-1'>暂无权限</div> : <React.Fragment>
{ {
(action!=='add' && (id||'')!=='') && <div> (action!=='add' && (id||'')!=='') && <div>
<div className='pl-common py-compact-common'> <div className='pl-common py-compact-common'>
......
...@@ -4,8 +4,7 @@ import { Drawer, Form } from 'antd'; ...@@ -4,8 +4,7 @@ import { Drawer, Form } from 'antd';
import AssetAction from './AssetAction'; import AssetAction from './AssetAction';
const AssetDetailDrawer = (props) => { const AssetDetailDrawer = (props) => {
const { onCancel, visible, id, dirId, reference } = props; const { onCancel, visible, id, dirId, previewAble, reference } = props;
const [ form ] = Form.useForm(); const [ form ] = Form.useForm();
return ( return (
...@@ -21,7 +20,7 @@ const AssetDetailDrawer = (props) => { ...@@ -21,7 +20,7 @@ const AssetDetailDrawer = (props) => {
}} }}
> >
{ {
visible && <AssetAction form={form} id={id} dirId={dirId} action='detail' reference={reference} readOnly /> visible && <AssetAction form={form} id={id} dirId={dirId} action='detail' previewAble={previewAble} reference={reference} readOnly />
} }
</Drawer> </Drawer>
) )
......
...@@ -31,7 +31,7 @@ const FC = () => { ...@@ -31,7 +31,7 @@ const FC = () => {
}, },
})) }))
const [ permissions, setPermissions ] = React.useState() const [ permissions, setPermissions ] = React.useState([])
const [loading, setLoading] = React.useState(false) const [loading, setLoading] = React.useState(false)
const [loadingElements, setLoadingElements] = React.useState(false) const [loadingElements, setLoadingElements] = React.useState(false)
const [columns, setColumns] = React.useState() const [columns, setColumns] = React.useState()
...@@ -58,6 +58,7 @@ const FC = () => { ...@@ -58,6 +58,7 @@ const FC = () => {
id: undefined, id: undefined,
dirId: undefined, dirId: undefined,
reference: undefined, reference: undefined,
previewAble: undefined,
}) })
const [page, setPage] = usePage() const [page, setPage] = usePage()
...@@ -411,7 +412,8 @@ const FC = () => { ...@@ -411,7 +412,8 @@ const FC = () => {
visible: true, visible: true,
id: value?.id, id: value?.id,
dirId: value?.dirId, dirId: value?.dirId,
reference: AssetBrowseReference reference: AssetBrowseReference,
previewAble: (permissions??[]).findIndex(item => item === 'preview') !== -1
}) })
}} }}
rowClassName={(record, index) => (record?.id === row?.id) ? 'yy-table-select-row' : ''} rowClassName={(record, index) => (record?.id === row?.id) ? 'yy-table-select-row' : ''}
...@@ -433,7 +435,8 @@ const FC = () => { ...@@ -433,7 +435,8 @@ const FC = () => {
setFilterElementParams({ setFilterElementParams({
visible: false, visible: false,
type: undefined, type: undefined,
reference: undefined reference: undefined,
previewAble: undefined
}) })
if (refresh) { if (refresh) {
refreshPage() refreshPage()
...@@ -460,7 +463,8 @@ const FC = () => { ...@@ -460,7 +463,8 @@ const FC = () => {
visible: false, visible: false,
id: undefined, id: undefined,
dirId: undefined, dirId: undefined,
reference: undefined reference: undefined,
previewAble: undefined,
}) })
}} }}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment