From f28e3a946ebb80d5759a94a20ca3a3dacbafb91e Mon Sep 17 00:00:00 2001 From: zclzone Date: Fri, 19 Jul 2024 14:55:02 +0800 Subject: [PATCH] fix: lint fix --- src/components/me/crud/index.vue | 1 + src/components/me/modal/index.vue | 10 ++++++---- src/composables/useCrud.js | 2 ++ src/layouts/components/tab/ContextMenu.vue | 3 ++- src/utils/storage/storage.js | 1 + src/views/base/unocss-icon.vue | 3 ++- src/views/demo/upload/index.vue | 3 ++- src/views/pms/resource/components/MenuTree.vue | 5 +++-- src/views/pms/resource/index.vue | 2 ++ src/views/pms/role/index.vue | 6 +++--- src/views/pms/user/index.vue | 1 + 11 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/components/me/crud/index.vue b/src/components/me/crud/index.vue index ae2e60a..d543ba5 100644 --- a/src/components/me/crud/index.vue +++ b/src/components/me/crud/index.vue @@ -145,6 +145,7 @@ async function handleQuery() { } } catch (error) { + console.error(error) tableData.value = [] pagination.itemCount = 0 } diff --git a/src/components/me/modal/index.vue b/src/components/me/modal/index.vue index 40b2585..52b0d4d 100644 --- a/src/components/me/modal/index.vue +++ b/src/components/me/modal/index.vue @@ -144,11 +144,12 @@ async function handleOk(data) { // 调用onOk函数，传入data参数 const res = await modalOptions.value.onOk(data) // 如果onOk函数的返回值不为false，则关闭模态框 - res !== false && close() + if (res !== false) + close() } catch (error) { - okLoading.value = false console.error(error) + okLoading.value = false } } @@ -163,11 +164,12 @@ async function handleCancel(data) { const res = await modalOptions.value.onCancel(data) // 如果onCancel函数的返回值不为false，则关闭模态框 - res !== false && close() + if (res !== false) + close() } catch (error) { - okLoading.value = false console.error(error) + okLoading.value = false } } diff --git a/src/composables/useCrud.js b/src/composables/useCrud.js index d3c4425..1a2ea7a 100644 --- a/src/composables/useCrud.js +++ b/src/composables/useCrud.js @@ -80,6 +80,7 @@ export function useCrud({ name, initForm = {}, doCreate, doDelete, doUpdate, ref data && refresh(data) } catch (error) { + console.error(error) okLoading.value = false return false } @@ -103,6 +104,7 @@ export function useCrud({ name, initForm = {}, doCreate, doDelete, doUpdate, ref refresh(data, true) } catch (error) { + console.error(error) d.loading = false } }, diff --git a/src/layouts/components/tab/ContextMenu.vue b/src/layouts/components/tab/ContextMenu.vue index ceaaae9..a9c3ebb 100644 --- a/src/layouts/components/tab/ContextMenu.vue +++ b/src/layouts/components/tab/ContextMenu.vue @@ -119,7 +119,8 @@ function handleHideDropdown() { function handleSelect(key) { const actionFn = actionMap.get(key) - actionFn && actionFn() + if (typeof actionFn === 'function') + actionFn() handleHideDropdown() } diff --git a/src/utils/storage/storage.js b/src/utils/storage/storage.js index 6741e07..d8510fb 100644 --- a/src/utils/storage/storage.js +++ b/src/utils/storage/storage.js @@ -47,6 +47,7 @@ class Storage { return def } catch (error) { + console.error(error) this.remove(key) return def } diff --git a/src/views/base/unocss-icon.vue b/src/views/base/unocss-icon.vue index 8960d8d..ef40558 100644 --- a/src/views/base/unocss-icon.vue +++ b/src/views/base/unocss-icon.vue @@ -39,6 +39,7 @@ import icons from 'isme:icons' const { copy, copied } = useClipboard() watch(copied, (val) => { - val && $message.success('已复制到剪切板') + if (val) + $message.success('已复制到剪切板') }) diff --git a/src/views/demo/upload/index.vue b/src/views/demo/upload/index.vue index 9145dd7..171fd94 100644 --- a/src/views/demo/upload/index.vue +++ b/src/views/demo/upload/index.vue @@ -70,7 +70,8 @@ const imgList = reactive([ ]) watch(copied, (val) => { - val && $message.success('已复制到剪切板') + if (val) + $message.success('已复制到剪切板') }) function onBeforeUpload({ file }) { diff --git a/src/views/pms/resource/components/MenuTree.vue b/src/views/pms/resource/components/MenuTree.vue index 1a2f74f..3e0b7c1 100644 --- a/src/views/pms/resource/components/MenuTree.vue +++ b/src/views/pms/resource/components/MenuTree.vue @@ -28,8 +28,8 @@ :on-update:selected-keys="onSelect" key-field="code" label-field="name" - default-expand-all - block-line + + block-line default-expand-all /> @@ -115,6 +115,7 @@ function handleDelete(item) { emit('update:currentMenu', null) } catch (error) { + console.error(error) $message.destroy('deleteMenu') } }, diff --git a/src/views/pms/resource/index.vue b/src/views/pms/resource/index.vue index 084b6ff..eaf04b5 100644 --- a/src/views/pms/resource/index.vue +++ b/src/views/pms/resource/index.vue @@ -231,6 +231,7 @@ function handleDeleteBtn(id) { d.loading = false } catch (error) { + console.error(error) d.loading = false } }, @@ -248,6 +249,7 @@ async function handleEnable(item) { item.enableLoading = false } catch (error) { + console.error(error) item.enableLoading = false } } diff --git a/src/views/pms/role/index.vue b/src/views/pms/role/index.vue index 36b85b1..925a6f6 100644 --- a/src/views/pms/role/index.vue +++ b/src/views/pms/role/index.vue @@ -74,9 +74,8 @@ :data="permissionTree" :checked-keys="modalForm.permissionIds" :on-update:checked-keys="(keys) => (modalForm.permissionIds = keys)" - checkable - check-on-click - default-expand-all + + default-expand-all checkable check-on-click class="cus-scroll max-h-200 w-full" /> @@ -211,6 +210,7 @@ async function handleEnable(row) { $table.value?.handleSearch() } catch (error) { + console.error(error) row.enableLoading = false } } diff --git a/src/views/pms/user/index.vue b/src/views/pms/user/index.vue index d09e82b..aa5a5f0 100644 --- a/src/views/pms/user/index.vue +++ b/src/views/pms/user/index.vue @@ -279,6 +279,7 @@ async function handleEnable(row) { $table.value?.handleSearch() } catch (error) { + console.error(error) row.enableLoading = false } }