@pisell/private-materials 6.2.31 → 6.2.33

package/lib/plus/clinetSearch/index.js

@@ -85,8 +85,10 @@ var ClientSearch = (0, import_react.forwardRef)(
           import_InfiniteScroll.default,
           {
             dataLength: searchResults.length,
-            next: onLoadMore || (() => {
-            }),
+            next: () => {
+              console.log("loading more");
+              onLoadMore == null ? void 0 : onLoadMore();
+            },
             hasMore: hasMore || false,
             style: { width: "100%" },
             loader: /* @__PURE__ */ import_react.default.createElement(
@@ -101,7 +103,8 @@ var ClientSearch = (0, import_react.forwardRef)(
               import_utils.locales.getText("pisell2.text.loading")
             ),
             endMessage: /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", color: "#999" } }, (searchResults == null ? void 0 : searchResults.length) ? import_utils.locales.getText("pisell2.text.no-more-data") : null),
-            scrollableTarget: "client-search_infinite-scroll"
+            scrollableTarget: "client-search_infinite-scroll",
+            scrollThreshold: "180px"
           },
           /* @__PURE__ */ import_react.default.createElement(
             import_antd.List,
@@ -167,10 +170,6 @@ var ClientSearch = (0, import_react.forwardRef)(
       handleModalCancel();
     };
     (0, import_react.useImperativeHandle)(ref, () => ({
-      setSearchKeyword: (keyword) => {
-        var _a2, _b2;
-        (_b2 = (_a2 = comprehensiveSearchRef.current) == null ? void 0 : _a2.setSearchKeyword) == null ? void 0 : _b2.call(_a2, keyword);
-      },
       resetScrollPosition: () => {
         if (scrollContainerRef.current) {
           scrollContainerRef.current.scrollTop = 0;

package/lib/plus/clinetSearch/index.less

@@ -26,6 +26,10 @@
     padding-right: 16px;
     color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
+    word-break: keep-all;
+    overflow: hidden;
+    word-wrap: normal;
+    text-overflow: ellipsis;
   }
 }
 

package/lib/plus/noteModal/AddTempModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTempModal: ({ open, onCancel, onConfirm, }: {
     open: boolean;

package/lib/pro/comprehensiveSearch/index.d.ts

@@ -1,9 +1,7 @@
 import React from 'react';
 import type { ComprehensiveSearchProps, SearchResult } from './types';
 import './index.less';
-export declare type ComprehensiveSearchRef = {
-    setSearchKeyword: (keyword: string) => void;
-};
+export declare type ComprehensiveSearchRef = {};
 declare const ComprehensiveSearch: React.ForwardRefExoticComponent<ComprehensiveSearchProps & React.RefAttributes<ComprehensiveSearchRef>>;
 export default ComprehensiveSearch;
 export type { ComprehensiveSearchProps, SearchResult };

package/lib/pro/comprehensiveSearch/index.js

@@ -37,10 +37,10 @@ var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_icon = require("@pisell/icon");
 var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_useTerminalPeripherals = __toESM(require("./hooks/useTerminalPeripherals"));
 var import_useNativeScanner = __toESM(require("./hooks/useNativeScanner"));
-var import_camera = __toESM(require("./camera.svg"));
 var import_locales = __toESM(require("./locales"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
@@ -64,14 +64,19 @@ var ComprehensiveSearch = (0, import_react.forwardRef)(
     resultSort = "asc",
     style,
     loading,
-    onSearchTextChange,
+    keyword,
+    onKeywordChange,
     onSearch,
     onAdd,
     onRowClick,
     ...props
   }, ref) => {
     var _a, _b, _c;
-    const [searchValue, setSearchValue] = (0, import_react.useState)("");
+    const [searchValue, setSearchValue] = (0, import_ahooks.useControllableValue)({
+      value: keyword,
+      onChange: onKeywordChange,
+      defaultValue: ""
+    });
     const { peripheralsStatus } = (0, import_useTerminalPeripherals.default)();
     const { activeNativeScanner, isTerminal } = (0, import_useNativeScanner.default)();
     const context = (0, import_useEngineContext.default)();
@@ -79,18 +84,6 @@ var ComprehensiveSearch = (0, import_react.forwardRef)(
       import_locales.default,
       ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
     );
-    async function checkCameraAvailability() {
-      try {
-        const devices = await navigator.mediaDevices.enumerateDevices();
-        const hasCamera = devices.some(
-          (device) => device.kind === "videoinput"
-        );
-        return hasCamera;
-      } catch (err) {
-        console.error("Error checking camera availability:", err);
-      }
-      return false;
-    }
     const handleSearch = async () => {
       try {
         await (onSearch == null ? void 0 : onSearch(searchValue));
@@ -100,7 +93,6 @@ var ComprehensiveSearch = (0, import_react.forwardRef)(
     const handleInputChange = (e) => {
       const value = e.target.value;
       setSearchValue(value);
-      onSearchTextChange == null ? void 0 : onSearchTextChange(value);
     };
     const handleAdd = () => {
       onAdd == null ? void 0 : onAdd();
@@ -148,11 +140,7 @@ var ComprehensiveSearch = (0, import_react.forwardRef)(
         }
       )), isShowSearchButton && /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__search-button-wrapper" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", onClick: handleSearch, loading }, import_utils.locales.getText("pisell2.text.search")))));
     };
-    (0, import_react.useImperativeHandle)(ref, () => ({
-      setSearchKeyword: (keyword) => {
-        setSearchValue(keyword);
-      }
-    }));
+    (0, import_react.useImperativeHandle)(ref, () => ({}));
     const renderResults = () => {
       if (import_react.default.isValidElement(resultDisplay)) {
         return resultDisplay;
@@ -218,12 +206,13 @@ var ComprehensiveSearch = (0, import_react.forwardRef)(
         import_antd.Button,
         {
           className: "comprehensive-search__new-button",
-          onClick: handleAdd
+          onClick: handleAdd,
+          type: "primary"
         },
         newButtonText || import_utils.locales.getText("pisell2.text.new-client"),
         /* @__PURE__ */ import_react.default.createElement(import_icon.PlusCircle, { style: { fontSize: 20 } })
       );
-      const iconGroup = /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__icon-group" }, isShowScanner && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-Scanner" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator((peripheralsStatus == null ? void 0 : peripheralsStatus.scanner) === "connected"))), isShowNFC && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-NFC" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator((peripheralsStatus == null ? void 0 : peripheralsStatus.nfc) === "connected"))), isShowCamera && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement("img", { src: import_camera.default }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator(isTerminal))));
+      const iconGroup = /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__icon-group" }, isShowScanner && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-Scanner" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator((peripheralsStatus == null ? void 0 : peripheralsStatus.scanner) === "connected"))), isShowNFC && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-NFC" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator((peripheralsStatus == null ? void 0 : peripheralsStatus.nfc) === "connected"))), isShowCamera && /* @__PURE__ */ import_react.default.createElement("span", { className: "comprehensive-search__icon-button" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-camera" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "status-indicator" }, stautsIndicator(isTerminal))));
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__third" }, newButtonAlign === "left" ? newButton : newButtonAlign === "right" ? iconGroup : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__third" }, newButtonAlign === "center" ? newButton : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__third" }, newButtonAlign === "left" ? iconGroup : newButtonAlign === "right" ? newButton : iconGroup));
     };
     const renderContent = () => /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search", style, ...props }, /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__top-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__top-row" }, getTopRowLayout())), renderSearchSection(), /* @__PURE__ */ import_react.default.createElement("div", { className: "comprehensive-search__results-container" }, renderResults()));

