From a67dee05808f77f9d224ae1081bad5a031ae01a2 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Wed, 8 Mar 2023 19:28:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20rate=E7=BB=84=E4=BB=B6=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dicons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/rate/demo.tsx  |  2 +-
 src/packages/rate/rate.scss | 13 +++++-
 src/packages/rate/rate.tsx  | 81 +++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/src/packages/rate/demo.tsx b/src/packages/rate/demo.tsx
index 77bd05d..bb59b8e 100644
--- a/src/packages/rate/demo.tsx
+++ b/src/packages/rate/demo.tsx
@@ -52,8 +52,8 @@ const RateDemo = () => {
         <Cell>
           <Rate modelValue={3} />
         </Cell>
-        <h2>{translated.halfStar}</h2>
 
+        <h2>{translated.halfStar}</h2>
         <Cell>
           <Rate allowHalf modelValue="3.5" />
         </Cell>
diff --git a/src/packages/rate/rate.scss b/src/packages/rate/rate.scss
index 49bc3d7..b983bc5 100644
--- a/src/packages/rate/rate.scss
+++ b/src/packages/rate/rate.scss
@@ -2,21 +2,32 @@
 
 .nut-rate {
   display: flex;
+
   &-item {
     display: flex;
     flex-shrink: 0;
     position: relative;
 
+    &__half {
+      position: absolute;
+      height: 100%;
+      width: 50% !important;
+      left: 0;
+      top: 0;
+      overflow: hidden;
+    }
+
     &__icon {
       color: $rate-icon-color;
       cursor: pointer;
+
       &--disabled {
         color: $rate-icon-void-color;
       }
 
       &.nut-rate-item__icon.nut-rate-item__icon--half {
         position: absolute;
-        width: 50% !important;
+        // width: 50% !important;
         left: 0;
         top: 0;
         overflow: hidden;
diff --git a/src/packages/rate/rate.tsx b/src/packages/rate/rate.tsx
index 4d774a4..0b96eb9 100644
--- a/src/packages/rate/rate.tsx
+++ b/src/packages/rate/rate.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent, useEffect, useState } from 'react'
 import classNames from 'classnames'
+import { StarFillN } from '@nutui/icons-react'
 import bem from '@/utils/bem'
-import Icon from '@/packages/icon'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
@@ -12,8 +12,7 @@ export interface RateProps extends BasicComponent {
   iconSize: string | number
   activeColor: string
   voidColor: string
-  checkedIcon: string
-  uncheckedIcon: string
+  checkedIcon: React.ReactNode
   disabled: boolean
   readonly: boolean
   allowHalf: boolean
@@ -29,8 +28,7 @@ const defaultProps = {
   iconSize: 18,
   activeColor: '',
   voidColor: '',
-  checkedIcon: 'star-fill-n',
-  uncheckedIcon: 'star-n',
+  checkedIcon: null,
   disabled: false,
   readonly: false,
   allowHalf: false,
@@ -47,14 +45,11 @@ export const Rate: FunctionComponent<Partial<RateProps>> = (props) => {
     activeColor,
     voidColor,
     checkedIcon,
-    uncheckedIcon,
     disabled,
     readonly,
     allowHalf,
     spacing,
     onChange,
-    iconClassPrefix,
-    iconFontClassName,
   } = {
     ...defaultProps,
     ...props,
@@ -109,38 +104,44 @@ export const Rate: FunctionComponent<Partial<RateProps>> = (props) => {
             onClick={(event) => onClick(event, n)}
             style={{ marginRight: pxCheck(spacing) }}
           >
-            <Icon
-              classPrefix={iconClassPrefix}
-              fontClassName={iconFontClassName}
-              size={iconSize}
-              className={classNames(bi('icon'), {
-                [bi('icon--disabled')]: disabled || n > score,
-              })}
-              name={n <= score ? checkedIcon : uncheckedIcon}
-              color={n <= score ? activeColor : voidColor}
-            />
-            {allowHalf && score > n - 1 && (
-              <Icon
-                classPrefix={iconClassPrefix}
-                fontClassName={iconFontClassName}
-                className={`${bi('icon')} ${bi('icon--half')}`}
-                color={n <= score ? activeColor : voidColor}
-                size={iconSize}
-                name={checkedIcon}
-              />
-            )}
-            {allowHalf && score < n - 1 && (
-              <Icon
-                classPrefix={iconClassPrefix}
-                fontClassName={iconFontClassName}
-                className={`${bi('icon')} ${bi('icon--disabled')} ${bi(
-                  'icon--half'
-                )}`}
-                color={voidColor}
-                size={iconSize}
-                name={uncheckedIcon}
-              />
-            )}
+            <>
+              {checkedIcon || (
+                <StarFillN
+                  width={iconSize}
+                  height={iconSize}
+                  color={n <= score ? activeColor : voidColor}
+                  className={classNames(bi('icon'), {
+                    [bi('icon--disabled')]: disabled || n > score,
+                  })}
+                />
+              )}
+              {(allowHalf && score > n - 1 && (
+                <div className={` ${bi('half')}`}>
+                  {checkedIcon || (
+                    <StarFillN
+                      width={iconSize}
+                      height={iconSize}
+                      color={n <= score ? activeColor : voidColor}
+                      className={`${bi('icon')} ${bi('icon--half')}`}
+                    />
+                  )}
+                </div>
+              )) ||
+                (allowHalf && score < n - 1 && (
+                  <div>
+                    {checkedIcon || (
+                      <StarFillN
+                        width={iconSize}
+                        height={iconSize}
+                        color={voidColor}
+                        className={`${bi('icon')} ${bi('icon--disabled')} ${bi(
+                          'icon--half'
+                        )}`}
+                      />
+                    )}
+                  </div>
+                ))}
+            </>
           </div>
         )
       })}
-- 
GitLab