@pisell/materials 6.11.107 → 6.11.108

package/es/components/buttonGroupPreview/index.js

@@ -66,6 +66,7 @@ var ButtonGroupPreview = /*#__PURE__*/forwardRef(function (props, ref) {
       var btnProps = _objectSpread(_objectSpread({}, buttonProps), props.updateButtonProps);
       var children = btnProps.children,
         dropdownButtonProps = _objectWithoutProperties(btnProps, _excluded);
+      var moreButtonChildren = children !== null && children !== void 0 ? children : dropdownButtonProps.icon ? null : /*#__PURE__*/React.createElement(MoreOutlined, null);
       return isMore ? /*#__PURE__*/React.createElement(Dropdown, {
         menu: {
           items: menuData
@@ -73,7 +74,7 @@ var ButtonGroupPreview = /*#__PURE__*/forwardRef(function (props, ref) {
         trigger: ['click']
       }, /*#__PURE__*/React.createElement(Button, _extends({
         key: id
-      }, dropdownButtonProps), children !== null && children !== void 0 ? children : /*#__PURE__*/React.createElement(MoreOutlined, null))) : /*#__PURE__*/React.createElement(Button, _extends({
+      }, dropdownButtonProps), moreButtonChildren)) : /*#__PURE__*/React.createElement(Button, _extends({
         key: id
       }, btnProps));
     }));

package/es/components/pisellFind/index.js

@@ -1,15 +1,27 @@
-var _excluded = ["triggerType", "buttonText", "placeholder", "showConfirmButton", "showHistory", "historyKey"];
+var _excluded = ["triggerType", "buttonText", "placeholder", "showConfirmButton", "showHistory", "historyKey", "enableScanner", "onScannerData", "onSearch"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
 import { locales as utilsLocales } from '@pisell/utils';
 import { PisellLookup } from "../pisellLookup";
+import useEngineContext from "../../hooks/useEngineContext";
 import { getText } from "../../locales";
 
+/**
+ * 原生扫码事件名，对齐宿主端约定。
+ */
+export var SCAN_RESULT_EVENT = 'nativeScanResult';
+
+/**
+ * 扫码枪回传数据（对齐宿主 ScanResultPayload）
+ * - code: 条码标识（如条码格式 / 业务字段）
+ * - data: 扫描得到的字符串值（写入输入框的内容）
+ */
+
 /**
  * PisellFind Props
- * 继承 PisellLookup 的所有 Props
+ * 继承 PisellLookup 的所有 Props，并扩展扫码枪监听相关字段。
  */
 
 /**
@@ -20,31 +32,27 @@ import { getText } from "../../locales";
 /**
  * PisellFind 组件
  * 基于 PisellLookup 的组件内查找优化版本
- * 
+ *
  * 核心特点：
  * - 默认使用 button 触发器
  * - 默认不显示确认按钮（输入即搜索）
  * - 默认开启搜索历史
  * - 默认不展示结果区（结果在页面其他位置展示）
- * 
+ * - 通过 `enableScanner` 接入扫码枪：使用宿主 `app.pubsub.subscribe(SCAN_RESULT_EVENT, ...)`，
+ *   每次扫码直接覆盖输入框内容并触发 onSearch / onScannerData；切回 false 时自动 unsubscribe。
+ *
  * @example
  * ```tsx
- * // 基础用法
- * <PisellFind
- *   onSearch={(keyword) => {
- *     const filtered = data.filter(item => item.name.includes(keyword));
- *     setFilteredData(filtered);
- *   }}
- * />
- * 
- * // 切换为 Input 模式
  * <PisellFind
  *   triggerType="input"
+ *   enableScanner={isActive}
+ *   onScannerData={(payload) => console.log('scan:', payload.data)}
  *   onSearch={(keyword) => filterData(keyword)}
  * />
  * ```
  */
 export var PisellFind = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _engineContext$appHel;
   var _props$triggerType = props.triggerType,
     triggerType = _props$triggerType === void 0 ? 'button' : _props$triggerType,
     _props$buttonText = props.buttonText,
@@ -65,17 +73,105 @@ export var PisellFind = /*#__PURE__*/forwardRef(function (props, ref) {
     showHistory = _props$showHistory === void 0 ? true : _props$showHistory,
     _props$historyKey = props.historyKey,
     historyKey = _props$historyKey === void 0 ? 'pisell_find_history' : _props$historyKey,
+    _props$enableScanner = props.enableScanner,
+    enableScanner = _props$enableScanner === void 0 ? false : _props$enableScanner,
+    onScannerData = props.onScannerData,
+    onSearch = props.onSearch,
     restProps = _objectWithoutProperties(props, _excluded);
+  var lookupRef = useRef(null);
+
+  /** 透传给监听回调的最新引用，避免回调闭包 stale */
+  var onScannerDataRef = useRef(onScannerData);
+  var onSearchRef = useRef(onSearch);
+  useEffect(function () {
+    onScannerDataRef.current = onScannerData;
+  }, [onScannerData]);
+  useEffect(function () {
+    onSearchRef.current = onSearch;
+  }, [onSearch]);
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        var _lookupRef$current;
+        return (_lookupRef$current = lookupRef.current) === null || _lookupRef$current === void 0 ? void 0 : _lookupRef$current.open();
+      },
+      close: function close() {
+        var _lookupRef$current2;
+        return (_lookupRef$current2 = lookupRef.current) === null || _lookupRef$current2 === void 0 ? void 0 : _lookupRef$current2.close();
+      },
+      getKeyword: function getKeyword() {
+        var _lookupRef$current$ge, _lookupRef$current3;
+        return (_lookupRef$current$ge = (_lookupRef$current3 = lookupRef.current) === null || _lookupRef$current3 === void 0 ? void 0 : _lookupRef$current3.getKeyword()) !== null && _lookupRef$current$ge !== void 0 ? _lookupRef$current$ge : '';
+      },
+      setKeyword: function setKeyword(v) {
+        var _lookupRef$current4;
+        return (_lookupRef$current4 = lookupRef.current) === null || _lookupRef$current4 === void 0 ? void 0 : _lookupRef$current4.setKeyword(v);
+      }
+    };
+  }, []);
+
+  /** 通过 useEngineContext 拿到宿主 app（含 pubsub.subscribe / unsubscribe） */
+  var engineContext = useEngineContext();
+  /**
+   * 用 ref 稳定 getApp 引用：低代码环境下 engineContext 每次渲染可能返回新引用，
+   * 若把 getApp 直接放进 effect 依赖会导致频繁 unsubscribe/subscribe（甚至漏掉扫码事件）。
+   * effect 依赖只保留 enableScanner，运行时通过 ref 拿最新的 getApp。
+   */
+  var getAppRef = useRef(undefined);
+  getAppRef.current = typeof (engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.getApp) === 'function' ? engineContext.appHelper.utils.getApp : undefined;
+  useEffect(function () {
+    if (!enableScanner) return undefined;
+    var getApp = getAppRef.current;
+    if (typeof getApp !== 'function') return undefined;
+    var app = getApp();
+    var pubsub = app === null || app === void 0 ? void 0 : app.pubsub;
+    if (!pubsub || typeof pubsub.subscribe !== 'function') {
+      return undefined;
+    }
+
+    /**
+     * 监听回调：每次扫码直接覆盖输入框。
+     * ScanResultPayload: { code, data }，取 code 作为输入框值与搜索关键词。
+     * setKeyword 在受控模式下会触发外部 onChange；onSearch 需要显式触发以驱动后续搜索流程
+     * （受控模式下宿主一般只通过 onSearch 拿到新关键词，不会在 onChange 里再触发一次 onSearch，
+     *  因此这里不会产生重复请求。如需自定义合流，可绑定 onScannerData 自行处理）。
+     *
+     * 非法 payload（无 code 或 code 为空串）直接忽略，避免把输入框/搜索条件意外清空。
+     */
+    var onScan = function onScan(payload) {
+      var _lookupRef$current5, _onSearchRef$current, _onScannerDataRef$cur;
+      var data = payload === null || payload === void 0 ? void 0 : payload.data;
+      if (typeof data !== 'string' || data.length === 0) {
+        return;
+      }
+      (_lookupRef$current5 = lookupRef.current) === null || _lookupRef$current5 === void 0 || _lookupRef$current5.setKeyword(data);
+      (_onSearchRef$current = onSearchRef.current) === null || _onSearchRef$current === void 0 || _onSearchRef$current.call(onSearchRef, data);
+      (_onScannerDataRef$cur = onScannerDataRef.current) === null || _onScannerDataRef$cur === void 0 || _onScannerDataRef$cur.call(onScannerDataRef, payload);
+    };
+    try {
+      pubsub.subscribe(SCAN_RESULT_EVENT, onScan);
+    } catch (e) {
+      console.warn('[PisellFind] subscribe scanner failed:', e);
+      return undefined;
+    }
+    return function () {
+      try {
+        var _pubsub$unsubscribe;
+        (_pubsub$unsubscribe = pubsub.unsubscribe) === null || _pubsub$unsubscribe === void 0 || _pubsub$unsubscribe.call(pubsub, SCAN_RESULT_EVENT, onScan);
+      } catch (e) {
+        console.warn('[PisellFind] unsubscribe scanner failed:', e);
+      }
+    };
+  }, [enableScanner]);
   return /*#__PURE__*/React.createElement(PisellLookup, _extends({
-    ref: ref,
+    ref: lookupRef,
     triggerType: triggerType,
     buttonText: buttonText,
     placeholder: placeholder,
     showConfirmButton: showConfirmButton,
     showHistory: showHistory,
-    historyKey: historyKey
+    historyKey: historyKey,
+    onSearch: onSearch
   }, restProps));
 });
