@pisell/materials 6.8.6 → 6.8.8

package/es/components/PisellProcedure/PisellProcedure.less

@@ -299,8 +299,10 @@
     
     // 固定在整体底部 - 跟随页面滚动，始终在底部
     &--fixed-bottom {
-      position: sticky;
-      bottom: 0;
+      position: relative;
+      bottom: auto;
+      flex-shrink: 0;
+      margin-top: auto;
     }
 
     // 内嵌在 content 区域底部 - 紧贴内容底部

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -210,16 +210,15 @@ var SubmitButton = function SubmitButton(props) {
               }
             }
             setFormFieldsUntouched(form);
-            _context2.next = 28;
+            _context2.next = 27;
             break;
           case 24:
             _context2.prev = 24;
             _context2.t0 = _context2["catch"](0);
-            debugger;
             PisellToast({
               content: "".concat(_context2.t0.message)
             });
-          case 28:
+          case 27:
           case "end":
             return _context2.stop();
         }

package/es/components/dataSourceComponents/fields/Input.Mobile/serve.js

@@ -65,13 +65,11 @@ export var useCountries = function useCountries() {
     data = _useRequest.data,
     run = _useRequest.run;
   useEffect(function () {
-    debugger;
     if (!isShop) {
       run();
     }
   }, [isShop]);
   var currentData = useMemo(function () {
-    debugger;
     if (isShop) {
       var _appHelper$utils;
       var codeList = appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 || (_appHelper$utils = _appHelper$utils.store) === null || _appHelper$utils === void 0 || (_appHelper$utils = _appHelper$utils.getState()) === null || _appHelper$utils === void 0 || (_appHelper$utils = _appHelper$utils.global) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.codeList;

package/es/components/productCard/cartSkuCard/components/basicInfo/index.d.ts

@@ -22,6 +22,7 @@ interface IProps {
      * 2. isMain 且 type 为 a5，展示holder
      */
     isMainProduct?: boolean;
+    maxSpecsCount?: number;
     type?: 'a2' | 'a5';
 }
 declare const BasicInfo: (props: IProps) => JSX.Element;

package/es/components/productCard/cartSkuCard/components/basicInfo/index.js

@@ -11,7 +11,9 @@ var BasicInfo = function BasicInfo(props) {
     dataSource = _props$dataSource === void 0 ? {} : _props$dataSource,
     style = props.style,
     isMainProduct = props.isMainProduct,
-    type = props.type;
+    type = props.type,
+    _props$maxSpecsCount = props.maxSpecsCount,
+    maxSpecsCount = _props$maxSpecsCount === void 0 ? 1 : _props$maxSpecsCount;
   var image = dataSource.image,
     bundle = dataSource.bundle,
     options = dataSource.options,
@@ -80,7 +82,8 @@ var BasicInfo = function BasicInfo(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "product-name"
   }, name), hasSpecs ? /*#__PURE__*/React.createElement(Specs, {
-    dataSource: dataSource
+    dataSource: dataSource,
+    maxSpecsCount: maxSpecsCount
   }) : /*#__PURE__*/React.createElement("div", {
     className: "product-price"
   }, formatAmount(price, 2, symbol))), /*#__PURE__*/React.createElement("div", {

package/es/components/productCard/cartSkuCard/components/packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;

package/es/components/productCard/cartSkuCard/components/specs/index.d.ts

@@ -1,3 +1,20 @@
 import './index.less';
-declare const Specs: (props: any) => JSX.Element | null;
+interface SpecsProps {
+    /** 数据源 */
+    dataSource?: {
+        bundle?: Array<{
+            title: string;
+        }>;
+        options?: Array<{
+            name: string;
+            price: number;
+            num: number;
+        }>;
+        product_option_string?: string;
+        symbol?: string;
+    };
+    /** 最大展示数量，默认为 1 */
+    maxSpecsCount?: number;
+}
+declare const Specs: (props: SpecsProps) => JSX.Element | null;
 export default Specs;

package/es/components/productCard/cartSkuCard/components/specs/index.js

@@ -4,7 +4,9 @@ import "./index.less";
 import { PREFIX } from "../../index";
 var Specs = function Specs(props) {
   var _props$dataSource = props.dataSource,
-    dataSource = _props$dataSource === void 0 ? {} : _props$dataSource;
+    dataSource = _props$dataSource === void 0 ? {} : _props$dataSource,
+    _props$maxSpecsCount = props.maxSpecsCount,
+    maxSpecsCount = _props$maxSpecsCount === void 0 ? 1 : _props$maxSpecsCount;
   var bundle = dataSource.bundle,
     options = dataSource.options,
     product_option_string = dataSource.product_option_string,
@@ -17,27 +19,34 @@ var Specs = function Specs(props) {
     }
   }, locales.getText('pisell2.cart.sku-card.more'));
   if (Array.isArray(bundle) && (bundle === null || bundle === void 0 ? void 0 : bundle.length) > 0) {
-    var first = bundle[0];
+    var displayItems = bundle.slice(0, maxSpecsCount);
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(PREFIX, "__specs")
-    }, /*#__PURE__*/React.createElement("div", null, first.title), bundle.length > 1 ? more : null);
+    }, displayItems.map(function (item, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: index
+      }, item.title);
+    }), bundle.length > maxSpecsCount ? more : null);
   }
   if (product_option_string) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(PREFIX, "__specs")
