@pisell/private-materials 6.11.191 → 6.11.192

package/lib/plus/saasAttendance/settings/components/membersField/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const MembersField: (props: {
     id?: string | undefined;

package/lib/plus/saasCreateOrganization/components/Header.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SCOProps } from '../types';
 import '../index.less';
 export declare const Header: (props: SCOProps) => JSX.Element;

package/lib/plus/saasCreateOrganization/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SCOProps } from './types';
 import './index.less';
 declare const SaasCreateOrganization: (props: SCOProps) => JSX.Element;

package/lib/plus/saasDevice/appDevicePlanning/index.js

@@ -59,11 +59,12 @@ var TYPE_CODE_STORAGE_KEY = "pisell_iot_type_code";
 var MODEL_CODE_STORAGE_KEY = "pisell_iot_model_code";
 var APP_TYPE_STORAGE_KEY = "pisell_app_type";
 var getStoredIotDevice = (app) => {
-  var _a;
+  var _a, _b;
   try {
     const iotDevice = JSON.parse(((_a = app == null ? void 0 : app.storage) == null ? void 0 : _a.getStorage("iotDevice")) || "{}");
+    const iotDeviceLastUsed = JSON.parse(((_b = app == null ? void 0 : app.storage) == null ? void 0 : _b.getStorage("iotDeviceLastUsed")) || "{}");
     return {
-      id: (iotDevice == null ? void 0 : iotDevice.id) !== void 0 && (iotDevice == null ? void 0 : iotDevice.id) !== null ? iotDevice.id : void 0,
+      id: (iotDeviceLastUsed == null ? void 0 : iotDeviceLastUsed.id) !== void 0 && (iotDeviceLastUsed == null ? void 0 : iotDeviceLastUsed.id) !== null ? iotDeviceLastUsed.id : void 0,
       number: (iotDevice == null ? void 0 : iotDevice.number) ? String(iotDevice.number) : ""
     };
   } catch (e) {
@@ -426,7 +427,7 @@ var SaasAppDevicePlanning = ({
     }
   };
   const handleLinkDevice = async (record) => {
-    var _a2, _b2, _c2, _d2, _e2, _f, _g;
+    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h;
     const app = (_a2 = utils == null ? void 0 : utils.getApp) == null ? void 0 : _a2.call(utils);
     setLinkingDeviceId(record.id);
     try {
@@ -437,6 +438,7 @@ var SaasAppDevicePlanning = ({
         (deviceDetail == null ? void 0 : deviceDetail.data) || {}
       );
       (_f = app == null ? void 0 : app.storage) == null ? void 0 : _f.setStorage("iotDevice", JSON.stringify(linkedDevice || {}));
+      (_g = app == null ? void 0 : app.storage) == null ? void 0 : _g.setStorage("iotDeviceLastUsed", JSON.stringify(linkedDevice || {}));
       setStoredIotDevice({
         id: typeof (linkedDevice == null ? void 0 : linkedDevice.id) === "number" ? linkedDevice.id : void 0,
         number: (linkedDevice == null ? void 0 : linkedDevice.number) ? String(linkedDevice.number) : ""
@@ -444,7 +446,7 @@ var SaasAppDevicePlanning = ({
       persistDeviceModel(record.typeCode, record.modelCode);
       const setting = await (0, import_serve.getDeviceSetting)(record.id, ["general.channel"]);
       const channel = (setting == null ? void 0 : setting["general.channel"]) ? String(setting["general.channel"]) : "system";
-      (_g = localStorage == null ? void 0 : localStorage.setItem) == null ? void 0 : _g.call(localStorage, "pisell_app_channel", channel);
+      (_h = localStorage == null ? void 0 : localStorage.setItem) == null ? void 0 : _h.call(localStorage, "pisell_app_channel", channel);
       setTakeoverDevice(void 0);
       reloadDevices();
       await (onLinked == null ? void 0 : onLinked({ device: linkedDevice, channel }));

package/lib/plus/saasRegister/components/EntryEmail.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/lib/plus/saasRegister/components/EntryInfo.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/lib/plus/saasRegister/components/GoLogin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 declare const GoLogin: (props: SRProps) => JSX.Element;

package/lib/plus/saasRegister/components/Header.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 export declare const Header: (props: SRProps) => JSX.Element;

package/lib/plus/saasRegister/components/VerifyError.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SRStepStatus } from '../types';
 import '../index.less';
 declare const VerifyError: (props: {

package/lib/plus/saasRegister/components/VerifyingLink.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../index.less';
 declare const VerifyingEmailLink: (props: {
     onVerifyLink: () => Promise<void>;

package/lib/plus/saasRegister/components/VertifyEmail.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../index.less';
 declare const VertifyEmail: (props: {
     email: string;

package/lib/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const OptionItemCard: (props: any) => JSX.Element;
 export default OptionItemCard;

package/lib/plus/skuOptionsSelection/components/OptionsCard/index.d.ts

@@ -1,7 +1,6 @@
 /**
  * 单规格商品卡片，点击后需要拉起弹窗展示具体的规格信息
  */
-/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;

package/lib/plus/skuOptionsSelection/components/TitleExtra/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const TitleExtra: (props: any) => JSX.Element;
 export default TitleExtra;

package/lib/plus/skuOptionsSelection/components/VariantCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const VariantCard: (props: any) => JSX.Element;
 export default VariantCard;

package/lib/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/lib/plus/walletEditor/components/relationProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const RelationProduct: ({ value, onChange, }: {
     value?: string[] | undefined;

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface PassDetailProps {
     dataSource?: any | null;

package/lib/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;

package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface TimelineSectionProps {
     code: string;

package/lib/plus/walletPassGallery/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export interface WalletPassGalleryProps {
     hideTitle: boolean;

package/lib/plus/webPosLogin/WebPosLogin.js

@@ -145,13 +145,18 @@ var WebPosLogin = (props) => {
     }
   };
   const handleStoreSelect = async (shopInfo, isShowGoBack2 = true) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const app = getApp();
-    app.storage.setStorage("tenant_domain", (_a2 = shopInfo == null ? void 0 : shopInfo.tenant) == null ? void 0 : _a2.default_domain);
+    if (isIotLogin) {
+      if (lastUsedStoreId !== shopInfo.id) {
+        (_a2 = app == null ? void 0 : app.storage) == null ? void 0 : _a2.removeStorage("iotDevice");
+      }
+    }
+    app.storage.setStorage("tenant_domain", (_b2 = shopInfo == null ? void 0 : shopInfo.tenant) == null ? void 0 : _b2.default_domain);
     app.storage.setStorage("selectedStore", JSON.stringify(shopInfo));
     setLastUsedStoreId(shopInfo.id);
     setSelectedStore(shopInfo);
-    (_b2 = app == null ? void 0 : app.logger) == null ? void 0 : _b2.addLog({
+    (_c2 = app == null ? void 0 : app.logger) == null ? void 0 : _c2.addLog({
       type: "info",
       title: "选择店铺页-点击店铺",
       metadata: shopInfo || {}
@@ -161,40 +166,49 @@ var WebPosLogin = (props) => {
       if (!res) {
         return;
       }
-      if (!((_c2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _c2.account_token)) {
+      if (!((_d2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _d2.account_token)) {
         (0, import_materials.PisellToast)({
           content: import_utils.locales.getText("webpos-login-store-data-missing")
         });
         return;
       }
-      (_e2 = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _e2.set((_d2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _d2.account_token, "pisellV1Token");
+      (_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");
       if (res.nocobase_tenant_token) {
-        (_f2 = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _f2.set(res.nocobase_tenant_token, "nocobaseToken");
+        (_g = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _g.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;
+        if (_iotDeviceNumber) {
+          const _pageSource = (_j = useSearchParams()) == null ? void 0 : _j.get("pageSource");
+          console.log(_pageSource, "pageSource");
+          if (_pageSource !== "pinLoginStore") {
+            (_k = app == null ? void 0 : app.storage) == null ? void 0 : _k.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("/");
+          }
+          return;
+        }
         setStep("device");
       } else {
         await getDeviceListFunction();
       }
       setIsShowGoBack(isShowGoBack2);
-      (_g = app == null ? void 0 : app.logger) == null ? void 0 : _g.addLog({
+      (_n = app == null ? void 0 : app.logger) == null ? void 0 : _n.addLog({
         type: "info",
         title: "选择店铺页-选择店铺成功",
         metadata: res || {}
       });
     } catch (err) {
-      (_h = app == null ? void 0 : app.logger) == null ? void 0 : _h.addLog({
+      (_o = app == null ? void 0 : app.logger) == null ? void 0 : _o.addLog({
         type: "error",
         title: "登录页-选择店铺失败",
         metadata: err || {}
       });
     }
   };
-  const handleChannelSelect = async (channel) => {
-    var _a2;
-    (_a2 = localStorage == null ? void 0 : localStorage.setItem) == null ? void 0 : _a2.call(localStorage, "pisell_app_channel", channel.code);
-    window.location.reload();
-  };
   const getDeviceListFunction = async () => {
     var _a2, _b2, _c2;
     if (isIotLogin) {
@@ -332,7 +346,15 @@ var WebPosLogin = (props) => {
     reloadAfterLogin == null ? void 0 : reloadAfterLogin();
   };
   const handleIotBack = () => {
-    setStep("store");
+    var _a2, _b2, _c2, _d2;
+    const app = getApp();
+    const _pageSource = (_a2 = useSearchParams()) == null ? void 0 : _a2.get("pageSource");
+    console.log(_pageSource, "pageSource");
+    if (_pageSource === "pinLoginDevice") {
+      (_d2 = (_c2 = (_b2 = app == null ? void 0 : app.history) == null ? void 0 : _b2.instance) == null ? void 0 : _c2.goBack) == null ? void 0 : _d2.call(_c2);
+    } else {
+      setStep("store");
+    }
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_WebPosLoginCpt.default,
@@ -359,7 +381,6 @@ var WebPosLogin = (props) => {
       onBack,
       onLoginSuccess,
       onIotDeviceLinked: handleIotDeviceLinked,
-      onChannelSelect: handleChannelSelect,
       onIotBack: handleIotBack
     }
   );

package/lib/plus/webPosLogin/types.d.ts

@@ -234,8 +234,6 @@ export interface WebPosLoginCptProps {
     onBack?: () => void;
     /** 登录成功回调 */
     onLoginSuccess?: (data: any) => void;
-    /** 渠道选择回调 */
-    onChannelSelect?: (channel: ChannelItem) => void;
     /** IOT 设备绑定完成回调 */
     onIotDeviceLinked?: (params: DeviceLinkedParams) => void;
     /** IOT 返回上一步回调 */

package/lib/pro/pisellPhoneKeyboard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import './index.less';
 interface PisellPhoneKeyboardProps {

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CashKeyboardBaseProps } from './types';
 import './index.less';
 declare const CashKeyboardIntact: (props: CashKeyboardBaseProps) => JSX.Element;

package/lib/pro/priceKeyboard/components/cashKeyboard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CashKeyboardBaseProps } from './types';
 export interface CashKeyboardProps extends CashKeyboardBaseProps {
     containerProps?: {

package/lib/pro/priceKeyboard/components/paymentKeyboard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PaymentKeyboardBaseProps } from './types';
 import './index.less';
 interface PaymentKeyboardProps extends PaymentKeyboardBaseProps {

package/lib/pro/skuDetailModal/components/weighing/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { TareOption, WeighingMode, WeighingProps, WeighingValue } from './types';
 import './index.less';
 export type { TareOption, WeighingMode, WeighingValue, WeighingProps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.191",
+  "version": "6.11.192",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,8 +69,8 @@
     "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/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",