@pisell/utils 3.0.0 → 3.0.2

package/es/jsBridge/index.js

@@ -1,30 +1,25 @@
 import regDeviceApi from "./regDeviceApi";
-
-/**
- * 打印小票
- */
-
-/**
- * 打印ITS备货单/划菜单
- */
-
 /**
  * webView页面中调用打印机打印
  * 此api暂时只支持native app平台下ios手机
  * @param params
  * @param callback
  */
-export function webPrint(params, _callback) {
+export function webPrint(params, _callback, onError) {
   regDeviceApi().then(function (jsBridge) {
     jsBridge.callDeviceApi({
-      apiName: "webPrint",
+      apiName: 'webPrint',
       params: params,
       callback: function callback() {
         _callback && _callback.apply(void 0, arguments);
       }
     });
+  }).catch(function (err) {
+    onError === null || onError === void 0 || onError(err);
+    console.error('webPrint', err);
   });
 }
+
 /**
  * webView页面中调用APP内的数据
  * 此api暂时只支持native app平台下ios手机
@@ -34,11 +29,32 @@ export function webPrint(params, _callback) {
 export function dataManager(params, _callback2, onError) {
   regDeviceApi().then(function (jsBridge) {
     jsBridge.callDeviceApi({
-      apiName: "dataManager",
+      apiName: 'dataManager',
       params: params,
       callback: function callback() {
         _callback2 && _callback2.apply(void 0, arguments);
       }
     });
   }).catch(onError);
+}
+
+/**
+ * webView页面中调用APP内的支付
+ * 此api暂时只支持native app平台下ios
+ * @param params
+ * @param callback
+ */
+export function webPayment(params, _callback3, onError) {
+  regDeviceApi().then(function (jsBridge) {
+    jsBridge.callDeviceApi({
+      apiName: 'webPayment',
+      params: params,
+      callback: function callback() {
+        _callback3 && _callback3.apply(void 0, arguments);
+      }
+    });
+  }).catch(function (err) {
+    onError === null || onError === void 0 || onError(err);
+    console.error('webPayment', err);
+  });
 }

package/es/jsBridge/regDeviceApi.js

@@ -68,10 +68,10 @@ function getComposedBridge(deviceType) {
         } catch (error) {
           console.log("error ".concat(apiName), error);
         }
-        if (result.code || result.code === 0) {
-          // 强转字符串，兼容安卓的number
-          result.code = "".concat(result.code);
-        }
+        // if (result.code || result.code === 0) {
+        //   // 强转字符串，兼容安卓的number
+        //   result.code = `${result.code}`;
+        // }
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }

package/es/jsBridge/types.js

@@ -0,0 +1 @@
+export {};

package/es/locales.js

@@ -51,7 +51,6 @@ var init = function init(_localeMaps, _locale) {
 
   // 更新当前语言对应的多语言
   localeMap = localeMaps[locale];
-  console.log('多语言注入成功, 当前语言为:' + locale);
 };
 
 /**

package/es/miniRedux.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { createContext, useCallback, useReducer, forwardRef, useRef } from 'react';
+import React, { createContext, useCallback, useMemo, useReducer, forwardRef, useRef } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var miniRedux = function miniRedux(_ref2) {
   var _ref2$namespace = _ref2.namespace,
@@ -49,6 +49,11 @@ export var miniRedux = function miniRedux(_ref2) {
           });
         }
       }, []);
+
+      // 缓存Context value，避免不必要的重新渲染
+      var contextValue = useMemo(function () {
+        return _defineProperty(_defineProperty({}, namespace, providerState), "dispatch", _dispatch);
+      }, [providerState, _dispatch]);
       var _props = _objectSpread(_objectSpread({}, props), {}, _defineProperty(_defineProperty({}, namespace, providerState), "dispatch", _dispatch));
       var _ref = null;
       if (_props.forwardedRef) {
@@ -56,7 +61,7 @@ export var miniRedux = function miniRedux(_ref2) {
         delete _props.forwardedRef;
       }
       return /*#__PURE__*/_jsx(Context.Provider, {
-        value: _defineProperty(_defineProperty({}, namespace, providerState), "dispatch", _dispatch),
+        value: contextValue,
         children: /*#__PURE__*/_jsx(ComponentUi, _objectSpread(_objectSpread({}, _props), {}, {
           ref: ref
         }))

package/lib/jsBridge/index.js

@@ -30,11 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var jsBridge_exports = {};
 __export(jsBridge_exports, {
   dataManager: () => dataManager,
+  webPayment: () => webPayment,
   webPrint: () => webPrint
 });
 module.exports = __toCommonJS(jsBridge_exports);
 var import_regDeviceApi = __toESM(require("./regDeviceApi"));
-function webPrint(params, callback) {
+function webPrint(params, callback, onError) {
   (0, import_regDeviceApi.default)().then((jsBridge) => {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
@@ -43,6 +44,9 @@ function webPrint(params, callback) {
         callback && callback(...arg);
       }
     });
+  }).catch((err) => {
+    onError == null ? void 0 : onError(err);
+    console.error("webPrint", err);
   });
 }
 function dataManager(params, callback, onError) {
@@ -56,8 +60,23 @@ function dataManager(params, callback, onError) {
     });
   }).catch(onError);
 }
