From 9911abe6de8d3f77efa28175d748fee7553a90e2 Mon Sep 17 00:00:00 2001 From: chilingling <26962197+chilingling@users.noreply.github.com> Date: Thu, 16 Nov 2023 01:55:48 -0800 Subject: [PATCH] =?UTF-8?q?fix(pagePlugin):=20=E5=88=A0=E9=99=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=B7=BB=E5=8A=A0=E8=8A=82=E6=B5=81=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=A4=9A=E6=AC=A1=E5=87=BA=E7=8E=B0=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(pagePlugin): 删除文件夹添加防抖,避免多次出现无法删除弹窗 * fix(pagePlugin): use throttle by review comment --- .../plugins/page/src/PageFolderSetting.vue | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/plugins/page/src/PageFolderSetting.vue b/packages/plugins/page/src/PageFolderSetting.vue index 24515e52c..7691d5fd8 100644 --- a/packages/plugins/page/src/PageFolderSetting.vue +++ b/packages/plugins/page/src/PageFolderSetting.vue @@ -32,6 +32,7 @@ import { Button, Collapse, CollapseItem } from '@opentiny/vue' import { PluginSetting, SvgButton, ButtonGroup } from '@opentiny/tiny-engine-common' import { usePage, useModal, useApp, useNotify } from '@opentiny/tiny-engine-controller' import { isEqual } from '@opentiny/vue-renderless/common/object' +import throttle from '@opentiny/vue-renderless/common/deps/throttle' import PageGeneral from './PageGeneral.vue' import http from './http.js' @@ -158,40 +159,39 @@ export default { type: 'error', message: '此文件夹不是空文件夹,不能删除!' }) - return false - } else { - confirm({ - title: '提示', - message: '您是否要删除文件夹?', - exec: () => { - const id = pageSettingState.currentPageData?.id || '' - - requestDeletePage(id) - .then(() => { - pageSettingState.updateTreeData() - closeFolderSettingPanel() - useNotify({ - type: 'success', - message: '删除文件夹成功!' - }) - }) - .catch((error) => { - useNotify({ - type: 'success', - title: '删除文件夹失败!', - message: JSON.stringify(error?.message || error) - }) - }) - } - }) + + return } - return undefined + confirm({ + title: '提示', + message: '您是否要删除文件夹?', + exec: () => { + const id = pageSettingState.currentPageData?.id || '' + + requestDeletePage(id) + .then(() => { + pageSettingState.updateTreeData() + closeFolderSettingPanel() + useNotify({ + type: 'success', + message: '删除文件夹成功!' + }) + }) + .catch((error) => { + useNotify({ + type: 'success', + title: '删除文件夹失败!', + message: JSON.stringify(error?.message || error) + }) + }) + } + }) } return { saveFolderSetting, - deleteFolder, + deleteFolder: throttle(5000, true, deleteFolder), folderGeneralRef, closeFolderSettingPanel, isShow,