Merge branch 'main' of https://github.com/omijs/tdesign into main

omijs · Oct 18, 2023 · f579db7 · f579db7
2 parents 29fc0bd + bd200cc
commit f579db7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/skeleton/index.tsx b/src/skeleton/index.tsx
@@ -2,8 +2,8 @@ import _Skeleton from './skeleton'
 
 import './style/index'
 
-export type { TSkeletonProps } from './skeleton'
+export type { SkeletonProps } from './skeleton'
 export * from './type'
 
 export const Skeleton = _Skeleton
-export default Skeleton
+export default Skeleton
diff --git a/src/timeline/style/timeline-item.less b/src/timeline/style/timeline-item.less
@@ -227,7 +227,7 @@
 //label--alternate
 
 .@{prefix}-timeline-item-label--alternate {
-  &.@{prefix}-timeline-global-left .@{prefix}-timeline-item{
+  &.@{prefix}-timeline-item-global-left .@{prefix}-timeline-item{
 
     &__label {
       text-align: right;
@@ -239,7 +239,7 @@
     }
   }
 
-  &.@{prefix}-timeline-global-right  .@{prefix}-timeline-item{
+  &.@{prefix}-timeline-item-global-right  .@{prefix}-timeline-item{
     &__label {
       text-align: left;
       right: 0;

diff --git a/src/timeline/timeline-item.tsx b/src/timeline/timeline-item.tsx
@@ -5,6 +5,7 @@ import { StyledProps } from '../common'
 import { TdClassNamePrefix, parseTNode } from '../utils'
 import { isObject } from 'lodash'
 import { getAlign } from './getAlign'
+import timelineItemCss from './style/timeline-item.less'
 import '../loading'
 
 const DefaultTheme = ['default', 'primary', 'success', 'warning', 'error']
@@ -21,7 +22,7 @@ export interface TimelineItemProps extends TdTimelineItemProps, StyledProps, Sub
 
 @tag('t-timeline-item')
 export default class TimelineItem extends WeElement<TimelineItemProps> {
-  static css = css as string
+  static css = (css + timelineItemCss) as string
   static defaultProps = { dotColor: 'primary' }
   static propTypes = {
     children: Object,
@@ -57,7 +58,6 @@ export default class TimelineItem extends WeElement<TimelineItemProps> {
       mode,
     } = props
 
-    console.log('item props: ', props)
     const renderAlign = getAlign(globalAlign, layout)
 
     // 计算节点模式 CSS 类名
@@ -78,11 +78,11 @@ export default class TimelineItem extends WeElement<TimelineItemProps> {
       return ''
     }
 
-    const ele = parseTNode(dot)
+    const ele = parseTNode(dot) as WeElement
     let dotElement = undefined
     if (isObject(ele)) {
-      dotElement = cloneElement(ele, {
-        class: classNames(ele?.attributes?.class, `${componentName}__dot-content`),
+      dotElement = cloneElement(ele as any, {
+        class: classNames(ele?.attributes?.['class'], `${componentName}__dot-content`),
       })
     }
 

diff --git a/src/timeline/timeline.tsx b/src/timeline/timeline.tsx
@@ -6,7 +6,6 @@ import { StyledProps } from '../common'
 import { TdClassNamePrefix } from '../utils'
 import '../loading'
 import { getAlign } from './getAlign'
-import timelineItemCss from './style/timeline-item.less'
 
 export interface TimelineProps extends TdTimelineProps, StyledProps {}
 
@@ -100,7 +99,6 @@ export default class Timeline extends WeElement<TimelineProps> {
             }),
             status: itemsStatus[index],
             ...itemProps,
-            css: timelineItemCss,
           }),
         )}
       </ul>