From cc1490a97c946930eba199ee15e1c39e321bf634 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 31 Aug 2023 14:37:47 +0800
Subject: [PATCH] fix: type
---
src/components/Table/src/types/table.ts | 6 +++---
src/components/Tinymce/src/Editor.vue | 2 --
src/components/Tree/src/BasicTree.vue | 24 ++++++++++++------------
src/components/Tree/src/hooks/useTree.ts | 4 ++--
src/components/Upload/src/data.tsx | 2 +-
src/components/Upload/src/typing.ts | 2 +-
src/components/Verifition/src/Verify.vue | 2 +-
7 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index c70926cc..a3c1334c 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -257,7 +257,7 @@ export interface BasicTableProps<T = any> {
* Customize row expand Icon.
* @type Function | VNodeChild
*/
- expandIcon?: Function | VNodeChild | JSX.Element
+ expandIcon?: Fn | VNodeChild | JSX.Element
/**
* Whether to expand row by clicking anywhere in the whole row
@@ -275,7 +275,7 @@ export interface BasicTableProps<T = any> {
* Table footer renderer
* @type Function | VNodeChild
*/
- footer?: Function | VNodeChild | JSX.Element
+ footer?: Fn | VNodeChild | JSX.Element
/**
* Indent size in pixels of tree data
@@ -366,7 +366,7 @@ export interface BasicTableProps<T = any> {
*
* @version 1.5.4
*/
- transformCellText?: Function
+ transformCellText?: Fn
/**
* Callback executed before editable cell submit value, not for row-editor
diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue
index c2b1ffe1..2c66e2d5 100644
--- a/src/components/Tinymce/src/Editor.vue
+++ b/src/components/Tinymce/src/Editor.vue
@@ -286,8 +286,6 @@ function getUploadingImgName(name: string) {
</div>
</template>
-<style lang="less" scoped></style>
-
<style lang="less">
@prefix-cls: ~'@{namespace}-tinymce-container';
diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue
index f758dea3..5f9ff957 100644
--- a/src/components/Tree/src/BasicTree.vue
+++ b/src/components/Tree/src/BasicTree.vue
@@ -52,6 +52,18 @@ export default defineComponent({
}
})
+ const {
+ deleteNodeByKey,
+ insertNodeByKey,
+ insertNodesByKey,
+ filterByLevel,
+ updateNodeByKey,
+ getAllKeys,
+ getChildrenKeys,
+ getEnabledKeys,
+ getSelectedNode,
+ } = useTree(treeDataRef, getFieldNames)
+
const getBindValues = computed(() => {
const propsData = {
'blockNode': true,
@@ -99,18 +111,6 @@ export default defineComponent({
return !getTreeData.value || getTreeData.value.length === 0
})
- const {
- deleteNodeByKey,
- insertNodeByKey,
- insertNodesByKey,
- filterByLevel,
- updateNodeByKey,
- getAllKeys,
- getChildrenKeys,
- getEnabledKeys,
- getSelectedNode,
- } = useTree(treeDataRef, getFieldNames)
-
function getIcon(params: TreeItem, icon?: string) {
if (!icon) {
if (props.renderIcon && isFunction(props.renderIcon))
diff --git a/src/components/Tree/src/hooks/useTree.ts b/src/components/Tree/src/hooks/useTree.ts
index 59c065d8..92085975 100644
--- a/src/components/Tree/src/hooks/useTree.ts
+++ b/src/components/Tree/src/hooks/useTree.ts
@@ -186,10 +186,10 @@ export function useTree(treeDataRef: Ref<TreeDataItem[]>, getFieldNames: Compute
}
// Get selected node
- function getSelectedNode(key: KeyType, list?: TreeItem[], selectedNode?: TreeItem | null) {
+ function getSelectedNode(key: KeyType, treeList?: TreeItem[], selectedNode?: TreeItem | null) {
if (!key && key !== 0)
return null
- const treeData = list || unref(treeDataRef)
+ const treeData = treeList || unref(treeDataRef)
const { key: keyField, children: childrenField } = unref(getFieldNames)
if (!keyField)
return
diff --git a/src/components/Upload/src/data.tsx b/src/components/Upload/src/data.tsx
index 08a4cfe1..63f8a7e3 100644
--- a/src/components/Upload/src/data.tsx
+++ b/src/components/Upload/src/data.tsx
@@ -78,7 +78,7 @@ export function createTableColumns(): BasicColumn[] {
},
]
}
-export function createActionColumn(handleRemove: Function): BasicColumn {
+export function createActionColumn(handleRemove: Fn): BasicColumn {
return {
width: 120,
title: t('component.upload.operating'),
diff --git a/src/components/Upload/src/typing.ts b/src/components/Upload/src/typing.ts
index 2b7c5fb0..25f3d406 100644
--- a/src/components/Upload/src/typing.ts
+++ b/src/components/Upload/src/typing.ts
@@ -29,7 +29,7 @@ export interface FileBasicColumn {
* Renderer of the table cell. The return value should be a VNode, or an object for colSpan/rowSpan config
* @type Function | ScopedSlot
*/
- customRender?: Function
+ customRender?: Fn
/**
* Title of this column
* @type any (string | slot)
diff --git a/src/components/Verifition/src/Verify.vue b/src/components/Verifition/src/Verify.vue
index 527ff115..dc9e30bb 100644
--- a/src/components/Verifition/src/Verify.vue
+++ b/src/components/Verifition/src/Verify.vue
@@ -110,7 +110,7 @@ export default {
</script>
<template>
- <div v-show="showBox" :class="mode == 'pop' ? 'mask' : ''">
+ <div v-show="showBox" :class="mode === 'pop' ? 'mask' : ''">
<div :class="mode === 'pop' ? 'verifybox' : ''" :style="{ 'max-width': `${parseInt(imgSize.width) + 20}px` }">
<div v-if="mode === 'pop'" class="verifybox-top">
{{ t('component.captcha.verification') }}