@pisell/private-materials 6.12.140 → 6.12.142

package/es/pro/skuDetailModal/flow/presets.d.ts

@@ -2,27 +2,7 @@ import { ResolveSelectionFlowSteps, SelectionFlowStepConfig } from "./types.js";
 
 //#region src/pro/skuDetailModal/flow/presets.d.ts
 /** 用户端：每项选择能力独立成一步。 */
-declare const customerSteps: readonly [{
-  readonly key: "date";
-  readonly title: "pisell2.text.sku.detail.modal.step.date";
-  readonly modules: readonly ["date"];
-}, {
-  readonly key: "sku";
-  readonly title: "pisell2.text.sku.detail.modal.step.sku";
-  readonly modules: readonly ["sku"];
-}, {
-  readonly key: "time";
-  readonly title: "pisell2.text.sku.detail.modal.step.time";
-  readonly modules: readonly ["time"];
-}, {
-  readonly key: "resource";
-  readonly title: "pisell2.text.sku.detail.modal.step.resource";
-  readonly modules: readonly ["resource"];
-}, {
-  readonly key: "holder";
-  readonly title: "pisell2.text.sku.detail.modal.step.holder";
-  readonly modules: readonly ["holder"];
-}];
+declare const customerSteps: readonly SelectionFlowStepConfig[];
 /** POS：先完成日期与 SKU，再合并其余预约模块。 */
 declare const posSteps: readonly SelectionFlowStepConfig<string>[];
 /**
@@ -31,27 +11,7 @@ declare const posSteps: readonly SelectionFlowStepConfig<string>[];
  */
 declare const resolvePosSelectionFlowSteps: ResolveSelectionFlowSteps;
 declare const selectionFlowPresets: {
-  readonly customer: readonly [{
-    readonly key: "date";
-    readonly title: "pisell2.text.sku.detail.modal.step.date";
-    readonly modules: readonly ["date"];
-  }, {
-    readonly key: "sku";
-    readonly title: "pisell2.text.sku.detail.modal.step.sku";
-    readonly modules: readonly ["sku"];
-  }, {
-    readonly key: "time";
-    readonly title: "pisell2.text.sku.detail.modal.step.time";
-    readonly modules: readonly ["time"];
-  }, {
-    readonly key: "resource";
-    readonly title: "pisell2.text.sku.detail.modal.step.resource";
-    readonly modules: readonly ["resource"];
-  }, {
-    readonly key: "holder";
-    readonly title: "pisell2.text.sku.detail.modal.step.holder";
-    readonly modules: readonly ["holder"];
-  }];
+  readonly customer: readonly SelectionFlowStepConfig<string>[];
   readonly pos: readonly SelectionFlowStepConfig<string>[];
 };
 type SelectionFlowPresetName = keyof typeof selectionFlowPresets;

package/lib/components/bigSale/components/ProductList/index.js

