feat: ✨ 修复Text组件设置color属性后lines失效的问题

✅ Closes: #477

Author: Moonofweisheng

.vscode/settings.json

@@ -36,7 +36,7 @@
       // #vue组件中html代码格式化样式
     }
   },
-  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "typescript.tsdk": "node_modules/typescript/lib",
   "i18n-ally.localesPaths": [
     "src/uni_modules/wot-design-uni/locale",
     "src/uni_modules/wot-design-uni/locale/lang"

src/uni_modules/wot-design-uni/components/wd-text/index.scss

@@ -1,69 +1,37 @@
 @import '../common/abstracts/variable';
 @import '../common/abstracts/mixin';
 
-@mixin text-type-style($normalColor) {
-  color: $normalColor;
 
-  &.is-bold {
-    font-weight: bold;
-  }
-
-  &.is-lines-1,
-  &.is-lines-2,
-  &.is-lines-3,
-  &.is-lines-4,
-  &.is-lines-5 {
-    display: -webkit-box !important;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    word-break: break-all;
-    -webkit-box-orient: vertical !important;
-  }
-
-  &.is-lines-1 {
-    @include multiEllipsis(1);
-  }
-
-  &.is-lines-2 {
-    line-clamp: 2;
-    @include multiEllipsis(2);
-
-  }
-
-  &.is-lines-3 {
-    @include multiEllipsis(3);
-
-  }
 
-  &.is-lines-4 {
-    @include multiEllipsis(4);
+@include b(text) {
 
+  @include when(bold) {
+    font-weight: bold;
   }
 
-  &.is-lines-5 {
-    @include multiEllipsis(5);
-
+  @for $i from 1 through 5 {
+    &.is-lines-#{$i} {
+      @include multiEllipsis($i);
+    }
   }
-}
 
-@include b(text) {
   @include when(default) {
-    @include text-type-style($-text-info-color);
+    color: $-text-info-color;
   }
 
   @include when(primary) {
-    @include text-type-style($-text-primary-color);
+    color: $-text-primary-color;
   }
 
   @include when(error) {
-    @include text-type-style($-text-error-color);
+    color: $-text-error-color;
   }
 
   @include when(warning) {
-    @include text-type-style($-text-warning-color);
+    color: $-text-warning-color;
   }
 
   @include when(success) {
-    @include text-type-style($-text-success-color);
+    color: $-text-success-color;
   }
 }

src/uni_modules/wot-design-uni/components/wd-text/types.ts

@@ -1,7 +1,7 @@
 import type { ExtractPropTypes } from 'vue'
 import { baseProps, makeBooleanProp, makeStringProp } from '../common/props'
 
-export type TextType = 'default' | 'primary' | 'success' | 'warning' | 'danger'
+export type TextType = 'default' | 'primary' | 'success' | 'warning' | 'error'
 
 export const textProps = {
   ...baseProps,
@@ -68,13 +68,13 @@ export const textProps = {
    * 类型：string
    * 默认值：''
    */
-  prefix: makeStringProp(''),
+  prefix: String,
   /**
    * 后置插槽
    * 类型：string
    * 默认值：''
    */
-  suffix: makeStringProp(''),
+  suffix: String,
   /**
    * 文本显示的行数，如果设置，超出此行数，将会显示省略号。最大值为5。
    */

src/uni_modules/wot-design-uni/components/wd-text/wd-text.vue

@@ -1,8 +1,8 @@
 <template>
   <text @click="handleClick" :class="rootClass" :style="rootStyle">
-    <slot name="prefix">{{ props.prefix }}</slot>
+    <slot v-if="$slots.prefix || prefix" name="prefix">{{ prefix }}</slot>
     <text>{{ formattedText }}</text>
-    <slot name="suffix">{{ props.suffix }}</slot>
+    <slot v-if="$slots.suffix || suffix" name="suffix">{{ suffix }}</slot>
   </text>
 </template>
 

src/uni_modules/wot-design-uni/global.d.ts

@@ -1,10 +1,10 @@
 /*
  * @Author: weisheng
  * @Date: 2023-09-25 17:28:12
- * @LastEditTime: 2024-07-05 14:37:28
+ * @LastEditTime: 2024-07-31 23:10:28
  * @LastEditors: weisheng
  * @Description:
- * @FilePath: \wot-design-uni\src\uni_modules\wot-design-uni\global.d.ts
+ * @FilePath: /wot-design-uni/src/uni_modules/wot-design-uni/global.d.ts
  * 记得注释
  */
 import '@vue/runtime-core'
@@ -100,6 +100,7 @@ declare module '@vue/runtime-core' {
     WdSkeleton: typeof import('./components/wd-skeleton/wd-skeleton.vue')['default']
     WdIndexBar: typeof import('./components/wd-index-bar/wd-index-bar.vue')['default']
     WdIndexAnchor: typeof import('./components/wd-index-anchor/wd-index-anchor.vue')['default']
+    WdText: typeof import('./components/wd-text/wd-text.vue')['default']
   }
 }