wz-h5-design 1.0.7 → 1.0.8

package/dist/types/components/Tag/Tag.d.ts

@@ -19,6 +19,14 @@ export interface TagProps {
      * @description 背景颜色，type='solid' 时生效
      */
     bgColor?: string;
+    /**
+     * @description 边框颜色，type='line' 时生效
+     */
+    borderColor?: string;
+    /**
+     * @description 圆角大小
+     */
+    borderRadius?: number | string;
     /**
      * @description 字体粗细
      */

package/dist/wz-h5-design.es.js

@@ -1327,8 +1327,8 @@ const Divider = ({
       className: `wz-divider wz-divider--${direction} ${className}`,
       style: {
         background: color || defaultColor,
-        width: isVertical ? 2 : length || "100%",
-        height: isVertical ? length || 24 : 2,
+        width: isVertical ? 1 : length || "100%",
+        height: isVertical ? length || 16 : 2,
         margin,
         ...style
       }
@@ -2198,28 +2198,41 @@ const Tag = (props) => {
     size = "large",
     color,
     bgColor,
+    borderColor,
+    borderRadius,
     fontWeight,
     className,
     style,
     children
   } = props;
-  const classes = classNames("wz-tag", `wz-tag-${type}`, `wz-tag-${size}`, className);
+  const classes = classNames(
+    "wz-tag",
+    `wz-tag-${type}`,
+    `wz-tag-${size}`,
+    className
+  );
   const tagStyle = useMemo(() => {
     const newStyle = { ...style };
     if (color) {
       newStyle.color = color;
-      if (type === "line") {
+      if (type === "line" && !borderColor) {
         newStyle.borderColor = hexToRgba(color, 0.5);
       }
     }
-    if (bgColor && type === "solid") {
+    if (borderColor && type === "line") {
+      newStyle.borderColor = borderColor;
+    }
+    if (bgColor) {
       newStyle.backgroundColor = bgColor;
     }
+    if (borderRadius !== void 0) {
+      newStyle.borderRadius = typeof borderRadius === "number" ? `${borderRadius}px` : borderRadius;
+    }
     if (fontWeight) {
       newStyle.fontWeight = fontWeight;
     }
     return newStyle;
-  }, [type, color, bgColor, fontWeight, style]);
+  }, [type, color, bgColor, borderColor, borderRadius, fontWeight, style]);
   return /* @__PURE__ */ jsx("div", { className: classes, style: tagStyle, children });
 };
 const Tip = ({