@pisell/private-materials 6.3.103 → 6.3.105

package/es/components/booking/notes/NoteBlock/index.js

@@ -14,7 +14,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useState, useMemo } from "react";
-import { Button, Modal, message, Skeleton } from "antd";
+import { Button, message, Skeleton } from "antd";
+import { PisellModal } from '@pisell/materials';
 import { useRequest } from "ahooks";
 import NoteItem from "./NoteItem";
 import AddNote from "../addNote";
@@ -174,7 +175,7 @@ var NoteBlock = function NoteBlock(props) {
       item: d,
       onChange: _noteChange
     });
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Modal, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PisellModal, {
     title: editNote ? locales.getText("pisell2.text.status.edit-note") : locales.getText("pisell2.text.status.add-note"),
     open: isModalOpen,
     onOk: handleOk,

package/es/components/eftposPay/store/index.d.ts

@@ -195,7 +195,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**

package/es/components/eventBooking/components/ErrorTip/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/es/components/pay/toC/PaymentMethods/MWCreditCard/List/index.js

@@ -15,6 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useImperativeHandle, forwardRef, useMemo, useContext } from 'react';
 import { Button } from 'antd';
 import { locales } from '@pisell/utils';
+import { useDebounceFn } from 'ahooks';
 import { PisellModal, Iconfont, PisellCheckboxGroup, PisellRow, getBankCardTypeImg, PisellLoading, PisellText } from '@pisell/materials';
 import classNames from 'classnames';
 import { Context } from "../../../model";
@@ -126,12 +127,15 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
             // 关闭管理卡模式
             setManage(false);
 
+            // 重置确认按钮loading状态
+            setOkLoading(false);
+
             // 选中第一个卡
             setCurrentCard(0);
 
             // 异步 获取信用卡列表
             _getCreditCardList();
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -266,21 +270,32 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 11:11
    */
