Complete main UI #37

Merged
FatttSnake merged 192 commits from FatttSnake into dev 2024-02-23 16:31:17 +08:00
4 changed files with 2 additions and 28 deletions
Showing only changes of commit 37fcfecbb7 - Show all commits

2
src/global.d.ts vendored
View File

@@ -493,7 +493,6 @@ interface ToolBaseVo {
source: ToolDataVo source: ToolDataVo
dist: ToolDataVo dist: ToolDataVo
compiled: boolean compiled: boolean
enable: boolean
createTime: string createTime: string
updateTime: string updateTime: string
} }
@@ -503,7 +502,6 @@ interface ToolBaseAddEditParam {
name?: string name?: string
source?: string source?: string
dist?: string dist?: string
enable?: boolean
} }
interface ToolTemplateVo { interface ToolTemplateVo {

View File

@@ -80,7 +80,6 @@ const Base = () => {
setIsDrawerOpen(true) setIsDrawerOpen(true)
form.setFieldValue('id', undefined) form.setFieldValue('id', undefined)
form.setFieldValue('name', newFormValues?.name) form.setFieldValue('name', newFormValues?.name)
form.setFieldValue('enable', newFormValues?.enable ?? true)
} }
const baseColumns: _ColumnsType<ToolBaseVo> = [ const baseColumns: _ColumnsType<ToolBaseVo> = [
@@ -106,21 +105,6 @@ const Base = () => {
align: 'center', align: 'center',
render: (value: string) => utcToLocalTime(value) render: (value: string) => utcToLocalTime(value)
}, },
{
title: '状态',
width: '10em',
align: 'center',
render: (_, record) => (
<>
{record.enable ? (
<AntdTag color={'success'}></AntdTag>
) : (
<AntdTag></AntdTag>
)}
{!record.compiled && <AntdTag></AntdTag>}
</>
)
},
{ {
title: ( title: (
<> <>
@@ -381,7 +365,6 @@ const Base = () => {
setIsDrawerOpen(true) setIsDrawerOpen(true)
form.setFieldValue('id', value.id) form.setFieldValue('id', value.id)
form.setFieldValue('name', value.name) form.setFieldValue('name', value.name)
form.setFieldValue('enable', value.enable)
void form.validateFields() void form.validateFields()
} }
} }
@@ -668,7 +651,6 @@ const Base = () => {
)} )}
</> </>
), ),
dataIndex: 'enable',
width: '12em', width: '12em',
align: 'center', align: 'center',
render: (_, record) => ( render: (_, record) => (
@@ -920,8 +902,7 @@ const Base = () => {
if (!isDrawerEdit && formValues) { if (!isDrawerEdit && formValues) {
setNewFormValues({ setNewFormValues({
name: formValues.name, name: formValues.name
enable: formValues.enable
}) })
} }
}, [formValues]) }, [formValues])
@@ -958,9 +939,6 @@ const Base = () => {
> >
<AntdInput allowClear /> <AntdInput allowClear />
</AntdForm.Item> </AntdForm.Item>
<AntdForm.Item name={'enable'} label={'状态'}>
<AntdSwitch checkedChildren={'启用'} unCheckedChildren={'禁用'} />
</AntdForm.Item>
</AntdForm> </AntdForm>
) )

View File

@@ -84,7 +84,6 @@ const Category = () => {
</Permission> </Permission>
</> </>
), ),
dataIndex: 'enable',
width: '15em', width: '15em',
align: 'center', align: 'center',
render: (_, record) => ( render: (_, record) => (

View File

@@ -509,7 +509,6 @@ const Template = () => {
)} )}
</> </>
), ),
dataIndex: 'enable',
width: '12em', width: '12em',
align: 'center', align: 'center',
render: (_, record) => ( render: (_, record) => (
@@ -836,7 +835,7 @@ const Template = () => {
filterOption={filterOption} filterOption={filterOption}
options={baseData.map((value) => ({ options={baseData.map((value) => ({
value: value.id, value: value.id,
label: `${value.name}${!value.enable ? '(已禁用)' : ''}` label: value.name
}))} }))}
/> />
</AntdForm.Item> </AntdForm.Item>