Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
球球不吃虾
vue-vben-admin
提交
ea24dfa3
V
vue-vben-admin
项目概览
球球不吃虾
/
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,体验更适合开发者的 AI 搜索 >>
提交
ea24dfa3
编写于
11月 18, 2020
作者:
V
vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: bump 2.0.0-rc.11
上级
be2b8a7e
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
59 addition
and
71 deletion
+59
-71
CHANGELOG.en_US.md
CHANGELOG.en_US.md
+29
-0
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+6
-1
package.json
package.json
+1
-1
src/components/Drawer/src/types.ts
src/components/Drawer/src/types.ts
+1
-3
src/components/Drawer/src/useDrawer.ts
src/components/Drawer/src/useDrawer.ts
+8
-20
src/components/Modal/src/types.ts
src/components/Modal/src/types.ts
+1
-3
src/components/Modal/src/useModal.ts
src/components/Modal/src/useModal.ts
+8
-20
src/views/demo/comp/drawer/Drawer4.vue
src/views/demo/comp/drawer/Drawer4.vue
+2
-3
src/views/demo/comp/modal/Modal4.vue
src/views/demo/comp/modal/Modal4.vue
+2
-3
src/views/demo/comp/modal/index.vue
src/views/demo/comp/modal/index.vue
+1
-17
未找到文件。
CHANGELOG.en_US.md
浏览文件 @
ea24dfa3
## 2.0.0-rc.11 (2020-11-18)
### ✨ Features
-
Added base64 file stream download
-
Optimize upload components and examples
-
New editable row example
-
Add a personal page
-
New form page
-
Add details page
-
Integrate upload components into form by default
### 🎫 Chores
-
Update antdv to
`2.0.0-rc.1`
(temporarily restore to beta15, rc1 menu freezes too seriously.)
-
Add some notes
### ✨ Refactor
-
Removed
`receiveDrawerDataRef`
and
`transferDrawerData`
properties of
`useModal`
and
`useDrawer`
-
`openModal`
and
`openDrawer`
corresponding to
`useModal`
and
`useDrawer`
extend the third parameter. Used to open the trigger callback again
### 🐛 Bug Fixes
-
Repair form inputNumber verification error
-
Fix the error of setting the default value of the form
-
Fix the problem of occupying position when the menu collapse button is hidden
-
Fix the form baseColProps does not take effect
## 2.0.0-rc.10 (2020-11-13)
### ✨ Refactor
...
...
CHANGELOG.zh_CN.md
浏览文件 @
ea24dfa3
##
Wip
##
2.0.0-rc.11 (2020-11-18)
### ✨ Features
...
...
@@ -15,6 +15,11 @@
-
更新 antdv 到
`2.0.0-rc.1`
(暂时还原到 beta15,rc1 菜单卡顿太严重.)
-
添加部分注释
### ✨ Refactor
-
移除
`useModal`
与
`useDrawer`
的
`receiveDrawerDataRef`
和
`transferDrawerData`
属性
-
`useModal`
与
`useDrawer`
对应的
`openModal`
与
`openDrawer`
扩展第三个参数。用于再次打开触发回调
### 🐛 Bug Fixes
-
修复表单 inputNumber 校验错误
...
...
package.json
浏览文件 @
ea24dfa3
{
"name"
:
"vben-admin-2.0"
,
"version"
:
"2.0.0-rc.1
0
"
,
"version"
:
"2.0.0-rc.1
1
"
,
"scripts"
:
{
"bootstrap"
:
"yarn install"
,
"serve"
:
"esno ./build/script/preserve.ts && cross-env NODE_ENV=development vite"
,
...
...
src/components/Drawer/src/types.ts
浏览文件 @
ea24dfa3
...
...
@@ -7,8 +7,7 @@ export interface DrawerInstance {
}
export
interface
ReturnMethods
extends
DrawerInstance
{
openDrawer
:
<
T
=
any
>
(
visible
?:
boolean
,
data
?:
T
)
=>
void
;
transferDrawerData
:
(
data
:
any
)
=>
void
;
openDrawer
:
<
T
=
any
>
(
visible
?:
boolean
,
data
?:
T
,
openOnSet
?:
boolean
)
=>
void
;
}
export
type
RegisterFn
=
(
drawerInstance
:
DrawerInstance
,
uuid
?:
string
)
=>
void
;
...
...
@@ -17,7 +16,6 @@ export interface ReturnInnerMethods extends DrawerInstance {
closeDrawer
:
()
=>
void
;
changeLoading
:
(
loading
:
boolean
)
=>
void
;
changeOkLoading
:
(
loading
:
boolean
)
=>
void
;
receiveDrawerDataRef
:
any
;
}
export
type
UseDrawerReturnType
=
[
RegisterFn
,
ReturnMethods
];
...
...
src/components/Drawer/src/useDrawer.ts
浏览文件 @
ea24dfa3
...
...
@@ -6,16 +6,7 @@ import type {
UseDrawerInnerReturnType
,
}
from
'
./types
'
;
import
{
ref
,
getCurrentInstance
,
onUnmounted
,
unref
,
reactive
,
computed
,
watchEffect
,
nextTick
,
}
from
'
vue
'
;
import
{
ref
,
getCurrentInstance
,
onUnmounted
,
unref
,
reactive
,
watchEffect
,
nextTick
}
from
'
vue
'
;
import
{
isProdMode
}
from
'
/@/utils/env
'
;
import
{
isFunction
}
from
'
/@/utils/is
'
;
...
...
@@ -60,18 +51,19 @@ export function useDrawer(): UseDrawerReturnType {
getInstance
().
setDrawerProps
(
props
);
},
openDrawer
:
<
T
=
any
>
(
visible
=
true
,
data
?:
T
):
void
=>
{
openDrawer
:
<
T
=
any
>
(
visible
=
true
,
data
?:
T
,
openOnSet
=
false
):
void
=>
{
getInstance
().
setDrawerProps
({
visible
:
visible
,
});
if
(
data
)
{
dataTransferRef
[
unref
(
uidRef
)]
=
data
;
dataTransferRef
[
unref
(
uidRef
)]
=
openOnSet
?
{
...
data
,
__t__
:
Date
.
now
(),
}
:
data
;
}
},
transferDrawerData
(
val
:
any
)
{
dataTransferRef
[
unref
(
uidRef
)]
=
val
;
},
};
return
[
getDrawer
,
methods
];
...
...
@@ -111,10 +103,6 @@ export const useDrawerInner = (callbackFn?: Fn): UseDrawerInnerReturnType => {
return
[
register
,
{
receiveDrawerDataRef
:
computed
(()
=>
{
return
dataTransferRef
[
unref
(
uidRef
)];
}),
changeLoading
:
(
loading
=
true
)
=>
{
getInstance
().
setDrawerProps
({
loading
});
},
...
...
src/components/Modal/src/types.ts
浏览文件 @
ea24dfa3
...
...
@@ -9,8 +9,7 @@ export interface ModalMethods {
export
type
RegisterFn
=
(
modalMethods
:
ModalMethods
,
uuid
?:
string
)
=>
void
;
export
interface
ReturnMethods
extends
ModalMethods
{
openModal
:
<
T
=
any
>
(
props
?:
boolean
,
data
?:
T
)
=>
void
;
transferModalData
:
(
data
:
any
)
=>
void
;
openModal
:
<
T
=
any
>
(
props
?:
boolean
,
data
?:
T
,
openOnSet
?:
boolean
)
=>
void
;
}
export
type
UseModalReturnType
=
[
RegisterFn
,
ReturnMethods
];
...
...
@@ -18,7 +17,6 @@ export interface ReturnInnerMethods extends ModalMethods {
closeModal
:
()
=>
void
;
changeLoading
:
(
loading
:
boolean
)
=>
void
;
changeOkLoading
:
(
loading
:
boolean
)
=>
void
;
receiveModalDataRef
:
any
;
}
export
type
UseModalInnerReturnType
=
[
RegisterFn
,
ReturnInnerMethods
];
...
...
src/components/Modal/src/useModal.ts
浏览文件 @
ea24dfa3
...
...
@@ -5,16 +5,7 @@ import type {
ReturnMethods
,
UseModalInnerReturnType
,
}
from
'
./types
'
;
import
{
ref
,
onUnmounted
,
unref
,
getCurrentInstance
,
reactive
,
computed
,
watchEffect
,
nextTick
,
}
from
'
vue
'
;
import
{
ref
,
onUnmounted
,
unref
,
getCurrentInstance
,
reactive
,
watchEffect
,
nextTick
}
from
'
vue
'
;
import
{
isProdMode
}
from
'
/@/utils/env
'
;
import
{
isFunction
}
from
'
/@/utils/is
'
;
const
dataTransferRef
=
reactive
<
any
>
({});
...
...
@@ -55,18 +46,19 @@ export function useModal(): UseModalReturnType {
getInstance
().
setModalProps
(
props
);
},
openModal
:
<
T
=
any
>
(
visible
=
true
,
data
?:
T
):
void
=>
{
openModal
:
<
T
=
any
>
(
visible
=
true
,
data
?:
T
,
openOnSet
=
false
):
void
=>
{
getInstance
().
setModalProps
({
visible
:
visible
,
});
if
(
data
)
{
dataTransferRef
[
unref
(
uidRef
)]
=
data
;
dataTransferRef
[
unref
(
uidRef
)]
=
openOnSet
?
{
...
data
,
__t__
:
Date
.
now
(),
}
:
data
;
}
},
transferModalData
(
val
:
any
)
{
dataTransferRef
[
unref
(
uidRef
)]
=
val
;
},
};
return
[
register
,
methods
];
}
...
...
@@ -106,10 +98,6 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
return
[
register
,
{
receiveModalDataRef
:
computed
(()
=>
{
return
dataTransferRef
[
unref
(
uidRef
)];
}),
changeLoading
:
(
loading
=
true
)
=>
{
getInstance
().
setModalProps
({
loading
});
},
...
...
src/views/demo/comp/drawer/Drawer4.vue
浏览文件 @
ea24dfa3
<
template
>
<BasicDrawer
v-bind=
"$attrs"
@
register=
"register"
title=
"Drawer Title"
width=
"50%"
>
<div>
<p
class=
"h-20"
>
外部传递数据:
{{
receiveDrawerDataRef
}}
</p>
<BasicForm
@
register=
"registerForm"
/>
</div>
</BasicDrawer>
...
...
@@ -41,14 +40,14 @@
span
:
24
,
},
});
const
[
register
,
{
receiveDrawerDataRef
}
]
=
useDrawerInner
((
data
)
=>
{
const
[
register
]
=
useDrawerInner
((
data
)
=>
{
// 方式1
setFieldsValue
({
field2
:
data
.
data
,
field1
:
data
.
info
,
});
});
return
{
register
,
receiveDrawerDataRef
,
schemas
,
registerForm
};
return
{
register
,
schemas
,
registerForm
};
},
});
</
script
>
src/views/demo/comp/modal/Modal4.vue
浏览文件 @
ea24dfa3
<
template
>
<BasicModal
v-bind=
"$attrs"
@
register=
"register"
title=
"Modal Title"
>
<p
class=
"h-20"
>
外部传递数据:
{{
receiveModalDataRef
}}
</p>
<BasicForm
@
register=
"registerForm"
:model=
"model"
/>
</BasicModal>
</
template
>
...
...
@@ -46,7 +45,7 @@
},
});
const
[
register
,
{
receiveModalDataRef
}
]
=
useModalInner
((
data
)
=>
{
const
[
register
]
=
useModalInner
((
data
)
=>
{
// 方式1
// setFieldsValue({
// field2: data.data,
...
...
@@ -60,7 +59,7 @@
// model:{ field2: data.data, field1: data.info }
// })
});
return
{
register
,
receiveModalDataRef
,
schemas
,
registerForm
,
model
:
modelRef
};
return
{
register
,
schemas
,
registerForm
,
model
:
modelRef
};
},
});
</
script
>
src/views/demo/comp/modal/index.vue
浏览文件 @
ea24dfa3
...
...
@@ -40,24 +40,8 @@
const
[
register1
,
{
openModal
:
openModal1
,
setModalProps
}]
=
useModal
();
const
[
register2
,
{
openModal
:
openModal2
}]
=
useModal
();
const
[
register3
,
{
openModal
:
openModal3
}]
=
useModal
();
const
[
register4
,
{
openModal
:
openModal4
,
// transferModalData
},
]
=
useModal
();
const
[
register4
,
{
openModal
:
openModal4
}]
=
useModal
();
function
send
()
{
// transferModalData({
// data: 'content',
// info: 'Info',
// });
// setTimeout(() => {
// transferModalData({
// data: 'content1',
// info: 'Info1',
// });
// }, 3000);
openModal4
(
true
,
{
data
:
'
content
'
,
info
:
'
Info
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录