feat: 合并3.x 分支

Author: xiaoyatong

src/packages/badge/badge.scss

@@ -58,7 +58,7 @@
   }
 
   &-number {
-    font-family: 'JD';
+    font-family: 'JDZH-Regular';
   }
 
   &-one {

src/packages/col/col.taro.tsx

@@ -4,6 +4,7 @@ import React, {
   useContext,
   useEffect,
   useState,
+  useMemo,
 } from 'react'
 import classNames from 'classnames'
 import { View } from '@tarojs/components'
@@ -27,19 +28,16 @@ export const Col: FunctionComponent<Partial<TaroColProps>> = (props) => {
       ...defaultProps,
       ...props,
     }
-  const [colName, setColName] = useState('')
-  const [colStyle, setColStyle] = useState({})
   const { gutter } = useContext(DataContext) as any
 
-  const classs = () => {
-    // 定义col的class类
+  const classs = useMemo(() => {
     const prefixCls = 'nut-col'
     return `${prefixCls} ${prefixCls}-${span} ${
       gutter ? `${prefixCls}-gutter` : ''
     } ${prefixCls}-offset-${offset}`
-  }
-  const getStyle = () => {
-    // 定义col的style类
+  }, [offset, span, gutter])
+
+  const getStyle = useMemo(() => {
     const style: CSSProperties = {}
     if (!isFirst) {
       style.paddingLeft = pxTransform((gutter as number) / 2)
@@ -48,11 +46,15 @@ export const Col: FunctionComponent<Partial<TaroColProps>> = (props) => {
       style.paddingRight = pxTransform((gutter as number) / 2)
     }
     return style
-  }
+  }, [isFirst, isLast, gutter])
+
+  const [colName, setColName] = useState(classs)
+  const [colStyle, setColStyle] = useState(getStyle)
+
   useEffect(() => {
     setColName(classs)
     setColStyle(getStyle)
-  }, [span, offset, gutter])
+  }, [classs, getStyle])
 
   return (
     <View

src/packages/col/col.tsx

@@ -4,6 +4,7 @@ import React, {
   useContext,
   useEffect,
   useState,
+  useMemo,
 } from 'react'
 import classNames from 'classnames'
 import { DataContext } from '@/packages/row/context'
@@ -27,19 +28,16 @@ export const Col: FunctionComponent<
       ...defaultProps,
       ...props,
     }
-  const [colName, setColName] = useState('')
-  const [colStyle, setColStyle] = useState({})
   const { gutter } = useContext(DataContext) as any
 
-  const classs = () => {
-    // 定义col的class类
+  const classs = useMemo(() => {
     const prefixCls = 'nut-col'
     return `${prefixCls} ${prefixCls}-${span} ${
       gutter ? `${prefixCls}-gutter` : ''
     } ${prefixCls}-offset-${offset}`
-  }
-  const getStyle = () => {
-    // 定义col的style类
+  }, [offset, span, gutter])
+
+  const getStyle = useMemo(() => {
     const style: CSSProperties = {}
     if (!isFirst) {
       style.paddingLeft = `${(gutter as number) / 2}px`
@@ -48,11 +46,15 @@ export const Col: FunctionComponent<
       style.paddingRight = `${(gutter as number) / 2}px`
     }
     return style
-  }
+  }, [isFirst, isLast, gutter])
+
+  const [colName, setColName] = useState(classs)
+  const [colStyle, setColStyle] = useState(getStyle)
+
   useEffect(() => {
     setColName(classs)
     setColStyle(getStyle)
-  }, [span, offset, gutter])
+  }, [classs, getStyle])
 
   return (
     <div

src/packages/countdown/countdown.scss

@@ -16,7 +16,7 @@
     font-weight: $coutdown-font-weight;
     font-size: $countdown-font-size;
     line-height: calc($countdown-font-size + 2px);
-    font-family: 'JD';
+    font-family: 'JDZH-Regular';
   }
   &-number,
   &-number-primary {

src/packages/price/price.scss

@@ -9,7 +9,7 @@
   &-integer,
   &-decimal {
     color: $price-color;
-    font-family: 'JD';
+    font-family: 'JDZH-Bold';
     line-height: 1;
   }
 
@@ -18,7 +18,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-darkgray-color;
       }
     }
@@ -29,7 +29,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-primary-color;
       }
     }

src/packages/rate/rate.scss

@@ -100,7 +100,7 @@
     display: inline-flex;
     align-items: center;
     color: $rate-font-color;
-    font-family: 'JD';
+    font-family: 'JDZH-Regular';
     line-height: 1;
 
     &-normal {

src/packages/uploader/__tests__/uploader.spec.tsx

@@ -93,6 +93,50 @@ test('should render base uploader other props', () => {
   expect(fileItemClick).toBeCalled()
 })
 
+test('should render no-image file uploader list', () => {
+  const App = () => {
+    const defaultFileList: FileItem[] = [
+      {
+        name: '文件1.txt',
+        url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
+        status: 'success',
+        message: '上传成功',
+        type: 'list',
+        uid: '123',
+      },
+      {
+        name: '文件2.ppt',
+        url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
+        status: 'error',
+        message: '上传失败',
+        type: 'list',
+        uid: '124',
+      },
+      {
+        name: '文件3.cpp',
+        url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
+        status: 'uploading',
+        message: '上传中...',
+        type: 'list',
+        uid: '125',
+      },
+    ]
+
+    return (
+      <Uploader
+        defaultValue={defaultFileList}
+        uploadIcon="dongdong"
+        previewType="list"
+      />
+    )
+  }
+
+  const { container } = render(<App />)
+  const toast1 = container.querySelectorAll('.list')
+  expect(toast1).toBeTruthy()
+  expect(toast1.length).toBe(3)
+})
+
 test('should render base uploader list', () => {
   const App = () => {
     const defaultFileList: FileItem[] = [

src/packages/uploader/uploader.tsx

@@ -183,7 +183,7 @@ const InternalUploader: ForwardRefRenderFunction<
         name: file.name,
         type: file.type,
       }
-      if (preview && file.type?.includes('image')) {
+      if (preview) {
         const reader = new FileReader()
         reader.onload = (event: ProgressEvent<FileReader>) => {
           fileListRef.current = [