@pisell/private-materials 6.6.9 → 6.6.10

package/es/components/pay/toC/index.js

@@ -23,13 +23,14 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, getOrderBasicDetail } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
+import { getMachineCodeList } from "./PaymentMethods/WalletPass/serve";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
 import { saleChannelMap } from "./status";
 import "./index.less";
@@ -263,7 +264,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
+      var _order$_order, _state$payGroup2, _paymentListRef$curre, _yield$Promise$all, _yield$Promise$all2, data, allList, orderBasicDetail, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, products, _res, recommended, transformList, noApplicableVoucher, recommendedAmount, withCustomerIdList, _waitAmount2;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -276,14 +277,42 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return getPaymentsAndWalletPass({
+            return Promise.all([getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
-            });
+            }), getMachineCodeList({
+              order_id: order.order_id,
+              available: 2,
+              prepare_payments: [],
+              filter_prepare_wallet_pass: 1,
+              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+              other_exact_codes: []
+            }), getOrderBasicDetail(order.order_id)]);
           case 4:
-            data = _context3.sent;
-            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
+            _yield$Promise$all = _context3.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
+            data = _yield$Promise$all2[0];
+            allList = _yield$Promise$all2[1];
+            orderBasicDetail = _yield$Promise$all2[2];
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass;
+            products = (orderBasicDetail.detail || []).map(function (item) {
+              var _ref5;
+              return _objectSpread(_objectSpread({}, item), {}, {
+                is_price_include_tax: orderBasicDetail.is_price_include_tax,
+                product_bundle: (_ref5 = item.product_bundle || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (bundle) {
+                  return _objectSpread(_objectSpread({}, bundle), {}, {
+                    is_price_include_tax: orderBasicDetail.is_price_include_tax
+                  });
+                })
+              });
+            });
+            _res = utils.walletPassEvaluator.getRecommendedVouchers({
+              orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
+              products: products,
+              vouchers: allList || []
+            });
+            recommended = _res.recommended, transformList = _res.transformList, noApplicableVoucher = _res.noApplicableVoucher, recommendedAmount = _res.recommendedAmount; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
@@ -292,30 +321,40 @@ var ToCPay = function ToCPay(props, ref) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 customer_id: customer_id || item.customer_id
               });
-            }); // 设置交易组
+            });
+            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
                 // ...state.payGroup,
                 order_id: order === null || order === void 0 ? void 0 : order.order_id,
                 // total_amount: order?.amount,
+                orderDetail: orderBasicDetail,
                 // 原订单信息
                 _order: order,
                 payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
-                  amount: wallet_pass_amount,
-                  cards: withCustomerIdList
+                  // 推荐钱包
+                  cards: recommended,
+                  // 推荐金额
+                  amount: recommendedAmount,
+                  // 不可用钱包
+                  noApplicableVoucher: noApplicableVoucher,
+                  // 转换列表
+                  transformList: transformList
+                  // amount: wallet_pass_amount,
+                  // cards: wallet_pass_recommend_list,
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: remain_amount
+                wait_amount: Math.max(0, _waitAmount2)
               }
             });
 
             // 初始化支付列表
-            _context3.next = 11;
+            _context3.next = 19;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 11:
+          case 19:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -326,10 +365,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 21;
+            _context3.next = 29;
             break;
