Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
陈智峰
jinfa-admin
Commits
e62811ba
Commit
e62811ba
authored
Feb 25, 2022
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改活动页商品数据为空时报错
parent
89db360f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
global.d.ts
src/global/config/global.d.ts
+1
-0
useGetLayout.ts
...nagement/activePage/fixtures/common/hooks/useGetLayout.ts
+1
-1
useSaveData.ts
...anagement/activePage/fixtures/common/hooks/useSaveData.ts
+4
-1
No files found.
src/global/config/global.d.ts
View file @
e62811ba
...
@@ -33,6 +33,7 @@ export interface SiteInfo {
...
@@ -33,6 +33,7 @@ export interface SiteInfo {
logo
:
string
;
logo
:
string
;
siteUrl
:
string
;
siteUrl
:
string
;
symbol
?:
any
;
symbol
?:
any
;
language
:
string
;
}
}
export
interface
Global
{
export
interface
Global
{
...
...
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetLayout.ts
View file @
e62811ba
...
@@ -173,7 +173,7 @@ const createComponent = (
...
@@ -173,7 +173,7 @@ const createComponent = (
const
sonConfig
=
createComponent
(
const
sonConfig
=
createComponent
(
{
{
componentName
,
componentName
,
childrenData
:
current
.
childrenData
,
childrenData
:
current
.
childrenData
.
filter
(
Boolean
)
,
startKey
:
keyNum
,
startKey
:
keyNum
,
dataSource
,
dataSource
,
primaryKey
,
primaryKey
,
...
...
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useSaveData.ts
View file @
e62811ba
...
@@ -117,6 +117,9 @@ function useSaveData(options: Options) {
...
@@ -117,6 +117,9 @@ function useSaveData(options: Options) {
const
{
...
childRestProps
}
=
childrenNodeTarget
?.
props
;
const
{
...
childRestProps
}
=
childrenNodeTarget
?.
props
;
const
childrenData
=
childrenNodeTarget
.
childNodes
?.
map
((
_listItem
)
=>
{
const
childrenData
=
childrenNodeTarget
.
childNodes
?.
map
((
_listItem
)
=>
{
const
sonNodeTarget
=
pageConfig
[
_listItem
];
const
sonNodeTarget
=
pageConfig
[
_listItem
];
if
(
!
sonNodeTarget
?.
props
.
id
)
{
return
null
}
if
(
dataIndex
===
'suggestProduct'
)
{
if
(
dataIndex
===
'suggestProduct'
)
{
return
{
return
{
id
:
sonNodeTarget
?.
props
.
id
,
id
:
sonNodeTarget
?.
props
.
id
,
...
@@ -128,7 +131,7 @@ function useSaveData(options: Options) {
...
@@ -128,7 +131,7 @@ function useSaveData(options: Options) {
return
{
return
{
title
:
childRestProps
.
title
,
title
:
childRestProps
.
title
,
theme
:
childRestProps
.
theme
||
0
,
theme
:
childRestProps
.
theme
||
0
,
childrenData
:
childrenData
childrenData
:
childrenData
.
filter
(
Boolean
)
};
};
})
})
}
}
...
...
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