@pisell/private-materials 6.11.192 → 6.11.193

package/es/plus/webPosLogin/WebPosLogin.js

@@ -32,7 +32,8 @@ var WebPosLogin = function WebPosLogin(props) {
     getApp = _context$appHelper$ut2 === void 0 ? function () {
       return {};
     } : _context$appHelper$ut2,
-    reloadAfterLogin = _context$appHelper$ut.reloadAfterLogin;
+    reloadAfterLogin = _context$appHelper$ut.reloadAfterLogin,
+    pisellos = _context$appHelper$ut.pisellos;
   var _context$appHelper$co = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants,
     mediaConfig = _context$appHelper$co.mediaConfig,
     isIotLogin = _context$appHelper$co.isIotLogin;
@@ -226,6 +227,8 @@ var WebPosLogin = function WebPosLogin(props) {
       var _shopInfo$tenant, _app$logger;
       var isShowGoBack,
         app,
+        _pisellos$server,
+        _pisellos$server$clea,
         _app$storage9,
         _res$mypisell_data,
         _app$getPlugin2,
@@ -246,7 +249,19 @@ var WebPosLogin = function WebPosLogin(props) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             isShowGoBack = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
-            app = getApp(); // 如果是iot登录流程，需要判定一下店铺id是否发生变动，如果发生变动需要清除已经选择的设备信息
+            app = getApp();
+            if (!(lastUsedStoreId !== shopInfo.id)) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.next = 5;
+            return (_pisellos$server = pisellos.server) === null || _pisellos$server === void 0 || (_pisellos$server$clea = _pisellos$server.clearAllIndexDB) === null || _pisellos$server$clea === void 0 ? void 0 : _pisellos$server$clea.call(_pisellos$server);
+          case 5:
+            if (pisellos.server) {
+              pisellos.server = null;
+            }
+          case 6:
+            // 如果是iot登录流程，需要判定一下店铺id是否发生变动，如果发生变动需要清除已经选择的设备信息
             if (isIotLogin) {
               if (lastUsedStoreId !== shopInfo.id) {
                 app === null || app === void 0 || (_app$storage9 = app.storage) === null || _app$storage9 === void 0 || _app$storage9.removeStorage('iotDevice');
@@ -261,38 +276,38 @@ var WebPosLogin = function WebPosLogin(props) {
               title: '选择店铺页-点击店铺',
               metadata: shopInfo || {}
             });
-            _context2.prev = 8;
-            _context2.next = 11;
+            _context2.prev = 12;
+            _context2.next = 15;
             return getTenantDetail();
-          case 11:
+          case 15:
             res = _context2.sent;
             if (res) {
-              _context2.next = 14;
+              _context2.next = 18;
               break;
             }
             return _context2.abrupt("return");
-          case 14:
+          case 18:
             if (res !== null && res !== void 0 && (_res$mypisell_data = res.mypisell_data) !== null && _res$mypisell_data !== void 0 && _res$mypisell_data.account_token) {
-              _context2.next = 17;
+              _context2.next = 21;
               break;
             }
             PisellToast({
               content: locales.getText('webpos-login-store-data-missing')
             });
             return _context2.abrupt("return");
-          case 17:
+          case 21:
             app === null || app === void 0 || (_app$getPlugin2 = app.getPlugin('token')) === null || _app$getPlugin2 === void 0 || _app$getPlugin2.set(res === null || res === void 0 || (_res$mypisell_data2 = res.mypisell_data) === null || _res$mypisell_data2 === void 0 ? void 0 : _res$mypisell_data2.account_token, 'pisellV1Token');
             if (res.nocobase_tenant_token) {
               app === null || app === void 0 || (_app$getPlugin3 = app.getPlugin('token')) === null || _app$getPlugin3 === void 0 || _app$getPlugin3.set(res.nocobase_tenant_token, 'nocobaseToken');
             }
             if (!isIotLogin) {
-              _context2.next = 29;
+              _context2.next = 33;
               break;
             }
             // 如果本地已经存在了设备了，直接进入页面不再重新选择设备
             _iotDeviceNumber = (_JSON$parse3 = JSON.parse((app === null || app === void 0 || (_app$storage10 = app.storage) === null || _app$storage10 === void 0 ? void 0 : _app$storage10.getStorage('iotDevice')) || '{}')) === null || _JSON$parse3 === void 0 ? void 0 : _JSON$parse3.number;
             if (!_iotDeviceNumber) {
-              _context2.next = 26;
+              _context2.next = 30;
               break;
             }
             // 从路由中获取参数判定是否是从pin弹窗跳转而来，如果是选择后直接进入主页
@@ -305,14 +320,14 @@ var WebPosLogin = function WebPosLogin(props) {
               app === null || app === void 0 || (_app$history = app.history) === null || _app$history === void 0 || (_app$history = _app$history.instance) === null || _app$history === void 0 || _app$history.replace('/');
             }
             return _context2.abrupt("return");
-          case 26:
+          case 30:
             setStep('device');
-            _context2.next = 31;
+            _context2.next = 35;
             break;
-          case 29:
-            _context2.next = 31;
+          case 33:
+            _context2.next = 35;
             return getDeviceListFunction();
-          case 31:
+          case 35:
             setIsShowGoBack(isShowGoBack);
             // 保存店铺信息
             // app?.storage.setStorage("shopInfo", JSON.stringify(res || {}));
@@ -321,21 +336,21 @@ var WebPosLogin = function WebPosLogin(props) {
               title: '选择店铺页-选择店铺成功',
               metadata: res || {}
             });
-            _context2.next = 38;
+            _context2.next = 42;
             break;
-          case 35:
-            _context2.prev = 35;
-            _context2.t0 = _context2["catch"](8);
+          case 39:
+            _context2.prev = 39;
+            _context2.t0 = _context2["catch"](12);
             app === null || app === void 0 || (_app$logger3 = app.logger) === null || _app$logger3 === void 0 || _app$logger3.addLog({
               type: 'error',
               title: '登录页-选择店铺失败',
               metadata: _context2.t0 || {}
             });
-          case 38:
+          case 42:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[8, 35]]);
+      }, _callee2, null, [[12, 39]]);
     }));
     return function handleStoreSelect(_x2) {
       return _ref2.apply(this, arguments);

package/lib/plus/webPosLogin/WebPosLogin.js

@@ -46,7 +46,11 @@ var useSearchParams = () => {
 var WebPosLogin = (props) => {
   var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
-  const { getApp = () => ({}), reloadAfterLogin } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const {
+    getApp = () => ({}),
+    reloadAfterLogin,
+    pisellos
+  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const { mediaConfig, isIotLogin } = (_b = context.appHelper) == null ? void 0 : _b.constants;
   const {
     backgroundImage,
@@ -145,18 +149,24 @@ var WebPosLogin = (props) => {
     }
   };
   const handleStoreSelect = async (shopInfo, isShowGoBack2 = true) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const app = getApp();
+    if (lastUsedStoreId !== shopInfo.id) {
+      await ((_b2 = (_a2 = pisellos.server) == null ? void 0 : _a2.clearAllIndexDB) == null ? void 0 : _b2.call(_a2));
+      if (pisellos.server) {
+        pisellos.server = null;
+      }
+    }
     if (isIotLogin) {
       if (lastUsedStoreId !== shopInfo.id) {
-        (_a2 = app == null ? void 0 : app.storage) == null ? void 0 : _a2.removeStorage("iotDevice");
+        (_c2 = app == null ? void 0 : app.storage) == null ? void 0 : _c2.removeStorage("iotDevice");
       }
     }
-    app.storage.setStorage("tenant_domain", (_b2 = shopInfo == null ? void 0 : shopInfo.tenant) == null ? void 0 : _b2.default_domain);
+    app.storage.setStorage("tenant_domain", (_d2 = shopInfo == null ? void 0 : shopInfo.tenant) == null ? void 0 : _d2.default_domain);
     app.storage.setStorage("selectedStore", JSON.stringify(shopInfo));
     setLastUsedStoreId(shopInfo.id);
     setSelectedStore(shopInfo);
-    (_c2 = app == null ? void 0 : app.logger) == null ? void 0 : _c2.addLog({
+    (_e2 = app == null ? void 0 : app.logger) == null ? void 0 : _e2.addLog({
       type: "info",
       title: "选择店铺页-点击店铺",
       metadata: shopInfo || {}
@@ -166,28 +176,28 @@ var WebPosLogin = (props) => {
       if (!res) {
         return;
       }
-      if (!((_d2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _d2.account_token)) {
+      if (!((_f2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _f2.account_token)) {
         (0, import_materials.PisellToast)({
           content: import_utils.locales.getText("webpos-login-store-data-missing")
         });
         return;
       }
-      (_f2 = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _f2.set((_e2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _e2.account_token, "pisellV1Token");
+      (_h = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _h.set((_g = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _g.account_token, "pisellV1Token");
       if (res.nocobase_tenant_token) {
-        (_g = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _g.set(res.nocobase_tenant_token, "nocobaseToken");
+        (_i = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _i.set(res.nocobase_tenant_token, "nocobaseToken");
       }
       if (isIotLogin) {
-        const _iotDeviceNumber = (_i = JSON.parse(
-          ((_h = app == null ? void 0 : app.storage) == null ? void 0 : _h.getStorage("iotDevice")) || "{}"
-        )) == null ? void 0 : _i.number;
+        const _iotDeviceNumber = (_k = JSON.parse(
+          ((_j = app == null ? void 0 : app.storage) == null ? void 0 : _j.getStorage("iotDevice")) || "{}"
+        )) == null ? void 0 : _k.number;
         if (_iotDeviceNumber) {
-          const _pageSource = (_j = useSearchParams()) == null ? void 0 : _j.get("pageSource");
+          const _pageSource = (_l = useSearchParams()) == null ? void 0 : _l.get("pageSource");
           console.log(_pageSource, "pageSource");
           if (_pageSource !== "pinLoginStore") {
-            (_k = app == null ? void 0 : app.storage) == null ? void 0 : _k.setStorage("isLogin", true);
+            (_m = app == null ? void 0 : app.storage) == null ? void 0 : _m.setStorage("isLogin", true);
             reloadAfterLogin == null ? void 0 : reloadAfterLogin();
           } else {
-            (_m = (_l = app == null ? void 0 : app.history) == null ? void 0 : _l.instance) == null ? void 0 : _m.replace("/");
+            (_o = (_n = app == null ? void 0 : app.history) == null ? void 0 : _n.instance) == null ? void 0 : _o.replace("/");
           }
           return;
         }
@@ -196,13 +206,13 @@ var WebPosLogin = (props) => {
         await getDeviceListFunction();
       }
       setIsShowGoBack(isShowGoBack2);
-      (_n = app == null ? void 0 : app.logger) == null ? void 0 : _n.addLog({
+      (_p = app == null ? void 0 : app.logger) == null ? void 0 : _p.addLog({
         type: "info",
         title: "选择店铺页-选择店铺成功",
         metadata: res || {}
       });
     } catch (err) {
-      (_o = app == null ? void 0 : app.logger) == null ? void 0 : _o.addLog({
+      (_q = app == null ? void 0 : app.logger) == null ? void 0 : _q.addLog({
         type: "error",
         title: "登录页-选择店铺失败",
         metadata: err || {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.192",
+  "version": "6.11.193",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.59",
+    "@pisell/date-picker": "3.0.8",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",