Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
啊嘞嘞EC
vue-vben-admin
提交
47a448b8
V
vue-vben-admin
项目概览
啊嘞嘞EC
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47a448b8
编写于
8月 17, 2021
作者:
无
无木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(form): add `Divider` for schema component type
新增Divider用于较长表单的区域分割
上级
5138e447
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
94 addition
and
41 deletion
+94
-41
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+8
-0
src/components/Form/src/BasicForm.vue
src/components/Form/src/BasicForm.vue
+6
-2
src/components/Form/src/componentMap.ts
src/components/Form/src/componentMap.ts
+2
-0
src/components/Form/src/components/FormItem.vue
src/components/Form/src/components/FormItem.vue
+48
-34
src/components/Form/src/hooks/useFormEvents.ts
src/components/Form/src/hooks/useFormEvents.ts
+6
-2
src/components/Form/src/types/index.ts
src/components/Form/src/types/index.ts
+2
-1
src/views/demo/form/AdvancedForm.vue
src/views/demo/form/AdvancedForm.vue
+7
-2
src/views/demo/form/index.vue
src/views/demo/form/index.vue
+15
-0
未找到文件。
CHANGELOG.zh_CN.md
浏览文件 @
47a448b8
### ✨ Features
-
**BasicForm**
表单组件新增
`Divider`
,用于较长表单的区域分割
### 🐛 Bug Fixes
-
**其它**
修复部分封装组件在使用插槽时报错的问题
## 2.7.1(2021-08-16)
-
升级 vue 3.2,如果运行失败,删除 node_modules 后重装即可
...
...
src/components/Form/src/BasicForm.vue
浏览文件 @
47a448b8
...
...
@@ -29,7 +29,7 @@
#[item]=
"data"
v-for=
"item in ['resetBefore', 'submitBefore', 'advanceBefore', 'advanceAfter']"
>
<slot
:name=
"item"
v-bind=
"data"
></slot>
<slot
:name=
"item"
v-bind=
"data
||
{}
">
</slot>
</
template
>
</FormAction>
<slot
name=
"formFooter"
></slot>
...
...
@@ -132,7 +132,11 @@
}
}
}
return
schemas
as
FormSchema
[];
if
(
unref
(
getProps
).
showAdvancedButton
)
{
return
schemas
.
filter
((
schema
)
=>
schema
.
component
!==
'
Divider
'
)
as
FormSchema
[];
}
else
{
return
schemas
as
FormSchema
[];
}
});
const
{
handleToggleAdvanced
}
=
useAdvanced
({
...
...
src/components/Form/src/componentMap.ts
浏览文件 @
47a448b8
...
...
@@ -18,6 +18,7 @@ import {
TreeSelect
,
Slider
,
Rate
,
Divider
,
}
from
'
ant-design-vue
'
;
import
RadioButtonGroup
from
'
./components/RadioButtonGroup.vue
'
;
...
...
@@ -61,6 +62,7 @@ componentMap.set('IconPicker', IconPicker);
componentMap
.
set
(
'
InputCountDown
'
,
CountdownInput
);
componentMap
.
set
(
'
Upload
'
,
BasicUpload
);
componentMap
.
set
(
'
Divider
'
,
Divider
);
export
function
add
(
compName
:
ComponentType
,
component
:
Component
)
{
componentMap
.
set
(
compName
,
component
);
...
...
src/components/Form/src/components/FormItem.vue
浏览文件 @
47a448b8
...
...
@@ -5,7 +5,7 @@
import
type
{
ValidationRule
}
from
'
ant-design-vue/lib/form/Form
'
;
import
type
{
TableActionType
}
from
'
/@/components/Table
'
;
import
{
defineComponent
,
computed
,
unref
,
toRefs
}
from
'
vue
'
;
import
{
Form
,
Col
}
from
'
ant-design-vue
'
;
import
{
Form
,
Col
,
Divider
}
from
'
ant-design-vue
'
;
import
{
componentMap
}
from
'
../componentMap
'
;
import
{
BasicHelp
}
from
'
/@/components/Basic
'
;
import
{
isBoolean
,
isFunction
,
isNull
}
from
'
/@/utils/is
'
;
...
...
@@ -73,11 +73,17 @@
const
getComponentsProps
=
computed
(()
=>
{
const
{
schema
,
tableAction
,
formModel
,
formActionType
}
=
props
;
cons
t
{
componentProps
=
{}
}
=
schema
;
if
(
!
isFunction
(
componentProps
))
{
return
componentProps
;
le
t
{
componentProps
=
{}
}
=
schema
;
if
(
isFunction
(
componentProps
))
{
componentProps
=
componentProps
({
schema
,
tableAction
,
formModel
,
formActionType
})
??
{}
;
}
return
componentProps
({
schema
,
tableAction
,
formModel
,
formActionType
})
??
{};
if
(
schema
.
component
===
'
Divider
'
)
{
componentProps
=
Object
.
assign
({
type
:
'
horizontal
'
},
componentProps
,
{
orientation
:
'
left
'
,
plain
:
true
,
});
}
return
componentProps
;
});
const
getDisable
=
computed
(()
=>
{
...
...
@@ -300,38 +306,46 @@
}
function
renderItem
()
{
const
{
itemProps
,
slot
,
render
,
field
,
suffix
}
=
props
.
schema
;
const
{
itemProps
,
slot
,
render
,
field
,
suffix
,
component
,
label
}
=
props
.
schema
;
const
{
labelCol
,
wrapperCol
}
=
unref
(
itemLabelWidthProp
);
const
{
colon
}
=
props
.
formProps
;
const
getContent
=
()
=>
{
return
slot
?
getSlot
(
slots
,
slot
,
unref
(
getValues
))
:
render
?
render
(
unref
(
getValues
))
:
renderComponent
();
};
const
showSuffix
=
!!
suffix
;
const
getSuffix
=
isFunction
(
suffix
)
?
suffix
(
unref
(
getValues
))
:
suffix
;
return
(
<
Form
.
Item
name
=
{
field
}
colon
=
{
colon
}
class
=
{{
'
suffix-item
'
:
showSuffix
}}
{...(
itemProps
as
Recordable
)}
label
=
{
renderLabelHelpMessage
()}
rules
=
{
handleRules
()}
labelCol
=
{
labelCol
}
wrapperCol
=
{
wrapperCol
}
>
<
div
style
=
"
display:flex
"
>
<
div
style
=
"
flex:1
"
>
{
getContent
()}
<
/div
>
{
showSuffix
&&
<
span
class
=
"
suffix
"
>
{
getSuffix
}
<
/span>
}
<
/div
>
<
/Form.Item
>
);
if
(
component
===
'
Divider
'
)
{
return
(
<
Col
span
=
{
24
}
>
<
Divider
{...
unref
(
getComponentsProps
)}
>
{
label
}
<
/Divider
>
<
/Col
>
);
}
else
{
const
getContent
=
()
=>
{
return
slot
?
getSlot
(
slots
,
slot
,
unref
(
getValues
))
:
render
?
render
(
unref
(
getValues
))
:
renderComponent
();
};
const
showSuffix
=
!!
suffix
;
const
getSuffix
=
isFunction
(
suffix
)
?
suffix
(
unref
(
getValues
))
:
suffix
;
return
(
<
Form
.
Item
name
=
{
field
}
colon
=
{
colon
}
class
=
{{
'
suffix-item
'
:
showSuffix
}}
{...(
itemProps
as
Recordable
)}
label
=
{
renderLabelHelpMessage
()}
rules
=
{
handleRules
()}
labelCol
=
{
labelCol
}
wrapperCol
=
{
wrapperCol
}
>
<
div
style
=
"
display:flex
"
>
<
div
style
=
"
flex:1
"
>
{
getContent
()}
<
/div
>
{
showSuffix
&&
<
span
class
=
"
suffix
"
>
{
getSuffix
}
<
/span>
}
<
/div
>
<
/Form.Item
>
);
}
}
return
()
=>
{
...
...
src/components/Form/src/hooks/useFormEvents.ts
浏览文件 @
47a448b8
...
...
@@ -149,7 +149,9 @@ export function useFormEvents({
updateData
=
[...
data
];
}
const
hasField
=
updateData
.
every
((
item
)
=>
Reflect
.
has
(
item
,
'
field
'
)
&&
item
.
field
);
const
hasField
=
updateData
.
every
(
(
item
)
=>
item
.
component
===
'
Divider
'
||
(
Reflect
.
has
(
item
,
'
field
'
)
&&
item
.
field
)
);
if
(
!
hasField
)
{
error
(
...
...
@@ -169,7 +171,9 @@ export function useFormEvents({
updateData
=
[...
data
];
}
const
hasField
=
updateData
.
every
((
item
)
=>
Reflect
.
has
(
item
,
'
field
'
)
&&
item
.
field
);
const
hasField
=
updateData
.
every
(
(
item
)
=>
item
.
component
===
'
Divider
'
||
(
Reflect
.
has
(
item
,
'
field
'
)
&&
item
.
field
)
);
if
(
!
hasField
)
{
error
(
...
...
src/components/Form/src/types/index.ts
浏览文件 @
47a448b8
...
...
@@ -109,4 +109,5 @@ export type ComponentType =
|
'
IconPicker
'
|
'
Render
'
|
'
Slider
'
|
'
Rate
'
;
|
'
Rate
'
|
'
Divider
'
;
src/views/demo/form/AdvancedForm.vue
浏览文件 @
47a448b8
...
...
@@ -12,7 +12,7 @@
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
{
BasicForm
,
FormSchema
,
useForm
}
from
'
/@/components/Form/index
'
;
import
{
CollapseContainer
}
from
'
/@/components/Container
/index
'
;
import
{
CollapseContainer
}
from
'
/@/components/Container
'
;
import
{
PageWrapper
}
from
'
/@/components/Page
'
;
const
getSchamas
=
():
FormSchema
[]
=>
{
...
...
@@ -173,7 +173,12 @@
}
const
[
register1
]
=
useForm
({
labelWidth
:
120
,
schemas
:
[...
getSchamas
(),
...
getAppendSchemas
(),
...
extraSchemas
],
schemas
:
[
...
getSchamas
(),
...
getAppendSchemas
(),
{
field
:
''
,
component
:
'
Divider
'
,
label
:
'
更多字段
'
},
...
extraSchemas
,
],
actionColOptions
:
{
span
:
24
,
},
...
...
src/views/demo/form/index.vue
浏览文件 @
47a448b8
...
...
@@ -100,6 +100,11 @@
};
const
schemas
:
FormSchema
[]
=
[
{
field
:
''
,
component
:
'
Divider
'
,
label
:
'
基础字段
'
,
},
{
field
:
'
field1
'
,
component
:
'
Input
'
,
...
...
@@ -293,6 +298,11 @@
],
},
},
{
field
:
''
,
component
:
'
Divider
'
,
label
:
'
远程下拉演示
'
,
},
{
field
:
'
field30
'
,
component
:
'
ApiSelect
'
,
...
...
@@ -362,6 +372,11 @@
span
:
8
,
},
},
{
field
:
''
,
component
:
'
Divider
'
,
label
:
'
其它
'
,
},
{
field
:
'
field20
'
,
component
:
'
InputNumber
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录