package/lib/pro/comprehensiveSearch/index.less

@@ -37,12 +37,7 @@
     line-height: 20px;
     word-wrap: break-word;
     height: 40px;
-    color: #6941c6;
-    border-color: #e9d7fe;
-
-    &:hover {
-      background-color: #f9f5ff;
-    }
+    color: #fff;
   }
 
   &__icon-group {

package/lib/pro/comprehensiveSearch/types.d.ts

@@ -20,7 +20,8 @@ export interface ComprehensiveSearchProps {
     sortBy?: string;
     style?: React.CSSProperties;
     loading?: boolean;
-    onSearchTextChange?: (value: string) => void;
+    keyword?: string;
+    onKeywordChange?: (value: string) => void;
     onSearch?: (value: string) => void;
     onAdd?: () => void;
     onDataChange?: (data: any) => void;

package/lib/pro/skuDetailModal/index.js

@@ -198,6 +198,12 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     setDiscounts([]);
     setShowPriceAdjustModal(false);
   };
+  const coverText = (0, import_react.useMemo)(() => {
+    var _a2;
+    const title = ((_a2 = productData == null ? void 0 : productData.title) == null ? void 0 : _a2.trim()) || "";
+    if (!title) return "";
+    return Array.from(title).slice(0, 2).join("");
+  }, [productData == null ? void 0 : productData.title]);
   if (!productData) return null;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
@@ -212,7 +218,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
       width: 880,
       className: "pisell-sku-detail-modal"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-content-main" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-left" }, productData.cover ? /* @__PURE__ */ import_react.default.createElement("div", { className: "product-image" }, /* @__PURE__ */ import_react.default.createElement("img", { src: productData.cover || "" })) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "product-actions" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-content-main" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "product-image" }, productData.cover ? /* @__PURE__ */ import_react.default.createElement("img", { src: productData.cover || "" }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "product-cover-text" }, coverText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "product-actions" }, /* @__PURE__ */ import_react.default.createElement(
       import_materials.Button,
       {
         size: "large",
@@ -260,7 +266,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
         danger: true,
         size: "large",
         icon: /* @__PURE__ */ import_react.default.createElement(import_Delete_wght300_24px.default, { style: { fontSize: 20 } }),
-        className: "remove-btn",
+        className: "sku-detail-content-footer-remove-btn",
         onClick: handleRemove
       },
       import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.remove")
