Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
2628fb55
Commit
2628fb55
authored
Oct 25, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(drawer): refactor props detailType to isDetail
parent
491ba9a3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
17 deletions
+15
-17
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+5
-0
BasicDrawer.tsx
src/components/Drawer/src/BasicDrawer.tsx
+3
-3
props.ts
src/components/Drawer/src/props.ts
+3
-4
types.ts
src/components/Drawer/src/types.ts
+1
-5
Drawer5.vue
src/views/demo/comp/drawer/Drawer5.vue
+3
-5
No files found.
CHANGELOG.zh_CN.md
View file @
2628fb55
...
...
@@ -5,6 +5,11 @@
-
面包屑支持显示图标
-
新增 tinymce 富文本组件
-
表单新增 submitOnReset 控制是否在重置时重新发起请求
-
表格新增
`sortFn`
支持自定义排序
### ✨ Refactor
-
Drawer 组件的 detailType 修改为 isDetail
### 🎫 Chores
...
...
src/components/Drawer/src/BasicDrawer.tsx
View file @
2628fb55
...
...
@@ -16,7 +16,7 @@ import { FullLoading } from '/@/components/Loading/index';
import
{
getSlot
}
from
'
/@/utils/helper/tsxHelper
'
;
import
{
DrawerInstance
,
DrawerProps
,
DrawerType
}
from
'
./types
'
;
import
{
DrawerInstance
,
DrawerProps
}
from
'
./types
'
;
import
{
basicProps
}
from
'
./props
'
;
import
{
isFunction
,
isNumber
}
from
'
/@/utils/is
'
;
...
...
@@ -54,7 +54,7 @@ export default defineComponent({
};
opt
.
title
=
undefined
;
if
(
opt
.
drawerType
===
DrawerType
.
DETAIL
)
{
if
(
opt
.
isDetail
)
{
if
(
!
opt
.
width
)
{
opt
.
width
=
'
100%
'
;
}
...
...
@@ -157,7 +157,7 @@ export default defineComponent({
function
renderHeader
()
{
const
{
title
}
=
unref
(
getMergeProps
);
return
props
.
drawerType
===
DrawerType
.
DETAIL
?
(
return
props
.
isDetail
?
(
getSlot
(
slots
,
'
title
'
)
||
(
<
Row
type=
"flex"
align=
"middle"
class=
{
`${prefixCls}__detail-header`
}
>
{
()
=>
(
...
...
src/components/Drawer/src/props.ts
View file @
2628fb55
import
type
{
PropType
}
from
'
vue
'
;
import
{
DrawerType
}
from
'
./types
'
;
// import {DrawerProps} from './types'
export
const
footerProps
=
{
confirmLoading
:
Boolean
as
PropType
<
boolean
>
,
...
...
@@ -41,9 +40,9 @@ export const footerProps = {
},
};
export
const
basicProps
=
{
drawerType
:
{
type
:
Number
as
PropType
<
number
>
,
default
:
DrawerType
.
DEFAULT
,
isDetail
:
{
type
:
Boolean
as
PropType
<
boolean
>
,
default
:
false
,
},
title
:
{
type
:
String
as
PropType
<
string
>
,
...
...
src/components/Drawer/src/types.ts
View file @
2628fb55
...
...
@@ -20,10 +20,6 @@ export interface ReturnInnerMethods extends DrawerInstance {
export
type
UseDrawerReturnType
=
[
RegisterFn
,
ReturnMethods
];
export
type
UseDrawerInnerReturnType
=
[
RegisterFn
,
ReturnInnerMethods
];
export
enum
DrawerType
{
DETAIL
,
DEFAULT
,
}
export
interface
DrawerFooterProps
{
showOkBtn
:
boolean
;
...
...
@@ -69,7 +65,7 @@ export interface DrawerFooterProps {
footerHeight
:
string
|
number
;
}
export
interface
DrawerProps
extends
DrawerFooterProps
{
drawerType
:
DrawerType
;
isDetail
?:
boolean
;
loading
?:
boolean
;
showDetailBack
?:
boolean
;
visible
?:
boolean
;
...
...
src/views/demo/comp/drawer/Drawer5.vue
View file @
2628fb55
<
template
>
<BasicDrawer
v-bind=
"$attrs"
:
drawerType=
"DrawerType.DETAIL
"
title=
"Drawer Title5"
>
<BasicDrawer
v-bind=
"$attrs"
:
isDetail=
"true
"
title=
"Drawer Title5"
>
<p
class=
"h-20"
>
Content Message
</p>
</BasicDrawer>
</
template
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
{
BasicDrawer
,
DrawerType
}
from
'
/@/components/Drawer
'
;
import
{
BasicDrawer
}
from
'
/@/components/Drawer
'
;
export
default
defineComponent
({
components
:
{
BasicDrawer
},
setup
()
{
return
{
DrawerType
};
},
setup
()
{},
});
</
script
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment