@pisell/pisellos 3.0.93 → 3.0.95

package/dist/modules/Cart/utils/changePrice.js

@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _item$_productOrigin, _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
+            var _item$_productOrigin$, _item$_productOrigin, _item$_origin, _targetProduct$varian, _ref, _targetVariant$price, _ref2, _targetVariant$base_p, _item$_productOrigin2, _bundle;
+            var item, targetProduct, cartProduct, productInfo, variantId, targetVariant, bundle, _productInfo$variant;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,10 +40,17 @@ function _updateAllCartItemPrice() {
                   if (!productInfo) {
                     productInfo = item._productOrigin;
                   }
-                  bundle = item._bundleOrigin;
-                  productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
-                  productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
+
+                  // 查找选择的规格id
+                  variantId = (_item$_productOrigin$ = item === null || item === void 0 || (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.product_variant_id;
+                  targetVariant = targetProduct === null || targetProduct === void 0 || (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (variant) {
+                    return Number(variant.id) === Number(variantId);
+                  });
+                  bundle = item._bundleOrigin; // productInfo.price = targetProduct?.price;
+                  // productInfo.base_price = targetProduct?.base_price;
+                  productInfo.price = (_ref = (_targetVariant$price = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.price) !== null && _targetVariant$price !== void 0 ? _targetVariant$price : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price) !== null && _ref !== void 0 ? _ref : productInfo.price;
+                  productInfo.base_price = (_ref2 = (_targetVariant$base_p = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.base_price) !== null && _targetVariant$base_p !== void 0 ? _targetVariant$base_p : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price) !== null && _ref2 !== void 0 ? _ref2 : productInfo.base_price;
+                  productInfo.product_variant_id = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -75,8 +82,8 @@ function _updateAllCartItemPrice() {
                   // 如果有返回variant，则把对应variant的数据也补充进去
                   if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
                     productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
-                      var _targetProduct$varian;
-                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
+                      var _targetProduct$varian2;
+                      var targetVariant = (_targetProduct$varian2 = targetProduct.variant) === null || _targetProduct$varian2 === void 0 ? void 0 : _targetProduct$varian2.find(function (m) {
                         return m.id === n.id;
                       });
                       if (targetVariant) {
@@ -99,7 +106,7 @@ function _updateAllCartItemPrice() {
                     bundle: bundle,
                     options: item._optionsOrigin
                   });
-                case 15:
+                case 17:
                 case "end":
                   return _context.stop();
               }

package/dist/modules/Holder/index.d.ts

@@ -0,0 +1,48 @@
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
+export * from './types';
+export * from './utils';
+export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private request;
+    private cacheId;
+    private openCache;
+    private fatherModule;
+    private isLoading;
+    private error;
+    /** 已加载过表单数据的 form_id 缓存标记 */
+    private loadedFormIds;
+    private window;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /** 统一提交 formMap，仅此处触发 store changed */
+    private commitFormMap;
+    /** 通知 UI 刷新（数据未变但需要 re-read 的场景） */
+    private notifyFormMapChanged;
+    getHolderFormMap(): HolderFormMap;
+    getHolderFormData(formId: number | string): IFormItemData | undefined;
+    setFormData(formId: number | string, data: Partial<IFormItemData>): void;
+    private ensureFormItem;
+    private hasFormData;
+    private patchFormMap;
+    fetchFormInfo(params: IFetchFormInfoParams): Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords(params: IFetchFormRecordsParams): Promise<any>;
+    ensureFormData(params: IEnsureFormDataParams): Promise<IFormItemData>;
+    ensureFormByProduct(params: IEnsureFormByProductParams): Promise<IFormItemData | null>;
+    addFormRecord(params: IAddFormRecordParams): Promise<any>;
+    /**
+     * UI 层自行请求添加接口后，将返回记录合并到 holderMap 对应 form_id 的 records 中
+     */
+    appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
+    removeFormRecord(formId: number | string, formRecordId: number): void;
+    clearFormData(formId?: number | string): void;
+    /**
+     * 登录后按当前 holderMap 批量刷新所有表单的 records。
+     * 遍历 holderMap，从 form.form 中读取 form_id、shop_id，结合 customer_id 重新拉取记录。
+     */
+    refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
+    storeChange(path?: string): void;
+}