-
-// 显示名称
 PisellFind.displayName = 'PisellFind';

package/es/components/pisellFloorMapLayout/PisellFloorMapLayout.js

@@ -147,7 +147,12 @@ function PisellFloorMapLayoutInner(props, ref) {
     layoutPrefix: PREFIX,
     contentOffsetRef: contentOffsetRef,
     showDataSourceRecordFormBlock: showDataSourceRecordFormBlock,
-    focusViewportOnBoundsRef: focusViewportOnBoundsRef
+    focusViewportOnBoundsRef: focusViewportOnBoundsRef,
+    /**
+     * 网格显隐缓存与视口持久化共用同一命名空间，按业务/门店/平面图隔离；
+     * 与视口 `viewportPersistKey` 同源，避免换门店/平面图读到别家的网格偏好。
+     */
+    gridPersistNamespace: viewportPersistNamespace
   });
   var config = edit.config,
     currentCanvasId = edit.currentCanvasId,

package/es/components/pisellFloorMapLayout/hooks/useFloorMapEditState.js

@@ -53,12 +53,17 @@ var ZONE_PLACE_DEFAULT = {
   height: 160
 };
 var GRID_VIS_STORAGE_PREFIX = 'pisell-floor-map-layout.grid-visible';
-function getGridVisStorageKey(canvasId) {
-  return "".concat(GRID_VIS_STORAGE_PREFIX, ":").concat(canvasId);
+
+/**
+ * 网格显隐缓存 key：可选 `namespace`（通常拼自业务/门店/平面图，与视口 `viewportPersistNamespace`
+ * 同源）用于隔离不同场景。未传 namespace 时保持原 `prefix:canvasId`，向后兼容。
+ */
+function getGridVisStorageKey(canvasId, namespace) {
+  return namespace ? "".concat(GRID_VIS_STORAGE_PREFIX, ":").concat(namespace, ":").concat(canvasId) : "".concat(GRID_VIS_STORAGE_PREFIX, ":").concat(canvasId);
 }
-function readStoredGridVisible(canvasId) {
+function readStoredGridVisible(canvasId, namespace) {
   try {
-    var raw = localStorage.getItem(getGridVisStorageKey(canvasId));
+    var raw = localStorage.getItem(getGridVisStorageKey(canvasId, namespace));
     if (raw == null) return null;
     if (raw === '1') return true;
     if (raw === '0') return false;
@@ -67,21 +72,21 @@ function readStoredGridVisible(canvasId) {
     return null;
   }
 }
-function writeStoredGridVisible(canvasId, visible) {
+function writeStoredGridVisible(canvasId, visible, namespace) {
   try {
-    localStorage.setItem(getGridVisStorageKey(canvasId), visible ? '1' : '0');
+    localStorage.setItem(getGridVisStorageKey(canvasId, namespace), visible ? '1' : '0');
   } catch (_unused2) {
     // ignore localStorage failure (private mode / quota / sandbox)
   }
 }
 
 /** 与 props 同步 / dirty 基线一致：合并 localStorage 中的网格显隐偏好 */
-function normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp) {
+function normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp, namespace) {
   var baseConfig = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
   return _objectSpread(_objectSpread({}, baseConfig), {}, {
     canvases: baseConfig.canvases.map(function (canvas) {
       var _canvas$mapLayer;
-      var stored = readStoredGridVisible(canvas.id);
+      var stored = readStoredGridVisible(canvas.id, namespace);
       if (stored == null) return canvas;
       return _objectSpread(_objectSpread({}, canvas), {}, {
         mapLayer: _objectSpread(_objectSpread({}, (_canvas$mapLayer = canvas.mapLayer) !== null && _canvas$mapLayer !== void 0 ? _canvas$mapLayer : {}), {}, {
@@ -182,7 +187,8 @@ export function useFloorMapEditState(params) {
     layoutPrefix = params.layoutPrefix,
     contentOffsetRef = params.contentOffsetRef,
     showDataSourceRecordFormBlock = params.showDataSourceRecordFormBlock,
-    focusViewportOnBoundsRef = params.focusViewportOnBoundsRef;
+    focusViewportOnBoundsRef = params.focusViewportOnBoundsRef,
+    gridPersistNamespace = params.gridPersistNamespace;
   var scheduleFocusOnPlacements = useCallback(function (positions, sizes) {
     var _focusViewportOnBound;
     var box = getPlacementBoundingBox(positions, sizes);
@@ -244,7 +250,7 @@ export function useFloorMapEditState(params) {
       lastSyncedPropConfigRef.current = null;
       return;
     }
-    var nextConfig = normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp);
+    var nextConfig = normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp, gridPersistNamespace);
     var lastSynced = lastSyncedPropConfigRef.current;
     /**
      * 仅当「自上次 props 同步后用户又改过草稿」时拒绝覆盖：
@@ -279,16 +285,16 @@ export function useFloorMapEditState(params) {
         return c.id === prev;
       }) ? prev : (_enabled$0$id = (_enabled$ = enabled[0]) === null || _enabled$ === void 0 ? void 0 : _enabled$.id) !== null && _enabled$0$id !== void 0 ? _enabled$0$id : null;
     });
-    // replaceDraft 是稳定引用；故意只在上游 props 变时同步
+    // replaceDraft 是稳定引用；上游 props 或网格命名空间（切门店/平面图）变化时同步
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [floorMapConfigProp]);
+  }, [floorMapConfigProp, gridPersistNamespace]);
 
   /** 当前草稿与上游持久化 `floorMapConfig`（经同等规范化）是否不一致 */
   var isLayoutDirty = useMemo(function () {
     if (!isFloorMapView || !draftConfig || !floorMapConfigProp) return false;
-    var baseline = savedBaselineConfig !== null && savedBaselineConfig !== void 0 ? savedBaselineConfig : normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp);
+    var baseline = savedBaselineConfig !== null && savedBaselineConfig !== void 0 ? savedBaselineConfig : normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp, gridPersistNamespace);
     return !floorMapViewConfigsEqual(draftConfig, baseline);
-  }, [isFloorMapView, draftConfig, floorMapConfigProp, savedBaselineConfig]);
+  }, [isFloorMapView, draftConfig, floorMapConfigProp, savedBaselineConfig, gridPersistNamespace]);
 
   /**
    * 撤销/重做后：若选中的图元已不存在于新草稿（如撤回了刚复制/新建的元素），
@@ -732,11 +738,11 @@ export function useFloorMapEditState(params) {
       setSavedBaselineConfig(null);
       return;
     }
-    var nextConfig = normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp);
+    var nextConfig = normalizeFloorMapConfigWithStoredGrid(floorMapConfigProp, gridPersistNamespace);
     replaceDraft(nextConfig);
     lastSyncedPropConfigRef.current = nextConfig;
     setSavedBaselineConfig(null);
-  }, [floorMapConfigProp, replaceDraft]);
+  }, [floorMapConfigProp, replaceDraft, gridPersistNamespace]);
 
   /** 切换当前画布草稿中的 mapLayer.showGrid（随布局保存持久化） */
   var toggleDraftCanvasShowGrid = useCallback(function () {
@@ -747,7 +753,7 @@ export function useFloorMapEditState(params) {
           var _c$mapLayer;
           if (c.id !== currentCanvasId) return c;
           var nextShow = !Boolean((_c$mapLayer = c.mapLayer) === null || _c$mapLayer === void 0 ? void 0 : _c$mapLayer.showGrid);
-          writeStoredGridVisible(currentCanvasId, nextShow);
+          writeStoredGridVisible(currentCanvasId, nextShow, gridPersistNamespace);
           return _objectSpread(_objectSpread({}, c), {}, {
             mapLayer: _objectSpread(_objectSpread({}, c.mapLayer), {}, {
               showGrid: nextShow
@@ -756,7 +762,7 @@ export function useFloorMapEditState(params) {
         })
       });
     });
-  }, [currentCanvasId]);
+  }, [currentCanvasId, gridPersistNamespace]);
   var handleEditPanelUpdate = useCallback(function (patch) {
     if (!selectedId) return;
     var bindingPatch = patch.dataBinding;

package/es/components/pisellFloorMapLayout/shopFloorPlan/shopFloorPlanClient.js

@@ -24,9 +24,9 @@ function _fetchShopFloorPlanByCodeResponse() {
         case 0:
           _context7.next = 2;
           return http.get("/shop/schedule/floor-plan/code/".concat(encodeURIComponent(trimmedCode)), {}, _objectSpread({
-            fullResult: true,
-            isShopApi: true
+            fullResult: true
           }, (subscribe === null || subscribe === void 0 ? void 0 : subscribe.subscriberId) != null && subscribe.subscriberId !== '' ? _objectSpread({
+            isShopApi: true,
             abort: true,
             osServer: subscribe.osServer !== false,
             subscriberId: subscribe.subscriberId
@@ -63,8 +63,7 @@ export function createShopFloorPlanClient(options) {
           case 0:
             _context4.next = 2;
             return http.post('/shop/schedule/floor-plan', body, {
-              fullResult: true,
-              isShopApi: true
+              fullResult: true
             });
           case 2:
             res = _context4.sent;
@@ -266,8 +265,7 @@ export function createShopFloorPlanClient(options) {
             case 0:
               _context3.next = 2;
               return http.put("/shop/schedule/floor-plan/".concat(id), body, {
-                fullResult: true,
-                isShopApi: true
+                fullResult: true
               });
             case 2:
               res = _context3.sent;

package/es/components/pisellRecordBoard/layouts/GridLayout/Grid.js

@@ -217,8 +217,10 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
     }) : rawScrollX;
     if (scroll !== null && scroll !== void 0 && scroll.autoCalc && typeof ctx.scrollAreaHeight === 'number') {
       var wrapHeight = ctx.scrollAreaHeight;
-      // 40：表头等固定占高；uniformSummaryHeight：同值列总结区动态高度，无总结时为 0, 24是 uniformSummary padding
-      var reservedHeight = 40 + uniformSummaryHeight + 24;
+      // 40：表头固定高；uniformSummaryHeight：同值列总结区高度（ResizeObserver 量出，仅 content-box，不含 padding/border）；
+      // 25：仅在确实展示 uniformSummary 时补回 padding 12*2 + 1px border-bottom（见 Grid.less .pisell-record-board-uniform-summary）。
+      // 无总结时不应再多扣，否则 Table 不能撑满 scroll-body，会在 Table 与底部分页之间留白。
+      var reservedHeight = 40 + (uniformSummaryHeight > 0 ? uniformSummaryHeight + 25 : 0);
       return {
         x: scrollX !== null && scrollX !== void 0 ? scrollX : sumColumnWidths,
         y: Math.max(wrapHeight - reservedHeight, 100),

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

@@ -5,7 +5,7 @@ import { Tag, Tooltip } from 'antd';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { _formatAmount } from "../packages/utils";
 import "./index.less";
-import { locales, formatAmountWithOptions } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import { PREFIX } from "../../index";
 var Footer = function Footer(_ref) {
   var _item$_origin;
@@ -20,17 +20,6 @@ var Footer = function Footer(_ref) {
     num = item.num,
     discount_reason = item.discount_reason;
   var weighingInfo = item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin._extend) === null || _item$_origin === void 0 ? void 0 : _item$_origin.weighing;
-  var formatFooterAmount = function formatFooterAmount(amount) {
-    var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-    if (!weighingInfo) {
-      return _formatAmount(amount, symbol, precision);
-    }
-    return formatAmountWithOptions(amount, symbol, {
-      precision: precision,
-      hideDecimalForWholeNumbers: false
-    });
-  };
-
   /**
    * @title: 折扣
    * @description:
@@ -76,7 +65,7 @@ var Footer = function Footer(_ref) {
     className: classNames("".concat(PREFIX, "__footer-price-wrap"), weighingInfo && "".concat(PREFIX, "__footer-price-wrap--weighing"))
   }, !isOnlyTotal ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(PREFIX, "__footer-price"))
-  }, /*#__PURE__*/React.createElement("span", null, formatFooterAmount(total)), tip ? /*#__PURE__*/React.createElement(Tooltip, {
+  }, /*#__PURE__*/React.createElement("span", null, _formatAmount(total, symbol)), tip ? /*#__PURE__*/React.createElement(Tooltip, {
     title: locales.getText(tip),
     destroyTooltipOnHide: true
   }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
@@ -88,6 +77,6 @@ var Footer = function Footer(_ref) {
     className: "".concat(PREFIX, "__footer-total")
   }, isDiscount ? /*#__PURE__*/React.createElement("span", {
     className: "".concat(PREFIX, "__footer-origin-total")
-  }, formatFooterAmount(origin_total * num)) : null, /*#__PURE__*/React.createElement("span", null, formatFooterAmount(total * num))))), renderDiscountReason());
+  }, _formatAmount(origin_total * num, symbol, 2)) : null, /*#__PURE__*/React.createElement("span", null, _formatAmount(total * num, symbol))))), renderDiscountReason());
 };
 export default Footer;

package/es/components/productCard/cartSkuCard/components/AmountFooter/index.less

@@ -23,9 +23,8 @@
   }
 
   &__footer-price-wrap--weighing {
-    font-size: var(--pisell-cart-sku-card-physical-text-height, 4mm);
-    line-height: 1.3;
-    letter-spacing: -0.02em;
+    font-size: 14px;
+    line-height: 20px;
   }
 
   &__footer-discount {

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

@@ -1,7 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { image as imageAli, formatAmount } from '@pisell/utils';
@@ -58,14 +54,11 @@ var BasicInfo = function BasicInfo(props) {
   var weighingInfo = dataSource === null || dataSource === void 0 || (_origin = dataSource._origin) === null || _origin === void 0 || (_origin = _origin._extend) === null || _origin === void 0 ? void 0 : _origin.weighing;
   var hasWeighingInfo = Boolean(weighingInfo && (Number.isFinite(Number(weighingInfo === null || weighingInfo === void 0 ? void 0 : weighingInfo.weight)) || Number.isFinite(Number(weighingInfo === null || weighingInfo === void 0 ? void 0 : weighingInfo.net_weight))));
   var hasProductMeta = hasSpecs || hasWeighingInfo;
-  var basicInfoClassName = classNames("".concat(PREFIX, "__basic-info"), _defineProperty({}, "".concat(PREFIX, "__basic-info--weighing"), hasWeighingInfo));
   var renderProductMeta = function renderProductMeta() {
     if (!hasProductMeta) {
       return null;
     }
-    return /*#__PURE__*/React.createElement("div", {
-      className: classNames("".concat(PREFIX, "__product-meta"), _defineProperty({}, "".concat(PREFIX, "__product-meta--weighing"), hasWeighingInfo))
-    }, hasWeighingInfo ? /*#__PURE__*/React.createElement(Weighing, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, hasWeighingInfo ? /*#__PURE__*/React.createElement(Weighing, {
       dataSource: weighingInfo,
       symbol: symbol
     }) : null, hasSpecs ? /*#__PURE__*/React.createElement(Specs, {
@@ -120,7 +113,7 @@ var BasicInfo = function BasicInfo(props) {
   }, [isShowOriginalPrice, origin_total, total, hasSpecs, hasWeighingInfo]);
   if (type === 'a5') {
     return /*#__PURE__*/React.createElement("div", {
-      className: basicInfoClassName,
+      className: "".concat(PREFIX, "__basic-info"),
       style: style || {}
     }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /*#__PURE__*/React.createElement("div", {
       style: {
@@ -143,7 +136,7 @@ var BasicInfo = function BasicInfo(props) {
     // 套餐列表中，如果没有规格，则显示总价
     var _price = showAmount ? Number(price !== null && price !== void 0 ? price : 0) * num : price;
     return /*#__PURE__*/React.createElement("div", {
-      className: basicInfoClassName,
+      className: "".concat(PREFIX, "__basic-info"),
       style: style || {}
     }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /*#__PURE__*/React.createElement("div", {
       style: {
@@ -164,7 +157,7 @@ var BasicInfo = function BasicInfo(props) {
     }, formatAmount(origin_total, 2, symbol)) : null)), renderProductMeta()), renderEdit));
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: basicInfoClassName,
+    className: "".concat(PREFIX, "__basic-info"),
     style: style || {}
   }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /*#__PURE__*/React.createElement("div", {
     style: {

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

@@ -151,14 +151,6 @@
       }
     }
 
-    &--weighing {
-      .product-info .product-name {
-        font-size: 18px;
-        line-height: 1.3;
-        letter-spacing: -0.01em;
-      }
-    }
-
     .product-info-a9, .product-info-a5 {
       display: flex;
       justify-content: space-between;

package/es/components/productCard/cartSkuCard/components/resources/index.less

@@ -15,6 +15,10 @@
     overflow: hidden;
     text-overflow: ellipsis;
     margin: 0;
+
+    .resource-icon {
+      margin-right: 2px;
+    }
   }
 
   &--title {

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

@@ -14,7 +14,11 @@ var Specs = function Specs(props) {
     product_option_string = dataSource.product_option_string,
     symbol = dataSource.symbol;
   var more = /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX, "__specs-more")
+    style: {
+      color: '#667085',
+      fontSize: 10,
+      lineHeight: '10px'
+    }
   }, locales.getText('pisell2.cart.sku-card.more'));
 
   /**

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

@@ -8,13 +8,6 @@
   word-wrap: break-word;
   overflow: hidden;
 
-  &-more {
-    color: #667085;
-    font-size: 10px;
-    line-height: 10px;
-    letter-spacing: normal;
-  }
-
   > div {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -44,26 +37,9 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-
-  .pisell-cart-sku-card__product-meta--weighing & {
-    .pisell-lowcode-packages-product-bundle-option {
-      font-size: var(--pisell-cart-sku-card-physical-text-height, 4mm);
-      line-height: 1.3;
-      letter-spacing: -0.04em;
-    }
-  }
-
   .option-string-wrap {
     .pisell-cart-sku-card__specs > div {
       white-space: normal;
     }
   }
 }
-
-.pisell-cart-sku-card__product-meta--weighing {
-  .pisell-cart-sku-card__specs {
-    font-size: var(--pisell-cart-sku-card-physical-text-height, 4mm);
-    line-height: 1.3;
-    letter-spacing: -0.04em;
-  }
-}

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

@@ -35,7 +35,6 @@ var Weighing = function Weighing(props) {
   var netLabel = locales.getText('pisell2.cart.sku-card.weighing.net');
   var unitPriceText = "".concat(symbol || '').concat(unit_price !== null && unit_price !== void 0 ? unit_price : '0.00');
   var manualPrefix = isManualWeight ? '(M) ' : '';
-  var netWeightText = "".concat(tareValue > 0 ? '' : manualPrefix).concat(formatWeight(net_weight, unit), " ").concat(netLabel);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__weighing")
   }, tareValue > 0 ? /*#__PURE__*/React.createElement("div", {
@@ -44,8 +43,6 @@ var Weighing = function Weighing(props) {
     className: "".concat(PREFIX, "__weighing-row ").concat(PREFIX, "__weighing-row--large")
   }, /*#__PURE__*/React.createElement("span", null, "".concat(tareLabel, ": ").concat(formatWeight(tare === null || tare === void 0 ? void 0 : tare.value, (tare === null || tare === void 0 ? void 0 : tare.unit) || unit)))) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__weighing-row ").concat(PREFIX, "__weighing-row--large")
-  }, /*#__PURE__*/React.createElement("span", null, netWeightText), /*#__PURE__*/React.createElement("span", {
-    className: "".concat(PREFIX, "__weighing-unit-price")
-  }, "@ ".concat(unitPriceText, "/").concat(unitLabel))));
+  }, /*#__PURE__*/React.createElement("span", null, "".concat(tareValue > 0 ? '' : manualPrefix).concat(formatWeight(net_weight, unit), " ").concat(netLabel, " @ ").concat(unitPriceText, "/").concat(unitLabel))));
 };
 export default Weighing;

package/es/components/productCard/cartSkuCard/components/weighing/index.less

@@ -23,13 +23,10 @@
     }
 
     &--large {
-      font-size: var(--pisell-cart-sku-card-physical-text-height, 4mm) !important;
-      line-height: 1.3;
-      letter-spacing: -0.04em;
+      font-size: 14px;
+      line-height: 20px;
       align-items: flex-start;
       flex-wrap: wrap;
-      column-gap: 2px;
-      row-gap: 0;
       overflow: visible;
       white-space: normal;
       text-overflow: clip;
@@ -43,9 +40,4 @@
       }
     }
   }
-
-  &-unit-price {
-    flex-shrink: 0;
-    white-space: nowrap !important;
-  }
 }

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

@@ -5,8 +5,6 @@
 }
 
 .pisell-cart-sku-card {
-  --pisell-cart-sku-card-physical-text-height: 30px;
-
   padding: 4px 8px 4px 4px;
   border-radius: inherit;
   user-select: none;