+function webPayment(params, callback, onError) {
+  (0, import_regDeviceApi.default)().then((jsBridge) => {
+    jsBridge.callDeviceApi({
+      apiName: "webPayment",
+      params,
+      callback: (...arg) => {
+        callback && callback(...arg);
+      }
+    });
+  }).catch((err) => {
+    onError == null ? void 0 : onError(err);
+    console.error("webPayment", err);
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dataManager,
+  webPayment,
   webPrint
 });

package/lib/jsBridge/regDeviceApi.js

@@ -85,9 +85,6 @@ function getComposedBridge(deviceType) {
         } catch (error) {
           console.log(`error ${apiName}`, error);
         }
-        if (result.code || result.code === 0) {
-          result.code = `${result.code}`;
-        }
         inCb(result, ...args);
       };
       if (deviceType === "iphone") {

package/lib/jsBridge/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/jsBridge/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/locales.js

@@ -50,7 +50,6 @@ var init = (_localeMaps, _locale) => {
   }
   localeMaps = allLocales;
   localeMap = localeMaps[locale];
-  console.log("多语言注入成功, 当前语言为:" + locale);
 };
 var getText = (id) => {
   return localeMap[id] || id;

package/lib/miniRedux.js

@@ -61,6 +61,10 @@ var miniRedux = ({
           dispatch({ type, payload });
         }
       }, []);
+      const contextValue = (0, import_react.useMemo)(() => ({
+        [namespace]: providerState,
+        dispatch: _dispatch
+      }), [providerState, _dispatch]);
       let _props = {
         ...props,
         [namespace]: providerState,
@@ -71,13 +75,7 @@ var miniRedux = ({
         _ref = _props.forwardedRef;
         delete _props.forwardedRef;
       }
-      return /* @__PURE__ */ import_react.default.createElement(
-        Context.Provider,
-        {
-          value: { [namespace]: providerState, dispatch: _dispatch }
-        },
-        /* @__PURE__ */ import_react.default.createElement(ComponentUi, { ..._props, ref })
-      );
+      return /* @__PURE__ */ import_react.default.createElement(Context.Provider, { value: contextValue }, /* @__PURE__ */ import_react.default.createElement(ComponentUi, { ..._props, ref }));
     });
     return Components;
   };

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@pisell/utils",
-  "version": "3.0.0",
+  "version": "3.0.2",
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev"
+  },
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -24,9 +28,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev"
   }
 }

package/es/jsBridge/index.d.ts

@@ -1,118 +0,0 @@
-declare type LanguageNumber = {
-    en: number;
-    zh_CN: number;
-    zh_HK: number;
-};
-declare type LanguageString = {
-    en: string;
-    zh_CN: string;
-    zh_HK: string;
-} | string;
-/**
- * 打印小票
- */
-declare type WebPrint0 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "0";
-    data: {
-        /** 订单ID */
-        order_id: string;
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
-/**
- * 打印ITS备货单/划菜单
- */
-declare type WebPrint1 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "1";
-    data: {
-        /** 0:备货 1：划单 */
-        mode: "0" | "1";
-        resource: LanguageString;
-        /** 订单备注 */
-        order_note: string;
-        /** 订单时间或商品下单时间 */
-        time: string;
-        /** 订单编号 */
-        order_number?: string;
-        /** 商品 */
-        products: {
-            /** 商品名称 */
-            product_title: LanguageString;
-            /** 商品规格 */
-            product_option_string: LanguageString;
-            /** 商品备注 */
-            product_note: string;
-            /** 商品数量 */
-            product_quantity: number;
-            /** 加菜标识 待定 */
-            is_append?: boolean;
-            /** 退菜标识 待定 */
-            is_removed?: boolean;
-        }[];
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
-declare type WebPrint2 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "2";
-    data: {
-        /** 0: 普通票 1:成人票 2:免费成人票 */
-        type: "0" | "1" | "2";
-        /** 发行编码 */
-        encoded: string;
-        /** 编码 */
-        code: string;
-        /** 到期时间 */
-        expire_date: string;
-        areas: {
-            /** 区域名字 */
-            area_name: string;
-            /** 区域代码 */
-            area_code: string;
-            /** 可用次数 */
-            limit_num: number;
-            /**  已用次数 */
-            used_num: number;
-        }[];
-    };
-};
-declare type WebPrintParams = WebPrint0 | WebPrint1 | WebPrint2;
-/**
- * webView页面中调用打印机打印
- * 此api暂时只支持native app平台下ios手机
- * @param params
- * @param callback
- */
-export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void): void;
-declare type DataManagerParams = {
-    module: "set" | "get";
-    key: string;
-    data?: any;
-};
-/**
- * webView页面中调用APP内的数据
- * 此api暂时只支持native app平台下ios手机
- * @param params
- * @param callback
- */
-export declare function dataManager(params: DataManagerParams, callback: (...arg: any) => void, onError: () => void): void;
-export {};

