@pisell/private-materials 3.0.119 → 3.0.121

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

@@ -37,6 +37,8 @@ __export(utils_exports, {
   calcCalendarDataByTimeSlots: () => calcCalendarDataByTimeSlots,
   calcMinTimeMaxTimeBySchedules: () => calcMinTimeMaxTimeBySchedules,
   calcScheduleDateRange: () => calcScheduleDateRange,
+  formatScheduleData: () => formatScheduleData,
+  formatScheduleListByTabs: () => formatScheduleListByTabs,
   formatScheduleResult: () => formatScheduleResult,
   getDaysByStartEnd: () => getDaysByStartEnd,
   isAllDay: () => isAllDay
@@ -540,6 +542,100 @@ var calcMinTimeMaxTimeBySchedules = (schedules, scheduleAllMap, selectDate) => {
     };
   }, {});
 };
+var formatScheduleData = (relation, table_type, item_type, isExcluded) => {
+  const _relation = relation || [];
+  if (table_type && item_type && isExcluded) {
+    return _relation.find((item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) !== item_type);
+  }
+  if (table_type && item_type) {
+    return _relation.find((item) => (item == null ? void 0 : item.relation_table_type) === table_type && (item == null ? void 0 : item.item_type) === item_type);
+  }
+  if (table_type) {
+    return _relation.some((item) => (item == null ? void 0 : item.relation_table_type) === table_type);
+  }
+  if (item_type) {
+    return _relation.find((item) => (item == null ? void 0 : item.item_type) === item_type);
+  }
+};
+var formatScheduleListByTabs = (list, filterItem) => {
+  let _list = list || [];
+  if (filterItem) {
+    _list = _list.filter(filterItem);
+  }
+  let categoryObject = {
+    // 全部
+    all: {
+      id: 0,
+      name: import_utils.locales.getText("pisell2.schedule.tab.all"),
+      products: _list
+    },
+    //  附加费
+    surcharge: {
+      id: 1,
+      name: import_utils.locales.getText("pisell2.schedule.tab.surcharge"),
+      products: []
+    },
+    // 资源
+    resources: {
+      id: 2,
+      name: import_utils.locales.getText("pisell2.schedule.tab.resources"),
+      products: []
+    },
+    // 商品
+    products: {
+      id: 3,
+      name: import_utils.locales.getText("pisell2.schedule.tab.products"),
+      products: []
+    },
+    // 活动
+    events: {
+      id: 4,
+      name: import_utils.locales.getText("pisell2.schedule.tab.events"),
+      products: []
+    },
+    // 报价单
+    quotation: {
+      id: 5,
+      name: import_utils.locales.getText("pisell2.schedule.tab.quotation"),
+      products: []
+    },
+    // 营业时间
+    "open-hours": {
+      id: 6,
+      name: import_utils.locales.getText("pisell2.schedule.tab.open-hours"),
+      products: []
+    }
+  };
+  for (let i = 0; i < _list.length; i++) {
+    const productItem = _list[i];
+    const _relation = productItem.relation || [];
+    if (formatScheduleData(_relation, "custom_surcharge")) {
+      categoryObject.surcharge.products.push(productItem);
+    }
+    if (formatScheduleData(_relation, "form", "opening_hours", true)) {
+      categoryObject.resources.products.push(productItem);
+    }
+    if (formatScheduleData(_relation, "product")) {
+      categoryObject.products.products.push(productItem);
+    }
+    if (formatScheduleData(_relation, "product", "event_item")) {
+      categoryObject.events.products.push(productItem);
+    }
+    if (formatScheduleData(_relation, "shelf", "quotation")) {
+      categoryObject.quotation.products.push(productItem);
+    }
+    if (formatScheduleData(_relation, "", "opening_hours")) {
+      categoryObject["open-hours"].products.push(productItem);
+    }
+  }
+  Object.keys(categoryObject).forEach((cur) => {
+    var _a, _b;
+    if (((_b = (_a = categoryObject == null ? void 0 : categoryObject[cur]) == null ? void 0 : _a.products) == null ? void 0 : _b.length) === 0) {
+      delete categoryObject[cur];
+    }
+  });
+  return Object.values(categoryObject);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcCalendarDataByDesignation,
@@ -550,6 +646,8 @@ var calcMinTimeMaxTimeBySchedules = (schedules, scheduleAllMap, selectDate) => {
   calcCalendarDataByTimeSlots,
   calcMinTimeMaxTimeBySchedules,
   calcScheduleDateRange,
+  formatScheduleData,
+  formatScheduleListByTabs,
   formatScheduleResult,
   getDaysByStartEnd,
   isAllDay

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

@@ -57,6 +57,13 @@ export declare type ScheduleItem = {
     /** 是否全天 */
     is_all: 1 | 0;
     [key: string]: any;
+    relation?: {
+        id: number;
+        item_id: number;
+        item_type: string;
+        relation_table_type: string;
+        schedule_id: number;
+    }[];
 };
 export declare type ScheduleFormOtherValue = {
     /** 截止模式

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

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 export interface TabProductProps {
     list?: any[];
     scrollDom?: string;
@@ -10,6 +10,7 @@ export interface TabProductProps {
     listWrapClassName?: string;
     warpClassName?: string;
     stickyTop?: number;
+    name?: string | number;
 }
 declare const TabProduct: (props: TabProductProps) => React.JSX.Element;
 export default TabProduct;

package/lib/components/tabProduct/index.js

@@ -38,6 +38,7 @@ var import_card = __toESM(require("./card"));
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var io = null;
+var tabsHeight = 92;
 var TabProduct = (props) => {
   const {
     list = [],
@@ -48,7 +49,8 @@ var TabProduct = (props) => {
     listWrapClassName,
     renderItem,
     warpClassName,
-    stickyTop = 0
+    stickyTop = 0,
+    name
   } = props;
   const tabsRef = (0, import_react.useRef)();
   const [current, setCurrent] = (0, import_react.useState)(1);
@@ -59,18 +61,24 @@ var TabProduct = (props) => {
     }
   }, [list]);
   const handleObserver = () => {
+    var _a;
+    const domHeight = scrollDom ? ((_a = document.querySelector(scrollDom)) == null ? void 0 : _a.clientHeight) || window.innerHeight : window.innerHeight;
+    const marginTop = `-${tabsHeight}px`;
+    const marginBottom = `-${domHeight - tabsHeight - 10}px`;
     io = new IntersectionObserver(
       (entries) => {
-        var _a, _b, _c, _d;
+        var _a2, _b, _c, _d;
         console.log(entries);
         if (entries[0].isIntersecting) {
-          const [name, id] = (_c = (_b = (_a = entries[0]) == null ? void 0 : _a.target) == null ? void 0 : _b.id) == null ? void 0 : _c.split("-");
+          const [name2, id] = (_c = (_b = (_a2 = entries[0]) == null ? void 0 : _a2.target) == null ? void 0 : _b.id) == null ? void 0 : _c.split("-");
           setCurrent(Number(id));
           (_d = tabsRef == null ? void 0 : tabsRef.current) == null ? void 0 : _d.scroll(id);
         }
       },
       {
-        root: scrollDom ? document.querySelector(scrollDom) : null
+        root: scrollDom ? document.querySelector(scrollDom) : null,
+        rootMargin: `${marginTop} 0px ${marginBottom}`
+        // threshold: 0.5,
         // rootMargin: ,
       }
     );
@@ -105,7 +113,7 @@ var TabProduct = (props) => {
       import_card.default,
       {
         className: (0, import_classnames.default)("tabs", tabsWrapClassName),
-        id: "product-category"
+        id: `${name || "product"}-category`
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_tabs.default,
@@ -114,11 +122,12 @@ var TabProduct = (props) => {
           options: list,
           rowKey,
           tab: current,
+          name,
           onChange: (e) => {
             const dom = document == null ? void 0 : document.querySelector("#list-" + e);
             const main = document == null ? void 0 : document.querySelector(scrollDom || "");
             if (dom && main) {
-              main.scrollTop = dom.offsetTop - 40;
+              main.scrollTop = dom.offsetTop - 42;
             }
             handleUnObserver();
             setCurrent(e);

package/lib/components/tabProduct/tabs/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 export interface Com<T> extends React.FC<T> {
 }
 export declare type RowKey = string | number;
@@ -7,7 +7,7 @@ export interface Option {
     id: number | string;
     name: React.ReactNode;
 }
-export interface TabsProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "onChange"> {
+export interface TabsProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'onChange'> {
     renderTab: (item: any) => React.ReactNode;
     rowKey: RowKey;
     name: RowKey;

package/lib/components/tabProduct/tabs/index.js

@@ -63,9 +63,13 @@ var Tabs = ({ renderTab, rowKey, name = "tabs-", onChange, tab, className, optio
       calculateWidth();
     }
   }, [options]);
+  const _id = (0, import_react.useMemo)(() => {
+    const _id2 = name ? `pisell-${name}-tabs` : "pisell-tabs";
+    return _id2;
+  }, [name]);
   const calculateWidth = () => {
-    const content2 = document.querySelector("#pisell-tabs");
-    const itemList = document.querySelector("#pisell-tabs-content");
+    const content2 = document.querySelector(`#${_id}`);
+    const itemList = document.querySelector(`#${_id}-content`);
     if ((itemList == null ? void 0 : itemList.offsetWidth) + 60 < (content2 == null ? void 0 : content2.offsetWidth)) {
       setIsShowButton(false);
     }
@@ -98,7 +102,7 @@ var Tabs = ({ renderTab, rowKey, name = "tabs-", onChange, tab, className, optio
     debounceChange.run({ current, total });
   };
   const setTabScroll = (val) => {
-    let dom = document.querySelector("#pisell-tabs-content");
+    let dom = document.querySelector(`#${_id}-content`);
     console.log("domdom", dom);
     if (!dom) {
       return;
@@ -106,7 +110,7 @@ var Tabs = ({ renderTab, rowKey, name = "tabs-", onChange, tab, className, optio
     dom.scrollLeft = val;
   };
   const onPageChange = (type) => {
-    let dom = document.querySelector("#pisell-tabs-content");
+    let dom = document.querySelector(`#${_id}-content`);
     if (!dom) {
       return;
     }
@@ -150,7 +154,7 @@ var Tabs = ({ renderTab, rowKey, name = "tabs-", onChange, tab, className, optio
       "div",
       {
         className: "pisell-tabs-content",
-        id: "pisell-tabs-content",
+        id: `${_id}-content`,
         onScroll
       },
       _options.map((d, i) => {
@@ -172,6 +176,6 @@ var Tabs = ({ renderTab, rowKey, name = "tabs-", onChange, tab, className, optio
       })
     );
   }, [_options, rowKey, name, tab]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-tabs", className), id: "pisell-tabs" }, isShowButton && leftBtn, content, isShowButton && rightBtn);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-tabs", className), id: _id }, isShowButton && leftBtn, content, isShowButton && rightBtn);
 };
 var tabs_default = (0, import_react.forwardRef)(Tabs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.119",
+  "version": "3.0.121",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.97",
     "@pisell/utils": "1.0.28",
-    "@pisell/materials": "3.0.38"
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.0.38",
+    "@pisell/date-picker": "1.0.97"
   },
   "peerDependencies": {
     "react": "^18.0.0",