mirror of
https://github.com/ant-design/ant-design.git
synced 2025-06-08 01:53:34 +08:00
feat:[Tree] selected background color is gray when the node is disabled (#52173)
Some checks are pending
Publish Any Commit / build (push) Waiting to run
🔀 Sync mirror to Gitee / mirror (push) Waiting to run
✅ test / lint (push) Waiting to run
✅ test / test-react-legacy (16, 1/2) (push) Waiting to run
✅ test / test-react-legacy (16, 2/2) (push) Waiting to run
✅ test / test-react-legacy (17, 1/2) (push) Waiting to run
✅ test / test-react-legacy (17, 2/2) (push) Waiting to run
✅ test / test-node (push) Waiting to run
✅ test / test-react-latest (dom, 1/2) (push) Waiting to run
✅ test / test-react-latest (dom, 2/2) (push) Waiting to run
✅ test / test-react-latest-dist (dist, 1/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist, 2/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist-min, 1/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist-min, 2/2) (push) Blocked by required conditions
✅ test / test-coverage (push) Blocked by required conditions
✅ test / build (push) Waiting to run
✅ test / test lib/es module (es, 1/2) (push) Waiting to run
✅ test / test lib/es module (es, 2/2) (push) Waiting to run
✅ test / test lib/es module (lib, 1/2) (push) Waiting to run
✅ test / test lib/es module (lib, 2/2) (push) Waiting to run
👁️ Visual Regression Persist Start / test image (push) Waiting to run
Some checks are pending
Publish Any Commit / build (push) Waiting to run
🔀 Sync mirror to Gitee / mirror (push) Waiting to run
✅ test / lint (push) Waiting to run
✅ test / test-react-legacy (16, 1/2) (push) Waiting to run
✅ test / test-react-legacy (16, 2/2) (push) Waiting to run
✅ test / test-react-legacy (17, 1/2) (push) Waiting to run
✅ test / test-react-legacy (17, 2/2) (push) Waiting to run
✅ test / test-node (push) Waiting to run
✅ test / test-react-latest (dom, 1/2) (push) Waiting to run
✅ test / test-react-latest (dom, 2/2) (push) Waiting to run
✅ test / test-react-latest-dist (dist, 1/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist, 2/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist-min, 1/2) (push) Blocked by required conditions
✅ test / test-react-latest-dist (dist-min, 2/2) (push) Blocked by required conditions
✅ test / test-coverage (push) Blocked by required conditions
✅ test / build (push) Waiting to run
✅ test / test lib/es module (es, 1/2) (push) Waiting to run
✅ test / test lib/es module (es, 2/2) (push) Waiting to run
✅ test / test lib/es module (lib, 1/2) (push) Waiting to run
✅ test / test lib/es module (lib, 2/2) (push) Waiting to run
👁️ Visual Regression Persist Start / test image (push) Waiting to run
* feat:[Tree]对不可check的文本,select时候背景色改为灰色 * feat:[Tree] 修改disabled 选中的文本背景颜色 * feat: 对整行disable 的文本调整select背景色 * fix:恢复误改内容 * feat:删除不需要的多增加的注释内容 * feat:合并css选择器 * feat:更新 Tree snapshot * feat:删除不需要的提交 --------- Co-authored-by: 刘欢 <lh01217311@antgroup.com> Co-authored-by: afc163 <afc163@gmail.com>
This commit is contained in:
parent
8164b9e30e
commit
2a21f7ba88
@ -90,7 +90,7 @@ exports[`renders components/tree/demo/basic.tsx extend context correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected"
|
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -218,7 +218,7 @@ exports[`renders components/tree/demo/basic.tsx extend context correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
|
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected ant-tree-treenode-leaf-last"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -260,7 +260,7 @@ exports[`renders components/tree/demo/basic.tsx extend context correctly 1`] = `
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
|
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
|
||||||
title="parent 1-1"
|
title="parent 1-1"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4120,7 +4120,7 @@ exports[`renders components/tree/demo/multiple-line.tsx extend context correctly
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected"
|
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4248,7 +4248,7 @@ exports[`renders components/tree/demo/multiple-line.tsx extend context correctly
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
|
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected ant-tree-treenode-leaf-last"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4290,7 +4290,7 @@ exports[`renders components/tree/demo/multiple-line.tsx extend context correctly
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
|
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
|
||||||
title="parent 1-1"
|
title="parent 1-1"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
|
@ -90,7 +90,7 @@ exports[`renders components/tree/demo/basic.tsx correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected"
|
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -218,7 +218,7 @@ exports[`renders components/tree/demo/basic.tsx correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
|
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected ant-tree-treenode-leaf-last"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -260,7 +260,7 @@ exports[`renders components/tree/demo/basic.tsx correctly 1`] = `
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
|
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
|
||||||
title="parent 1-1"
|
title="parent 1-1"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4005,7 +4005,7 @@ exports[`renders components/tree/demo/multiple-line.tsx correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected"
|
class="ant-tree-treenode ant-tree-treenode-disabled ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4133,7 +4133,7 @@ exports[`renders components/tree/demo/multiple-line.tsx correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
aria-grabbed="false"
|
aria-grabbed="false"
|
||||||
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-leaf-last"
|
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked ant-tree-treenode-selected ant-tree-treenode-leaf-last"
|
||||||
draggable="false"
|
draggable="false"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -4175,7 +4175,7 @@ exports[`renders components/tree/demo/multiple-line.tsx correctly 1`] = `
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
|
class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
|
||||||
title="parent 1-1"
|
title="parent 1-1"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
|
@ -45,7 +45,7 @@ const App: React.FC = () => {
|
|||||||
<Tree
|
<Tree
|
||||||
checkable
|
checkable
|
||||||
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
||||||
defaultSelectedKeys={['0-0-0', '0-0-1']}
|
defaultSelectedKeys={['0-0-1']}
|
||||||
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
||||||
onSelect={onSelect}
|
onSelect={onSelect}
|
||||||
onCheck={onCheck}
|
onCheck={onCheck}
|
||||||
|
@ -58,7 +58,7 @@ const App: React.FC = () => {
|
|||||||
<Tree
|
<Tree
|
||||||
checkable
|
checkable
|
||||||
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
||||||
defaultSelectedKeys={['0-0-0', '0-0-1']}
|
defaultSelectedKeys={['0-0-1']}
|
||||||
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
||||||
onSelect={onSelect}
|
onSelect={onSelect}
|
||||||
onCheck={onCheck}
|
onCheck={onCheck}
|
||||||
|
@ -9,8 +9,8 @@ const treeData: TreeDataNode[] = [
|
|||||||
title: 'parent 0',
|
title: 'parent 0',
|
||||||
key: '0-0',
|
key: '0-0',
|
||||||
children: [
|
children: [
|
||||||
{ title: 'leaf 0-0', key: '0-0-0', isLeaf: true },
|
{ title: 'leaf 0-0', key: '0-0-0', isLeaf: true, disabled: true },
|
||||||
{ title: 'leaf 0-1', key: '0-0-1', isLeaf: true },
|
{ title: 'leaf 0-1', key: '0-0-1', isLeaf: true, disableCheckbox: true },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -46,7 +46,7 @@ const BasicDemo = () => <DirectoryTree {...sharedProps} multiple treeData={treeD
|
|||||||
|
|
||||||
const NormalDemo = () => <Tree {...sharedProps} defaultSelectedKeys={['0-1']} />;
|
const NormalDemo = () => <Tree {...sharedProps} defaultSelectedKeys={['0-1']} />;
|
||||||
|
|
||||||
const NormalCheckDemo = () => <Tree {...sharedProps} checkable defaultSelectedKeys={['0-1']} />;
|
const NormalCheckDemo = () => <Tree {...sharedProps} checkable defaultSelectedKeys={['0-1','0-0-0', '0-0-1','0-1-1']} />;
|
||||||
|
|
||||||
const NormalDragDemo = () => <Tree {...sharedProps} draggable defaultSelectedKeys={['0-1-0']} />;
|
const NormalDragDemo = () => <Tree {...sharedProps} draggable defaultSelectedKeys={['0-1-0']} />;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ const App: React.FC = () => {
|
|||||||
<Tree
|
<Tree
|
||||||
checkable
|
checkable
|
||||||
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
defaultExpandedKeys={['0-0-0', '0-0-1']}
|
||||||
defaultSelectedKeys={['0-0-0', '0-0-1']}
|
defaultSelectedKeys={['0-0-1']}
|
||||||
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
defaultCheckedKeys={['0-0-0', '0-0-1']}
|
||||||
onSelect={onSelect}
|
onSelect={onSelect}
|
||||||
onCheck={onCheck}
|
onCheck={onCheck}
|
||||||
|
@ -119,8 +119,8 @@ export const genBaseStyle = (prefixCls: string, token: TreeToken): CSSObject =>
|
|||||||
nodeSelectedBg,
|
nodeSelectedBg,
|
||||||
nodeHoverBg,
|
nodeHoverBg,
|
||||||
colorTextQuaternary,
|
colorTextQuaternary,
|
||||||
|
controlItemBgActiveDisabled,
|
||||||
} = token;
|
} = token;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
[treeCls]: {
|
[treeCls]: {
|
||||||
...resetComponent(token),
|
...resetComponent(token),
|
||||||
@ -199,6 +199,11 @@ export const genBaseStyle = (prefixCls: string, token: TreeToken): CSSObject =>
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
[`${treeCls}-checkbox-disabled + ${treeCls}-node-selected,&${treeNodeCls}-disabled${treeNodeCls}-selected ${treeCls}-node-content-wrapper`]:
|
||||||
|
{
|
||||||
|
backgroundColor: controlItemBgActiveDisabled,
|
||||||
|
},
|
||||||
|
|
||||||
// not disable
|
// not disable
|
||||||
[`&:not(${treeNodeCls}-disabled)`]: {
|
[`&:not(${treeNodeCls}-disabled)`]: {
|
||||||
// >>> Title
|
// >>> Title
|
||||||
|
Loading…
Reference in New Issue
Block a user