-    }, /*#__PURE__*/React.createElement("div", null, product_option_string), options.length > 1 ? more : null);
+    }, /*#__PURE__*/React.createElement("div", null, product_option_string), options && options.length > maxSpecsCount ? more : null);
   }
-  if (options.length > 0) {
-    var _first = options[0];
+  if (options && options.length > 0) {
+    var _displayItems = options.slice(0, maxSpecsCount);
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(PREFIX, "__specs")
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "spec-item"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "spec-name"
-    }, _first.name), /*#__PURE__*/React.createElement("span", {
-      className: "spec-num"
-    }, /*#__PURE__*/React.createElement("span", null, symbol, _first.price), /*#__PURE__*/React.createElement("span", null), "x", /*#__PURE__*/React.createElement("span", null, _first.num))), options.length > 1 ? more : null);
+    }, _displayItems.map(function (item, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "spec-item",
+        key: index
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "spec-name"
+      }, item.name), /*#__PURE__*/React.createElement("span", {
+        className: "spec-num"
+      }, /*#__PURE__*/React.createElement("span", null, symbol, item.price), /*#__PURE__*/React.createElement("span", null), "x", /*#__PURE__*/React.createElement("span", null, item.num)));
+    }), options.length > maxSpecsCount ? more : null);
   }
   return null;
 };

