yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-05 03:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:strapi/strapi into features/deits

Browse Source
This commit is contained in:
Convly 2022-10-14 10:00:50 +02:00
commit 51bbd9cef1
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js
View File

@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { Typography } from '@strapi/design-system/Typography';
import { Tooltip } from '@strapi/design-system/Tooltip';
import Media from './Media';
import MultipleMedias from './MultipleMedias';
import RelationMultiple from './RelationMultiple';
@ -55,6 +56,15 @@ const CellContent = ({ content, fieldSchema, metadatas, name, queryInfos, rowId
return <SingleComponent value={content} metadatas={metadatas} />;
case 'string':
return (
<Tooltip description={content}>
<TypographyMaxWidth ellipsis textColor="neutral800">
<CellValue type={type} value={content} />
</TypographyMaxWidth>
</Tooltip>
);
default:
return (
<TypographyMaxWidth ellipsis textColor="neutral800">

5
packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js
View File

@ -9,6 +9,7 @@ import { Typography } from '@strapi/design-system/Typography';
import get from 'lodash/get';
import has from 'lodash/has';
import isEmpty from 'lodash/isEmpty';
import { Tooltip } from '@strapi/design-system/Tooltip';
import { getTrad } from '../../utils';
const StyledBullet = styled.div`
@ -43,7 +44,9 @@ const SingleValue = (props) => {
<Component {...props}>
<Flex>
<StyledBullet title={title} isDraft={isDraft} />
<Typography ellipsis>{props.data.label ?? '-'}</Typography>
<Tooltip description={props.data.label ?? '-'}>
<Typography ellipsis>{props.data.label ?? '-'}</Typography>
</Tooltip>
</Flex>
</Component>
);

2
packages/core/admin/package.json
View File

@ -54,7 +54,7 @@
"@strapi/babel-plugin-switch-ee-ce": "4.4.3",
"@strapi/design-system": "1.2.5",
"@strapi/helper-plugin": "4.4.3",
"@strapi/icons": "1.2.3",
"@strapi/icons": "1.2.5",
"@strapi/permissions": "4.4.3",
"@strapi/typescript-utils": "4.4.3",
"@strapi/utils": "4.4.3",

4
packages/core/helper-plugin/package.json
View File

@ -78,8 +78,8 @@
"@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.4.10",
"@storybook/react": "^6.5.10",
"@strapi/design-system": "1.2.3",
"@strapi/icons": "1.2.3",
"@strapi/design-system": "1.2.5",
"@strapi/icons": "1.2.5",
"@testing-library/react": "11.2.7",
"@testing-library/react-hooks": "3.7.0",
"babel-loader": "^8.2.5",

10
yarn.lock
View File

@ -5453,10 +5453,10 @@
optionalDependencies:
typescript "^4.6.2"
"@strapi/icons@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.2.3.tgz#5999417e5643ee33e0177577003ddd8e8c53907b"
integrity sha512-vBvOl5sW4GKQAbna3aAhWi2HWOEZ9/v22iX5jG+0vqAwKdRGWaTBkMIYnw0UhKLUbVX3W+P+ViAtIbUycoLelg==
"@strapi/icons@1.2.5":
version "1.2.5"
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.2.5.tgz#957ab7a336cb2b3ad5a4e1deec3257b41622337f"
integrity sha512-7c3vzMqmm4Xfms47mEJu8F1pV1Eizxrn/sND6WEdizc/S2sRhnye3axaHH4xtncqapB1NKUIUb2z5Bl0Xn+WCw==
dependencies:
rimraf "^3.0.2"
@ -17886,8 +17886,6 @@ path-case@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5"
integrity sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=
dependencies:
no-case "^2.2.0"
path-dirname@^1.0.0:
version "1.0.2"