@@ -720,26 +720,30 @@ const BigSaleProductListInner = ({ isActive = true, osKey, productListPreference
 	* @example
 	* renderListItem(item, 0);
 	*/
-	const renderListItem = (0, ahooks.useMemoizedFn)((item, index) => usesV2ProductCard ? /* @__PURE__ */ react.default.createElement(require_ProductCardV2.default, {
-		key: item.id,
-		index,
-		item,
-		requiresOptions: !require_utils.isNormalProductByDurationSchedule(item),
-		value: phoneCartProductValues,
-		onChange: handlePhoneProductCardChange,
-		decorateConfig: v2ProductCardDecorateConfig
-	}) : /* @__PURE__ */ react.default.createElement(require_index.default, {
-		key: item.id,
-		index,
-		item,
-		onSelect: () => handleSelectProduct(item),
-		onSelectCover: () => handleSelectProduct(item),
-		onSelectInfo: () => handleSelectProduct(item),
-		isSelected: false,
-		selectionTrigger: productSelectionTrigger,
-		scenario: "booking2",
-		customSkuCardAllConfig: skuCardAllConfig
-	}));
+	const renderListItem = (0, ahooks.useMemoizedFn)((item, index) => {
+		const isBookingProduct = !require_utils.isNormalProductByDurationSchedule(item);
+		return usesV2ProductCard ? /* @__PURE__ */ react.default.createElement(require_ProductCardV2.default, {
+			key: item.id,
+			index,
+			item,
+			requiresOptions: isBookingProduct,
+			hideAction: isBookingProduct,
+			value: phoneCartProductValues,
+			onChange: handlePhoneProductCardChange,
+			decorateConfig: v2ProductCardDecorateConfig
+		}) : /* @__PURE__ */ react.default.createElement(require_index.default, {
+			key: item.id,
+			index,
+			item,
+			onSelect: () => handleSelectProduct(item),
+			onSelectCover: () => handleSelectProduct(item),
+			onSelectInfo: () => handleSelectProduct(item),
+			isSelected: false,
+			selectionTrigger: productSelectionTrigger,
+			scenario: "booking2",
+			customSkuCardAllConfig: skuCardAllConfig
+		});
+	});
 	const setPersistentSearchScrolling = (0, ahooks.useMemoizedFn)((isScrolling) => {
 		var _listWrapperRef$curre;
 		if (variant !== "phone" || !persistentSearch) return;

package/lib/plus/pisellSalesProductCard/index.js

@@ -52,7 +52,7 @@ function isNormalProduct(product) {
 	const requiresDetail = isEnabledProductFlag(productAny === null || productAny === void 0 ? void 0 : productAny.isOpenDetailModal) || isEnabledProductFlag(productAny === null || productAny === void 0 ? void 0 : productAny.open_sold_weight) || ["session_product", "session_ticket"].includes(String((productAny === null || productAny === void 0 ? void 0 : productAny.extension_type) || ""));
 	return !(hasOption || hasBundle || hasVariant || requiresDetail);
 }
-const PisellSalesProductCard = ({ product, requiresOptions = false, value, selectedQuantity: selectedQuantityProp, disabled = false, stepperProps, optionsText, skuCardConfig, cartElementId, style, className, onChange, onClick }) => {
+const PisellSalesProductCard = ({ product, requiresOptions = false, hideAction = false, value, selectedQuantity: selectedQuantityProp, disabled = false, stepperProps, optionsText, skuCardConfig, cartElementId, style, className, onChange, onClick }) => {
 	var _context$appHelper$ut, _product$price, _value$num, _stepperProps$min3, _stepperProps$step;
 	const context = require_useEngineContext.default();
 	_pisell_utils.locales.init(require_locales.default, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get("umi_locale")) || "en");
@@ -146,7 +146,7 @@ const PisellSalesProductCard = ({ product, requiresOptions = false, value, selec
 	}) : /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__image-placeholder` }, textCover)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__content` }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__title` }, title), /* @__PURE__ */ react.default.createElement(require_index$1.default, {
 		value: (_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0,
 		isMini: !!product.is_bundle
-	})), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__action` }, normalProduct ? /* @__PURE__ */ react.default.createElement("div", {
+	})), !hideAction ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__action` }, normalProduct ? /* @__PURE__ */ react.default.createElement("div", {
 		className: `${PREFIX}__stepper`,
 		onClick: (event) => event.stopPropagation(),
 		onPointerDown: (event) => event.stopPropagation(),
@@ -201,7 +201,7 @@ const PisellSalesProductCard = ({ product, requiresOptions = false, value, selec
 	}, optionsText || _pisell_utils.locales.getText("pisell2.text.options"), selectedQuantity > 0 ? /* @__PURE__ */ react.default.createElement("span", {
 		className: `${PREFIX}__options-button-badge`,
 		"aria-hidden": "true"
-	}, selectedQuantity) : null)))));
+	}, selectedQuantity) : null)) : null)));
 };
 //#endregion
 exports.default = PisellSalesProductCard;

package/lib/plus/productSelect/ProductCard/ProductCardV2.js

@@ -11,7 +11,7 @@ classnames = require_runtime.__toESM(classnames);
 * v2 卡片：复用 ProductCard 的结构能力（分类项 + IntersectionTrigger），
 * 商品项内部渲染 PisellSalesProductCard。
 */
-const ProductCardV2 = (0, react.memo)(({ item, index, context, className, value, onChange, decorateConfig = {}, cartElementId, requiresOptions = false }) => {
+const ProductCardV2 = (0, react.memo)(({ item, index, context, className, value, onChange, decorateConfig = {}, cartElementId, requiresOptions = false, hideAction = false }) => {
 	var _item$product_id, _ref2, _item$product_id2, _item$item_rule_limit, _item$item_rule_limit2, _item$item_rule_limit3, _item$item_rule_limit4, _item$item_rule_limit5, _item$item_rule_limit6;
 	const { __typename } = item;
 	if (__typename === "category") return /* @__PURE__ */ react.default.createElement("div", {
@@ -45,6 +45,7 @@ const ProductCardV2 = (0, react.memo)(({ item, index, context, className, value,
 		}),
 		product: item,
 		requiresOptions,
+		hideAction,
 		style: salesCardStyle,
 		stepperProps: {
 			min: item === null || item === void 0 || (_item$item_rule_limit = item.item_rule_limit) === null || _item$item_rule_limit === void 0 ? void 0 : _item$item_rule_limit.min,

package/lib/plus/saasDevice/appDevicePlanning/hooks/useDeviceLinking.js

@@ -39,6 +39,30 @@ const useDeviceLinking = ({ utils, onLinked, reloadDevices, setStoredIotDevice,
 							metadata: { error }
 						});
 					}
+					try {
+						var _app$plugins3, _app$plugins4, _app$plugins5;
+						yield app === null || app === void 0 || (_app$plugins3 = app.plugins) === null || _app$plugins3 === void 0 || (_app$plugins3 = _app$plugins3.get("mqtt")) === null || _app$plugins3 === void 0 ? void 0 : _app$plugins3.stopHeartbeat();
+						yield app === null || app === void 0 || (_app$plugins4 = app.plugins) === null || _app$plugins4 === void 0 || (_app$plugins4 = _app$plugins4.get("mqtt")) === null || _app$plugins4 === void 0 ? void 0 : _app$plugins4.disconnect();
+						yield app === null || app === void 0 || (_app$plugins5 = app.plugins) === null || _app$plugins5 === void 0 || (_app$plugins5 = _app$plugins5.get("mqtt")) === null || _app$plugins5 === void 0 ? void 0 : _app$plugins5.clearCredentials();
+					} catch (error) {
+						var _app$logger2;
+						app === null || app === void 0 || (_app$logger2 = app.logger) === null || _app$logger2 === void 0 || _app$logger2.addLog({
+							type: "error",
+							title: "销毁老的mqtt失败",
+							metadata: { error }
+						});
+					}
+					try {
+						var _app$plugins6, _app$plugins6$saveCre;
+						yield app === null || app === void 0 || (_app$plugins6 = app.plugins) === null || _app$plugins6 === void 0 || (_app$plugins6 = _app$plugins6.get("mqtt")) === null || _app$plugins6 === void 0 || (_app$plugins6$saveCre = _app$plugins6.saveCredentials) === null || _app$plugins6$saveCre === void 0 ? void 0 : _app$plugins6$saveCre.call(_app$plugins6, linkedDevice);
+					} catch (error) {
+						var _app$logger3;
+						app === null || app === void 0 || (_app$logger3 = app.logger) === null || _app$logger3 === void 0 || _app$logger3.addLog({
+							type: "error",
+							title: "将凭证信息存入 mqtt 失败",
+							metadata: { error }
+						});
+					}
 					setStoredIotDevice({
 						id: typeof (linkedDevice === null || linkedDevice === void 0 ? void 0 : linkedDevice.id) === "number" ? linkedDevice.id : void 0,
 						number: (linkedDevice === null || linkedDevice === void 0 ? void 0 : linkedDevice.number) ? String(linkedDevice.number) : ""
@@ -57,14 +81,14 @@ const useDeviceLinking = ({ utils, onLinked, reloadDevices, setStoredIotDevice,
 						var _localStorage, _localStorage$setItem;
 						(_localStorage = localStorage) === null || _localStorage === void 0 || (_localStorage$setItem = _localStorage.setItem) === null || _localStorage$setItem === void 0 || _localStorage$setItem.call(_localStorage, "pisell_app_channel", channel);
 						try {
-							var _app$plugins3, _app$plugins3$set;
-							yield app === null || app === void 0 || (_app$plugins3 = app.plugins) === null || _app$plugins3 === void 0 || (_app$plugins3 = _app$plugins3.get("nativeStorage")) === null || _app$plugins3 === void 0 || (_app$plugins3$set = _app$plugins3.set) === null || _app$plugins3$set === void 0 ? void 0 : _app$plugins3$set.call(_app$plugins3, {
+							var _app$plugins7, _app$plugins7$set;
+							yield app === null || app === void 0 || (_app$plugins7 = app.plugins) === null || _app$plugins7 === void 0 || (_app$plugins7 = _app$plugins7.get("nativeStorage")) === null || _app$plugins7 === void 0 || (_app$plugins7$set = _app$plugins7.set) === null || _app$plugins7$set === void 0 ? void 0 : _app$plugins7$set.call(_app$plugins7, {
 								key: "pisell_app_channel",
 								value: channel
 							});
 						} catch (error) {
-							var _app$logger2;
-							app === null || app === void 0 || (_app$logger2 = app.logger) === null || _app$logger2 === void 0 || _app$logger2.addLog({
+							var _app$logger4;
+							app === null || app === void 0 || (_app$logger4 = app.logger) === null || _app$logger4 === void 0 || _app$logger4.addLog({
 								type: "error",
 								title: "将渠道信息存入 nativeStorage 失败",
 								metadata: { error }

package/lib/plus/saasDevice/appDevicePlanning/modules/devices/components/DeviceTable/index.js

@@ -22,9 +22,12 @@ const DeviceTable = ({ data, loading, search, page, pageSize, linkingDeviceId, g
 		const isLinking = linkingDeviceId === record.id;
 		const isDisabled = Boolean(linkingDeviceId);
 		if (record.isCurrent) return /* @__PURE__ */ react.default.createElement(_pisell_materials.Button, {
+			type: "primary",
 			className: "saas-app-device-planning-device-table__current-button",
 			icon: /* @__PURE__ */ react.default.createElement(_ant_design_icons.CheckOutlined, null),
-			disabled: true
+			loading: isLinking,
+			disabled: isDisabled,
+			onClick: () => onLink(record)
 		}, getText("pisell2.saas.device-planning.action.current-device"));
 		if (record.isLastUsed) return /* @__PURE__ */ react.default.createElement(_pisell_materials.Button, {
 			type: "primary",

package/lib/plus/saasDevice/appDevicePlanning/modules/devices/components/DeviceTable/index.less

@@ -140,9 +140,29 @@
   }
 
   &__current-button {
-    color: rgba(0, 0, 0, 0.25);
-    background: #f0f0f0;
-    border-color: #f0f0f0;
+    color: #fff !important;
+    background: #16a34a !important;
+    border-color: #16a34a !important;
+
+    &:not(:disabled):hover,
+    &:not(:disabled):focus {
+      color: #fff;
+      background: #15803d;
+      border-color: #15803d;
+    }
+
+    &:not(:disabled):active {
+      color: #fff;
+      background: #166534;
+      border-color: #166534;
+    }
+
+    &:disabled {
+      color: rgba(0, 0, 0, 0.25);
+      background: #f0f0f0;
+      border-color: #d9d9d9;
+      box-shadow: none;
+    }
   }
 
   &__empty {