package/es/components/productCard/cartSkuCard/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["dataSource", "isShowImage", "isShowHolder", "isShowNote", "isShowDelete", "isShowAmountFooter", "isShowPackageNote", "isShowEditProduct", "onEditProduct", "onAction", "onDelete", "onNote", "onLike", "onCard", "onChangeResource", "onChangeHolder", "type", "rightActions", "escapeDom"];
+var _excluded = ["dataSource", "isShowImage", "isShowHolder", "isShowNote", "isShowDelete", "isShowAmountFooter", "isShowPackageNote", "isShowEditProduct", "onEditProduct", "onAction", "onDelete", "onNote", "onLike", "onCard", "onChangeResource", "onChangeHolder", "type", "rightActions", "escapeDom", "maxSpecsCount"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -58,6 +58,8 @@ var CartSkuCard = function CartSkuCard(props) {
     _props$rightActions = props.rightActions,
     rightActions = _props$rightActions === void 0 ? [] : _props$rightActions,
     escapeDom = props.escapeDom,
+    _props$maxSpecsCount = props.maxSpecsCount,
+    maxSpecsCount = _props$maxSpecsCount === void 0 ? 1 : _props$maxSpecsCount,
     other = _objectWithoutProperties(props, _excluded);
   var useOpenNoteRef = useRef();
   var context = useEngineContext();
@@ -111,7 +113,8 @@ var CartSkuCard = function CartSkuCard(props) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BasicInfo, {
       isShowImage: isShowImage,
       dataSource: dataSource,
-      isMainProduct: true
+      isMainProduct: true,
+      maxSpecsCount: maxSpecsCount
     }), /*#__PURE__*/React.createElement(DiscountReason, {
       dataSource: dataSource
     }), isShowNote ? /*#__PURE__*/React.createElement(Note, _extends({}, other, {

package/es/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;

package/lib/components/PisellProcedure/PisellProcedure.less

@@ -299,8 +299,10 @@
     
     // 固定在整体底部 - 跟随页面滚动，始终在底部
     &--fixed-bottom {
-      position: sticky;
-      bottom: 0;
+      position: relative;
+      bottom: auto;
+      flex-shrink: 0;
+      margin-top: auto;
     }
 
     // 内嵌在 content 区域底部 - 紧贴内容底部

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -158,7 +158,6 @@ var SubmitButton = (props) => {
       }
       (0, import_utils.setFormFieldsUntouched)(form);
     } catch (error) {
-      debugger;
       (0, import_pisellToast.default)({
         content: `${error.message}`
       });

package/lib/components/dataSourceComponents/fields/Input.Mobile/serve.js

@@ -69,14 +69,12 @@ var useCountries = () => {
     manual: true
   });
   (0, import_react.useEffect)(() => {
-    debugger;
     if (!isShop) {
       run();
     }
   }, [isShop]);
   const currentData = (0, import_react.useMemo)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-    debugger;
     if (isShop) {
       const codeList = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.store) == null ? void 0 : _b.getState()) == null ? void 0 : _c.global) == null ? void 0 : _d.codeList;
       if (codeList) {

package/lib/components/productCard/cartSkuCard/components/basicInfo/index.d.ts

@@ -22,6 +22,7 @@ interface IProps {
      * 2. isMain 且 type 为 a5，展示holder
      */
     isMainProduct?: boolean;
+    maxSpecsCount?: number;
     type?: 'a2' | 'a5';
 }
 declare const BasicInfo: (props: IProps) => JSX.Element;

package/lib/components/productCard/cartSkuCard/components/basicInfo/index.js

@@ -40,7 +40,7 @@ var import_holders = __toESM(require("../holders"));
 var import__ = require("../../index");
 var import_index = require("./index.less");
 var BasicInfo = (props) => {
-  const { isShowImage, dataSource = {}, style, isMainProduct, type } = props;
+  const { isShowImage, dataSource = {}, style, isMainProduct, type, maxSpecsCount = 1 } = props;
   const {
     image,
     bundle,
@@ -78,6 +78,6 @@ var BasicInfo = (props) => {
   if (type === "a5") {
     return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__basic-info`, style: style || {} }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /* @__PURE__ */ import_react.default.createElement("div", { style: { width: 20 } }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-info` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-name` }, name), (!holder_id || !(holder_id == null ? void 0 : holder_id.length)) && !isFormSubject ? /* @__PURE__ */ import_react.default.createElement("div", { className: `product-price` }, (0, import_utils.formatAmount)(price, 2, symbol)) : /* @__PURE__ */ import_react.default.createElement(import_holders.default, { dataSource })));
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__basic-info`, style: style || {} }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /* @__PURE__ */ import_react.default.createElement("div", { style: { width: 20 } }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-info` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-name` }, name), hasSpecs ? /* @__PURE__ */ import_react.default.createElement(import_specs.default, { dataSource }) : /* @__PURE__ */ import_react.default.createElement("div", { className: `product-price` }, (0, import_utils.formatAmount)(price, 2, symbol))), /* @__PURE__ */ import_react.default.createElement("div", { className: `product-amount` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `total-amont` }, (0, import_utils.formatAmount)(total * num, 2, symbol)), origin_total && Number(total) !== Number(origin_total) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `origin-amount` }, (0, import_utils.formatAmount)(origin_total * num, 2, symbol)) : null));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__basic-info`, style: style || {} }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /* @__PURE__ */ import_react.default.createElement("div", { style: { width: 20 } }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-info` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `product-name` }, name), hasSpecs ? /* @__PURE__ */ import_react.default.createElement(import_specs.default, { dataSource, maxSpecsCount }) : /* @__PURE__ */ import_react.default.createElement("div", { className: `product-price` }, (0, import_utils.formatAmount)(price, 2, symbol))), /* @__PURE__ */ import_react.default.createElement("div", { className: `product-amount` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `total-amont` }, (0, import_utils.formatAmount)(total * num, 2, symbol)), origin_total && Number(total) !== Number(origin_total) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `origin-amount` }, (0, import_utils.formatAmount)(origin_total * num, 2, symbol)) : null));
 };
 var basicInfo_default = BasicInfo;

