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
linweijiong
jinfa-admin
Commits
89db360f
Commit
89db360f
authored
Feb 23, 2022
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改pc 活动页装修
parent
a33e2024
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
20 deletions
+21
-20
useGetLayout.ts
...nagement/activePage/fixtures/common/hooks/useGetLayout.ts
+1
-1
useSaveData.ts
...anagement/activePage/fixtures/common/hooks/useSaveData.ts
+19
-18
web.tsx
...marketingActivitiesManagement/activePage/fixtures/web.tsx
+1
-1
No files found.
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetLayout.ts
View file @
89db360f
...
...
@@ -202,7 +202,7 @@ const createComponent = (
props
:
isDept
?
omit
(
current
,
[
'childrenData'
])
:
specialKey
&&
specialKey
===
otherProps
[
floor
-
1
].
type
?
{
label
:
labels
[
`
${
childProps
}
-
${
rest
.
join
(
"-"
)
}
`
]
||
[]
,
...
childProps
}
?
{
label
:
labels
[
`
${
rest
.
join
(
"-"
)}
-
${
childProps
.
id
}
`
]
||
[]
,
...
childProps
}
:
childProps
,
otherProps
:
otherProps
[
floor
-
1
],
childNodes
:
parentChildKeys
,
...
...
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/common/hooks/useSaveData.ts
View file @
89db360f
...
...
@@ -8,6 +8,7 @@ import { history } from 'umi';
type
Options
=
{
id
:
number
;
environment
?:
"app"
|
"web"
}
/** 数组转合集 */
...
...
@@ -59,7 +60,7 @@ type ResultType = {
}
&
ActivityContent
function
useSaveData
(
options
:
Options
)
{
const
{
id
}
=
options
const
{
id
,
environment
=
'app'
}
=
options
const
[
saving
,
setSaving
]
=
useState
<
boolean
>
(
false
);
const
generaterData
=
(
source
:
ResultType
,
dataIndex
:
string
,
assignData
:
{[
key
:
string
]:
any
}
)
=>
{
...
...
@@ -102,22 +103,7 @@ function useSaveData(options: Options) {
childrenData
:
childrenData
}
});
}
else
if
(
ACTIVITY_LIST
.
includes
(
dataIndex
as
ACTIVITY_KEYS
)
&&
dataIndex
!==
'combination'
)
{
const
{
...
otherProps
}
=
props
||
{};
const
childrenData
=
childNodes
.
map
((
_record
)
=>
{
const
childTargetProps
=
pageConfig
[
_record
].
props
;
return
childTargetProps
.
id
;
}).
filter
(
Boolean
);
// const childrenData = products?.map((_item) => _item.id) || [];
result
=
generaterData
(
result
,
dataIndex
,
{
sort
:
sort
,
props
:
{
...
pick
(
otherProps
,
[
'theme'
,
'title'
]),
visible
:
props
.
status
??
true
,
childrenData
:
childrenData
}
});
}
else
if
(
dataIndex
===
'suggestProduct'
||
dataIndex
===
'combination'
)
{
}
else
if
(
dataIndex
===
'suggestProduct'
||
(
dataIndex
===
'combination'
&&
environment
===
'app'
))
{
const
{
...
otherProps
}
=
props
||
{};
const
{
childNodes
}
=
target
;
const
temp
=
{
...
...
@@ -148,7 +134,22 @@ function useSaveData(options: Options) {
}
};
result
=
generaterData
(
result
,
dataIndex
,
temp
);
}
}
else
if
(
ACTIVITY_LIST
.
includes
(
dataIndex
as
ACTIVITY_KEYS
))
{
const
{
...
otherProps
}
=
props
||
{};
const
childrenData
=
childNodes
.
map
((
_record
)
=>
{
const
childTargetProps
=
pageConfig
[
_record
].
props
;
return
childTargetProps
.
id
;
}).
filter
(
Boolean
);
// const childrenData = products?.map((_item) => _item.id) || [];
result
=
generaterData
(
result
,
dataIndex
,
{
sort
:
sort
,
props
:
{
...
pick
(
otherProps
,
[
'theme'
,
'title'
]),
visible
:
props
.
status
??
true
,
childrenData
:
childrenData
}
});
}
});
const
withThemeStyle
=
{
...
result
,
...
...
src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/web.tsx
View file @
89db360f
...
...
@@ -24,7 +24,7 @@ const Web = () => {
// useDraggable(el);
const
{
id
}
=
usePageStatus
();
const
[
scale
,
setScale
]
=
useState
(
0.75
);
const
{
saving
,
onSave
}
=
useSaveData
({
id
:
+
id
});
const
{
saving
,
onSave
}
=
useSaveData
({
id
:
+
id
,
environment
:
'web'
});
const
[
leftBarVisible
,
setLeftBarVisible
]
=
useState
<
boolean
>
(
true
);
const
{
detail
,
loading
}
=
useGetWebLayout
();
...
...
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