FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Optimize code

Browse Source
This commit is contained in:
Fat Snake
2024-01-23 18:03:32 +08:00
parent ee23f03e4c
commit 50f7b99bbe
2 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/System/Tools/Base.tsx
View File

@@ -136,7 +136,6 @@ const Base = () => {
)} )}
</> </>
), ),
dataIndex: 'enable',
width: '12em', width: '12em',
align: 'center', align: 'center',
render: (_, record) => ( render: (_, record) => (

135
src/pages/System/Tools/Template.tsx
View File

@@ -74,10 +74,6 @@ const Template = () => {
) )
const handleOnAddBtnClick = () => { const handleOnAddBtnClick = () => {
if (Object.keys(hasEdited).length) {
void message.warning('新增前请保存修改')
return
}
setIsDrawerEdit(false) setIsDrawerEdit(false)
setIsDrawerOpen(true) setIsDrawerOpen(true)
form.setFieldValue('id', undefined) form.setFieldValue('id', undefined)
@@ -105,21 +101,21 @@ const Template = () => {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
width: '20%', width: '0',
align: 'center', align: 'center',
render: (value: string) => utcToLocalTime(value) render: (value: string) => utcToLocalTime(value)
}, },
{ {
title: '修改时间', title: '修改时间',
dataIndex: 'updateTime', dataIndex: 'updateTime',
width: '20%', width: '0',
align: 'center', align: 'center',
render: (value: string) => utcToLocalTime(value) render: (value: string) => utcToLocalTime(value)
}, },
{ {
title: '状态', title: '状态',
dataIndex: 'enable', dataIndex: 'enable',
width: '5%', width: '0',
align: 'center', align: 'center',
render: (value) => render: (value) =>
value ? <AntdTag color={'success'}>启用</AntdTag> : <AntdTag>禁用</AntdTag> value ? <AntdTag color={'success'}>启用</AntdTag> : <AntdTag>禁用</AntdTag>
@@ -127,15 +123,20 @@ const Template = () => {
{ {
title: ( title: (
<> <>
操作 ( 操作
<a style={{ color: COLOR_PRODUCTION }} onClick={handleOnAddBtnClick}> {!Object.keys(hasEdited).length && (
新增 <>
</a> {' '}
) (
<a style={{ color: COLOR_PRODUCTION }} onClick={handleOnAddBtnClick}>
新增
</a>
)
</>
)}
</> </>
), ),
dataIndex: 'enable', width: '8em',
width: '15em',
align: 'center', align: 'center',
render: (_, record) => ( render: (_, record) => (
<> <>
@@ -150,14 +151,16 @@ const Template = () => {
</a> </a>
</Permission> </Permission>
)} )}
<Permission operationCode={'system:tool:modify:base'}> {!Object.keys(hasEdited).length && (
<a <Permission operationCode={'system:tool:modify:base'}>
style={{ color: COLOR_PRODUCTION }} <a
onClick={handleOnEditBtnClick(record)} style={{ color: COLOR_PRODUCTION }}
> onClick={handleOnEditBtnClick(record)}
编辑 >
</a> 编辑
</Permission> </a>
</Permission>
)}
<Permission operationCode={'system:tool:delete:base'}> <Permission operationCode={'system:tool:delete:base'}>
<a <a
style={{ color: COLOR_PRODUCTION }} style={{ color: COLOR_PRODUCTION }}
@@ -203,11 +206,6 @@ const Template = () => {
const handleOnEditBtnClick = (value: ToolTemplateVo) => { const handleOnEditBtnClick = (value: ToolTemplateVo) => {
return () => { return () => {
if (Object.keys(hasEdited).length) {
void message.warning('编辑前请保存修改')
return
}
setIsDrawerEdit(true) setIsDrawerEdit(true)
setIsDrawerOpen(true) setIsDrawerOpen(true)
form.setFieldValue('id', value.id) form.setFieldValue('id', value.id)
@@ -362,6 +360,16 @@ const Template = () => {
...templateDetailData, ...templateDetailData,
[record.id]: response.data! [record.id]: response.data!
}) })
setTemplateData(
templateData.map((value) =>
value.id === response.data!.id
? {
...response.data!,
source: { id: response.data!.source.id }
}
: value
)
)
break break
default: default:
void message.error(`获取模板 ${record.name} 文件内容失败，请稍后重试`) void message.error(`获取模板 ${record.name} 文件内容失败，请稍后重试`)
@@ -382,11 +390,6 @@ const Template = () => {
} }
const handleOnAddFile = () => { const handleOnAddFile = () => {
if (Object.keys(hasEdited).length) {
void message.warning('新建文件前请先保存更改')
return
}
void modal.confirm({ void modal.confirm({
title: '新建文件', title: '新建文件',
content: ( content: (
@@ -493,11 +496,17 @@ const Template = () => {
{ {
title: ( title: (
<> <>
操作 ( 操作
<a style={{ color: COLOR_PRODUCTION }} onClick={handleOnAddFile}> {!Object.keys(hasEdited).length && (
新增 <>
</a> {' '}
) (
<a style={{ color: COLOR_PRODUCTION }} onClick={handleOnAddFile}>
新增
</a>
)
</>
)}
</> </>
), ),
dataIndex: 'enable', dataIndex: 'enable',
@@ -514,22 +523,26 @@ const Template = () => {
编辑 编辑
</a> </a>
</Permission> </Permission>
<Permission operationCode={'system:tool:modify:category'}> {!Object.keys(hasEdited).length && (
<a <Permission operationCode={'system:tool:modify:category'}>
onClick={handleOnRenameFile(record.name)} <a
style={{ color: COLOR_PRODUCTION }} onClick={handleOnRenameFile(record.name)}
> style={{ color: COLOR_PRODUCTION }}
重命名 >
</a> 重命名
</Permission> </a>
<Permission operationCode={'system:tool:delete:category'}> </Permission>
<a )}
onClick={handleOnDeleteFile(record.name)} {!Object.keys(hasEdited).length && (
style={{ color: COLOR_PRODUCTION }} <Permission operationCode={'system:tool:delete:category'}>
> <a
删除 onClick={handleOnDeleteFile(record.name)}
</a> style={{ color: COLOR_PRODUCTION }}
</Permission> >
删除
</a>
</Permission>
)}
</AntdSpace> </AntdSpace>
</> </>
) )
@@ -551,10 +564,6 @@ const Template = () => {
const handleOnRenameFile = (fileName: string) => { const handleOnRenameFile = (fileName: string) => {
return () => { return () => {
if (Object.keys(hasEdited).length) {
void message.warning('重命名文件前请先保存更改')
return
}
renameFileForm.setFieldValue('fileName', fileName) renameFileForm.setFieldValue('fileName', fileName)
void modal.confirm({ void modal.confirm({
title: '重命名文件', title: '重命名文件',
@@ -655,11 +664,6 @@ const Template = () => {
const handleOnDeleteFile = (fileName: string) => { const handleOnDeleteFile = (fileName: string) => {
return () => { return () => {
if (Object.keys(hasEdited).length) {
void message.warning('删除文件前请先保存更改')
return
}
modal modal
.confirm({ .confirm({
title: '确定删除', title: '确定删除',
@@ -726,7 +730,9 @@ const Template = () => {
const handleOnChangeFileContent = (_content: string, _fileName: string, files: IFiles) => { const handleOnChangeFileContent = (_content: string, _fileName: string, files: IFiles) => {
setEditingFiles({ ...editingFiles, [editingTemplateId]: files }) setEditingFiles({ ...editingFiles, [editingTemplateId]: files })
setHasEdited({ ...hasEdited, [editingTemplateId]: true }) if (!hasEdited[editingTemplateId]) {
setHasEdited({ ...hasEdited, [editingTemplateId]: true })
}
} }
const getBaseData = () => { const getBaseData = () => {
@@ -859,6 +865,7 @@ const Template = () => {
onChangeFileContent={handleOnChangeFileContent} onChangeFileContent={handleOnChangeFileContent}
showFileSelector={false} showFileSelector={false}
tsconfig={tsconfig} tsconfig={tsconfig}
readonly={isLoading || templateDetailLoading[editingTemplateId]}
/> />
<div className={'close-editor-btn'} onClick={handleOnCloseBtnClick}> <div className={'close-editor-btn'} onClick={handleOnCloseBtnClick}>
<Icon component={IconOxygenClose} /> <Icon component={IconOxygenClose} />
@@ -868,7 +875,7 @@ const Template = () => {
</FlexBox> </FlexBox>
</HideScrollbar> </HideScrollbar>
<AntdDrawer <AntdDrawer
title={isDrawerEdit ? '编辑基板' : '添加基板'} title={isDrawerEdit ? '编辑模板' : '添加模板'}
onClose={handleOnDrawerClose} onClose={handleOnDrawerClose}
open={isDrawerOpen} open={isDrawerOpen}
closable={!isSubmitting} closable={!isSubmitting}