hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-28 18:05:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update 184

Browse Source
This commit is contained in:
xingyu4j
2022-11-08 09:42:22 +08:00
parent dc84ebde9d
commit 84cb1bd4db
7 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-ui-admin-vue3/src/components/Form/src/Form.vue
View File

@ -226,6 +226,11 @@ export default defineComponent({
vModel={formModel.value[item.field]}
{...(autoSetPlaceholder && setTextPlaceholder(item))}
{...setComponentProps(item)}
style={
item?.component === 'Input'
? { width: '189.5px', ...item.componentProps?.style }
: { ...item.componentProps?.style }
}
{...(notRenderOptions.includes(item?.component as string) &&
item?.componentProps?.options
? { options: item?.componentProps?.options || [] }

7
yudao-ui-admin-vue3/src/components/Form/src/components/useRenderCheckbox.tsx
View File

@ -11,7 +11,12 @@ export const useRenderCheckbox = () => {
typeof defineComponent
>
return item?.componentProps?.options?.map((option) => {
return <Com label={option[labelAlias || 'value']}>{option[valueAlias || 'label']}</Com>
const { value, ...other } = option
return (
<Com label={option[labelAlias || 'value']} {...other}>
{option[valueAlias || 'label']}
</Com>
)
})
}

7
yudao-ui-admin-vue3/src/components/Form/src/components/useRenderRadio.tsx
View File

@ -11,7 +11,12 @@ export const useRenderRadio = () => {
typeof defineComponent
>
return item?.componentProps?.options?.map((option) => {
return <Com label={option[labelAlias || 'value']}>{option[valueAlias || 'label']}</Com>
const { value, ...other } = option
return (
<Com label={option[labelAlias || 'value']} {...other}>
{option[valueAlias || 'label']}
</Com>
)
})
}

4
yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue
View File

@ -220,10 +220,10 @@ export default defineComponent({
// 水平菜单
&__horizontal {
height: calc(~'var( - -top-tool-height)') !important;
height: calc(~'var(--top-tool-height)') !important;
:deep(.@{elNamespace}-menu--horizontal) {
height: calc(~'var( - -top-tool-height)');
height: calc(~'var(--top-tool-height)');
border-bottom: none;
// 重新设置底部高亮颜色
& > .@{elNamespace}-sub-menu.is-active {