@@ -269,12 +275,22 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
       {
         type: "default",
         size: "large",
-        onClick: handleManualPriceChange
+        onClick: handleManualPriceChange,
+        className: "sku-detail-content-footer-price-btn"
       },
-      import_utils.locales.getText(
+      /* @__PURE__ */ import_react.default.createElement("span", { className: "sku-detail-content-footer-price-btn-text" }, import_utils.locales.getText(
         "pisell2.text.sku.detail.modal.btn.manual.price.change"
-      )
-    ), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", size: "large", onClick: handleConfirm }, import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm"))))),
+      ))
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Button,
+      {
+        type: "primary",
+        size: "large",
+        onClick: handleConfirm,
+        className: "sku-detail-content-footer-confirm-btn"
+      },
+      import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm")
+    )))),
     noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
       import_noteModal.default,
       {

package/lib/pro/skuDetailModal/index.less

@@ -34,6 +34,20 @@
       object-fit: cover;
       background: lightgray 50% / cover no-repeat;
     }
+
+    .product-cover-text {
+      width: 100%;
+      height: 100%;
+      background-color: #dedede;
+      color: #747474;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 40px;
+      font-weight: 600;
+      line-height: 1;
+      user-select: none;
+    }
   }
 
   .product-actions {
@@ -44,6 +58,7 @@
 
     .add-note-btn {
       width: 100%;
+      height: 48px;
     }
   }
 
@@ -199,10 +214,35 @@
     align-items: center;
     justify-content: space-between;
 
