@pisell/materials 3.3.21 → 3.3.22

package/es/components/pisellInformationEntry/hooks/useNativeScanner.js

@@ -1,7 +1,7 @@
 import { useCallback, useEffect } from 'react';
 import useEngineContext from "../../../hooks/useEngineContext";
 export var useNativeScanner = function useNativeScanner(onChange) {
-  var _context$appHelper;
+  var _context$appHelper, _interaction$utils3, _interaction$utils3$i;
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     interaction = _ref.interaction,
@@ -30,6 +30,6 @@ export var useNativeScanner = function useNativeScanner(onChange) {
   }, []);
   return {
     activeNativeScanner: activeNativeScanner,
-    isTerminal: isTerminal && isTerminal()
+    isTerminal: isTerminal && isTerminal() || (interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$i = _interaction$utils3.isAppEnv) === null || _interaction$utils3$i === void 0 ? void 0 : _interaction$utils3$i.call(_interaction$utils3))
   };
 };

package/es/components/walletCard/index.js

@@ -76,13 +76,34 @@ var toBooleanValue = function toBooleanValue(value) {
 };
 
 // 自定义钩子：处理二维码/条形码模态框
-var useCodeModal = function useCodeModal(cardNo, onCodeClick) {
+var useCodeModal = function useCodeModal(cardNo, onCodeClick, codeType) {
+  var _context$appHelper;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isModalOpen = _useState2[0],
     setIsModalOpen = _useState2[1];
+  var context = useEngineContext();
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref.interaction;
   var handleCodeClick = function handleCodeClick(e) {
+    var _interaction$utils, _interaction$utils$is;
     e.stopPropagation();
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils)) {
+      var _interaction$utils2, _interaction$utils2$p;
+      var typeMap = {
+        orCode: "qrCode",
+        barCode: "barCode"
+      };
+      interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
+        module: 'global',
+        key: 'openCodeModal',
+        data: {
+          type: typeMap[codeType] || codeType,
+          value: cardNo
+        }
+      });
+      return;
+    }
     if (onCodeClick) {
       onCodeClick();
     } else {
@@ -101,32 +122,32 @@ var useCodeModal = function useCodeModal(cardNo, onCodeClick) {
 };
 
 // 子组件：卡片头部
-var CardHeader = function CardHeader(_ref) {
-  var _ref$showIcon = _ref.showIcon,
-    showIcon = _ref$showIcon === void 0 ? true : _ref$showIcon,
-    _ref$showWalletName = _ref.showWalletName,
-    showWalletName = _ref$showWalletName === void 0 ? true : _ref$showWalletName,
-    _ref$showShopName = _ref.showShopName,
-    showShopName = _ref$showShopName === void 0 ? true : _ref$showShopName,
-    _ref$showCardNo = _ref.showCardNo,
-    showCardNo = _ref$showCardNo === void 0 ? true : _ref$showCardNo,
-    _ref$showCode = _ref.showCode,
-    showCode = _ref$showCode === void 0 ? true : _ref$showCode,
-    iconImg = _ref.iconImg,
-    mode = _ref.mode,
-    _ref$walletName = _ref.walletName,
-    walletName = _ref$walletName === void 0 ? 'Level' : _ref$walletName,
-    _ref$shopName = _ref.shopName,
-    shopName = _ref$shopName === void 0 ? 'Store name' : _ref$shopName,
-    _ref$cardNo = _ref.cardNo,
-    cardNo = _ref$cardNo === void 0 ? 'Wallet number' : _ref$cardNo,
-    _ref$cardStyle = _ref.cardStyle,
-    cardStyle = _ref$cardStyle === void 0 ? 'normal' : _ref$cardStyle,
-    _ref$codeType = _ref.codeType,
-    codeType = _ref$codeType === void 0 ? 'barCode' : _ref$codeType,
-    onCodeClick = _ref.onCodeClick,
-    _ref$isLogin = _ref.isLogin,
-    isLogin = _ref$isLogin === void 0 ? false : _ref$isLogin;
+var CardHeader = function CardHeader(_ref2) {
+  var _ref2$showIcon = _ref2.showIcon,
+    showIcon = _ref2$showIcon === void 0 ? true : _ref2$showIcon,
+    _ref2$showWalletName = _ref2.showWalletName,
+    showWalletName = _ref2$showWalletName === void 0 ? true : _ref2$showWalletName,
+    _ref2$showShopName = _ref2.showShopName,
+    showShopName = _ref2$showShopName === void 0 ? true : _ref2$showShopName,
+    _ref2$showCardNo = _ref2.showCardNo,
+    showCardNo = _ref2$showCardNo === void 0 ? true : _ref2$showCardNo,
+    _ref2$showCode = _ref2.showCode,
+    showCode = _ref2$showCode === void 0 ? true : _ref2$showCode,
+    iconImg = _ref2.iconImg,
+    mode = _ref2.mode,
+    _ref2$walletName = _ref2.walletName,
+    walletName = _ref2$walletName === void 0 ? 'Level' : _ref2$walletName,
+    _ref2$shopName = _ref2.shopName,
+    shopName = _ref2$shopName === void 0 ? 'Store name' : _ref2$shopName,
+    _ref2$cardNo = _ref2.cardNo,
+    cardNo = _ref2$cardNo === void 0 ? 'Wallet number' : _ref2$cardNo,
+    _ref2$cardStyle = _ref2.cardStyle,
+    cardStyle = _ref2$cardStyle === void 0 ? 'normal' : _ref2$cardStyle,
+    _ref2$codeType = _ref2.codeType,
+    codeType = _ref2$codeType === void 0 ? 'barCode' : _ref2$codeType,
+    onCodeClick = _ref2.onCodeClick,
+    _ref2$isLogin = _ref2.isLogin,
+    isLogin = _ref2$isLogin === void 0 ? false : _ref2$isLogin;
   // 处理可能为0/1的布尔值
   var processedShowIcon = toBooleanValue(showIcon);
   var processedShowWalletName = toBooleanValue(showWalletName);
@@ -165,9 +186,9 @@ var CardHeader = function CardHeader(_ref) {
 };
 
 // 子组件：卡片内容项
-var CardItem = function CardItem(_ref2) {
-  var item = _ref2.item,
-    symbol = _ref2.symbol;
+var CardItem = function CardItem(_ref3) {
+  var item = _ref3.item,
+    symbol = _ref3.symbol;
   var key = item.key,
     label = item.label,
     value = item.value;
@@ -188,9 +209,9 @@ var CardItem = function CardItem(_ref2) {
 };
 
 // 子组件：卡片内容
-var CardContent = function CardContent(_ref3) {
-  var items = _ref3.items,
-    symbol = _ref3.symbol;
+var CardContent = function CardContent(_ref4) {
+  var items = _ref4.items,
+    symbol = _ref4.symbol;
   // 定义期望的顺序
   var expectedOrder = ['piont', 'balance', 'discount', 'voucher'];
 
@@ -218,9 +239,9 @@ var CardContent = function CardContent(_ref3) {
 };
 
 // 子组件：二维码/条形码显示
-var CodeDisplay = function CodeDisplay(_ref4) {
-  var codeType = _ref4.codeType,
-    cardNo = _ref4.cardNo;
+var CodeDisplay = function CodeDisplay(_ref5) {
+  var codeType = _ref5.codeType,
+    cardNo = _ref5.cardNo;
   if (!cardNo) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-code"
@@ -250,12 +271,12 @@ var blockEvent = function blockEvent(e) {
 };
 
 // 子组件：二维码/条形码模态框
-var CodeModal = function CodeModal(_ref5) {
-  var isOpen = _ref5.isOpen,
-    onClose = _ref5.onClose,
-    codeType = _ref5.codeType,
-    cardNo = _ref5.cardNo,
-    platform = _ref5.platform;
+var CodeModal = function CodeModal(_ref6) {
+  var isOpen = _ref6.isOpen,
+    onClose = _ref6.onClose,
+    codeType = _ref6.codeType,
+    cardNo = _ref6.cardNo,
+    platform = _ref6.platform;
   return /*#__PURE__*/React.createElement(PisellModal, {
     title: getText(codeType === 'barCode' ? 'walletCard-barcode' : 'walletCard-qrcode'),
     platform: platform,
@@ -316,10 +337,10 @@ var WalletCard = function WalletCard(props) {
   var showCode = toBooleanValue(mergedProps.showCode);
   var isLogin = toBooleanValue(mergedProps.isLogin);
   var context = useEngineContext();
-  var _ref6 = context.appHelper || {},
-    utils = _ref6.utils;
+  var _ref7 = context.appHelper || {},
+    utils = _ref7.utils;
   // 使用自定义钩子处理模态框逻辑
-  var _useCodeModal = useCodeModal(cardNo, onCodeClick),
+  var _useCodeModal = useCodeModal(cardNo, onCodeClick, codeType),
     isModalOpen = _useCodeModal.isModalOpen,
     handleCodeClick = _useCodeModal.handleCodeClick,
     closeModal = _useCodeModal.closeModal;

package/lib/components/pisellInformationEntry/hooks/useNativeScanner.js

@@ -35,12 +35,12 @@ module.exports = __toCommonJS(useNativeScanner_exports);
 var import_react = require("react");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var useNativeScanner = (onChange) => {
-  var _a;
+  var _a, _b, _c;
   const context = (0, import_useEngineContext.default)();
   const { interaction, isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   (0, import_react.useEffect)(() => {
-    var _a2, _b;
-    (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.mountFunction) == null ? void 0 : _b.call(
+    var _a2, _b2;
+    (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.mountFunction) == null ? void 0 : _b2.call(
       _a2,
       "global",
       "nativeScannerResult",
@@ -55,8 +55,8 @@ var useNativeScanner = (onChange) => {
     );
   }, []);
   const activeNativeScanner = (0, import_react.useCallback)(() => {
-    var _a2, _b;
-    (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b.call(_a2, {
+    var _a2, _b2;
+    (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
       module: "global",
       key: "active_native_scanner",
       data: {
@@ -66,7 +66,7 @@ var useNativeScanner = (onChange) => {
   }, []);
   return {
     activeNativeScanner,
-    isTerminal: isTerminal && isTerminal()
+    isTerminal: isTerminal && isTerminal() || ((_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.isAppEnv) == null ? void 0 : _c.call(_b))
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/walletCard/index.js

@@ -89,10 +89,29 @@ var toBooleanValue = (value) => {
   if (value === 1 || value === "1") return true;
   return !!value;
 };
-var useCodeModal = (cardNo, onCodeClick) => {
+var useCodeModal = (cardNo, onCodeClick, codeType) => {
+  var _a;
   const [isModalOpen, setIsModalOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const handleCodeClick = (e) => {
+    var _a2, _b, _c, _d;
     e.stopPropagation();
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      const typeMap = {
+        orCode: "qrCode",
+        barCode: "barCode"
+      };
+      (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
+        module: "global",
+        key: "openCodeModal",
+        data: {
+          type: typeMap[codeType] || codeType,
+          value: cardNo
+        }
+      });
+      return;
+    }
     if (onCodeClick) {
       onCodeClick();
     } else {
@@ -269,7 +288,8 @@ var WalletCard = (props) => {
   const { utils } = context.appHelper || {};
   const { isModalOpen, handleCodeClick, closeModal } = useCodeModal(
     cardNo,
-    onCodeClick
+    onCodeClick,
+    codeType
   );
   const backgroundStyle = (0, import_react.useMemo)(() => {
     if (props.customBackgroundImage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "3.3.21",
+  "version": "3.3.22",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",