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
bcab4b77
Commit
bcab4b77
authored
Nov 03, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf(use-message): fix typo
parent
0f4b847d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
56 additions
and
17 deletions
+56
-17
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
useMessage.tsx
src/hooks/web/useMessage.tsx
+35
-2
exception.ts
src/router/menus/modules/demo/exception.ts
+0
-4
feat.ts
src/router/menus/modules/demo/feat.ts
+4
-0
exception.ts
src/router/routes/modules/demo/exception.ts
+0
-8
feat.ts
src/router/routes/modules/demo/feat.ts
+8
-0
index.vue
src/views/sys/error-log/index.vue
+8
-3
No files found.
CHANGELOG.zh_CN.md
View file @
bcab4b77
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
-
修复升级之后 table 类型问题
-
修复升级之后 table 类型问题
-
修复分割菜单且左侧菜单没有数据时候,继续展示上一次子菜单的问题
-
修复分割菜单且左侧菜单没有数据时候,继续展示上一次子菜单的问题
-
修复
`useMessage`
类型问题
## 2.0.0-rc.8 (2020-11-2)
## 2.0.0-rc.8 (2020-11-2)
...
...
src/hooks/web/useMessage.tsx
View file @
bcab4b77
import
type
{
ModalFunc
,
ModalFuncProps
}
from
'
ant-design-vue/lib/modal/Modal
'
;
import
type
{
ModalFunc
,
ModalFuncProps
}
from
'
ant-design-vue/lib/modal/Modal
'
;
import
type
{
MessageApi
}
from
'
ant-design-vue/lib/message/index
'
;
import
type
{
VNodeTypes
,
CSSProperties
}
from
'
vue
'
;
import
{
Modal
,
message
as
Message
,
notification
}
from
'
ant-design-vue
'
;
import
{
Modal
,
message
as
Message
,
notification
}
from
'
ant-design-vue
'
;
import
{
InfoCircleFilled
,
CheckCircleFilled
,
CloseCircleFilled
}
from
'
@ant-design/icons-vue
'
;
import
{
InfoCircleFilled
,
CheckCircleFilled
,
CloseCircleFilled
}
from
'
@ant-design/icons-vue
'
;
import
{
useSetting
}
from
'
/@/hooks/core/useSetting
'
;
import
{
useSetting
}
from
'
/@/hooks/core/useSetting
'
;
export
interface
ArgsProps
{
message
:
VNodeTypes
;
description
?:
VNodeTypes
;
btn
?:
VNodeTypes
;
key
?:
string
;
onClose
?:
()
=>
void
;
duration
?:
number
|
null
;
icon
?:
VNodeTypes
;
placement
?:
NotificationPlacement
;
style
?:
CSSProperties
;
prefixCls
?:
string
;
class
?:
string
;
readonly
type
?:
IconType
;
onClick
?:
()
=>
void
;
top
?:
number
;
bottom
?:
number
;
getContainer
?:
()
=>
HTMLElement
;
closeIcon
?:
VNodeTypes
;
}
export
declare
type
NotificationPlacement
=
'
topLeft
'
|
'
topRight
'
|
'
bottomLeft
'
|
'
bottomRight
'
;
export
declare
type
IconType
=
'
success
'
|
'
info
'
|
'
error
'
|
'
warning
'
;
export
interface
ConfigProps
{
top
?:
string
|
number
;
bottom
?:
string
|
number
;
duration
?:
number
;
placement
?:
NotificationPlacement
;
getContainer
?:
()
=>
HTMLElement
;
closeIcon
?:
VNodeTypes
;
}
export
interface
ModalOptionsEx
extends
Omit
<
ModalFuncProps
,
'
iconType
'
>
{
export
interface
ModalOptionsEx
extends
Omit
<
ModalFuncProps
,
'
iconType
'
>
{
iconType
:
'
warning
'
|
'
success
'
|
'
error
'
|
'
info
'
;
iconType
:
'
warning
'
|
'
success
'
|
'
error
'
|
'
info
'
;
}
}
...
@@ -84,8 +117,8 @@ notification.config({
...
@@ -84,8 +117,8 @@ notification.config({
*/
*/
export
function
useMessage
()
{
export
function
useMessage
()
{
return
{
return
{
createMessage
:
Message
,
createMessage
:
Message
as
MessageApi
,
notification
,
notification
:
notification
as
(
arg
:
ArgsProps
)
=>
void
,
createConfirm
:
createConfirm
,
createConfirm
:
createConfirm
,
createSuccessModal
,
createSuccessModal
,
createErrorModal
,
createErrorModal
,
...
...
src/router/menus/modules/demo/exception.ts
View file @
bcab4b77
...
@@ -25,10 +25,6 @@ const menu: MenuModule = {
...
@@ -25,10 +25,6 @@ const menu: MenuModule = {
path
:
'
not-data
'
,
path
:
'
not-data
'
,
name
:
'
无数据
'
,
name
:
'
无数据
'
,
},
},
{
path
:
'
error-log
'
,
name
:
'
错误日志
'
,
},
],
],
},
},
};
};
...
...
src/router/menus/modules/demo/feat.ts
View file @
bcab4b77
...
@@ -45,6 +45,10 @@ const menu: MenuModule = {
...
@@ -45,6 +45,10 @@ const menu: MenuModule = {
path
:
'
full-screen
'
,
path
:
'
full-screen
'
,
name
:
'
全屏
'
,
name
:
'
全屏
'
,
},
},
{
path
:
'
error-log
'
,
name
:
'
错误日志
'
,
},
{
{
path
:
'
testTab
'
,
path
:
'
testTab
'
,
name
:
'
带参Tab
'
,
name
:
'
带参Tab
'
,
...
...
src/router/routes/modules/demo/exception.ts
View file @
bcab4b77
...
@@ -78,13 +78,5 @@ export default {
...
@@ -78,13 +78,5 @@ export default {
afterCloseLoading
:
true
,
afterCloseLoading
:
true
,
},
},
},
},
{
path
:
'
/error-log
'
,
name
:
'
ErrorLog
'
,
component
:
()
=>
import
(
'
/@/views/sys/error-log/index.vue
'
),
meta
:
{
title
:
'
错误日志
'
,
},
},
],
],
}
as
AppRouteModule
;
}
as
AppRouteModule
;
src/router/routes/modules/demo/feat.ts
View file @
bcab4b77
...
@@ -96,6 +96,14 @@ export default {
...
@@ -96,6 +96,14 @@ export default {
title
:
'
全屏
'
,
title
:
'
全屏
'
,
},
},
},
},
{
path
:
'
/error-log
'
,
name
:
'
ErrorLog
'
,
component
:
()
=>
import
(
'
/@/views/sys/error-log/index.vue
'
),
meta
:
{
title
:
'
错误日志
'
,
},
},
{
{
path
:
'
/testTab/:id
'
,
path
:
'
/testTab/:id
'
,
name
:
'
TestTab
'
,
name
:
'
TestTab
'
,
...
...
src/views/sys/error-log/index.vue
View file @
bcab4b77
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
import
DetailModal
from
'
./DetailModal.vue
'
;
import
DetailModal
from
'
./DetailModal.vue
'
;
import
{
useModal
}
from
'
/@/components/Modal/index
'
;
import
{
useModal
}
from
'
/@/components/Modal/index
'
;
import
{
useMessage
}
from
'
/@/hooks/web/useMessage
'
;
import
{
BasicTable
,
useTable
,
TableAction
}
from
'
/@/components/Table/index
'
;
import
{
BasicTable
,
useTable
,
TableAction
}
from
'
/@/components/Table/index
'
;
...
@@ -32,6 +33,7 @@
...
@@ -32,6 +33,7 @@
import
{
getColumns
}
from
'
./data
'
;
import
{
getColumns
}
from
'
./data
'
;
import
{
cloneDeep
}
from
'
lodash-es
'
;
import
{
cloneDeep
}
from
'
lodash-es
'
;
import
{
isDevMode
}
from
'
/@/utils/env
'
;
export
default
defineComponent
({
export
default
defineComponent
({
name
:
'
ErrorHandler
'
,
name
:
'
ErrorHandler
'
,
...
@@ -39,8 +41,8 @@
...
@@ -39,8 +41,8 @@
setup
()
{
setup
()
{
const
rowInfoRef
=
ref
<
ErrorInfo
>
();
const
rowInfoRef
=
ref
<
ErrorInfo
>
();
const
imgListRef
=
ref
<
string
[]
>
([]);
const
imgListRef
=
ref
<
string
[]
>
([]);
const
[
register
,
{
setTableData
}]
=
useTable
({
const
[
register
,
{
setTableData
}]
=
useTable
({
titleHelpMessage
:
'
只在`/src/settings/projectSetting.ts` 内的useErrorHandle=true时生效!
'
,
title
:
'
错误日志列表
'
,
title
:
'
错误日志列表
'
,
columns
:
getColumns
(),
columns
:
getColumns
(),
actionColumn
:
{
actionColumn
:
{
...
@@ -50,8 +52,8 @@
...
@@ -50,8 +52,8 @@
slots
:
{
customRender
:
'
action
'
},
slots
:
{
customRender
:
'
action
'
},
},
},
});
});
const
[
registerModal
,
{
openModal
}]
=
useModal
();
const
[
registerModal
,
{
openModal
}]
=
useModal
();
watch
(
watch
(
()
=>
errorStore
.
getErrorInfoState
,
()
=>
errorStore
.
getErrorInfoState
,
(
list
)
=>
{
(
list
)
=>
{
...
@@ -63,7 +65,10 @@
...
@@ -63,7 +65,10 @@
immediate
:
true
,
immediate
:
true
,
}
}
);
);
const
{
createMessage
}
=
useMessage
();
if
(
isDevMode
())
{
createMessage
.
info
(
'
只在`/src/settings/projectSetting.ts` 内的useErrorHandle=true时生效!
'
);
}
// 查看详情
// 查看详情
function
handleDetail
(
row
:
ErrorInfo
)
{
function
handleDetail
(
row
:
ErrorInfo
)
{
rowInfoRef
.
value
=
row
;
rowInfoRef
.
value
=
row
;
...
...
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