@pisell/private-materials 6.12.157 → 6.12.158

package/lib/components/pay/toB/components/MX51/index.js

@@ -14,7 +14,7 @@ const MX51 = (props, ref) => {
 	const logger = require_useLogger.default();
 	const context = require_useEngineContext.default();
 	const action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
-	const onOpen = ({ data, payCallback }) => {
+	const onOpen = ({ data, payCallback, isActive }) => {
 		const { params, mode } = data;
 		const uniquePaymentNumber = getUuid();
 		const newData = {
@@ -32,6 +32,15 @@ const MX51 = (props, ref) => {
 			title: "ToB_MX51_onOpen 开始调用",
 			metadata: { params: newData }
 		});
+		if (isActive && !isActive()) return false;
+		if (typeof action !== "function") {
+			logger === null || logger === void 0 || logger.addLog({
+				type: "error",
+				title: "ToB_MX51_onOpen 支付能力不可用",
+				metadata: { params: newData }
+			});
+			return false;
+		}
 		action({
 			type: "webpos.handleMX51Pay",
 			data: newData,
@@ -65,6 +74,7 @@ const MX51 = (props, ref) => {
 				});
 			}
 		});
+		return true;
 	};
 	(0, react.useImperativeHandle)(ref, () => ({ open: onOpen }));
 	return null;

package/lib/components/pay/toB/paymentMethods/index.js

@@ -1,5 +1,6 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
+const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_objectWithoutProperties = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js");
 const require_useLogger = require("../../../../hooks/useLogger.js");
 const require_index = require("../components/EFTPOS/index.js");
@@ -12,25 +13,38 @@ const PaymentMethods = (props, ref) => {
 	const eftposRef = (0, react.useRef)(null);
 	const mx51Ref = (0, react.useRef)(null);
 	const logger = require_useLogger.default();
-	const onPay = (type, params) => {
-		const { callback } = params, otherParams = require_objectWithoutProperties._objectWithoutProperties(params, _excluded);
-		console.log("onPay_params>>>>", type, params);
-		logger === null || logger === void 0 || logger.addLog({
-			type: "info",
-			title: "ToB_PaymentMethods_onPay 开始调用",
-			metadata: {
-				type,
-				params
+	const onPay = function() {
+		var _ref = require_asyncToGenerator._asyncToGenerator(function* (type, params) {
+			const { callback } = params, otherParams = require_objectWithoutProperties._objectWithoutProperties(params, _excluded);
+			console.log("onPay_params>>>>", type, params);
+			logger === null || logger === void 0 || logger.addLog({
+				type: "info",
+				title: "ToB_PaymentMethods_onPay 开始调用",
+				metadata: {
+					type,
+					params
+				}
+			});
+			const paymentRef = type === "eftpos" ? eftposRef.current : mx51Ref.current;
+			if (!(paymentRef === null || paymentRef === void 0 ? void 0 : paymentRef.open)) return false;
+			try {
+				return (yield paymentRef.open(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, otherParams), {}, { payCallback: (res) => type === "eftpos" ? _eftpcallback(res, callback) : _mx51callback(res, callback) }))) === true;
+			} catch (error) {
+				logger === null || logger === void 0 || logger.addLog({
+					type: "error",
+					title: "ToB_PaymentMethods_onPay 启动失败",
+					metadata: {
+						type,
+						error: error instanceof Error ? error.message : String(error)
+					}
+				});
+				return false;
 			}
 		});
-		if (type === "eftpos") {
-			var _eftposRef$current, _eftposRef$current$op;
-			(_eftposRef$current = eftposRef.current) === null || _eftposRef$current === void 0 || (_eftposRef$current$op = _eftposRef$current.open) === null || _eftposRef$current$op === void 0 || _eftposRef$current$op.call(_eftposRef$current, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, otherParams), {}, { payCallback: (res) => _eftpcallback(res, callback) }));
-		} else if (type === "mx51") {
-			var _mx51Ref$current, _mx51Ref$current$open;
-			(_mx51Ref$current = mx51Ref.current) === null || _mx51Ref$current === void 0 || (_mx51Ref$current$open = _mx51Ref$current.open) === null || _mx51Ref$current$open === void 0 || _mx51Ref$current$open.call(_mx51Ref$current, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, otherParams), {}, { payCallback: (res) => _mx51callback(res, callback) }));
-		}
-	};
+		return function onPay(_x, _x2) {
+			return _ref.apply(this, arguments);
+		};
+	}();
 	const _eftpcallback = (res, callback) => {
 		const params = {
 			status: res.status,

package/lib/plus/salesSdk/demo/hosts/legacyOpenProductDetail.js

@@ -3,8 +3,6 @@ const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtim
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
 //#region src/plus/salesSdk/demo/hosts/legacyOpenProductDetail.ts
-/** 商品详情弹窗未回调时的兜底超时（避免 addProductWithFlow 永久 pending） */
-const OPEN_PRODUCT_DETAIL_TIMEOUT_MS = 12e4;
 const formatBundle = (bundle) => {
 	if (!Array.isArray(bundle)) return [];
 	return bundle.map((item) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, { bundle_product_id: item._bundle_product_id }));
@@ -31,12 +29,8 @@ function createLegacyOpenProductDetailHost(deps) {
 			const settle = (fn) => {
 				if (settled) return;
 				settled = true;
-				clearTimeout(timer);
 				fn();
 			};
-			const timer = setTimeout(() => {
-				settle(() => reject(/* @__PURE__ */ new Error("[SalesSdk] openProductDetail 超时：页面未响应 pisell1.handleOpenProductModal（请确认低代码页已注册该 action，且场次弹窗能正常打开）")));
-			}, OPEN_PRODUCT_DETAIL_TIMEOUT_MS);
 			action({
 				type: "pisell1.handleOpenProductModal",
 				data: {
@@ -54,7 +48,7 @@ function createLegacyOpenProductDetailHost(deps) {
 				callback: (e, extension_type, detail) => {
 					console.log(e, extension_type, detail, "detail1234");
 					settle(() => resolve({
-						e: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, e), {}, { bundle: formatBundle(e.bundle) }),
+						e: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, e), {}, { bundle: formatBundle(e === null || e === void 0 ? void 0 : e.bundle) }),
 						extension_type,
 						detail
 					}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.157",
+  "version": "6.12.158",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,9 +70,9 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.4",
-    "@pisell/materials": "6.12.44",
+    "@pisell/materials": "6.12.45",
     "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.4",
     "@pisell/date-picker": "3.0.10"
   },
   "peerDependencies": {