@pisell/materials 2.2.39 → 2.2.40

package/es/components/productCard/index.js

@@ -18,25 +18,28 @@ import Time from "./components/Time";
 import Packages from "./components/Packages";
 import Sales from "./components/Sales";
 import AmountFooter from "./components/AmountFooter";
+import Items from "./components/MultiDay";
 import Note from "./components/Note";
 import Action from "./components/Action";
 import UseOpenNote from "./hooks/useOpenNote";
 import localeTexts from "./locales";
+import { defaultValue } from "./status";
 import "./index.less";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 var ProductCard = function ProductCard(props) {
-  var _dataSource$_extend, _dataSource$_extend$d, _classNames;
-  var dataSource = props.dataSource,
+  var _classNames, _dataSource$items;
+  var _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? defaultValue.dataSource : _props$dataSource,
     _props$isShowImage = props.isShowImage,
-    isShowImage = _props$isShowImage === void 0 ? true : _props$isShowImage,
+    isShowImage = _props$isShowImage === void 0 ? defaultValue.isShowImage : _props$isShowImage,
     _props$isShowHolder = props.isShowHolder,
-    isShowHolder = _props$isShowHolder === void 0 ? true : _props$isShowHolder,
+    isShowHolder = _props$isShowHolder === void 0 ? defaultValue.isShowHolder : _props$isShowHolder,
     _props$isShowNote = props.isShowNote,
-    isShowNote = _props$isShowNote === void 0 ? true : _props$isShowNote,
+    isShowNote = _props$isShowNote === void 0 ? defaultValue.isShowNote : _props$isShowNote,
     _props$isShowDelete = props.isShowDelete,
-    isShowDelete = _props$isShowDelete === void 0 ? true : _props$isShowDelete,
+    isShowDelete = _props$isShowDelete === void 0 ? defaultValue.isShowDelete : _props$isShowDelete,
     _props$isShowPackageN = props.isShowPackageNote,
-    isShowPackageNote = _props$isShowPackageN === void 0 ? true : _props$isShowPackageN,
+    isShowPackageNote = _props$isShowPackageN === void 0 ? defaultValue.isShowPackageNote : _props$isShowPackageN,
     _onAction = props.onAction,
     _onDelete = props.onDelete,
     onNote = props.onNote,
@@ -44,6 +47,15 @@ var ProductCard = function ProductCard(props) {
     onCard = props.onCard,
     other = _objectWithoutProperties(props, _excluded);
   var useOpenNoteRef = useRef();
+  console.log(dataSource, isShowImage, isShowNote, 'dataSource');
+  var image = dataSource.image,
+    bundle = dataSource.bundle,
+    relation_products = dataSource.relation_products,
+    _id = dataSource._id,
+    isShowAction = dataSource.isShowAction,
+    actionText = dataSource.actionText,
+    errorMessage = dataSource.errorMessage,
+    isNormalProduct = dataSource.isNormalProduct;
 
   /**
    * @title: 显示图片
@@ -54,8 +66,8 @@ var ProductCard = function ProductCard(props) {
    * @Date: 2024-11-21 19:33
    */
   var showImage = useMemo(function () {
-    return isShowImage && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.cover);
-  }, [isShowImage, dataSource === null || dataSource === void 0 ? void 0 : dataSource.cover]);
+    return isShowImage && image;
+  }, [isShowImage, image]);
 
   /**
    * @title: 是否隐藏footer分割线
@@ -66,12 +78,11 @@ var ProductCard = function ProductCard(props) {
    * @Date: 2024-11-23 13:30
    */
   var hideDivider = useMemo(function () {
-    var _dataSource$bundle, _dataSource$relation_;
-    return (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$bundle = dataSource.bundle) === null || _dataSource$bundle === void 0 ? void 0 : _dataSource$bundle.length) || (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$relation_ = dataSource.relation_details) === null || _dataSource$relation_ === void 0 ? void 0 : _dataSource$relation_.length);
-  }, [dataSource === null || dataSource === void 0 ? void 0 : dataSource.bundle, dataSource === null || dataSource === void 0 ? void 0 : dataSource.relation_details]);
+    return (bundle === null || bundle === void 0 ? void 0 : bundle.length) || (relation_products === null || relation_products === void 0 ? void 0 : relation_products.length);
+  }, [bundle, relation_products]);
   return /*#__PURE__*/React.createElement(CardPro, {
-    className: classNames('pisell-lowcode-product-card', (_classNames = {}, _defineProperty(_classNames, 'pisell-lowcode-product-card-image', !showImage), _defineProperty(_classNames, 'pisell-lowcode-normal-product-card', !showImage && !(dataSource !== null && dataSource !== void 0 && (_dataSource$_extend = dataSource._extend) !== null && _dataSource$_extend !== void 0 && (_dataSource$_extend$d = _dataSource$_extend.date) !== null && _dataSource$_extend$d !== void 0 && _dataSource$_extend$d.value)), _classNames)),
-    key: dataSource === null || dataSource === void 0 ? void 0 : dataSource._id
+    className: classNames('pisell-lowcode-product-card', (_classNames = {}, _defineProperty(_classNames, 'pisell-lowcode-product-card-image', !showImage), _defineProperty(_classNames, 'pisell-lowcode-normal-product-card', !showImage && isNormalProduct), _classNames)),
+    key: _id
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     onClick: function onClick(e) {
       e.preventDefault();
@@ -86,19 +97,22 @@ var ProductCard = function ProductCard(props) {
     onDelete: function onDelete() {
       _onDelete === null || _onDelete === void 0 ? void 0 : _onDelete(dataSource);
     }
-  })), dataSource !== null && dataSource !== void 0 && dataSource._extend ? /*#__PURE__*/React.createElement(Time, {
+  })), /*#__PURE__*/React.createElement(Time, {
     item: dataSource,
     isShowHolder: isShowHolder,
     onLike: function onLike(item) {
       return _onLike === null || _onLike === void 0 ? void 0 : _onLike(item);
     }
-  }) : null, /*#__PURE__*/React.createElement(Packages, {
+  }), /*#__PURE__*/React.createElement(Packages, {
     item: dataSource,
     isShowPackageNote: isShowPackageNote
   }), /*#__PURE__*/React.createElement(Sales, {
     item: dataSource,
     isShowNote: isShowNote
-  }), /*#__PURE__*/React.createElement(AmountFooter, {
+  }), (_dataSource$items = dataSource.items) !== null && _dataSource$items !== void 0 && _dataSource$items.length ? /*#__PURE__*/React.createElement(Items, {
+    dataSource: dataSource,
+    hideDivider: hideDivider
+  }) : /*#__PURE__*/React.createElement(AmountFooter, {
     item: dataSource,
     hideDivider: hideDivider,
     type: "total"
@@ -109,13 +123,13 @@ var ProductCard = function ProductCard(props) {
         item: dataSource
       });
     }