+    .sku-detail-content-footer-remove-btn {
+      width: 120px;
+      height: 48px;
+    }
+
     .modal-actions {
       display: flex;
       gap: 8px;
       justify-content: flex-end;
+
+      .sku-detail-content-footer-price-btn {
+        width: 140px;
+        height: 48px;
+
+        .sku-detail-content-footer-price-btn-text {
+          width: 100%;
+          text-align: center;
+          // 支持换行显示
+          white-space: wrap;
+          font-size: 16px;
+          font-weight: 400;
+          line-height: 20px;
+        }
+      }
+
+      .sku-detail-content-footer-confirm-btn {
+        width: 200px;
+        height: 48px;
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.2.31",
+  "version": "6.2.33",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/materials": "6.2.30",
-    "@pisell/utils": "3.0.0",
+    "@pisell/date-picker": "3.0.4",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.4"
+    "@pisell/materials": "6.2.32",
+    "@pisell/utils": "3.0.0"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/pro/comprehensiveSearch/camera.svg

@@ -1,4 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 12.5658C3 12.0404 3 11.7776 3.02193 11.5563C3.2334 9.4219 4.9219 7.7334 7.05632 7.52193C7.27762 7.5 7.55454 7.5 8.10838 7.5C8.32178 7.5 8.42848 7.5 8.51908 7.49451C9.67592 7.42445 10.6889 6.69432 11.1212 5.619C11.1551 5.53479 11.1867 5.43986 11.25 5.25C11.3133 5.06014 11.3449 4.96521 11.3788 4.881C11.8111 3.80568 12.8241 3.07555 13.9809 3.00549C14.0715 3 14.1716 3 14.3717 3H21.6283C21.8284 3 21.9285 3 22.0191 3.00549C23.1759 3.07555 24.1889 3.80568 24.6212 4.881C24.6551 4.96521 24.6867 5.06014 24.75 5.25C24.8133 5.43986 24.8449 5.53479 24.8788 5.619C25.3111 6.69432 26.3241 7.42445 27.4809 7.49451C27.5715 7.5 27.6782 7.5 27.8916 7.5C28.4455 7.5 28.7224 7.5 28.9437 7.52193C31.0781 7.7334 32.7666 9.4219 32.9781 11.5563C33 11.7776 33 12.0404 33 12.5658V24.3C33 26.8202 33 28.0804 32.5095 29.043C32.0781 29.8897 31.3897 30.5781 30.543 31.0095C29.5804 31.5 28.3202 31.5 25.8 31.5H10.2C7.67976 31.5 6.41965 31.5 5.45704 31.0095C4.61031 30.5781 3.9219 29.8897 3.49047 29.043C3 28.0804 3 26.8202 3 24.3V12.5658Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M18 24.75C21.3137 24.75 24 22.0637 24 18.75C24 15.4363 21.3137 12.75 18 12.75C14.6863 12.75 12 15.4363 12 18.75C12 22.0637 14.6863 24.75 18 24.75Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

package/lib/pro/comprehensiveSearch/camera.svg

@@ -1,4 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 12.5658C3 12.0404 3 11.7776 3.02193 11.5563C3.2334 9.4219 4.9219 7.7334 7.05632 7.52193C7.27762 7.5 7.55454 7.5 8.10838 7.5C8.32178 7.5 8.42848 7.5 8.51908 7.49451C9.67592 7.42445 10.6889 6.69432 11.1212 5.619C11.1551 5.53479 11.1867 5.43986 11.25 5.25C11.3133 5.06014 11.3449 4.96521 11.3788 4.881C11.8111 3.80568 12.8241 3.07555 13.9809 3.00549C14.0715 3 14.1716 3 14.3717 3H21.6283C21.8284 3 21.9285 3 22.0191 3.00549C23.1759 3.07555 24.1889 3.80568 24.6212 4.881C24.6551 4.96521 24.6867 5.06014 24.75 5.25C24.8133 5.43986 24.8449 5.53479 24.8788 5.619C25.3111 6.69432 26.3241 7.42445 27.4809 7.49451C27.5715 7.5 27.6782 7.5 27.8916 7.5C28.4455 7.5 28.7224 7.5 28.9437 7.52193C31.0781 7.7334 32.7666 9.4219 32.9781 11.5563C33 11.7776 33 12.0404 33 12.5658V24.3C33 26.8202 33 28.0804 32.5095 29.043C32.0781 29.8897 31.3897 30.5781 30.543 31.0095C29.5804 31.5 28.3202 31.5 25.8 31.5H10.2C7.67976 31.5 6.41965 31.5 5.45704 31.0095C4.61031 30.5781 3.9219 29.8897 3.49047 29.043C3 28.0804 3 26.8202 3 24.3V12.5658Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M18 24.75C21.3137 24.75 24 22.0637 24 18.75C24 15.4363 21.3137 12.75 18 12.75C14.6863 12.75 12 15.4363 12 18.75C12 22.0637 14.6863 24.75 18 24.75Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>