fix(Descriptions): fix ellipsis type error

ant-design · Nov 15, 2022 · d051be5 · d051be5
1 parent 4b522af
commit d051be5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 342 deletions.
diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx
@@ -51,7 +51,7 @@ export type ProDescriptionsItemProps<T = Record<string, any>, ValueType = 'text'
     hide?: boolean;
     plain?: boolean;
     copyable?: boolean;
-    ellipsis?: boolean;
+    ellipsis?: boolean | { showTitle?: boolean };
     mode?: ProFieldFCMode;
     children?: React.ReactNode;
     order?: number;

diff --git a/packages/form/src/demos/config-provider.tsx b/packages/form/src/demos/config-provider.tsx
@@ -13,7 +13,7 @@ import {
 } from '@ant-design/pro-components';
 import { ConfigProvider, Input } from 'antd';
 import enUS from 'antd/es/locale/en_US';
-import { LightWrapper } from '../BaseForm';
+import { LightWrapper } from '../BaseForm/LightWrapper';
 
 export default () => (
   <ConfigProvider locale={enUS}>

diff --git a/packages/layout/src/demos/designSiderMenu.tsx b/packages/layout/src/demos/designSiderMenu.tsx
@@ -1,16 +1,7 @@
-import {
-  CaretDownFilled,
-  GithubFilled,
-  InfoCircleFilled,
-  PlusCircleFilled,
-  QuestionCircleFilled,
-  SearchOutlined,
-} from '@ant-design/icons';
+import { GithubFilled, InfoCircleFilled, QuestionCircleFilled } from '@ant-design/icons';
 import ProCard from '@ant-design/pro-card';
 import type { ProSettings } from '@ant-design/pro-layout';
 import { PageContainer, ProLayout, SettingDrawer } from '@ant-design/pro-layout';
-import { css } from '@emotion/css';
-import { Dropdown, Input } from 'antd';
 import { useState } from 'react';
 import defaultProps from './_defaultProps';
 
@@ -69,73 +60,6 @@ export default () => {
             <GithubFilled key="GithubFilled" />,
           ];
         }}
-        menuExtraRender={(props) => {
-          if (props.collapsed) return [];
-          return (
-            <>
-              <Dropdown placement="bottom">
-                <div
-                  style={{
-                    color: 'rgba(0, 0, 0, 0.85)',
-                    fontWeight: 500,
-                    cursor: 'pointer',
-                    display: 'flex',
-                    gap: 4,
-                    alignItems: 'center',
-                    minWidth: '180px',
-                  }}
-                  className={css`
-                    font-size: 16px;
-                    margin-top: 24px;
-                    padding: 0 12px;
-                    &:hover {
-                      background-color: rgba(0, 0, 0, 0.03);
-                    }
-                  `}
-                >
-                  <span> 企业级资产中心</span>
-                  <CaretDownFilled />
-                </div>
-              </Dropdown>
-              <div
-                key="SearchOutlined"
-                aria-hidden
-                style={{
-                  marginBlockStart: '24px',
-                  display: 'flex',
-                  alignItems: 'center',
-                }}
-                onMouseDown={(e) => {
-                  e.stopPropagation();
-                  e.preventDefault();
-                }}
-              >
-                <Input
-                  style={{
-                    borderRadius: 4,
-                    marginInlineEnd: 12,
-                    backgroundColor: 'rgba(0,0,0,0.03)',
-                  }}
-                  prefix={
-                    <SearchOutlined
-                      style={{
-                        color: 'rgba(0, 0, 0, 0.15)',
-                      }}
-                    />
-                  }
-                  placeholder="搜索方案"
-                  bordered={false}
-                />
-                <PlusCircleFilled
-                  style={{
-                    color: 'var(--ant-primary-color)',
-                    fontSize: 24,
-                  }}
-                />
-              </div>
-            </>
-          );
-        }}
         menuItemRender={(item, dom) => (
           <div
             onClick={() => {

diff --git a/packages/layout/src/demos/siderMode.tsx b/packages/layout/src/demos/siderMode.tsx
@@ -1,16 +1,7 @@
-import {
-  CaretDownFilled,
-  GithubFilled,
-  InfoCircleFilled,
-  PlusCircleFilled,
-  QuestionCircleFilled,
-  SearchOutlined,
-} from '@ant-design/icons';
+import { GithubFilled, InfoCircleFilled, QuestionCircleFilled } from '@ant-design/icons';
 import ProCard from '@ant-design/pro-card';
 import type { ProSettings } from '@ant-design/pro-layout';
 import { PageContainer, ProLayout, SettingDrawer } from '@ant-design/pro-layout';
-import { css } from '@emotion/css';
-import { Dropdown, Input } from 'antd';
 import { useState } from 'react';
 import defaultProps from './_defaultProps';
 
@@ -67,74 +58,6 @@ export default () => {
             <GithubFilled key="GithubFilled" />,
           ];
         }}
-        menuExtraRender={(props) => {
-          if (props.collapsed) return [];
-          return (
-            <>
-              <Dropdown placement="bottom">
-                <div
-                  style={{
-                    color: 'rgba(0, 0, 0, 0.85)',
-                    fontWeight: 500,
-                    cursor: 'pointer',
-                    display: 'flex',
-                    gap: 4,
-                    alignItems: 'center',
-                    minWidth: '180px',
-                  }}
-                  className={css`
-                    font-size: 16px;
-                    margin-top: 24px;
-                    padding: 0 12px;
-                    &:hover {
-                      background-color: rgba(0, 0, 0, 0.03);
-                    }
-                  `}
-                >
-                  <span> 企业级资产中心</span>
-                  <CaretDownFilled />
-                </div>
-              </Dropdown>
-
-              <div
-                key="SearchOutlined"
-                aria-hidden
-                style={{
-                  marginBlockStart: '24px',
-                  display: 'flex',
-                  alignItems: 'center',
-                }}
-                onMouseDown={(e) => {
-                  e.stopPropagation();
-                  e.preventDefault();
-                }}
-              >
-                <Input
-                  style={{
-                    borderRadius: 4,
-                    marginInlineEnd: 12,
-                    backgroundColor: 'rgba(0,0,0,0.03)',
-                  }}
-                  prefix={
-                    <SearchOutlined
-                      style={{
-                        color: 'rgba(0, 0, 0, 0.15)',
-                      }}
-                    />
-                  }
-                  placeholder="搜索方案"
-                  bordered={false}
-                />
-                <PlusCircleFilled
-                  style={{
-                    color: 'var(--ant-primary-color)',
-                    fontSize: 24,
-                  }}
-                />
-              </div>
-            </>
-          );
-        }}
         menuItemRender={(item, dom) => (
           <div
             onClick={() => {

diff --git a/packages/layout/src/demos/splitMenus.tsx b/packages/layout/src/demos/splitMenus.tsx
@@ -1,5 +1,4 @@
-import ProLayout, { SettingDrawer } from '@ant-design/pro-layout';
-import { PageContainer } from '../components/PageContainer';
+import { PageContainer, SettingDrawer, ProLayout } from '@ant-design/pro-components';
 import defaultProps from './_defaultProps';
 
 export default () => {

diff --git a/packages/table/src/components/ListToolBar/style.ts b/packages/table/src/components/ListToolBar/style.ts
@@ -14,7 +14,7 @@ const genProListStyle: GenerateStyle<ProListToken> = (token) => {
         justifyContent: 'space-between',
         paddingBlock: token.padding,
         paddingInline: 0,
-        ' &-mobile': { flexDirection: 'column' },
+        '&-mobile': { flexDirection: 'column' },
       },
       '&-title': {
         display: 'flex',