@dckj-npm/dc-material 0.1.30 → 0.1.32

package/es/components/carousel/carousel.scss

@@ -12,7 +12,7 @@
 }
 
 .carousel-image {
-  min-width: 100%;
+  width: 100%;
   height: 100%;
   object-fit: cover;
   object-position: center;

package/es/components/goods-card-list/goods-card-list.js

@@ -13,7 +13,6 @@ var GoodsCardList = function GoodsCardList(_ref) {
     _ref$onClick = _ref.onClick,
     _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
     otherProps = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var _otherProps = otherProps || {};
   var _useState = useState([]),
     positions = _useState[0],
     setPositions = _useState[1];
@@ -95,6 +94,20 @@ var GoodsCardList = function GoodsCardList(_ref) {
   },
   // 当 dataList 变化时重新计算
   [dataList]);
+  var resolveResultDesc = function resolveResultDesc(desc) {
+    var htmlString = "<div>" + desc + "</div>";
+    // 创建一个虚拟的 DOM 容器
+    var tempDiv = document.createElement('div');
+    tempDiv.innerHTML = htmlString;
+    // 提取文本
+    return tempDiv.textContent || tempDiv.innerText;
+  };
+  var resultStyle = _extends({}, otherProps.style || {}, {
+    height: maxContainerHeight + 20 + "px"
+  });
+  var _otherProps = _extends({}, otherProps || {}, {
+    style: resultStyle
+  });
   return /*#__PURE__*/React.createElement("div", _extends({
     className: "card-list-goods__container waterfall-container",
     style: {
@@ -124,12 +137,16 @@ var GoodsCardList = function GoodsCardList(_ref) {
       className: "card-list-goods__title"
     }, item.title), /*#__PURE__*/React.createElement("div", {
       className: "card-list-goods__desc"
-    }, item.desc), /*#__PURE__*/React.createElement("div", {
+    }, resolveResultDesc(item.desc)), /*#__PURE__*/React.createElement("div", {
       className: "card-list-goods__bottom"
     }, /*#__PURE__*/React.createElement("div", {
       className: "card-list-goods__unit"
     }, "\uFFE5"), /*#__PURE__*/React.createElement("div", {
       className: "card-list-goods__price"
+    }, item.activePrice || item.price), item.activePrice && /*#__PURE__*/React.createElement("div", {
+      className: "card-list-goods__unit__delete"
+    }, "\uFFE5"), item.activePrice && /*#__PURE__*/React.createElement("div", {
+      className: "card-list-goods__price__delete"
     }, item.price), /*#__PURE__*/React.createElement("div", {
       className: "card-list-goods__sales"
     }, "\u5DF2\u552E", item.sales > maxSales ? maxSales + "+" : item.sales))));

package/es/components/goods-card-list/goods-card-list.scss

@@ -8,7 +8,7 @@
     transition: top 0.35s ease, left 0.35s ease, width 0.35s ease;
     overflow: hidden;
     border-radius: 8px;
-    box-shadow: 0 3px 9px 1px rgba(204,204,204,0.35);
+    box-shadow: 0 3px 9px 1px rgba(204, 204, 204, 0.35);
 
     & > .card-list-goods__image {
       height: 200px;
@@ -58,12 +58,27 @@
         margin-bottom: 0.25rem;
         display: flex;
         align-items: baseline;
+        flex-wrap: wrap;
+        row-gap: 0.5rem;
+
+        & > div {
+          display: flex;
+        }
 
         .card-list-goods__unit {
           font-size: 12px;
           color: #F57D51;
           font-weight: 700;
           line-height: 1;
+
+          &__delete {
+            margin-left: 0;
+            font-size: 14px;
+            color: #666666;
+            line-height: 1;
+            text-decoration: line-through
+          }
+
         }
 
         .card-list-goods__price {
@@ -71,11 +86,18 @@
           color: #F57D51;
           font-weight: 700;
           line-height: 1;
+
+          &__delete {
+            margin-left: 0;
+            font-size: 14px;
+            color: #666666;
+            line-height: 1;
+            text-decoration: line-through
+          }
         }
 
         .card-list-goods__sales {
-          margin-left: 0.5rem;
-          margin-right: 0.5rem;
+          margin-left: 3px;
           font-size: 12px;
           color: #666666;
           line-height: 1;
@@ -88,6 +110,3 @@
   }
 
 }
-
-
-

package/es/components/goods-card-list/types.d.ts

@@ -34,6 +34,10 @@ export interface GoodsCardListItemProps {
      * 价格
      */
     price: string;
+    /**
+     * 促销价格
+     */
+    activePrice?: string;
     /**
      * 销量
      */

package/es/components/radio-group/radio-group.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["options", "name", "type", "defaultValue", "selectColor", "selectTextColor", "unSelectColor", "unSelectTextColor", "isWrap", "onChange", "children"];
 import React, { useEffect, useState } from 'react';
-import { convertChildren } from "../../utils/children-node-handle";
 import "./index.scss";
+import RadioGroupItem from "./radio-group-item";
 function uuid() {
   return Math.random().toString(36).substring(2);
 }
@@ -45,8 +45,8 @@ var RadioGroup = function RadioGroup(_ref) {
   _otherProps.style = wrapClass + ' ' + _otherProps.style ? _otherProps.style : '';
   return /*#__PURE__*/React.createElement("div", _extends({
     className: "radio-group__panel"
-  }, _otherProps), options.map(function (option) {
-    return convertChildren(children, 'custom-radio-group-item', {
+  }, _otherProps), (options || []).map(function (option) {
+    return /*#__PURE__*/React.createElement(RadioGroupItem, {
       label: option.label,
       value: option.value,
       key: option.value,
@@ -59,6 +59,19 @@ var RadioGroup = function RadioGroup(_ref) {
       unSelectTextColor: unSelectTextColor,
       onChange: handleChange
     });
+    // return convertChildren(children, 'custom-radio-group-item', {
+    //     label: option.label,
+    //     value: option.value,
+    //     key: option.value,
+    //     checked: selectedValue === option.value,
+    //     name: name,
+    //     type: type,
+    //     selectColor: selectColor,
+    //     selectTextColor: selectTextColor,
+    //     unSelectColor: unSelectColor,
+    //     unSelectTextColor: unSelectTextColor,
+    //     onChange: handleChange
+    // })
   }));
 };
 RadioGroup.displayName = 'RadioGroup';

package/es/components/tab-container/tab-container.js

@@ -9,7 +9,6 @@ export var TabContainer = function TabContainer(props) {
   var className = props.className,
     restProps = _objectWithoutPropertiesLoose(props, _excluded);
   var CustomTabItem = function CustomTabItem(key, props) {
-    console.log('key', key, props);
     return /*#__PURE__*/React.createElement("div", {
       className: "navigation"
     }, key.title);

package/lib/components/carousel/carousel.scss

@@ -12,7 +12,7 @@
 }
 
 .carousel-image {
-  min-width: 100%;
+  width: 100%;
   height: 100%;
   object-fit: cover;
   object-position: center;

package/lib/components/goods-card-list/goods-card-list.js

@@ -20,7 +20,6 @@ var GoodsCardList = function GoodsCardList(_ref) {
     _ref$onClick = _ref.onClick,
     _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
     otherProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
-  var _otherProps = otherProps || {};
   var _useState = (0, _react.useState)([]),
     positions = _useState[0],
     setPositions = _useState[1];
@@ -102,6 +101,20 @@ var GoodsCardList = function GoodsCardList(_ref) {
   },
   // 当 dataList 变化时重新计算
   [dataList]);
+  var resolveResultDesc = function resolveResultDesc(desc) {
+    var htmlString = "<div>" + desc + "</div>";
+    // 创建一个虚拟的 DOM 容器
+    var tempDiv = document.createElement('div');
+    tempDiv.innerHTML = htmlString;
+    // 提取文本
+    return tempDiv.textContent || tempDiv.innerText;
+  };
+  var resultStyle = (0, _extends2["default"])({}, otherProps.style || {}, {
+    height: maxContainerHeight + 20 + "px"
+  });
+  var _otherProps = (0, _extends2["default"])({}, otherProps || {}, {
+    style: resultStyle
+  });
   return /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
     className: "card-list-goods__container waterfall-container",
     style: {
@@ -131,12 +144,16 @@ var GoodsCardList = function GoodsCardList(_ref) {
       className: "card-list-goods__title"
     }, item.title), /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-list-goods__desc"
-    }, item.desc), /*#__PURE__*/_react["default"].createElement("div", {
+    }, resolveResultDesc(item.desc)), /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-list-goods__bottom"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-list-goods__unit"
     }, "\uFFE5"), /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-list-goods__price"
+    }, item.activePrice || item.price), item.activePrice && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "card-list-goods__unit__delete"
+    }, "\uFFE5"), item.activePrice && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "card-list-goods__price__delete"
     }, item.price), /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-list-goods__sales"
     }, "\u5DF2\u552E", item.sales > maxSales ? maxSales + "+" : item.sales))));

