Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
quantum-blocks
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
ui
quantum-blocks
Commits
15d46529
Commit
15d46529
authored
Dec 20, 2022
by
Xuguangxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 变更查询活动列表参数
parent
7abb0697
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
9 deletions
+20
-9
editor.ts
app/controller/editor.ts
+19
-8
router.ts
app/router.ts
+1
-1
No files found.
app/controller/editor.ts
View file @
15d46529
...
@@ -197,19 +197,30 @@ export default class EditorController extends Controller {
...
@@ -197,19 +197,30 @@ export default class EditorController extends Controller {
}
}
ctx
.
body
=
ctx
.
helper
.
ok
(
pageInfo
);
ctx
.
body
=
ctx
.
helper
.
ok
(
pageInfo
);
}
}
// updated_at: {
// [ctx.model.Sequelize.Op.lt]: Date.now(),
// [ctx.model.Sequelize.Op.gt]: new Date(Date.now() - 1000 * 60 * 60 * 24 * 30)
// },
public
async
getListForActivityCalendar
(
ctx
:
Context
)
{
public
async
getListForActivityCalendar
(
ctx
:
Context
)
{
const
{
pageSize
,
pageNo
,
pageName
,
tenantId
,
id
}
=
ctx
.
query
;
let
{
exposeTime
}
=
ctx
.
request
.
body
;
exposeTime
=
exposeTime
.
replace
(
/-/g
,
'
/
'
)
let
where
=
omitBy
({
let
where
=
omitBy
({
pageName
:
pageName
&&
{
like
:
`%
${
pageName
}
%`
},
validStartTime
:
{
id
,
[
ctx
.
model
.
Sequelize
.
Op
.
lt
]:
exposeTime
},
validEndTime
:
{
[
ctx
.
model
.
Sequelize
.
Op
.
gt
]:
exposeTime
},
enable
:
1
,
enable
:
1
,
isPublish
:
1
,
isPublish
:
1
,
tenantId
:
tenantId
||
'
560761
'
tenantId
:
'
560761
'
},
v
=>
!
v
);
},
v
=>
!
v
);
const
{
count
:
total
,
rows
:
data
}
=
await
ctx
.
model
.
PageInfo
.
findAndCountAll
({
const
{
rows
:
data
}
=
await
ctx
.
model
.
PageInfo
.
findAndCountAll
({
where
,
where
,
limit
:
+
pageSize
||
10
,
offset
:
(
+
pageNo
-
1
)
*
+
pageSize
||
0
,
order
:
[[
'
updated_at
'
,
'
DESC
'
]],
order
:
[[
'
updated_at
'
,
'
DESC
'
]],
attributes
:
[
'
id
'
,
'
uuid
'
,
'
pageName
'
,
'
tenantId
'
,
'
validStartTime
'
,
'
validEndTime
'
]
attributes
:
[
'
id
'
,
'
uuid
'
,
'
pageName
'
,
'
tenantId
'
,
'
validStartTime
'
,
'
validEndTime
'
]
});
});
...
@@ -220,6 +231,6 @@ export default class EditorController extends Controller {
...
@@ -220,6 +231,6 @@ export default class EditorController extends Controller {
dataValues
.
tenantId
&&
delete
dataValues
.
tenantId
;
dataValues
.
tenantId
&&
delete
dataValues
.
tenantId
;
return
item
.
dataValues
;
return
item
.
dataValues
;
})
})
ctx
.
body
=
ctx
.
helper
.
ok
(
{
total
,
list
:
res
}
);
ctx
.
body
=
ctx
.
helper
.
ok
(
res
);
}
}
}
}
\ No newline at end of file
app/router.ts
View file @
15d46529
...
@@ -13,7 +13,7 @@ export default (application: Application) => {
...
@@ -13,7 +13,7 @@ export default (application: Application) => {
router
.
post
(
'
/editor/update
'
,
controller
.
editor
.
update
);
router
.
post
(
'
/editor/update
'
,
controller
.
editor
.
update
);
router
.
post
(
'
/editor/clearcache
'
,
controller
.
editor
.
clearCache
);
router
.
post
(
'
/editor/clearcache
'
,
controller
.
editor
.
clearCache
);
router
.
get
(
'
/editor/get/list
'
,
controller
.
editor
.
getList
);
router
.
get
(
'
/editor/get/list
'
,
controller
.
editor
.
getList
);
router
.
ge
t
(
'
/editor/getList/activityCalendar
'
,
controller
.
editor
.
getListForActivityCalendar
);
router
.
pos
t
(
'
/editor/getList/activityCalendar
'
,
controller
.
editor
.
getListForActivityCalendar
);
router
.
get
(
'
/editor/get/template
'
,
controller
.
editor
.
getTemplateList
);
router
.
get
(
'
/editor/get/template
'
,
controller
.
editor
.
getTemplateList
);
router
.
get
(
'
/editor/getServerTime
'
,
controller
.
editor
.
getServerTime
);
router
.
get
(
'
/editor/getServerTime
'
,
controller
.
editor
.
getServerTime
);
router
.
get
(
'
/editor/get/:uuid
'
,
controller
.
editor
.
get
);
router
.
get
(
'
/editor/get/:uuid
'
,
controller
.
editor
.
get
);
...
...
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