@pisell/private-materials 6.0.25 → 6.1.1

package/lib/components/schedules/calendar/index.less

@@ -1,167 +1,173 @@
 .calender-box {
-    padding: 0 10px;
-
-    .calender-year-wrap {
-        position: relative;
-    }
-
-    .calender-year {
-        padding: 20px 0;
-        color: #000;
-        font-family: Inter;
-        font-size: 36px;
-        font-style: normal;
-        font-weight: 500;
-        line-height: 44px;
-        letter-spacing: -0.72px;
-        background-color: #fff;
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .caleddar-month {
-        color: #344054;
-        font-family: Inter;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: 600;
-        line-height: 24px;
-        margin-bottom: 4px;
-
+  padding: 0 10px;
+
+  .calender-year-wrap {
+    position: relative;
+  }
+
+  .calender-year {
+    padding: 20px 0;
+    color: #000;
+    font-size: 36px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 44px;
+    letter-spacing: -0.72px;
+    background-color: #fff;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+  }
+
+  .caleddar-month {
+    color: #344054;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 24px;
+    margin-bottom: 4px;
+  }
+
+  // antd calendar样式修改
+  .ant-picker-panel {
+    border-top: none;
+  }
+
+  .pisell-lowcode-picker-cell {
+    padding: 0;
+    border-top: none;
+  }
+
+  .cell-size {
+    width: 40px;
+    height: 40px;
+    padding: 4px;
+  }
+
+  .date-cell {
+    .cell-size ();
+    text-align: center;
+    line-height: 50px;
+  }
+
+  .ant-picker-content th {
+    .date-cell();
+  }
+
+  .caleddar-date-cell {
+    .cell-size ();
+    position: relative;
+    border-radius: 50%;
+
+    &.select {
+      background-color: #fedf89;
+      padding: 4px;
     }
 
-    // antd calendar样式修改
-    .ant-picker-panel {
-        border-top: none;
+    &.excluded {
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0%;
+        left: 0%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(
+          -45deg,
+          #ffffff 25%,
+          transparent 25%,
+          transparent 50%,
+          #ffffff 50%,
+          #ffffff 75%,
+          transparent 75%,
+          transparent
+        );
+        background-size: 10px 10px;
+      }
     }
 
-    .pisell-lowcode-picker-cell {
-        padding: 0;
-        border-top: none;
+    .caleddar-date {
+      color: #101828;
+      border-radius: 50%;
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &.has-status {
+        color: #ffffff;
+      }
+
+      &.disabled-date {
+        color: #7d89b0;
+      }
     }
+  }
 
-    .cell-size {
-        width: 40px;
-        height: 40px;
-        padding: 4px;
-    }
-
-    .date-cell {
-        .cell-size ();
-        text-align: center;
-        line-height: 50px;
-    }
-
-    .ant-picker-content th {
-        .date-cell()
-    }
-
-    .caleddar-date-cell {
-        .cell-size ();
-        position: relative;
-        border-radius: 50%;
-
-        &.select {
-            background-color: #FEDF89;
-            padding: 4px;
-        }
-
-        &.excluded {
-            &::after {
-                content: '';
-                position: absolute;
-                top: 0%;
-                left: 0%;
-                width: 100%;
-                height: 100%;
-                background: linear-gradient(-45deg, #ffffff 25%, transparent 25%, transparent 50%, #ffffff 50%, #ffffff 75%, transparent 75%, transparent);
-                background-size: 10px 10px;
-            }
-        }
-
-        .caleddar-date {
-            color: #101828;
-            border-radius: 50%;
-            width: 100%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-
-            &.has-status {
-                color: #ffffff;
-            }
-
-            &.disabled-date {
-                color: #7D89B0;
-            }
-        }
-    }
-
-    .ant-picker-cell {
-        padding: 0;
-        .cell-size ();
-    }
+  .ant-picker-cell {
+    padding: 0;
+    .cell-size ();
+  }
 }
 
 // 布局
 .month-list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
-
-    .month-item-box {
-        display: flex;
-        // &.month-item-1 {
-        //     justify-content: center;
-        // }
-
-        // &.month-item-2 {
-        //     justify-content: center;
-        // }
-
-        // &.month-item-3 {
-        //     &:nth-child(1n) {
-        //         justify-content: flex-start;
-        //     }
-
-        //     &:nth-child(2n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(3n) {
-        //         justify-content: flex-end;
-        //     }
-        // }
-
-        // &.month-item-4 {
-        //     &:nth-child(1n) {
-        //         justify-content: flex-start;
-        //     }
-
-        //     &:nth-child(2n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(3n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(4n) {
-        //         justify-content: flex-end;
-        //     }
-        // }
-    }
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
 
-    .month-item {
-        width: 280px;
-        margin: 10px;
-    }
+  .month-item-box {
+    display: flex;
+    // &.month-item-1 {
+    //     justify-content: center;
+    // }
+
+    // &.month-item-2 {
+    //     justify-content: center;
+    // }
+
+    // &.month-item-3 {
+    //     &:nth-child(1n) {
+    //         justify-content: flex-start;
+    //     }
+
+    //     &:nth-child(2n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(3n) {
+    //         justify-content: flex-end;
+    //     }
+    // }
+
+    // &.month-item-4 {
+    //     &:nth-child(1n) {
+    //         justify-content: flex-start;
+    //     }
+
+    //     &:nth-child(2n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(3n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(4n) {
+    //         justify-content: flex-end;
+    //     }
+    // }
+  }
+
+  .month-item {
+    width: 280px;
+    margin: 10px;
+  }
 }
 
 .pisell-lowcode-picker-cell-disabled {
-    &::before {
-        display: none;
-    }
-}
+  &::before {
+    display: none;
+  }
+}

package/lib/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/lib/components/schedules/components/ScheduleList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddSchedules: ({ value, onChange, drawerContainer, isSelf }: any) => JSX.Element;
 export default AddSchedules;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type Value = number[];
 declare const SchedulesModule: ({ value, onChange, drawerContainer, ruleFn, tabKey, previewItemChange, isSelf, isTitle, }: {

package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const ProductDetailDrawer: () => JSX.Element;
 export default ProductDetailDrawer;

package/lib/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/lib/components/schedules/products/list/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/lib/components/schedules/resources/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Resources: () => JSX.Element;
 export default Resources;

package/lib/components/schedules/resources/list/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/lib/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

package/lib/components/schedules/schedules/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SchedulesConnect: () => JSX.Element;
 export default SchedulesConnect;

package/lib/components/schedules/schedules/utils.js

@@ -144,7 +144,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
       const _end = _start.add(scheduleDiff, "second");
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
-          startTmp = startTmp.day(1).add(frequency, "week");
+          startTmp = startTmp.day(1).add(frequency, "day");
           continue;
         }
         const arr = getDataRange({

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
-  request = {};
   constructor() {
+    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/shoppingCart/Provider.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 export declare const CartContext: React.Context<any>;
-export declare const CartProvider: ({ children, props, onCard, onChange, onAddProduct, onActiveKey, }: any) => JSX.Element;
+export declare const CartProvider: ({ children, props, onCard, onAction, onChange, onAddProduct, onActiveKey, }: any) => JSX.Element;

package/lib/components/shoppingCart/Provider.js

@@ -41,6 +41,7 @@ var CartProvider = ({
   children,
   props,
   onCard,
+  onAction,
   onChange,
   onAddProduct,
   onActiveKey
@@ -79,7 +80,6 @@ var CartProvider = ({
     }
     const params = { ...defaultState, ...newState };
     const result = { ...params, ...(0, import_utils.formatState)(params) };
-    console.log(result, params, "result");
     setState(result);
   }, [
     props == null ? void 0 : props.platform,
@@ -97,7 +97,8 @@ var CartProvider = ({
         onCard,
         onChange,
         onAddProduct,
-        onActiveKey
+        onActiveKey,
+        onAction
       }
     },
     children

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -40,7 +40,19 @@ var import_useAddService = __toESM(require("../../hooks/useAddService"));
 var Product = (props) => {
   const { id, lists, isAdd = true } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
-  const { disabledEdit, isShowPackageNote, isShowNote, hideAddBtn, platform } = state;
+  const {
+    disabledEdit,
+    isShowPackageNote,
+    isShowNote,
+    hideAddBtn,
+    platform,
+    isShowChangeResource,
+    isShowDelete,
+    isShowChangeHolder,
+    isShowHolder,
+    isShowAddHolderButton,
+    isShowEditProduct
+  } = state;
   const clearCart = (0, import_useClearCart.default)(id);
   const handleChange = (item, type, other) => {
     if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
@@ -50,9 +62,25 @@ var Product = (props) => {
     return {
       isShowNote,
       isShowPackageNote,
-      disabledEdit
+      disabledEdit,
+      isShowChangeResource,
+      isShowChangeHolder,
+      isShowDelete,
+      isShowHolder,
+      isShowAddHolderButton,
+      isShowEditProduct
     };
-  }, [isShowNote, isShowPackageNote, disabledEdit]);
+  }, [
+    isShowNote,
+    isShowPackageNote,
+    disabledEdit,
+    isShowChangeResource,
+    isShowDelete,
+    isShowHolder,
+    isShowAddHolderButton,
+    isShowChangeHolder,
+    isShowEditProduct
+  ]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.ProductCard,
@@ -63,7 +91,11 @@ var Product = (props) => {
         onDelete: (e) => handleChange(e, "delete", item),
         onNote: (e) => handleChange(e, "note", { note: e.note }),
         onLike: (e) => handleChange(e, "like", { like_status: e.like_status }),
+        onEditProduct: (e) => handleChange == null ? void 0 : handleChange(e, "edit_product"),
         onCard: (e) => handleChange == null ? void 0 : handleChange(e, "view"),
+        onChangeResource: (e) => handleChange(item, "change_resource", e),
+        onChangeHolder: (e) => handleChange(item, "change_holder", e),
+        onAddHolder: (e) => handleChange(item, "add_holder", e),
         ...productParams
       }
     );

package/lib/components/shoppingCart/components/Cart/index.less

@@ -50,19 +50,19 @@
     margin-top: 12px;
   }
 
-  .pisell-lowcode__shopping-cart-add-service {
-    color: var(--Blue-700, #175cd3);
-    font-size: 16px;
-    font-style: normal;
-    font-weight: 400;
-    line-height: 24px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    cursor: pointer;
-  }
-
-  .pisell-lowcode__shopping-cart-add-service-products {
-    align-items: start;
-  }
+  //.pisell-lowcode__shopping-cart-add-service {
+  //  color: var(--Blue-700, #175cd3);
+  //  font-size: 16px;
+  //  font-style: normal;
+  //  font-weight: 400;
+  //  line-height: 24px;
+  //  display: flex;
+  //  align-items: center;
+  //  gap: 8px;
+  //  cursor: pointer;
+  //}
+  //
+  //.pisell-lowcode__shopping-cart-add-service-products {
+  //  align-items: start;
+  //}
 }

package/lib/components/shoppingCart/components/Render/index.js

@@ -48,7 +48,6 @@ var Content = () => {
   (0, import_react.useEffect)(() => {
     var _a, _b, _c, _d;
     let _holders = holders == null ? void 0 : holders.filter((item) => (item == null ? void 0 : item.key) > 0);
-    console.log(isEdit, products, _holders, pet, "wh_holder");
     if ((_holders == null ? void 0 : _holders.length) && !(pet == null ? void 0 : pet.length) && (products == null ? void 0 : products.length) && !isEdit && platform !== "h5") {
       if (_holders.length === 1) {
         onChange(products, "update_holders", (_a = _holders[0]) == null ? void 0 : _a.key);

package/lib/components/shoppingCart/components/Render/index.less

@@ -1,2 +1,17 @@
 .pisell-lowcode__shopping-cart-wrap {
+  .pisell-lowcode__shopping-cart-add-service {
+    color: var(--Blue-700, #175cd3);
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 24px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    cursor: pointer;
+  }
+
+  .pisell-lowcode__shopping-cart-add-service-products {
+    align-items: start
+  }
 }

package/lib/components/shoppingCart/hooks/useAddService.js

@@ -48,8 +48,7 @@ var useAddService = (id, type) => {
       }),
       onClick: () => onAddProduct(id)
     },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-plus-circle" }),
-    /* @__PURE__ */ import_react.default.createElement("span", null, type === "more" ? import_utils.locales.getText("pisell2.text.shopping-cart.add.more") : import_utils.locales.getText("pisell2.text.shopping-cart.add.service"))
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: 6 } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-plus-circle" }), /* @__PURE__ */ import_react.default.createElement("span", null, type === "more" ? import_utils.locales.getText("pisell2.text.shopping-cart.add.more") : import_utils.locales.getText("pisell2.text.shopping-cart.add.service")))
   ) : null;
 };
 var useAddService_default = useAddService;

package/lib/components/shoppingCart/hooks/useClearCart.js

@@ -38,8 +38,8 @@ var import_materials = require("@pisell/materials");
 var import_useContext = require("./useContext");
 var import_utils = require("@pisell/utils");
 var useClearCart = (key) => {
-  const { state, updateState, onChange } = (0, import_useContext.useContext)();
-  const { isProductList, disabledEdit, holders } = state;
+  const { state, onChange } = (0, import_useContext.useContext)();
+  const { isProductList, disabledEdit, holders, isHideClearCart } = state;
   const handleClear = () => {
     let products = [...(state == null ? void 0 : state.products) || []];
     if (typeof key === "undefined") {
@@ -51,7 +51,7 @@ var useClearCart = (key) => {
       products = products.filter((item) => (item == null ? void 0 : item.holder_id) !== key);
     }
   };
-  return !disabledEdit && (holders == null ? void 0 : holders.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(
+  return !disabledEdit && (holders == null ? void 0 : holders.length) > 0 && !isHideClearCart ? /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: (0, import_classnames.default)("pisell-lowcode__shopping-cart-clear-btn", {

package/lib/components/shoppingCart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { shoppingCartProps } from './type';
-declare const shoppingCart: ({ onCard, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
+declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/lib/components/shoppingCart/index.js

@@ -40,6 +40,7 @@ var import_locales = __toESM(require("./locales"));
 import_utils.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
 var shoppingCart = ({
   onCard,
+  onAction,
   onChange,
   onAddProduct,
   onActiveKey,
@@ -50,6 +51,7 @@ var shoppingCart = ({
     {
       props,
       onCard,
+      onAction,
       onChange,
       onAddProduct,
       onActiveKey

package/lib/components/shoppingCart/status.js

@@ -42,7 +42,11 @@ var productDefault = {
   holders: [],
   products: [],
   isEdit: false,
-  disabledEdit: false
+  disabledEdit: false,
+  isShowChangeResource: false,
+  isShowChangeHolder: false,
+  isShowHolder: true,
+  isShowAddHolderButton: false
 };
 var defaultData = {
   isOpenGroup: true,