-          case 15:
-            _context3.prev = 15;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -352,11 +391,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 21:
+          case 29:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 15]]);
+      }, _callee3, null, [[1, 23]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -373,7 +412,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -433,7 +472,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -445,7 +484,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -519,7 +558,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -578,7 +617,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -596,7 +635,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -608,7 +647,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup10, _state$payGroup11, _state$payGroup12;
       var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -686,7 +725,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
@@ -743,7 +782,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -783,7 +822,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,5 +29,13 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
+    orderDetail: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/pay/toC/serve.d.ts

@@ -60,3 +60,21 @@ export declare const getWalletNameAndPopupStatus: (values: {
  * @description: 获取支付结果
  */
 export declare const getPaymentResult: (values: any) => Promise<any>;
+declare type OrderBasicDetail = {
+    id: number;
+    status: string;
+    payment_status: string;
+    order_time: string;
+    detail: any[];
+    product_unpaid_total_pay_amount: number;
+    product_paid_total_pay_amount: number;
+    is_price_include_tax: 1 | 0;
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export declare const getOrderBasicDetail: (order_id: string) => Promise<OrderBasicDetail>;
+export {};

package/es/components/pay/toC/serve.js

@@ -185,4 +185,32 @@ export var getWalletNameAndPopupStatus = /*#__PURE__*/function () {
  */
 export var getPaymentResult = function getPaymentResult(values) {
   return request.getRequest().get("/h5/pay/order/payment/result", values);
-};
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export var getOrderBasicDetail = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_id) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return request.getRequest().get("/h5/order/order/".concat(order_id, "/basic-detail"), {});
+        case 2:
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
+          return _context5.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function getOrderBasicDetail(_x5) {
+    return _ref5.apply(this, arguments);
+  };
+}();

package/es/components/pay/toC/utils.d.ts

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string;
+        amount: string | number;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

package/es/components/pay/toC/utils.js

@@ -6,6 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
+import { isNumber } from "@pisell/utils";
 /**
  * 计算walletPass列表数据的总金额
  * @param list
@@ -95,6 +96,9 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var clientPayment = function clientPayment(params) {

package/es/components/pisellSelectCustomerModal/CustomerCard/index.d.ts

@@ -8,5 +8,5 @@ export interface CustomerCardProps {
     onRemove?: (value?: any) => void;
     customIcon?: React.ReactNode;
 }
-declare const CustomerCard: ({ onClickItem, customer, showIcon, customIcon, onRemove, className, }: CustomerCardProps) => React.JSX.Element;
+declare const CustomerCard: ({ onClickItem, customer, showIcon, customIcon, onRemove, className, }: CustomerCardProps) => JSX.Element;
 export default CustomerCard;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => React.JSX.Element;
+declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const GenderField: (props: any) => React.JSX.Element;
+declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const PhoneField: ({ value, onChange }: any) => React.JSX.Element;
+declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;
     phone: string;
 }
-declare const AddClient: (props: AddClientProps) => React.JSX.Element;
+declare const AddClient: (props: AddClientProps) => JSX.Element;
 export default AddClient;

package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface CustomerListProps {
     value: any;
@@ -9,5 +8,5 @@ interface CustomerListProps {
     onLoadMore: () => void;
     setPage: (page: 'create') => void;
 }
-declare const CustomerList: (props: CustomerListProps) => React.JSX.Element;
+declare const CustomerList: (props: CustomerListProps) => JSX.Element;
 export default CustomerList;

package/es/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface RightPanelProps {
     value: any;
@@ -11,5 +10,5 @@ export interface QueryParams {
     skip: number;
     num: number;
 }
-declare const RightPanel: (props: RightPanelProps) => React.JSX.Element;
+declare const RightPanel: (props: RightPanelProps) => JSX.Element;
 export default RightPanel;

package/es/components/pisellSelectCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';
@@ -12,5 +11,5 @@ interface PisellSelectCustomerModalProps {
     keyboardProps?: any;
     virtualKeyInputProps?: any;
 }
-declare const PisellSelectCustomerModal: (props: PisellSelectCustomerModalProps) => React.JSX.Element;
+declare const PisellSelectCustomerModal: (props: PisellSelectCustomerModalProps) => JSX.Element;
 export default PisellSelectCustomerModal;

package/es/components/productExtension/fields/Actor/index.d.ts

@@ -1,5 +1,4 @@
-import React from "react";
 declare const Actor: ({ name }: {
     name: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default Actor;

package/es/components/productExtension/fields/Forms/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 export interface InfoProps {
     relation_id: any;
     action: any;
@@ -6,5 +5,5 @@ export interface InfoProps {
     onChange: any;
     apis: any;
 }
-declare const Forms: (props: InfoProps) => React.JSX.Element;
+declare const Forms: (props: InfoProps) => JSX.Element;
 export default Forms;

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => React.JSX.Element;
+declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => React.JSX.Element;
+declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/es/components/productExtension/fields/SelectProducts/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface valueType {
 }
@@ -6,5 +5,5 @@ interface SelectProductsProps {
     value?: valueType[];
     onChange?: (value: valueType[]) => void;
 }
-declare const SelectProducts: ({ value, onChange }: SelectProductsProps) => React.JSX.Element;
+declare const SelectProducts: ({ value, onChange }: SelectProductsProps) => JSX.Element;
 export default SelectProducts;

package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const SelectResourcesTable: ({ value, onChange }: any) => React.JSX.Element;
+declare const SelectResourcesTable: ({ value, onChange }: any) => JSX.Element;
 export default SelectResourcesTable;

package/es/components/productExtension/index.d.ts

@@ -1,8 +1,7 @@
-import React from "react";
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;
     type: "all" | "once" | "batch";
 }
-declare const ProductExtension: ({ onDataChange, type }: ProductExtensionProps) => React.JSX.Element;
+declare const ProductExtension: ({ onDataChange, type }: ProductExtensionProps) => JSX.Element;
 export default ProductExtension;

package/es/components/productSelect/components/TabProduct/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const TabProduct: (props: any) => React.JSX.Element;
+declare const TabProduct: (props: any) => JSX.Element;
 export default TabProduct;

package/es/components/productSelect/components/pisellPriceText/index.d.ts

@@ -7,5 +7,5 @@ interface IProps {
     prefix?: React.ReactElement;
     suffix?: React.ReactElement;
 }
-declare const index: (props: IProps) => React.JSX.Element;
+declare const index: (props: IProps) => JSX.Element;
 export default index;

package/es/components/productSelect/components/productGroup/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {
@@ -34,6 +33,6 @@ interface ProductGroupProps {
     onSelectProduct?: (id: number) => void;
     currentProductId?: number;
 }
-declare const ProductGroup: ({ data, layout, onSelectProduct, currentProductId, isProductCover, imgWidth, imgHeight, radius, isTitle, isSubtitle, showSpec, isTag, isPrice, isOriginPrice, showZeroPrice, showMarketingTag, showRemark, isStock, }: ProductGroupProps & ProductCardConfig) => React.JSX.Element;
-export declare const ProductGroupSkeleton: ({ layout }: any) => React.JSX.Element;
+declare const ProductGroup: ({ data, layout, onSelectProduct, currentProductId, isProductCover, imgWidth, imgHeight, radius, isTitle, isSubtitle, showSpec, isTag, isPrice, isOriginPrice, showZeroPrice, showMarketingTag, showRemark, isStock, }: ProductGroupProps & ProductCardConfig) => JSX.Element;
+export declare const ProductGroupSkeleton: ({ layout }: any) => JSX.Element;
 export default ProductGroup;

package/es/components/productSelect/index.d.ts

@@ -22,5 +22,5 @@ interface ProductSelectProps {
     selectedItems?: Array<any>;
     productListSetting?: Partial<ProductCardConfig>;
 }
-declare const index: ({ dataSource, showSearch, scrollDom, style, token: customToken, onChange, selectedItems, productListSetting, ...rest }: ProductSelectProps) => React.JSX.Element;
+declare const index: ({ dataSource, showSearch, scrollDom, style, token: customToken, onChange, selectedItems, productListSetting, ...rest }: ProductSelectProps) => JSX.Element;
 export default index;

package/es/components/ruleSetting/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
 interface RuleSettingProps {
     value: any;
@@ -6,5 +5,5 @@ interface RuleSettingProps {
     className: string;
     style: any;
 }
-declare const RuleSetting: (props: RuleSettingProps) => React.JSX.Element;
+declare const RuleSetting: (props: RuleSettingProps) => JSX.Element;
 export default RuleSetting;

package/es/components/ruleSetting/ruleBorder/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
 interface RuleSettingProps {
     value: any;
@@ -6,5 +5,5 @@ interface RuleSettingProps {
     startDomClassName: string;
     endDomClassName: string;
 }
-declare const RuleBorder: (props: RuleSettingProps) => React.JSX.Element;
+declare const RuleBorder: (props: RuleSettingProps) => JSX.Element;
 export default RuleBorder;

package/es/components/schedules/calendar/calendarItem.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;
@@ -7,5 +6,5 @@ declare type CalendarItemProps = {
     onSelect: (date: string, item?: CalendarDataItem) => void;
     isEdit: boolean;
 };
-declare const CalendarItem: (props: CalendarItemProps) => React.JSX.Element;
+declare const CalendarItem: (props: CalendarItemProps) => JSX.Element;
 export default CalendarItem;

package/es/components/schedules/calendar/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const Calendar: () => React.JSX.Element;
+declare const Calendar: () => JSX.Element;
 export default Calendar;

package/es/components/schedules/components/Card/index.d.ts

@@ -2,5 +2,5 @@ import React from "react";
 import "./index.less";
 interface CardProps extends React.HTMLAttributes<HTMLDivElement> {
 }
-declare const Card: (props: Partial<CardProps>) => React.JSX.Element;
+declare const Card: (props: Partial<CardProps>) => JSX.Element;
 export default Card;

package/es/components/schedules/components/CurrentDay/index.d.ts

@@ -1,8 +1,7 @@
-import React from "react";
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;
     currentDay?: string;
 };
-declare const CurrentDay: (props: CurrentDayProps) => React.JSX.Element | null;
+declare const CurrentDay: (props: CurrentDayProps) => JSX.Element | null;
 export default CurrentDay;

package/es/components/schedules/components/ResourceList/index.d.ts

@@ -10,5 +10,5 @@ interface ResourceListProps {
     loading: boolean;
     onClick?: (item: ResourceItem) => void;
 }
-declare const ResourceList: (props: ResourceListProps) => React.JSX.Element;
+declare const ResourceList: (props: ResourceListProps) => JSX.Element;
 export default ResourceList;

package/es/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {
@@ -12,5 +11,5 @@ declare type ScheduleDetailListPropsType = {
  * @param props
  * @constructor
  */
-declare const ScheduleDetailList: (props: ScheduleDetailListPropsType) => React.JSX.Element;
+declare const ScheduleDetailList: (props: ScheduleDetailListPropsType) => JSX.Element;
 export default ScheduleDetailList;

package/es/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;
@@ -8,5 +7,5 @@ interface RenderScheduleItemProps {
     onDelete?: (item: ScheduleItem) => void;
     showDeleteIcon?: boolean;
 }
-declare const RenderScheduleItem: ({ item, onItemClick, onDelete, showDeleteIcon, }: RenderScheduleItemProps) => React.JSX.Element;
+declare const RenderScheduleItem: ({ item, onItemClick, onDelete, showDeleteIcon, }: RenderScheduleItemProps) => JSX.Element;
 export default RenderScheduleItem;

package/es/components/schedules/components/ScheduleList/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';
@@ -17,5 +16,5 @@ declare type ScheduleListType = {
  * @param props
  * @constructor
  */
-declare const ScheduleList: (props: ScheduleListType) => React.JSX.Element;
+declare const ScheduleList: (props: ScheduleListType) => JSX.Element;
 export default ScheduleList;