package/lib/components/productCard/cartSkuCard/components/packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;

package/lib/components/productCard/cartSkuCard/components/specs/index.d.ts

@@ -1,3 +1,20 @@
 import './index.less';
-declare const Specs: (props: any) => JSX.Element | null;
+interface SpecsProps {
+    /** 数据源 */
+    dataSource?: {
+        bundle?: Array<{
+            title: string;
+        }>;
+        options?: Array<{
+            name: string;
+            price: number;
+            num: number;
+        }>;
+        product_option_string?: string;
+        symbol?: string;
+    };
+    /** 最大展示数量，默认为 1 */
+    maxSpecsCount?: number;
+}
+declare const Specs: (props: SpecsProps) => JSX.Element | null;
 export default Specs;

package/lib/components/productCard/cartSkuCard/components/specs/index.js

@@ -37,7 +37,7 @@ var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
 var import__ = require("../../index");
 var Specs = (props) => {
-  const { dataSource = {} } = props;
+  const { dataSource = {}, maxSpecsCount = 1 } = props;
   const { bundle, options, product_option_string, symbol } = dataSource;
   const more = /* @__PURE__ */ import_react.default.createElement(
     "div",
@@ -51,15 +51,15 @@ var Specs = (props) => {
     import_utils.locales.getText("pisell2.cart.sku-card.more")
   );
   if (Array.isArray(bundle) && (bundle == null ? void 0 : bundle.length) > 0) {
-    const first = bundle[0];
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, /* @__PURE__ */ import_react.default.createElement("div", null, first.title), bundle.length > 1 ? more : null);
+    const displayItems = bundle.slice(0, maxSpecsCount);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, displayItems.map((item, index) => /* @__PURE__ */ import_react.default.createElement("div", { key: index }, item.title)), bundle.length > maxSpecsCount ? more : null);
   }
   if (product_option_string) {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, /* @__PURE__ */ import_react.default.createElement("div", null, product_option_string), options.length > 1 ? more : null);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, /* @__PURE__ */ import_react.default.createElement("div", null, product_option_string), options && options.length > maxSpecsCount ? more : null);
   }
-  if (options.length > 0) {
-    const first = options[0];
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, /* @__PURE__ */ import_react.default.createElement("div", { className: "spec-item" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "spec-name" }, first.name), /* @__PURE__ */ import_react.default.createElement("span", { className: "spec-num" }, /* @__PURE__ */ import_react.default.createElement("span", null, symbol, first.price), /* @__PURE__ */ import_react.default.createElement("span", null), "x", /* @__PURE__ */ import_react.default.createElement("span", null, first.num))), options.length > 1 ? more : null);
+  if (options && options.length > 0) {
+    const displayItems = options.slice(0, maxSpecsCount);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__specs` }, displayItems.map((item, index) => /* @__PURE__ */ import_react.default.createElement("div", { className: "spec-item", key: index }, /* @__PURE__ */ import_react.default.createElement("span", { className: "spec-name" }, item.name), /* @__PURE__ */ import_react.default.createElement("span", { className: "spec-num" }, /* @__PURE__ */ import_react.default.createElement("span", null, symbol, item.price), /* @__PURE__ */ import_react.default.createElement("span", null), "x", /* @__PURE__ */ import_react.default.createElement("span", null, item.num)))), options.length > maxSpecsCount ? more : null);
   }
   return null;
 };

package/lib/components/productCard/cartSkuCard/index.js

@@ -75,6 +75,7 @@ var CartSkuCard = (props) => {
     type,
     rightActions = [],
     escapeDom,
+    maxSpecsCount = 1,
     ...other
   } = props;
   const useOpenNoteRef = (0, import_react.useRef)();
@@ -131,7 +132,8 @@ var CartSkuCard = (props) => {
       {
         isShowImage,
         dataSource,
-        isMainProduct: true
+        isMainProduct: true,
+        maxSpecsCount
       }
     ), /* @__PURE__ */ import_react.default.createElement(import_discountReason.default, { dataSource }), isShowNote ? /* @__PURE__ */ import_react.default.createElement(
       import_Note.default,

package/lib/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.8.6",
+  "version": "6.8.8",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -78,9 +78,9 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
-    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.7",
     "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",