Commit e241aaaf authored by xiexiuxing's avatar xiexiuxing

fix:恢复合并的按钮

parent 2daabe40
// 这里是处理比较特殊的url 跳转的 // 这里是处理比较特殊的url 跳转的
import { getAuth } from "@/utils/auth"; import { getAuth } from "@/utils/auth";
export const AuthUrl = (btnCode: string, munuCode: string) => { export const AuthUrl = (btnCode: string, munuCode?: string) => {
const { auth } = getAuth() const { auth } = getAuth()
const { pathname } = new URL(window.location.href); const { pathname } = new URL(window.location.href);
const RoutesAuth = auth.filter((item: any) => item?.u === pathname) const RoutesAuth = auth.filter((item: any) => item?.u === pathname)
......
...@@ -24,6 +24,8 @@ import ModalTable from '@/components/ModalTable' ...@@ -24,6 +24,8 @@ import ModalTable from '@/components/ModalTable'
import { clearModalParams } from '@/utils' import { clearModalParams } from '@/utils'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { getProductCustomerGetCustomerAttributeList, getProductPlatformGetAttributeList, postProductCustomerDeleteCustomerAttribute, postProductCustomerSyncAttribute, postProductCustomerUpdateCustomerAttributeStatus } from '@/services/ProductV2Api' import { getProductCustomerGetCustomerAttributeList, getProductPlatformGetAttributeList, postProductCustomerDeleteCustomerAttribute, postProductCustomerSyncAttribute, postProductCustomerUpdateCustomerAttributeStatus } from '@/services/ProductV2Api'
import { AuthUrl } from '@/components/AuthButton/AuthUrl'
import AuthButton from '@/components/AuthButton'
// import styles from './index.less' // import styles from './index.less'
const formActions = createFormActions(); const formActions = createFormActions();
...@@ -141,19 +143,22 @@ const Attribute: React.FC<{}> = () => { ...@@ -141,19 +143,22 @@ const Attribute: React.FC<{}> = () => {
dataIndex: 'isEnable', dataIndex: 'isEnable',
key: 'isEnable', key: 'isEnable',
render: (text: any, record: any) => ( render: (text: any, record: any) => (
<Popconfirm
title={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.title' })} <AuthButton btnCode='attribute.state' >
onConfirm={() => confirm(record)} <Popconfirm
onCancel={cancel} title={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.title' })}
okText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.okText' })} onConfirm={() => confirm(record)}
cancelText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.cancelText' })} onCancel={cancel}
> okText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.okText' })}
<Button cancelText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.cancelText' })}
type="link" >
style={record.isEnable ? { color: '#00B37A' } : { color: 'red' }}> <Button
{record.isEnable ? <>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.link.1' })} <PlayCircleOutlined /></> : <>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.link.2' })} <PauseCircleOutlined /></>} type="link"
</Button> style={record.isEnable ? { color: '#00B37A' } : { color: 'red' }}>
</Popconfirm> {record.isEnable ? <>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.link.1' })} <PlayCircleOutlined /></> : <>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.isEnable.link.2' })} <PauseCircleOutlined /></>}
</Button>
</Popconfirm>
</AuthButton>
) )
}, },
{ {
...@@ -161,26 +166,33 @@ const Attribute: React.FC<{}> = () => { ...@@ -161,26 +166,33 @@ const Attribute: React.FC<{}> = () => {
dataIndex: 'option', dataIndex: 'option',
render: (text: any, record: any) => record.isEnable ? '' : <> render: (text: any, record: any) => record.isEnable ? '' : <>
<Button type='link' onClick={() => handleEdit(record)}>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.linke.1' })}</Button>
<AuthButton btnCode='attribute.edit' >
<Button type='link' onClick={() => handleEdit(record)}>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.linke.1' })}</Button>
</AuthButton>
<Popconfirm <AuthButton btnCode='attribute.del' >
title={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.title' })} <Popconfirm
onConfirm={() => clickDelete(record)} title={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.title' })}
onCancel={cancel} onConfirm={() => clickDelete(record)}
okText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.okText' })} onCancel={cancel}
cancelText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.cancelText' })} okText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.okText' })}
> cancelText={intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.cancelText' })}
<Button type='link'>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.linke.2' })}</Button> >
</Popconfirm> <Button type='link'>{intl.formatMessage({ id: 'classAndProperty.attribute.columns.option.linke.2' })}</Button>
</Popconfirm>
</AuthButton>
</> </>
} }
]; ];
const handleSee = (record: any) => { const handleSee = (record: any) => {
history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true`) if (AuthUrl('attribute.see')) {
history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true`)
}
} }
const confirm = (record: any) => { const confirm = (record: any) => {
...@@ -241,13 +253,18 @@ const Attribute: React.FC<{}> = () => { ...@@ -241,13 +253,18 @@ const Attribute: React.FC<{}> = () => {
const Actions = ( const Actions = (
<Space> <Space>
<Button type="primary" icon={<PlusOutlined />} onClick={() => { history.push('/memberCenter/commodityAbility/classAndProperty/attribute/add') }}> <AuthButton btnCode='attribute.add' >
{intl.formatMessage({ id: 'classAndProperty.attribute.actions.button.1' })} <Button type="primary" icon={<PlusOutlined />} onClick={() => { history.push('/memberCenter/commodityAbility/classAndProperty/attribute/add') }}>
</Button> {intl.formatMessage({ id: 'classAndProperty.attribute.actions.button.1' })}
</Button>
</AuthButton>
<span> <span>
<Tooltip title={intl.formatMessage({ id: 'classAndProperty.attribute.actions.tooltip' })}> <AuthButton btnCode='attribute.synchronization' >
<Button type="default" style={{ marginLeft: 16 }} onClick={syncAttribute}>{intl.formatMessage({ id: 'classAndProperty.attribute.actions.button.2' })}</Button> <Tooltip title={intl.formatMessage({ id: 'classAndProperty.attribute.actions.tooltip' })}>
</Tooltip> <Button type="default" style={{ marginLeft: 16 }} onClick={syncAttribute}>{intl.formatMessage({ id: 'classAndProperty.attribute.actions.button.2' })}</Button>
</Tooltip>
</AuthButton>
</span> </span>
</Space> </Space>
); );
......
...@@ -19,6 +19,8 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -19,6 +19,8 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { getProductCustomerGetCustomerCategoryAttributeList, getProductCustomerGetCustomerCategoryTree, postProductCustomerDeleteCustomerCategoryAttribute, postProductCustomerSaveCustomerCategoryAttribute } from '@/services/ProductV2Api'; import { getProductCustomerGetCustomerCategoryAttributeList, getProductCustomerGetCustomerCategoryTree, postProductCustomerDeleteCustomerCategoryAttribute, postProductCustomerSaveCustomerCategoryAttribute } from '@/services/ProductV2Api';
import { ISchema } from '@formily/antd'; import { ISchema } from '@formily/antd';
import AuthButton from '@/components/AuthButton';
import { AuthUrl } from '@/components/AuthButton/AuthUrl';
const fetchCategoryTreeData = async (params?) => { const fetchCategoryTreeData = async (params?) => {
const res = await getProductCustomerGetCustomerCategoryTree() const res = await getProductCustomerGetCustomerCategoryTree()
...@@ -110,7 +112,7 @@ const CategoryAttributes: React.FC<{}> = () => { ...@@ -110,7 +112,7 @@ const CategoryAttributes: React.FC<{}> = () => {
useEffect(() => { useEffect(() => {
if (selectKey && flag.current) { if (selectKey && flag.current) {
ref.current.reload() ref.current.reload()
} else if(!selectKey) { } else if (!selectKey) {
flag.current = false flag.current = false
} else { } else {
flag.current = true flag.current = true
...@@ -148,7 +150,10 @@ const CategoryAttributes: React.FC<{}> = () => { ...@@ -148,7 +150,10 @@ const CategoryAttributes: React.FC<{}> = () => {
} }
const handleSee = (record: any) => { const handleSee = (record: any) => {
history.push(`/memberCenter/commodityAbility/classAndProperty/categoryAttributes/viewAttributes?id=${record.id}`) if (AuthUrl('categoryAttributes.see')) {
history.push(`/memberCenter/commodityAbility/classAndProperty/categoryAttributes/viewAttributes?id=${record.id}`)
}
} }
const handleSelectOk = () => { const handleSelectOk = () => {
...@@ -218,14 +223,17 @@ const CategoryAttributes: React.FC<{}> = () => { ...@@ -218,14 +223,17 @@ const CategoryAttributes: React.FC<{}> = () => {
render: (text: any, record: any) => { render: (text: any, record: any) => {
return ( return (
<> <>
<Popconfirm <AuthButton btnCode='propertyValue.edit' >
title={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.popconfirm' })} <Popconfirm
onConfirm={() => clickRelief(record.id)} title={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.popconfirm' })}
okText={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.okText' })} onConfirm={() => clickRelief(record.id)}
cancelText={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.cancelText' })} okText={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.okText' })}
> cancelText={intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.cancelText' })}
<Button type='link'>{intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.button' })}</Button> >
</Popconfirm> <Button type='link'>{intl.formatMessage({ id: 'classAndProperty.categoryAttributes.columns.button' })}</Button>
</Popconfirm>
</AuthButton>
</> </>
) )
} }
...@@ -361,9 +369,12 @@ const CategoryAttributes: React.FC<{}> = () => { ...@@ -361,9 +369,12 @@ const CategoryAttributes: React.FC<{}> = () => {
}, },
children: ( children: (
<> <>
<Button type="primary" icon={<PlusOutlined />} onClick={handleNewLink}> <AuthButton btnCode='categoryAttributes.add' >
{intl.formatMessage({ id: 'classAndProperty.categoryAttributes.formilyChilds.button' })} <Button type="primary" icon={<PlusOutlined />} onClick={handleNewLink}>
</Button> {intl.formatMessage({ id: 'classAndProperty.categoryAttributes.formilyChilds.button' })}
</Button>
</AuthButton>
</> </>
) )
}} }}
......
...@@ -14,6 +14,7 @@ import { useTreeTabs } from '@/hooks/useTreeTabs'; ...@@ -14,6 +14,7 @@ import { useTreeTabs } from '@/hooks/useTreeTabs';
import NiceForm from '@/components/NiceForm'; import NiceForm from '@/components/NiceForm';
import { getProductCustomerGetCustomerCategory, getProductCustomerGetCustomerCategoryTree, getProductPlatformGetCategoryTree, postProductCustomerDeleteCustomerCategory, postProductCustomerSaveOrUpdateCustomerCategory, postProductCustomerSyncCategory } from '@/services/ProductV2Api'; import { getProductCustomerGetCustomerCategory, getProductCustomerGetCustomerCategoryTree, getProductPlatformGetCategoryTree, postProductCustomerDeleteCustomerCategory, postProductCustomerSaveOrUpdateCustomerCategory, postProductCustomerSyncCategory } from '@/services/ProductV2Api';
import { help } from '@/pages/transaction/common'; import { help } from '@/pages/transaction/common';
import AuthButton from '@/components/AuthButton';
const { ON_FORM_INPUT_CHANGE } = LifeCycleTypes const { ON_FORM_INPUT_CHANGE } = LifeCycleTypes
...@@ -213,7 +214,10 @@ const ClassProperty: React.FC<{}> = () => { ...@@ -213,7 +214,10 @@ const ClassProperty: React.FC<{}> = () => {
// customExpandkeys={['8']} // customExpandkeys={['8']}
/> />
: :
<Button block type='primary' onClick={() => handleSelect()}>{intl.formatMessage({ id: 'classAndProperty.class.h3.none' })}</Button>
<AuthButton btnCode='class.synchronization' menuCode='memberAbility'>
<Button block type='primary' onClick={() => handleSelect()}>{intl.formatMessage({ id: 'classAndProperty.class.h3.none' })}</Button>
</AuthButton>
} }
</Card> </Card>
</Col> </Col>
...@@ -254,14 +258,20 @@ const ClassProperty: React.FC<{}> = () => { ...@@ -254,14 +258,20 @@ const ClassProperty: React.FC<{}> = () => {
> >
<FormButtonGroup> <FormButtonGroup>
<Button loading={finshLoading} htmlType='submit' type="primary" style={{ marginTop: 32, marginBottom: 16, marginRight: 24 }}>
{intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.button.1' })} <AuthButton btnCode='class.add' menuCode='memberAbility'>
</Button> <Button loading={finshLoading} htmlType='submit' type="primary" style={{ marginTop: 32, marginBottom: 16, marginRight: 24 }}>
{intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.button.1' })}
</Button>
</AuthButton>
<Popconfirm title={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.popconfirm' })} okText={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.okText' })} cancelText={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.cancelText' })} onConfirm={handleDeleteMenu}> <Popconfirm title={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.popconfirm' })} okText={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.okText' })} cancelText={intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.cancelText' })} onConfirm={handleDeleteMenu}>
{ {
treeStatus !== FormState.ADD && <Button style={{ marginTop: 32, marginBottom: 16 }}> treeStatus !== FormState.ADD &&
{intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.button.2' })} <AuthButton btnCode='class.del' menuCode='memberAbility'>
</Button> <Button style={{ marginTop: 32, marginBottom: 16 }}>
{intl.formatMessage({ id: 'classAndProperty.class.h3.formButtonGroup.button.2' })}
</Button>
</AuthButton>
} }
</Popconfirm> </Popconfirm>
</FormButtonGroup> </FormButtonGroup>
......
...@@ -22,6 +22,8 @@ import { ISchema } from '@formily/antd'; ...@@ -22,6 +22,8 @@ import { ISchema } from '@formily/antd';
import { clearModalParams } from '@/utils'; import { clearModalParams } from '@/utils';
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'; import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { getProductCustomerGetCustomerAttributeTree, getProductCustomerGetCustomerAttributeValueList, getProductPlatformGetSyncAttributeValueList, postProductCustomerDeleteCustomerAttributeValue, postProductCustomerSyncAttributeValue, postProductCustomerUpdateCustomerAttributeValueStatus } from '@/services/ProductV2Api'; import { getProductCustomerGetCustomerAttributeTree, getProductCustomerGetCustomerAttributeValueList, getProductPlatformGetSyncAttributeValueList, postProductCustomerDeleteCustomerAttributeValue, postProductCustomerSyncAttributeValue, postProductCustomerUpdateCustomerAttributeValueStatus } from '@/services/ProductV2Api';
import AuthButton from '@/components/AuthButton';
import { AuthUrl } from '@/components/AuthButton/AuthUrl';
const treeActions = createTreeActions() const treeActions = createTreeActions()
...@@ -121,7 +123,7 @@ const PropertyValue: React.FC<{}> = () => { ...@@ -121,7 +123,7 @@ const PropertyValue: React.FC<{}> = () => {
useEffect(() => { useEffect(() => {
if (selectKey && flag.current) { if (selectKey && flag.current) {
ref.current.reload({ current: 1, pageSize: 10, name: '', customerAttributeId: selectKey }) ref.current.reload({ current: 1, pageSize: 10, name: '', customerAttributeId: selectKey })
} else if(!selectKey) { } else if (!selectKey) {
flag.current = false flag.current = false
} else { } else {
flag.current = true flag.current = true
...@@ -166,7 +168,9 @@ const PropertyValue: React.FC<{}> = () => { ...@@ -166,7 +168,9 @@ const PropertyValue: React.FC<{}> = () => {
} }
const handleSee = (record: any) => { const handleSee = (record: any) => {
history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&type=${record.type}`) if (AuthUrl('propertyValue.see')) {
history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&type=${record.type}`)
}
} }
const columns: ColumnType<any>[] = [ const columns: ColumnType<any>[] = [
...@@ -191,19 +195,22 @@ const PropertyValue: React.FC<{}> = () => { ...@@ -191,19 +195,22 @@ const PropertyValue: React.FC<{}> = () => {
render: (text: any, record: any) => { render: (text: any, record: any) => {
let component: ReactNode = null let component: ReactNode = null
component = ( component = (
<Popconfirm
title={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.title' })} <AuthButton btnCode='propertyValue.state' >
onConfirm={() => confirm(record)} <Popconfirm
onCancel={cancel} title={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.title' })}
okText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.okText' })} onConfirm={() => confirm(record)}
cancelText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.cancelText' })} onCancel={cancel}
> okText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.okText' })}
<Button cancelText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.cancelText' })}
type="link" >
style={record.isEnable ? { color: '#00B37A' } : { color: 'red' }}> <Button
{record.isEnable ? <>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.button.1' })} <PlayCircleOutlined /></> : <>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.button.2' })} <PauseCircleOutlined /></>} type="link"
</Button> style={record.isEnable ? { color: '#00B37A' } : { color: 'red' }}>
</Popconfirm> {record.isEnable ? <>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.button.1' })} <PlayCircleOutlined /></> : <>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.popconfirm.button.2' })} <PauseCircleOutlined /></>}
</Button>
</Popconfirm>
</AuthButton>
) )
return component return component
} }
...@@ -217,21 +224,27 @@ const PropertyValue: React.FC<{}> = () => { ...@@ -217,21 +224,27 @@ const PropertyValue: React.FC<{}> = () => {
<> <>
{ {
record.isEnable ? '' : <> record.isEnable ? '' : <>
<Button
type='link' <AuthButton btnCode='propertyValue.edit' >
onClick={() => history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/edit?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}`)} <Button
> type='link'
{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.1' })} onClick={() => history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/edit?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}`)}
</Button> >
<Popconfirm {intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.1' })}
title={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.title' })} </Button>
onConfirm={() => clickDelete(record)} </AuthButton>
onCancel={cancel} <AuthButton btnCode='propertyValue.del' >
okText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.okText' })} <Popconfirm
cancelText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.cancelText' })} title={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.title' })}
> onConfirm={() => clickDelete(record)}
<Button type='link'>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2' })}</Button> onCancel={cancel}
</Popconfirm> okText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.okText' })}
cancelText={intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2.popconfirm.cancelText' })}
>
<Button type='link'>{intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.2' })}</Button>
</Popconfirm>
</AuthButton>
</> </>
} }
</> </>
...@@ -391,15 +404,18 @@ const PropertyValue: React.FC<{}> = () => { ...@@ -391,15 +404,18 @@ const PropertyValue: React.FC<{}> = () => {
}, },
children: ( children: (
<> <>
<Button <AuthButton btnCode='attribute.add' >
type="primary" <Button
icon={<PlusOutlined />} type="primary"
onClick={() => { icon={<PlusOutlined />}
history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/add?attrId=${selectKey || history.location.query.attrId}&attrName=${selectNode?._title || history.location.query.attrName}&type=${selectNode?.type || history.location.query.type}`) onClick={() => {
}} history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/add?attrId=${selectKey || history.location.query.attrId}&attrName=${selectNode?._title || history.location.query.attrName}&type=${selectNode?.type || history.location.query.type}`)
> }}
{intl.formatMessage({ id: 'classAndProperty.propertyValue.standardTable.formilyChilds.button' })} >
</Button> {intl.formatMessage({ id: 'classAndProperty.propertyValue.standardTable.formilyChilds.button' })}
</Button>
</AuthButton>
</> </>
) )
}} }}
......
...@@ -161,7 +161,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -161,7 +161,7 @@ const MemberMaintain: React.FC<[]> = () => {
{record.showUpdate && ( {record.showUpdate && (
<> <>
<AuthButton btnCode='memberImport.commit' menuCode='memberAbility'> <AuthButton btnCode='memberImport.edit' menuCode='memberAbility'>
<Button <Button
type="link" type="link"
onClick={() => onClick={() =>
...@@ -258,7 +258,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -258,7 +258,7 @@ const MemberMaintain: React.FC<[]> = () => {
</Space> </Space>
)} */} )} */}
<Space> <Space>
<AuthButton btnCode='memberImport.del' menuCode='memberAbility'> <AuthButton btnCode='memberImport.add' menuCode='memberAbility'>
<Button <Button
type="primary" type="primary"
onClick={() => onClick={() =>
......
...@@ -488,7 +488,7 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => { ...@@ -488,7 +488,7 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => {
<Form.Item <Form.Item
label={<RequireItem label="" />} label={<RequireItem label="" />}
> >
<AuthButton btnCode='hopAbility.Submit' menuCode='shopAbility'> <AuthButton btnCode='shopAbility.Submit' menuCode='shopAbility'>
<Button loading={confirmLoading} type="primary" style={{ marginRight: 16 }} onClick={handleSave}>{intl.formatMessage({ id: 'common.button.save' })}</Button> <Button loading={confirmLoading} type="primary" style={{ marginRight: 16 }} onClick={handleSave}>{intl.formatMessage({ id: 'common.button.save' })}</Button>
</AuthButton> </AuthButton>
......
...@@ -72,7 +72,7 @@ const ShopSeoAdded = () => { ...@@ -72,7 +72,7 @@ const ShopSeoAdded = () => {
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'common.button.back' })} />} backIcon={<ReutrnEle description={intl.formatMessage({ id: 'common.button.back' })} />}
extra={ extra={
link !== 'detail' && link !== 'detail' &&
<AuthButton menuCode='shopAbility' btnCode={id ? 'hopSeodetail.edit' : 'shopSeodetail.add'} > <AuthButton btnCode={id ? 'shopSeodetail.edit' : 'shopSeodetail.add'} >
<Button type="primary" loading={confirmLoading} onClick={handleSave}>{intl.formatMessage({ id: 'common.button.save' })}</Button> <Button type="primary" loading={confirmLoading} onClick={handleSave}>{intl.formatMessage({ id: 'common.button.save' })}</Button>
</AuthButton> </AuthButton>
......
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