Skip to content

Commit cc3793b

Browse files
committed
feat:保存逻辑调整
1 parent 01c0a81 commit cc3793b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

packages/common/js/http.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const requestEvent = (url, params) => {
3737
* @returns { Promise }
3838
*
3939
*/
40-
export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage, isShowNotify = true) => {
40+
export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage, isUpdateTree = true) => {
4141
return getMetaApi(META_SERVICE.Http)
4242
.post(`/app-center/api/pages/update/${pageId}`, params)
4343
.then((res) => {
@@ -57,7 +57,7 @@ export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage, is
5757
}
5858
}
5959

60-
if (isShowNotify) {
60+
if (isUpdateTree) {
6161
useNotify({ message: '保存成功!', type: 'success' })
6262
}
6363

@@ -77,7 +77,9 @@ export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage, is
7777
.finally(() => {
7878
const { pageSettingState } = usePage()
7979
// 更新页面管理的列表,如果不存在,说明还没有打开过页面管理面板
80-
pageSettingState.updateTreeData?.()
80+
if (isUpdateTree) {
81+
pageSettingState.updateTreeData?.()
82+
}
8183
pageSettingState.isNew = false
8284
})
8385
}

packages/plugins/page/src/PageSetting.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ export default {
208208
})
209209
}
210210
211-
const updatePage = (id, params, isShowNotify = true) => {
211+
const updatePage = (id, params, isUpdateTree = true) => {
212212
const routerChange = pageSettingState.currentPageDataCopy.route !== pageSettingState.currentPageData.route
213213
const isCurEditPage = pageState?.currentPage?.id === id
214214
215-
return handlePageUpdate(id, params, routerChange, isCurEditPage, isShowNotify)
215+
return handlePageUpdate(id, params, routerChange, isCurEditPage, isUpdateTree)
216216
}
217217
218218
const restorePage = (pageData) => {
@@ -292,7 +292,7 @@ export default {
292292
}
293293
}
294294
295-
const settingDefaultPage = () => {
295+
const settingDefaultPage = async () => {
296296
const params = { ...pageSettingState.defaultPage, isDefault: true }
297297
updatePage(pageSettingState.defaultPage?.id, params, false)
298298
}
@@ -308,9 +308,10 @@ export default {
308308
}
309309
const exec = () => {
310310
pageSettingState.currentPageData.message = state.historyMessage.trim() || 'Page auto save'
311-
editPage()
312311
if (pageSettingState.defaultPage?.id) {
313-
settingDefaultPage()
312+
settingDefaultPage().then(editPage)
313+
} else {
314+
editPage()
314315
}
315316
state.historyMessage = ''
316317
}

0 commit comments

Comments
 (0)