package/es/locales.d.ts

@@ -1,12 +0,0 @@
-export declare const locales: {
-    init: (_localeMaps: any, _locale: string) => void;
-    getText: (id: string) => any;
-    locale: string;
-    localeMap: any;
-    localeMaps: {
-        en: {};
-        'zh-CN': {};
-        'zh-HK': {};
-    };
-    formatLocale: (_locale: string) => string;
-};

package/lib/jsBridge/index.d.ts

@@ -1,118 +0,0 @@
-declare type LanguageNumber = {
-    en: number;
-    zh_CN: number;
-    zh_HK: number;
-};
-declare type LanguageString = {
-    en: string;
-    zh_CN: string;
-    zh_HK: string;
-} | string;
-/**
- * 打印小票
- */
-declare type WebPrint0 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "0";
-    data: {
-        /** 订单ID */
-        order_id: string;
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
-/**
- * 打印ITS备货单/划菜单
- */
-declare type WebPrint1 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "1";
-    data: {
-        /** 0:备货 1：划单 */
-        mode: "0" | "1";
-        resource: LanguageString;
-        /** 订单备注 */
-        order_note: string;
-        /** 订单时间或商品下单时间 */
-        time: string;
-        /** 订单编号 */
-        order_number?: string;
-        /** 商品 */
-        products: {
-            /** 商品名称 */
-            product_title: LanguageString;
-            /** 商品规格 */
-            product_option_string: LanguageString;
-            /** 商品备注 */
-            product_note: string;
-            /** 商品数量 */
-            product_quantity: number;
-            /** 加菜标识 待定 */
-            is_append?: boolean;
-            /** 退菜标识 待定 */
-            is_removed?: boolean;
-        }[];
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
-declare type WebPrint2 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "2";
-    data: {
-        /** 0: 普通票 1:成人票 2:免费成人票 */
-        type: "0" | "1" | "2";
-        /** 发行编码 */
-        encoded: string;
-        /** 编码 */
-        code: string;
-        /** 到期时间 */
-        expire_date: string;
-        areas: {
-            /** 区域名字 */
-            area_name: string;
-            /** 区域代码 */
-            area_code: string;
-            /** 可用次数 */
-            limit_num: number;
-            /**  已用次数 */
-            used_num: number;
-        }[];
-    };
-};
-declare type WebPrintParams = WebPrint0 | WebPrint1 | WebPrint2;
-/**
- * webView页面中调用打印机打印
- * 此api暂时只支持native app平台下ios手机
- * @param params
- * @param callback
- */
-export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void): void;
-declare type DataManagerParams = {
-    module: "set" | "get";
-    key: string;
-    data?: any;
-};
-/**
- * webView页面中调用APP内的数据
- * 此api暂时只支持native app平台下ios手机
- * @param params
- * @param callback
- */
-export declare function dataManager(params: DataManagerParams, callback: (...arg: any) => void, onError: () => void): void;
-export {};

package/lib/locales.d.ts

@@ -1,12 +0,0 @@
-export declare const locales: {
-    init: (_localeMaps: any, _locale: string) => void;
-    getText: (id: string) => any;
-    locale: string;
-    localeMap: any;
-    localeMaps: {
-        en: {};
-        'zh-CN': {};
-        'zh-HK': {};
-    };
-    formatLocale: (_locale: string) => string;
-};