Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jxf111348
vue-vben-admin
提交
5091a875
V
vue-vben-admin
项目概览
jxf111348
/
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,发现更多精彩内容 >>
提交
5091a875
编写于
1月 02, 2021
作者:
V
vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(modal): add minHeight and height prop #156
上级
5c273534
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
13 deletion
+21
-13
src/components/Form/src/BasicForm.vue
src/components/Form/src/BasicForm.vue
+1
-11
src/components/Form/src/hooks/useFormValues.ts
src/components/Form/src/hooks/useFormValues.ts
+7
-1
src/components/Modal/src/BasicModal.vue
src/components/Modal/src/BasicModal.vue
+2
-0
src/components/Modal/src/components/ModalWrapper.vue
src/components/Modal/src/components/ModalWrapper.vue
+6
-1
src/components/Modal/src/props.ts
src/components/Modal/src/props.ts
+2
-0
src/components/Modal/src/types.ts
src/components/Modal/src/types.ts
+3
-0
未找到文件。
src/components/Form/src/BasicForm.vue
浏览文件 @
5091a875
...
...
@@ -31,17 +31,7 @@
import
type
{
AdvanceState
}
from
'
./types/hooks
'
;
import
type
{
CSSProperties
,
Ref
,
WatchStopHandle
}
from
'
vue
'
;
import
{
defineComponent
,
reactive
,
ref
,
computed
,
unref
,
onMounted
,
watch
,
toRefs
,
toRaw
,
}
from
'
vue
'
;
import
{
defineComponent
,
reactive
,
ref
,
computed
,
unref
,
onMounted
,
watch
,
toRefs
}
from
'
vue
'
;
import
{
Form
,
Row
}
from
'
ant-design-vue
'
;
import
FormItem
from
'
./components/FormItem
'
;
import
FormAction
from
'
./components/FormAction.vue
'
;
...
...
src/components/Form/src/hooks/useFormValues.ts
浏览文件 @
5091a875
import
{
isArray
,
isFunction
,
isObject
,
isString
}
from
'
/@/utils/is
'
;
import
moment
from
'
moment
'
;
import
{
unref
}
from
'
vue
'
;
import
{
unref
,
nextTick
}
from
'
vue
'
;
import
type
{
Ref
,
ComputedRef
}
from
'
vue
'
;
import
type
{
FieldMapToTime
,
FormSchema
}
from
'
../types/form
'
;
import
{
useModalContext
}
from
'
/@/components/Modal
'
;
interface
UseFormValuesContext
{
transformDateFuncRef
:
Ref
<
Fn
>
;
...
...
@@ -18,6 +19,7 @@ export function useFormValues({
getSchema
,
formModel
,
}:
UseFormValuesContext
)
{
const
modalFn
=
useModalContext
();
// Processing form values
function
handleFormValues
(
values
:
Recordable
)
{
if
(
!
isObject
(
values
))
{
...
...
@@ -81,6 +83,10 @@ export function useFormValues({
}
});
defaultValueRef
.
value
=
obj
;
nextTick
(()
=>
{
// Solve the problem of modal adaptive height calculation when the form is placed in the modal
modalFn
?.
redoModalHeight
?.();
});
}
return
{
handleFormValues
,
initDefault
};
...
...
src/components/Modal/src/BasicModal.vue
浏览文件 @
5091a875
...
...
@@ -23,6 +23,8 @@
:fullScreen=
"fullScreenRef"
ref=
"modalWrapperRef"
:loading=
"getProps.loading"
:minHeight=
"getProps.minHeight"
:height=
"getProps.height"
:visible=
"visibleRef"
:modalFooterHeight=
"footer !== undefined && !footer ? 0 : undefined"
v-bind=
"omit(getProps.wrapperProps, 'visible')"
...
...
src/components/Modal/src/components/ModalWrapper.vue
浏览文件 @
5091a875
...
...
@@ -38,6 +38,7 @@
modalHeaderHeight
:
propTypes
.
number
.
def
(
50
),
modalFooterHeight
:
propTypes
.
number
.
def
(
54
),
minHeight
:
propTypes
.
number
.
def
(
200
),
height
:
propTypes
.
number
,
footerOffset
:
propTypes
.
number
.
def
(
0
),
visible
:
propTypes
.
bool
,
fullScreen
:
propTypes
.
bool
,
...
...
@@ -142,7 +143,11 @@
realHeightRef
.
value
=
window
.
innerHeight
-
props
.
modalFooterHeight
-
props
.
modalHeaderHeight
;
}
else
{
realHeightRef
.
value
=
realHeight
>
maxHeight
?
maxHeight
:
realHeight
+
16
+
30
;
realHeightRef
.
value
=
props
.
height
?
props
.
height
:
realHeight
>
maxHeight
?
maxHeight
:
realHeight
+
16
+
30
;
}
emit
(
'
height-change
'
,
unref
(
realHeightRef
));
}
catch
(
error
)
{
...
...
src/components/Modal/src/props.ts
浏览文件 @
5091a875
...
...
@@ -8,6 +8,8 @@ const { t } = useI18n();
export
const
modalProps
=
{
visible
:
propTypes
.
bool
,
height
:
propTypes
.
number
,
minHeight
:
propTypes
.
number
,
// open drag
draggable
:
propTypes
.
bool
.
def
(
true
),
centered
:
propTypes
.
bool
,
...
...
src/components/Modal/src/types.ts
浏览文件 @
5091a875
...
...
@@ -27,6 +27,8 @@ export interface ReturnInnerMethods extends ModalMethods {
export
type
UseModalInnerReturnType
=
[
RegisterFn
,
ReturnInnerMethods
];
export
interface
ModalProps
{
minHeight
?:
number
;
height
?:
number
;
// 启用wrapper后 底部可以适当增加高度
wrapperFooterOffset
?:
number
;
draggable
?:
boolean
;
...
...
@@ -195,6 +197,7 @@ export interface ModalWrapperProps {
modalHeaderHeight
:
number
;
modalFooterHeight
:
number
;
minHeight
:
number
;
height
:
number
;
visible
:
boolean
;
fullScreen
:
boolean
;
useWrapper
:
boolean
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录