-  })) : null, dataSource !== null && dataSource !== void 0 && dataSource._showAction && dataSource !== null && dataSource !== void 0 && dataSource._actionText ? /*#__PURE__*/React.createElement(Action, {
+  })) : null, isShowAction && actionText ? /*#__PURE__*/React.createElement(Action, {
     item: dataSource,
     onAction: function onAction() {
       return _onAction === null || _onAction === void 0 ? void 0 : _onAction(dataSource);
     }
-  }) : null, dataSource !== null && dataSource !== void 0 && dataSource._errorMessage ? /*#__PURE__*/React.createElement(Alert, {
-    message: dataSource._errorMessage,
+  }) : null, errorMessage ? /*#__PURE__*/React.createElement(Alert, {
+    message: errorMessage,
     type: "warning",
     showIcon: true,
     className: "pisell-lowcode-product-card-error"

package/es/components/productCard/index.less

@@ -1,6 +1,7 @@
 .pisell-lowcode-product-card {
   overflow: hidden;
   border: 1px solid var(--Gray-300, #d0d5dd);
+
   &:hover,
   &:active {
     border: 1px solid var(--Gray-400, #98a2b3);
@@ -36,7 +37,7 @@
     width: 6px;
     height: 100%;
     background: var(--Blue-400, #53b1fd);
-    z-index: 2;
+    z-index: 0 !important;
   }
 }
 
@@ -50,4 +51,4 @@
   border: none !important;
   margin: 8px -16px -8px;
   border-radius: 0 0 8px 8px;
-}
+}

package/es/components/productCard/status.d.ts

@@ -1,4 +1,27 @@
-import { ProductCardTypes } from './types';
+import { ProductCardTypes, bundleType, optionType, productType } from './types';
+/**
+ * @title: 套餐数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 23:21
+ */
+export declare const defaultBundle: bundleType;
+/**
+ * @description: 单规格
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 23:00
+ */
+export declare const defaultOption: optionType;
+/**
+ * @title: 商品商品类型
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 22:48
+ */
+export declare const defaultProduct: productType;
 /**
  * @title: 默认数据
  * @description:

package/es/components/productCard/status.js

@@ -1,3 +1,51 @@
+/**
+ * @title: 套餐数据
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 23:21
+ */
+export var defaultBundle = {
+  id: 0,
+  name: '',
+  num: 1,
+  price: 0,
+  total: 0
+};
+
+/**
+ * @description: 单规格
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 23:00
+ */
+export var defaultOption = {
+  id: 0,
+  name: '',
+  num: 1,
+  price: 0,
+  total: 0
+};
+
+/**
+ * @title: 商品商品类型
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 22:48
+ */
+export var defaultProduct = {
+  id: 0,
+  _id: 0,
+  name: '',
+  price: 0,
+  total: 0,
+  num: 1,
+  image: '',
+  isShowNote: true,
+  note: ''
+};
+
 /**
  * @title: 默认数据
  * @description: 
@@ -6,10 +54,12 @@
  * @Date: 2024-12-12 16:49
  */
 export var defaultValue = {
-  dataSource: {},
+  dataSource: defaultProduct,
   isShowImage: true,
   isShowHolder: true,
   isShowNote: true,
   isShowDelete: true,
-  isShowPackageNote: true
+  isShowPackageNote: true,
+  locale: 'en-US',
+  symbol: '$'
 };

package/es/components/productCard/types.d.ts

@@ -1,14 +1,73 @@
+export declare type bundleType = {
+    id: number;
+    name: string;
+    num: number;
+    price: number;
+    total: number;
+    origin_total?: number;
+    price_type?: string;
+    options?: optionType[];
+};
+/**
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 23:00
+ */
+export declare type optionType = {
+    id: number;
+    name: string;
+    num: number;
+    price: number;
+    total: number;
+    origin_total?: number;
+};
+/**
+ * @title: 商品商品类型
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-02 22:48
+ */
+export declare type productType = {
+    _id: string | number;
+    id: number;
+    name: string;
+    price: number;
+    total: number;
+    num: number;
+    origin_total?: number;
+    image?: string;
+    isShowNote?: boolean;
+    note?: string;
+    like_status?: string;
+    bundle?: bundleType[];
+    options?: optionType[];
+    isShowAction?: boolean;
+    actionText?: string;
+    errorMessage?: string;
+    product_option_string?: string;
+    discount_reason?: string;
+    relation_products?: any[];
+    resource_id?: string | number;
+    relation_form_name?: string;
+    holder_title?: string;
+    start_date?: string;
+    end_date?: string;
+};
 /**
  * 排序总配置
  */
 export declare type ProductCardTypes = {
-    dataSource: any;
+    dataSource: productType;
     isShowImage?: boolean;
     isShowHolder?: boolean;
     isShowNote?: boolean;
     isShowPackageNote?: boolean;
     isShowDelete?: boolean;
     disabledEdit?: boolean;
+    locale?: string;
+    symbol?: string;
     onAction?: (val: any) => void;
     onDelete?: (val: any) => void;
     onNote?: (val: any) => void;

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

@@ -1,60 +1,24 @@
-import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import 'dayjs/locale/en';
 import 'dayjs/locale/zh-tw';
-declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
-declare class Request {
-    private request;
-    constructor();
-    setRequest(val: any): void;
-    getRequest(): {
-        get: RType;
-        post: RType;
-        put: RType;
-        remove: RType;
-        custom: RType;
-    };
-}
-export declare const request: Request;
 /**
- * @title: 格式化持续时长用于展示
+ * @title: 是否英文
  * @description:
- * @param {number} service_times
+ * @param {any} item
  * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 14:00
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:49
  */
-export declare const getDiscountTime: (service_times: number) => string;
+export declare const isEn: (item: any) => boolean;
 /**
- * @title: 时间切片
+ * @title: 跨日预约时间
  * @description:
- * @param {any} config
- * @param {string} locale
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 13:59
- */
-export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
-    timeSlices: {
-        label: string;
-        value: string;
-    }[];
-    durationSlicesBasedOnTime: {
-        label: string;
-        value: number;
-    }[];
-};
-export declare const getNowTime: () => string;
-export declare const isNowTime: (time: string) => boolean;
-/**
- * @title: 获取服务的开始时间, 如果是now 转换为当前的时间
- * @description:
- * @param {string} start_time
+ * @param {any} item
  * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 14:03
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:50
  */
-export declare const getServeStartTime: (start_time: string) => string;
+export declare const formatMultiDayDate: (item: any) => string;
 /**
  * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
  * @description:
@@ -65,101 +29,3 @@ export declare const getServeStartTime: (start_time: string) => string;
  * @Date: 2024-04-26 14:04
  */
 export declare const getServiceTime: (item: any, currentDate: any) => string;
-export declare const findNextSlice: ({ timeSlices, index, date, }: {
-    timeSlices: any[];
-    index?: number | undefined;
-    date?: string | undefined;
-}) => any;
-export declare const findNextDuration: (current: any, array: any, defaultValue?: any) => any;
-export declare const formatProductListByCategory: (list: any, filterItem: any) => unknown[];
-export declare const getResourceTimeIsUsable: (item: any, cacheItem: any) => any;
-/**
- * @title: 查找是否有可用的time
- * @description:
- * @param {any} resourceItem
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-01-09 13:57
- */
-export declare const formatTimes: (resourceItem: any, cacheItem: any) => any;
-/**
- * @title: 获取店铺的营业结束时间
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-23 10:00
- */
-export declare const getShopOpeningHours: () => string;
-/**
- * @title: 对灵活时长进行处理
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-23 10:00
- */
-export declare const flexibleObj: {
-    create: (num: number) => any;
-    getValue: (str: string | number) => number;
-    isFlexible: (str: string | number) => boolean;
-    add: (current: number | string, duration: number) => any;
-};
-/**
- * @title: 获取结束时间
- * @description: 取 endDate | 店铺营业时间 最小的那一个
- * @param {any} startDate
- * @param {string} duration
- * @param {any} endDate
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-23 10:01
- */
-export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
-export declare const getServiceTimes: (service: any) => {
-    startDate: dayjs.Dayjs;
-    endDate: dayjs.Dayjs;
-};
-export declare const getErrorList: (resource: any, cacheItem: any) => {
-    label: any;
-    type: string;
-}[];
-/**
- * @title: 格式化资源, 添加自定义参数
- * @description:
- * @param {any} resourceItem
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-01-09 13:40
- */
-export declare const formatResource: (resourceItem: any, cacheItem?: any, formatLabel?: any) => any;
-export declare const getLastServer: (list: any) => any;
-export declare const getCacheParams: () => any;
-export declare const deleteCacheParams: () => void;
-/**
- * @title: 创建一个服务商品
- * @description:
- * @param {any} state
- * @param {any} item
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-01-26 14:09
- */
-export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
-export declare const getProductTotalPrice: (item: any) => number;
-/**
- * @title: 判断 duration
- * @description: 用于处理不同格式的duration
- * @param {number} duration
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-23 10:02
- */
-export declare const getDuration: (duration: number | {
-    type: string;
-    value: number;
-}) => number | {
-    type: string;
-    value: number;
-} | "flexible";
-export declare const isWalkIn: (customer_id?: number | string) => boolean;
-export declare const getIsEdit: (state: any) => boolean;
-export {};