package/lib/components/goods-card-list/goods-card-list.scss

@@ -8,7 +8,7 @@
     transition: top 0.35s ease, left 0.35s ease, width 0.35s ease;
     overflow: hidden;
     border-radius: 8px;
-    box-shadow: 0 3px 9px 1px rgba(204,204,204,0.35);
+    box-shadow: 0 3px 9px 1px rgba(204, 204, 204, 0.35);
 
     & > .card-list-goods__image {
       height: 200px;
@@ -58,12 +58,27 @@
         margin-bottom: 0.25rem;
         display: flex;
         align-items: baseline;
+        flex-wrap: wrap;
+        row-gap: 0.5rem;
+
+        & > div {
+          display: flex;
+        }
 
         .card-list-goods__unit {
           font-size: 12px;
           color: #F57D51;
           font-weight: 700;
           line-height: 1;
+
+          &__delete {
+            margin-left: 0;
+            font-size: 14px;
+            color: #666666;
+            line-height: 1;
+            text-decoration: line-through
+          }
+
         }
 
         .card-list-goods__price {
@@ -71,11 +86,18 @@
           color: #F57D51;
           font-weight: 700;
           line-height: 1;
+
+          &__delete {
+            margin-left: 0;
+            font-size: 14px;
+            color: #666666;
+            line-height: 1;
+            text-decoration: line-through
+          }
         }
 
         .card-list-goods__sales {
-          margin-left: 0.5rem;
-          margin-right: 0.5rem;
+          margin-left: 3px;
           font-size: 12px;
           color: #666666;
           line-height: 1;
@@ -88,6 +110,3 @@
   }
 
 }
