Skip to content

Commit 5b58396

Browse files
committed
style: lint format
1 parent 37d35f7 commit 5b58396

File tree

11 files changed

+46
-17
lines changed

11 files changed

+46
-17
lines changed

components/_util/props-util/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,15 @@ const getSlots = ele => {
7171
return { ...slots, ...getScopedSlots(ele) };
7272
};
7373

74+
export const skipFlattenKey = Symbol('skipFlatten');
7475
const flattenChildren = (children = [], filterEmpty = true) => {
7576
const temp = Array.isArray(children) ? children : [children];
7677
const res = [];
7778
temp.forEach(child => {
7879
if (Array.isArray(child)) {
7980
res.push(...flattenChildren(child, filterEmpty));
8081
} else if (child && child.type === Fragment) {
81-
if (child.props && child.props.skipFlatten) {
82+
if (child.key === skipFlattenKey) {
8283
res.push(child);
8384
} else {
8485
res.push(...flattenChildren(child.children, filterEmpty));

components/radio/RadioButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default defineComponent({
1111
useProvideRadioOptionTypeContext('button');
1212
return () => {
1313
return (
14-
<Radio {...props} prefixCls={prefixCls.value} type="radio">
14+
<Radio {...props} prefixCls={prefixCls.value}>
1515
{slots.default?.()}
1616
</Radio>
1717
);

components/upload/UploadList/ListItem.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export const listItemProps = () => {
5050
};
5151

5252
export type ListItemProps = Partial<ExtractPropTypes<ReturnType<typeof listItemProps>>>;
53-
5453
export default defineComponent({
5554
name: 'ListItem',
5655
inheritAttrs: false,
@@ -110,7 +109,7 @@ export default defineComponent({
110109
src={file.thumbUrl || file.url}
111110
alt={file.name}
112111
class={`${prefixCls}-list-item-image`}
113-
crossOrigin={file.crossOrigin}
112+
crossorigin={file.crossOrigin}
114113
/>
115114
) : (
116115
iconNode

components/upload/interface.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type {
44
} from '../vc-upload/interface';
55
import type { ProgressProps } from '../progress';
66
import type { VueNode } from '../_util/type';
7-
import type { ExtractPropTypes, PropType, CSSProperties } from 'vue';
7+
import type { ExtractPropTypes, PropType, CSSProperties, ImgHTMLAttributes } from 'vue';
88

99
export interface FileType extends OriRcFile {
1010
readonly lastModifiedDate: Date;
@@ -27,7 +27,7 @@ export interface UploadFile<T = any> {
2727
status?: UploadFileStatus;
2828
percent?: number;
2929
thumbUrl?: string;
30-
crossOrigin?: HTMLImageElement['crossOrigin'];
30+
crossOrigin?: ImgHTMLAttributes['crossorigin'];
3131
originFileObj?: FileType;
3232
response?: T;
3333
error?: any;

components/vc-dropdown/Dropdown.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Trigger from '../vc-trigger';
55
import placements from './placements';
66
import { cloneElement } from '../_util/vnode';
77
import classNames from '../_util/classNames';
8+
import { skipFlattenKey } from '../_util/props-util';
89

910
export default defineComponent({
1011
props: {
@@ -72,7 +73,7 @@ export default defineComponent({
7273
getPopupContainer: () => triggerRef.value.getPopupDomNode(),
7374
};
7475
return (
75-
<Fragment skipFlatten>
76+
<Fragment key={skipFlattenKey}>
7677
{props.arrow && <div class={`${props.prefixCls}-arrow`} />}
7778
{cloneElement(overlayElement, extraOverlayProps, false)}
7879
</Fragment>

components/vc-input/BaseInput.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { CSSProperties } from 'vue';
12
import { defineComponent, ref } from 'vue';
23
import classNames from '../_util/classNames';
34
import type { MouseEventHandler } from '../_util/EventInterface';
@@ -101,7 +102,7 @@ export default defineComponent({
101102
element = (
102103
<span
103104
class={affixWrapperCls}
104-
style={attrs.style}
105+
style={attrs.style as CSSProperties}
105106
hidden={!hasAddon({ addonAfter, addonBefore }) && hidden}
106107
onMousedown={onInputMouseDown}
107108
ref={containerRef}
@@ -136,7 +137,7 @@ export default defineComponent({
136137
// Need another wrapper for changing display:table to display:inline-block
137138
// and put style prop in wrapper
138139
return (
139-
<span class={mergedGroupClassName} style={attrs.style} hidden={hidden}>
140+
<span class={mergedGroupClassName} style={attrs.style as CSSProperties} hidden={hidden}>
140141
<span class={mergedWrapperClassName}>
141142
{addonBefore && <span class={addonCls}>{addonBefore}</span>}
142143
{cloneElement(element, { style: null, hidden: null })}

components/vc-tree-select/TreeSelect.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { conductCheck } from '../vc-tree/utils/conductUtil';
3030
import { warning } from '../vc-util/warning';
3131
import { toReactive } from '../_util/toReactive';
3232
import useMaxLevel from '../vc-tree/useMaxLevel';
33-
import type { ExpandAction } from '../tree/DirectoryTree';
33+
import type { ExpandAction } from '../vc-tree/props';
3434

3535
export type OnInternalSelect = (value: RawValueType, info: { selected: boolean }) => void;
3636

components/vc-tree-select/TreeSelectContext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { InjectionKey } from 'vue';
22
import { provide, inject } from 'vue';
3-
import type { ExpandAction } from '../tree/DirectoryTree';
3+
import type { ExpandAction } from '../vc-tree/props';
44
import type { DefaultOptionType, InternalFieldName, OnInternalSelect } from './TreeSelect';
55

66
export interface TreeSelectContextProps {

components/vc-tree/Tree.tsx

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export default defineComponent({
6565
disabled: false,
6666
checkStrictly: false,
6767
draggable: false,
68+
expandAction: false,
6869
defaultExpandParent: true,
6970
autoExpandParent: false,
7071
defaultExpandAll: false,
@@ -617,16 +618,34 @@ export default defineComponent({
617618

618619
dragNode = null;
619620
};
621+
const triggerExpandActionExpand: NodeMouseEventHandler = (e, treeNode) => {
622+
const { expanded, key } = treeNode;
623+
624+
const node = flattenNodes.value.filter(nodeItem => nodeItem.key === key)[0];
625+
const eventNode = convertNodePropsToEventData({
626+
...getTreeNodeProps(key, treeNodeRequiredProps.value),
627+
data: node.data,
628+
});
629+
setExpandedKeys(expanded ? arrDel(expandedKeys.value, key) : arrAdd(expandedKeys.value, key));
630+
631+
onNodeExpand(e, eventNode);
632+
};
620633

621634
const onNodeClick: NodeMouseEventHandler = (e, treeNode) => {
622-
const { onClick } = props;
635+
const { onClick, expandAction } = props;
636+
if (expandAction === 'click') {
637+
triggerExpandActionExpand(e, treeNode);
638+
}
623639
if (onClick) {
624640
onClick(e, treeNode);
625641
}
626642
};
627643

628644
const onNodeDoubleClick: NodeMouseEventHandler = (e, treeNode) => {
629-
const { onDblclick } = props;
645+
const { onDblclick, expandAction } = props;
646+
if (expandAction === 'doubleclick' || expandAction === 'dblclick') {
647+
triggerExpandActionExpand(e, treeNode);
648+
}
630649
if (onDblclick) {
631650
onDblclick(e, treeNode);
632651
}
@@ -1107,6 +1126,8 @@ export default defineComponent({
11071126
onContextmenu,
11081127
onScroll,
11091128
direction,
1129+
rootClassName,
1130+
rootStyle,
11101131
} = props;
11111132

11121133
const { class: className, style } = attrs;
@@ -1179,11 +1200,12 @@ export default defineComponent({
11791200
>
11801201
<div
11811202
role="tree"
1182-
class={classNames(prefixCls, className, {
1203+
class={classNames(prefixCls, className, rootClassName, {
11831204
[`${prefixCls}-show-line`]: showLine,
11841205
[`${prefixCls}-focused`]: focused.value,
11851206
[`${prefixCls}-active-focused`]: activeKey.value !== null,
11861207
})}
1208+
style={rootStyle}
11871209
>
11881210
<NodeList
11891211
ref={listRef}

components/vc-tree/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// base rc-tree 5.4.4
1+
// base rc-tree 5.6.3
22
import type { TreeProps, TreeNodeProps } from './props';
33
import Tree from './Tree';
44
import TreeNode from './TreeNode';

0 commit comments

Comments
 (0)