回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度;el-radio的label属性兼容下个版本;优化iframe布局'

This commit is contained in:
芋道源码
2024-08-21 13:41:32 +00:00
committed by Gitee
parent ce5d8d3780
commit 1d07068806
143 changed files with 344 additions and 436 deletions

View File

@@ -13,7 +13,6 @@
v-model="queryParams.name"
placeholder="请输入部门名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>

View File

@@ -22,7 +22,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -28,7 +28,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -25,26 +25,12 @@ const crudSchemas = reactive<CrudSchema[]>([
{
label: '邮箱',
field: 'mail',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '用户名',
field: 'username',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '密码',

View File

@@ -21,10 +21,7 @@ const crudSchemas = reactive<CrudSchema[]>([
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
style: {
width: '240px'
}
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
detail: {
@@ -39,14 +36,7 @@ const crudSchemas = reactive<CrudSchema[]>([
label: '用户编号',
field: 'userId',
isSearch: true,
isTable: false,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isTable: false
},
{
label: '用户类型',
@@ -54,14 +44,7 @@ const crudSchemas = reactive<CrudSchema[]>([
dictType: DICT_TYPE.USER_TYPE,
dictClass: 'number',
isSearch: true,
isTable: false,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isTable: false
},
{
label: '邮件标题',
@@ -82,14 +65,7 @@ const crudSchemas = reactive<CrudSchema[]>([
field: 'sendStatus',
dictType: DICT_TYPE.SYSTEM_MAIL_SEND_STATUS,
dictClass: 'string',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '邮箱账号',
@@ -103,9 +79,6 @@ const crudSchemas = reactive<CrudSchema[]>([
optionsAlias: {
labelField: 'mail',
valueField: 'id'
},
style: {
width: '240px'
}
}
}
@@ -120,14 +93,7 @@ const crudSchemas = reactive<CrudSchema[]>([
{
label: '模板编号',
field: 'templateId',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '模板编码',

View File

@@ -22,26 +22,12 @@ const crudSchemas = reactive<CrudSchema[]>([
{
label: '模板编码',
field: 'code',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '模板名称',
field: 'name',
isSearch: true,
search: {
componentProps: {
style: {
width: '240px'
}
}
}
isSearch: true
},
{
label: '模板标题',
@@ -73,9 +59,6 @@ const crudSchemas = reactive<CrudSchema[]>([
optionsAlias: {
labelField: 'mail',
valueField: 'id'
},
style: {
width: '240px'
}
}
},
@@ -99,14 +82,7 @@ const crudSchemas = reactive<CrudSchema[]>([
field: 'status',
isSearch: true,
dictType: DICT_TYPE.COMMON_STATUS,
dictClass: 'number',
search: {
componentProps: {
style: {
width: '240px'
}
}
}
dictClass: 'number'
},
{
label: '备注',
@@ -124,10 +100,7 @@ const crudSchemas = reactive<CrudSchema[]>([
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
style: {
width: '240px'
}
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
}
},

View File

@@ -25,7 +25,7 @@
<el-radio-button
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_MENU_TYPE)"
:key="dict.label"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio-button>
@@ -66,7 +66,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.label"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -77,8 +77,8 @@
<Tooltip message="选择隐藏时,路由将不会出现在侧边栏,但仍然可以访问" title="显示状态" />
</template>
<el-radio-group v-model="formData.visible">
<el-radio key="true" :value="true" border>显示</el-radio>
<el-radio key="false" :value="false" border>隐藏</el-radio>
<el-radio key="true" :label="true" border>显示</el-radio>
<el-radio key="false" :label="false" border>隐藏</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formData.type !== 3" label="总是显示" prop="alwaysShow">
@@ -89,8 +89,8 @@
/>
</template>
<el-radio-group v-model="formData.alwaysShow">
<el-radio key="true" :value="true" border>总是</el-radio>
<el-radio key="false" :value="false" border>不是</el-radio>
<el-radio key="true" :label="true" border>总是</el-radio>
<el-radio key="false" :label="false" border>不是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formData.type === 2" label="缓存状态" prop="keepAlive">
@@ -101,8 +101,8 @@
/>
</template>
<el-radio-group v-model="formData.keepAlive">
<el-radio key="true" :value="true" border>缓存</el-radio>
<el-radio key="false" :value="false" border>不缓存</el-radio>
<el-radio key="true" :label="true" border>缓存</el-radio>
<el-radio key="false" :label="false" border>不缓存</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

View File

@@ -34,7 +34,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -20,7 +20,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -27,7 +27,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -61,7 +61,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="业务编号" prop="bizId">

View File

@@ -13,7 +13,6 @@
v-model="queryParams.name"
placeholder="请输入岗位名称"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -22,12 +21,11 @@
v-model="queryParams.code"
placeholder="请输入岗位编码"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"

View File

@@ -8,7 +8,7 @@
<el-tag>{{ formData.code }}</el-tag>
</el-form-item>
<el-form-item label="菜单权限">
<el-card class="w-full h-400px !overflow-y-scroll" shadow="never">
<el-card class="cardHeight">
<template #header>
全选/全不选:
<el-switch
@@ -151,3 +151,10 @@ const handleCheckedTreeExpand = () => {
}
}
</script>
<style lang="scss" scoped>
.cardHeight {
width: 100%;
max-height: 400px;
overflow-y: scroll;
}
</style>

View File

@@ -1,5 +1,5 @@
<template>
<Dialog v-model="dialogVisible" title="数据权限" width="800">
<Dialog v-model="dialogVisible" title="菜单权限" width="800">
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="角色名称">
<el-tag>{{ formData.name }}</el-tag>
@@ -21,9 +21,9 @@
<el-form-item
v-if="formData.dataScope === SystemDataScopeEnum.DEPT_CUSTOM"
label="权限范围"
label-width="80px"
style="display: flex"
>
<el-card class="w-full h-400px !overflow-y-scroll" shadow="never">
<el-card class="card" shadow="never">
<template #header>
全选/全不选:
<el-switch

View File

@@ -25,7 +25,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -14,7 +14,6 @@
v-model="queryParams.signature"
placeholder="请输入短信签名"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -41,7 +40,6 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>

View File

@@ -44,7 +44,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -26,7 +26,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -49,7 +49,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -62,7 +62,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

View File

@@ -11,7 +11,7 @@
<el-input v-model="formData.name" placeholder="请输入套餐名" />
</el-form-item>
<el-form-item label="菜单权限">
<el-card class="w-full h-400px !overflow-y-scroll" shadow="never">
<el-card class="cardHeight">
<template #header>
全选/全不选:
<el-switch
@@ -45,7 +45,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -185,3 +185,10 @@ const handleCheckedTreeExpand = () => {
}
}
</script>
<style lang="scss" scoped>
.cardHeight {
width: 100%;
max-height: 400px;
overflow-y: scroll;
}
</style>