diff --git a/src/contentLayout/__tests__/__snapshots__/contentLayout.test.tsx.snap b/src/contentLayout/__tests__/__snapshots__/contentLayout.test.tsx.snap index b73ac6092..03f59c69f 100644 --- a/src/contentLayout/__tests__/__snapshots__/contentLayout.test.tsx.snap +++ b/src/contentLayout/__tests__/__snapshots__/contentLayout.test.tsx.snap @@ -6,14 +6,14 @@ exports[`test contentLayout should support contentLayout success render 1`] = ` "baseElement":
, "container":
, diff --git a/src/contentLayout/__tests__/contentLayout.test.tsx b/src/contentLayout/__tests__/contentLayout.test.tsx index 5ed3db1db..486056082 100644 --- a/src/contentLayout/__tests__/contentLayout.test.tsx +++ b/src/contentLayout/__tests__/contentLayout.test.tsx @@ -26,7 +26,7 @@ describe('test contentLayout', () => { /> ); - expect(container.querySelector('.content-layout')?.style.height).toBe( + expect(container.querySelector('.dtc-content-layout')?.style.height).toBe( 'calc(100vh - 96px)' ); }); @@ -47,7 +47,7 @@ describe('test contentLayout', () => { /> ); - expect(container.querySelector('.content-layout')?.style.height).toBe( + expect(container.querySelector('.dtc-content-layout')?.style.height).toBe( '500px' ); }); diff --git a/src/contentLayout/index.scss b/src/contentLayout/index.scss index 5a83aea16..012e68c2e 100644 --- a/src/contentLayout/index.scss +++ b/src/contentLayout/index.scss @@ -1,4 +1,4 @@ -.content-layout { +.dtc-content-layout { display: flex; flex-direction: column; overflow: hidden; diff --git a/src/contentLayout/index.tsx b/src/contentLayout/index.tsx index ad549e3a5..6053ce5b9 100644 --- a/src/contentLayout/index.tsx +++ b/src/contentLayout/index.tsx @@ -11,7 +11,7 @@ interface IProps { className?: string; } -export const NAME = 'content-layout'; +export const NAME = 'dtc-content-layout'; const ContentLayout = (props: IProps) => { const { height = 'calc(100vh - 96px)', style, className, children } = props; diff --git a/src/dropdown/style.scss b/src/dropdown/style.scss index ec7330947..52fda85e3 100644 --- a/src/dropdown/style.scss +++ b/src/dropdown/style.scss @@ -1,35 +1,3 @@ -// .dtc-mul-select-dropdown { -// .dtc-option-select-overlay { -// background: #FFF; -// box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1); -// border-radius: 2px; -// width: 220px; -// height: auto; -// .dtc-option-select-overlay-menu { -// max-height: 240px; -// overflow-y: scroll; -// } -// .ant-checkbox-group { -// width: 100%; -// } -// .ant-divider-horizontal { -// background: #E8E8E8; -// width: 204px; -// margin: 0 0 0 8px; -// min-width: 204px; -// } -// .dtc-option-select-overlay-row { -// padding: 8px; -// &.footer-box { -// display: flex; -// justify-content: space-between; -// align-items: center; -// width: 100%; -// } -// } -// } -// } - $gap: 8px; $item-size: 32px; diff --git a/src/filterRules/__tests__/__snapshots__/filterRules.test.tsx.snap b/src/filterRules/__tests__/__snapshots__/filterRules.test.tsx.snap index 6bdc22a58..45b8249e0 100644 --- a/src/filterRules/__tests__/__snapshots__/filterRules.test.tsx.snap +++ b/src/filterRules/__tests__/__snapshots__/filterRules.test.tsx.snap @@ -6,13 +6,13 @@ exports[`FilterRules should support FilterRules success render 1`] = ` "baseElement":
, "container":
(props: IProps) => { return (
1, + className={classnames('dtc-ruleController__condition', { + 'dtc-ruleController__condition--active': item.children.length > 1, })} >
(props: IProps) => { } // 渲染自定义的 component return ( -
+
{value?.children && ( )} -
+
{component({ rowKey: item.key, disabled: composeDisabled, @@ -211,7 +211,7 @@ export const RulesController = (props: IProps) => { })}
{!composeDisabled && ( -
+
{item.level === maxLevel ? null : ( (props: IProps) => { calculateTreeItemHeight(value, !!disabled); return ( -
+
{renderCondition(value, [], !!disabled || !!value.disabled)}
); diff --git a/src/modal/__tests__/__snapshots__/modal.test.tsx.snap b/src/modal/__tests__/__snapshots__/modal.test.tsx.snap index c1df09f75..ea4a52a9a 100644 --- a/src/modal/__tests__/__snapshots__/modal.test.tsx.snap +++ b/src/modal/__tests__/__snapshots__/modal.test.tsx.snap @@ -15,7 +15,7 @@ exports[`Test Modal Component Should Match snapshot 1`] = `