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

Refactor(Variable): Optimize variable name

Browse Source
This commit is contained in:
Fat Snake
2024-05-06 15:37:45 +08:00
parent 5e6c8f214c
commit 779e0ab2c0
28 changed files with 194 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/System/Group.tsx
View File

@@ -50,7 +50,7 @@ const Group = () => {
const [isRegexLegal, setIsRegexLegal] = useState(true)
const [isDrawerOpen, setIsDrawerOpen] = useState(false)
const [isDrawerEdit, setIsDrawerEdit] = useState(false)
const [submittable, setSubmittable] = useState(false)
const [isSubmittable, setIsSubmittable] = useState(false)
const [roleData, setRoleData] = useState<RoleVo[]>([])
const [isLoadingRole, setIsLoadingRole] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
@@ -471,10 +471,10 @@ const Group = () => {
useEffect(() => {
form.validateFields({ validateOnly: true }).then(
() => {
setSubmittable(true)
setIsSubmittable(true)
},
() => {
setSubmittable(false)
setIsSubmittable(false)
}
)
@@ -589,7 +589,7 @@ const Group = () => {
</AntdButton>
<AntdButton
type={'primary'}
disabled={!submittable}
disabled={!isSubmittable}
loading={isSubmitting}
onClick={handleOnSubmit}
>

10
src/pages/System/Log.tsx
View File

@@ -10,7 +10,7 @@ import FlexBox from '@/components/common/FlexBox'
const Log = () => {
const [logData, setLogData] = useState<SysLogGetVo[]>([])
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [tableParams, setTableParams] = useState<TableParam>({
pagination: {
current: 1,
@@ -181,11 +181,11 @@ const Log = () => {
}
const getLog = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void r_sys_log_get({
currentPage: tableParams.pagination?.current,
@@ -218,7 +218,7 @@ const Log = () => {
}
})
.finally(() => {
setLoading(false)
setIsLoading(false)
})
}
@@ -276,7 +276,7 @@ const Log = () => {
columns={dataColumns}
rowKey={(record) => record.id}
pagination={tableParams.pagination}
loading={loading}
loading={isLoading}
onChange={handleOnTableChange}
/>
</Card>

8
src/pages/System/Role.tsx
View File

@@ -50,7 +50,7 @@ const Role = () => {
const [isRegexLegal, setIsRegexLegal] = useState(true)
const [isDrawerOpen, setIsDrawerOpen] = useState(false)
const [isDrawerEdit, setIsDrawerEdit] = useState(false)
const [submittable, setSubmittable] = useState(false)
const [isSubmittable, setIsSubmittable] = useState(false)
const [powerTreeData, setPowerTreeData] = useState<_DataNode[]>([])
const [isLoadingPower, setIsLoadingPower] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
@@ -480,10 +480,10 @@ const Role = () => {
useEffect(() => {
form.validateFields({ validateOnly: true }).then(
() => {
setSubmittable(true)
setIsSubmittable(true)
},
() => {
setSubmittable(false)
setIsSubmittable(false)
}
)
@@ -598,7 +598,7 @@ const Role = () => {
</AntdButton>
<AntdButton
type={'primary'}
disabled={!submittable}
disabled={!isSubmittable}
loading={isSubmitting}
onClick={handleOnSubmit}
>

10
src/pages/System/Settings/Base.tsx
View File

@@ -5,7 +5,7 @@ import SettingsCard from '@/components/system/SettingCard'
const Base = () => {
const [baseForm] = AntdForm.useForm<BaseSettingsParam>()
const baseFormValues = AntdForm.useWatch([], baseForm)
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const handleOnReset = () => {
getBaseSettings()
@@ -24,17 +24,17 @@ const Base = () => {
}
const getBaseSettings = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void r_sys_settings_base_get().then((res) => {
const response = res.data
if (response.success) {
const data = response.data
data && baseForm.setFieldsValue(data)
setLoading(false)
setIsLoading(false)
}
})
}
@@ -48,7 +48,7 @@ const Base = () => {
<SettingsCard
icon={IconOxygenBase}
title={'基础'}
loading={loading}
loading={isLoading}
onReset={handleOnReset}
onSave={handleOnSave}
modifyOperationCode={['system:settings:modify:base']}

10
src/pages/System/Settings/Mail.tsx
View File

@@ -11,7 +11,7 @@ const Mail = () => {
const [modal, contextHolder] = AntdModal.useModal()
const [mailForm] = AntdForm.useForm<MailSettingsParam>()
const mailFormValues = AntdForm.useWatch([], mailForm)
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [mailSendForm] = AntdForm.useForm<MailSendParam>()
const handleOnTest = () => {
@@ -95,17 +95,17 @@ const Mail = () => {
}
const getMailSettings = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void r_sys_settings_mail_get().then((res) => {
const response = res.data
if (response.success) {
const data = response.data
data && mailForm.setFieldsValue(data)
setLoading(false)
setIsLoading(false)
}
})
}
@@ -119,7 +119,7 @@ const Mail = () => {
<SettingsCard
icon={IconOxygenEmail}
title={'邮件'}
loading={loading}
loading={isLoading}
onReset={handleOnReset}
onSave={handleOnSave}
modifyOperationCode={['system:settings:modify:mail']}

10
src/pages/System/Settings/SensitiveWord.tsx
View File

@@ -13,7 +13,7 @@ const SensitiveWord = () => {
const [dataSource, setDataSource] = useState<SensitiveWordVo[]>()
const [targetKeys, setTargetKeys] = useState<string[]>([])
const [selectedKeys, setSelectedKeys] = useState<string[]>([])
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [isAdding, setIsAdding] = useState(false)
const [newWord, setNewWord] = useState('')
@@ -47,10 +47,10 @@ const SensitiveWord = () => {
}
const getSensitiveWordSettings = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void r_sys_settings_sensitive_get().then((res) => {
const response = res.data
@@ -58,7 +58,7 @@ const SensitiveWord = () => {
const data = response.data
data && setDataSource(data)
data && setTargetKeys(data.filter((value) => value.enable).map((value) => value.id))
setLoading(false)
setIsLoading(false)
}
})
}
@@ -103,7 +103,7 @@ const SensitiveWord = () => {
<SettingsCard
icon={IconOxygenSensitive}
title={'敏感词'}
loading={loading}
loading={isLoading}
onReset={handleOnReset}
onSave={handleOnSave}
modifyOperationCode={['system:settings:modify:sensitive']}

10
src/pages/System/Settings/TwoFactor.tsx
View File

@@ -5,7 +5,7 @@ import SettingsCard from '@/components/system/SettingCard'
const TwoFactor = () => {
const [twoFactorForm] = AntdForm.useForm<TwoFactorSettingsParam>()
const twoFactorFormValues = AntdForm.useWatch([], twoFactorForm)
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const handleOnReset = () => {
getTwoFactorSettings()
@@ -24,17 +24,17 @@ const TwoFactor = () => {
}
const getTwoFactorSettings = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void r_sys_settings_two_factor_get().then((res) => {
const response = res.data
if (response.success) {
const data = response.data
data && twoFactorForm.setFieldsValue(data)
setLoading(false)
setIsLoading(false)
}
})
}
@@ -48,7 +48,7 @@ const TwoFactor = () => {
<SettingsCard
icon={IconOxygenSafe}
title={'双因素'}
loading={loading}
loading={isLoading}
onReset={handleOnReset}
onSave={handleOnSave}
modifyOperationCode={['system:settings:modify:two-factor']}

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

@@ -60,7 +60,7 @@ const Base = () => {
const [isLoading, setIsLoading] = useState(false)
const [isDrawerOpen, setIsDrawerOpen] = useState(false)
const [isDrawerEdit, setIsDrawerEdit] = useState(false)
const [submittable, setSubmittable] = useState(false)
const [isSubmittable, setIsSubmittable] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
const [editingBaseId, setEditingBaseId] = useState<string>('')
const [editingFiles, setEditingFiles] = useState<Record<string, IFiles>>({})
@@ -70,7 +70,7 @@ const Base = () => {
const [baseDetailData, setBaseDetailData] = useState<Record<string, ToolBaseVo>>({})
const [baseDetailLoading, setBaseDetailLoading] = useState<Record<string, boolean>>({})
const [tsconfig, setTsconfig] = useState<ITsconfig>()
const [compiling, setCompiling] = useState(false)
const [isCompiling, setIsCompiling] = useState(false)
const [compileForm] = AntdForm.useForm<{ entryFileName: string }>()
useBeforeUnload(
@@ -220,10 +220,10 @@ const Base = () => {
const handleOnCompileBtnClick = (value: ToolBaseVo) => {
return () => {
if (compiling || isLoading) {
if (isCompiling || isLoading) {
return
}
setCompiling(true)
setIsCompiling(true)
setIsLoading(true)
void message.loading({ content: '加载文件中', key: 'COMPILE_LOADING', duration: 0 })
@@ -263,7 +263,7 @@ const Base = () => {
const files = base64ToFiles(baseDetail!.source.data!)
if (!Object.keys(files).includes(IMPORT_MAP_FILE_NAME)) {
void message.warning(`编译中止：未包含 ${IMPORT_MAP_FILE_NAME} 文件`)
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
return
}
@@ -272,7 +272,7 @@ const Base = () => {
importMap = JSON.parse(files[IMPORT_MAP_FILE_NAME].value) as IImportMap
} catch (e) {
void message.warning(`编译中止：Import Map 文件转换失败`)
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
return
}
@@ -353,14 +353,14 @@ const Base = () => {
})
.finally(() => {
message.destroy('UPLOADING')
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
})
})
.catch((e: Error) => {
void message.error(`编译失败：${e.message}`)
message.destroy('COMPILING')
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
})
})
@@ -372,13 +372,13 @@ const Base = () => {
}
),
onCancel: () => {
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
}
})
})
.catch(() => {
setCompiling(false)
setIsCompiling(false)
setIsLoading(false)
message.destroy('COMPILE_LOADING')
})
@@ -1002,10 +1002,10 @@ const Base = () => {
useEffect(() => {
form.validateFields({ validateOnly: true }).then(
() => {
setSubmittable(true)
setIsSubmittable(true)
},
() => {
setSubmittable(false)
setIsSubmittable(false)
}
)
@@ -1034,7 +1034,7 @@ const Base = () => {
</AntdButton>
<AntdButton
type={'primary'}
disabled={!submittable}
disabled={!isSubmittable}
loading={isSubmitting}
onClick={handleOnSubmit}
>

8
src/pages/System/Tools/Category.tsx
View File

@@ -27,7 +27,7 @@ const Category = () => {
const [isLoading, setIsLoading] = useState(false)
const [isDrawerOpen, setIsDrawerOpen] = useState(false)
const [isDrawerEdit, setIsDrawerEdit] = useState(false)
const [submittable, setSubmittable] = useState(false)
const [isSubmittable, setIsSubmittable] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
const handleOnAddBtnClick = () => {
@@ -230,10 +230,10 @@ const Category = () => {
useEffect(() => {
form.validateFields({ validateOnly: true }).then(
() => {
setSubmittable(true)
setIsSubmittable(true)
},
() => {
setSubmittable(false)
setIsSubmittable(false)
}
)
@@ -256,7 +256,7 @@ const Category = () => {
</AntdButton>
<AntdButton
type={'primary'}
disabled={!submittable}
disabled={!isSubmittable}
loading={isSubmitting}
onClick={handleOnSubmit}
>

8
src/pages/System/Tools/Code.tsx
View File

@@ -15,7 +15,7 @@ const Code = () => {
const navigate = useNavigate()
const [modal, contextHolder] = AntdModal.useModal()
const { id } = useParams()
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [files, setFiles] = useState<IFiles>({})
const [selectedFileName, setSelectedFileName] = useState('')
const [platform, setPlatform] = useState<Platform>('WEB')
@@ -47,10 +47,10 @@ const Code = () => {
}
const getTool = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void message.loading({ content: '加载中……', key: 'LOADING', duration: 0 })
void r_sys_tool_get_one(id!)
@@ -69,7 +69,7 @@ const Code = () => {
}
})
.finally(() => {
setLoading(false)
setIsLoading(false)
message.destroy('LOADING')
})
}

8
src/pages/System/Tools/Execute.tsx
View File

@@ -12,7 +12,7 @@ import { base64ToFiles, base64ToStr, IMPORT_MAP_FILE_NAME } from '@/components/P
const Execute = () => {
const navigate = useNavigate()
const { id } = useParams()
const [loading, setLoading] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const [compiledCode, setCompiledCode] = useState('')
const render = (toolVo: ToolVo) => {
@@ -39,10 +39,10 @@ const Execute = () => {
}
const getTool = () => {
if (loading) {
if (isLoading) {
return
}
setLoading(true)
setIsLoading(true)
void message.loading({ content: '加载中……', key: 'LOADING', duration: 0 })
void r_sys_tool_get_one(id!)
@@ -61,7 +61,7 @@ const Execute = () => {
}
})
.finally(() => {
setLoading(false)
setIsLoading(false)
message.destroy('LOADING')
})
}

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

@@ -60,7 +60,7 @@ const Template = () => {
const [isDrawerEdit, setIsDrawerEdit] = useState(false)
const [baseData, setBaseData] = useState<ToolBaseVo[]>([])
const [isLoadingBaseData, setIsLoadingBaseData] = useState(false)
const [submittable, setSubmittable] = useState(false)
const [isSubmittable, setIsSubmittable] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
const [editingTemplateId, setEditingTemplateId] = useState<string>('')
const [editingFiles, setEditingFiles] = useState<Record<string, IFiles>>({})
@@ -884,10 +884,10 @@ const Template = () => {
useEffect(() => {
form.validateFields({ validateOnly: true }).then(
() => {
setSubmittable(true)
setIsSubmittable(true)
},
() => {
setSubmittable(false)
setIsSubmittable(false)
}
)
@@ -972,7 +972,7 @@ const Template = () => {
</AntdButton>
<AntdButton
type={'primary'}
disabled={!submittable}
disabled={!isSubmittable}
loading={isSubmitting}
onClick={handleOnSubmit}
>