-  var onOk = function onOk() {
-    var _props$onChange;
-    // 管理卡模式下, 则执行删除卡操作
-    if (manage) {
-      setManage(false);
-      handleBatchDeleteCards();
-      return;
-    }
+  // 确认按钮loading状态
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    okLoading = _useState14[0],
+    setOkLoading = _useState14[1];
+  var _useDebounceFn = useDebounceFn(function () {
+      var _props$onChange;
+      // 管理卡模式下, 则执行删除卡操作
+      if (manage) {
+        setManage(false);
+        handleBatchDeleteCards();
+        return;
+      }
 
-    // 否则回调到外部
-    var cur = creditCardList.find(function (d) {
-      return d.id === currentCard;
-    });
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
-  };
+      // 展示loading, 防止重复点击
+      setOkLoading(true);
+
+      // 否则回调到外部
+      var cur = creditCardList.find(function (d) {
+        return d.id === currentCard;
+      });
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
+    }, {
+      wait: 300
+    }),
+    onOk = _useDebounceFn.run;
 
   // 渲染列表
   var renderList = useMemo(function () {
@@ -330,7 +345,8 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
     okText: manage ? locales.getText('tocPay.text.done') : okText,
     onOk: onOk,
     okButtonProps: {
-      disabled: !currentCard
+      disabled: !currentCard,
+      loading: okLoading
     },
     bodyStyle: {
       padding: 24

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -367,15 +367,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           timer = null; // 返回promise
           return _context3.abrupt("return", new Promise(function (res, rej) {
             var _threeDSMethodData$pa7;
-            // 10秒内没有成功则走N逻辑
-            timer = setTimeout(function () {
-              res(defaultReturnParams);
-              log({
-                msg: '第三步: 10秒超时则走N逻辑',
-                data: threeDSMethodData
-              });
-            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
-            window.addEventListener('message', function (event) {
+            var handleMessage = function handleMessage(event) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
                 // 返回 threeDSServerTransID 则 res
@@ -388,6 +380,8 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   if (timer) {
                     clearTimeout(timer);
                   }
+                  // 移除监听器，防止重复触发
+                  window.removeEventListener('message', handleMessage);
                   // 10秒内成功则走Y逻辑
                   res({
                     threeDSServerTransID: event.data.threeDSServerTransID,
@@ -395,7 +389,19 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   });
                 }
               }
-            }, false);
+            };
+
+            // 10秒内没有成功则走N逻辑
+            timer = setTimeout(function () {
+              // 超时也要移除监听器
+              window.removeEventListener('message', handleMessage);
+              res(defaultReturnParams);
+              log({
+                msg: '第三步: 10秒超时则走N逻辑',
+                data: threeDSMethodData
+              });
+            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
+            window.addEventListener('message', handleMessage, false);
           }));
         case 28:
         case "end":

package/es/components/shoppingCart/components/Empty/index.d.ts

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

package/es/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/index.d.ts

@@ -52,8 +52,8 @@ export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
-export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './components/authentication/admin';
-export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps } from './components/authentication/admin';
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, } from './components/authentication/admin';
+export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps, } from './components/authentication/admin';
 export { default as ContactInfo } from './plus/contactInfo';
 export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
@@ -71,7 +71,9 @@ export { default as ProNumberSelector } from './pro/pisellNumberSelector';
 export { default as SKUOptionsSelection } from './plus/skuOptionsSelection';
 export { default as SaasAttendance } from './plus/saasAttendance';
 export { default as Selector } from './pro/Selector';
+export { default as PisellSalesGrid } from './plus/pisellSalesGrid';
 export { default as EcoCupProject } from './components/ecocup/cupProject';
 export { default as EcoCupList } from './components/ecocup/cupList';
 export { default as EcoCustomerList } from './components/ecocup/customerList';
 export { default as OrderList } from './plus/orderList';
+export { default as pisellSalesManagement } from './plus/pisellSalesManagement';

package/es/index.js

@@ -73,7 +73,9 @@ export { default as ProNumberSelector } from "./pro/pisellNumberSelector";
 export { default as SKUOptionsSelection } from "./plus/skuOptionsSelection";
 export { default as SaasAttendance } from "./plus/saasAttendance";
 export { default as Selector } from "./pro/Selector";
+export { default as PisellSalesGrid } from "./plus/pisellSalesGrid";
 export { default as EcoCupProject } from "./components/ecocup/cupProject";
 export { default as EcoCupList } from "./components/ecocup/cupList";
 export { default as EcoCustomerList } from "./components/ecocup/customerList";
-export { default as OrderList } from "./plus/orderList";
+export { default as OrderList } from "./plus/orderList";
+export { default as pisellSalesManagement } from "./plus/pisellSalesManagement";

package/es/plus/contactInfo/components/SwipeAction/index.js

@@ -12,7 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { animated, useSpring } from '@react-spring/web';
-import { useDrag } from '@use-gesture/react/dist/use-gesture-react.cjs';
+import { useDrag } from '@use-gesture/react';
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 
 // 本地实现的工具函数和类型

package/es/plus/orderList/components/HandleActions.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 declare const HandleActions: (props: {
     locales: any;
+    __id?: string;
 }) => React.JSX.Element;
 export default HandleActions;

package/es/plus/orderList/components/HandleActions.js

@@ -3,7 +3,8 @@ import { PisellDataSourceContainer, PisellSort, PisellFilter } from '@pisell/mat
 import { getFilterButtonList, getSortList } from "../config";
 var ColumnsSetting = PisellDataSourceContainer.ColumnsSetting;
 var HandleActions = function HandleActions(props) {
-  var locales = props.locales;
+  var locales = props.locales,
+    __id = props.__id;
   var filterButtonListValue = useMemo(function () {
     return {
       otherFilter: getFilterButtonList(locales)
@@ -12,7 +13,9 @@ var HandleActions = function HandleActions(props) {
   var sortList = useMemo(function () {
     return getSortList(locales);
   }, [locales]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColumnsSetting, null), /*#__PURE__*/React.createElement(PisellSort, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColumnsSetting, {
+    __id: __id
+  }), /*#__PURE__*/React.createElement(PisellSort, {
     hasForm: false,
     list: sortList
   }), /*#__PURE__*/React.createElement(PisellFilter, {

package/es/plus/orderList/components/Toolbar.d.ts

@@ -2,5 +2,6 @@ import React from 'react';
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;
+    __id?: string;
 }) => React.JSX.Element;
 export default Toolbar;

package/es/plus/orderList/components/Toolbar.js

@@ -20,7 +20,8 @@ import dayjs from 'dayjs';
 var useContainerContext = PisellDataSourceContainer.useContainerContext;
 var Toolbar = function Toolbar(props) {
   var locales = props.locales,
-    clearSelectedData = props.clearSelectedData;
+    clearSelectedData = props.clearSelectedData,
+    __id = props.__id;
   var _useContainerContext = useContainerContext(),
     serverActions = _useContainerContext.serverActions,
     refManager = _useContainerContext.refManager,
@@ -50,7 +51,8 @@ var Toolbar = function Toolbar(props) {
       locales: locales
     }),
     bottomRight: /*#__PURE__*/React.createElement(HandleActions, {
-      locales: locales
+      locales: locales,
+      __id: __id
     })
   }));
 };

package/es/plus/orderList/index.d.ts

@@ -4,6 +4,7 @@ export interface OrderListProps {
     biz: string;
     className?: string;
     style?: React.CSSProperties;
+    __id?: string;
 }
 declare const OrderList: (props: OrderListProps) => React.JSX.Element;
 export default OrderList;

package/es/plus/orderList/index.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -25,7 +26,8 @@ var OrderList = function OrderList(props) {
   var _context$engine, _context$appHelper, _window, _utils$getApp;
   var biz = props.biz,
     style = props.style,
-    className = props.className;
+    className = props.className,
+    __id = props.__id;
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en'); // 默认改为英文
 
@@ -122,7 +124,10 @@ var OrderList = function OrderList(props) {
     title: locales.getText('pisell2.orderList.title')
   }), /*#__PURE__*/React.createElement(Toolbar, {
     clearSelectedData: clearSelectedData,
+    __id: __id,
     locales: locales
-  }), /*#__PURE__*/React.createElement(PisellGridView, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Table, tableConfig)), /*#__PURE__*/React.createElement(OrderBatchActionBar, batchActionBarConfig), /*#__PURE__*/React.createElement(PisellGridPro.Footer, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Pagination, null)))));
+  }), /*#__PURE__*/React.createElement(PisellGridView, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Table, _extends({}, tableConfig, {
+    __id: __id
+  }))), /*#__PURE__*/React.createElement(OrderBatchActionBar, batchActionBarConfig), /*#__PURE__*/React.createElement(PisellGridPro.Footer, null, /*#__PURE__*/React.createElement(PisellDataSourceContainer.Pagination, null)))));
 };
 export default OrderList;

package/es/plus/pisellSalesGrid/PisellSalesGrid.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { PisellSalesGridProps } from './types';
+import './PisellSalesGrid.less';
+declare const PisellSalesGrid: React.FC<PisellSalesGridProps>;
+export default PisellSalesGrid;