-
-
-

package/lib/components/goods-card-list/types.d.ts

@@ -34,6 +34,10 @@ export interface GoodsCardListItemProps {
      * 价格
      */
     price: string;
+    /**
+     * 促销价格
+     */
+    activePrice?: string;
     /**
      * 销量
      */

package/lib/components/radio-group/radio-group.js

@@ -6,8 +6,8 @@ exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
-var _childrenNodeHandle = require("../../utils/children-node-handle");
 require("./index.scss");
+var _radioGroupItem = _interopRequireDefault(require("./radio-group-item"));
 var _excluded = ["options", "name", "type", "defaultValue", "selectColor", "selectTextColor", "unSelectColor", "unSelectTextColor", "isWrap", "onChange", "children"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -52,8 +52,8 @@ var RadioGroup = function RadioGroup(_ref) {
   _otherProps.style = wrapClass + ' ' + _otherProps.style ? _otherProps.style : '';
   return /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
     className: "radio-group__panel"
-  }, _otherProps), options.map(function (option) {
-    return (0, _childrenNodeHandle.convertChildren)(children, 'custom-radio-group-item', {
+  }, _otherProps), (options || []).map(function (option) {
+    return /*#__PURE__*/_react["default"].createElement(_radioGroupItem["default"], {
       label: option.label,
       value: option.value,
       key: option.value,
@@ -66,6 +66,19 @@ var RadioGroup = function RadioGroup(_ref) {
       unSelectTextColor: unSelectTextColor,
       onChange: handleChange
     });
+    // return convertChildren(children, 'custom-radio-group-item', {
+    //     label: option.label,
+    //     value: option.value,
+    //     key: option.value,
+    //     checked: selectedValue === option.value,
+    //     name: name,
+    //     type: type,
+    //     selectColor: selectColor,
+    //     selectTextColor: selectTextColor,
+    //     unSelectColor: unSelectColor,
+    //     unSelectTextColor: unSelectTextColor,
+    //     onChange: handleChange
+    // })
   }));
 };
 RadioGroup.displayName = 'RadioGroup';

package/lib/components/tab-container/tab-container.js

@@ -14,7 +14,6 @@ var TabContainer = exports.TabContainer = function TabContainer(props) {
   var className = props.className,
     restProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var CustomTabItem = function CustomTabItem(key, props) {
-    console.log('key', key, props);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "navigation"
     }, key.title);