@pisell/materials 6.2.39 → 6.2.41

package/es/components/table/Table/fields/text/Show/index.d.ts

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

package/es/components/table/Table/fields/text/Sort/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/fields/text/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/es/components/table/Table/fields/treeSelect/Config/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/es/components/table/Table/fields/treeSelect/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/es/components/table/Table/fields/treeSelect/Sort/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/es/components/table/Table/index.js

@@ -57,11 +57,14 @@ var GridViewTable = function GridViewTable(_ref) {
       payload: newData
     });
   });
-  var handleResize = function handleResize(index) {
+  var handleResize = function handleResize(index, record) {
     return function (e, _ref2) {
       var size = _ref2.size;
-      var nextColumns = _toConsumableArray(columns);
-      nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
+      var findIndex = column_setting.findIndex(function (item) {
+        return item.dataIndex === record.dataIndex;
+      });
+      var nextColumns = _toConsumableArray(column_setting);
+      nextColumns[findIndex] = _objectSpread(_objectSpread({}, nextColumns[findIndex]), {}, {
         width: size.width
       });
       form.setFieldValue('column_setting', nextColumns);
@@ -97,6 +100,7 @@ var GridViewTable = function GridViewTable(_ref) {
   var components = useGenTableComponents({
     form: form
   });
+  console.log(columns, 'columns12');
   var showTotal = useCallback(function (total, range, pageSize) {
     var start = range[0] - 1;
     var _current = start / pageSize + 1;

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filters" | "filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("filters" | "column_setting" | "gallery_setting" | "order_by" | "group_by" | "view_mode" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/TableFilter/SortIcon.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface SortIconProps {
     sortOrder: null | "ascend" | "descend";
 }

package/es/components/table/hooks/useTableSetting.js

@@ -231,7 +231,7 @@ var useTableSetting = function useTableSetting(params) {
         }
       } else {
         var names = new Set();
-        if ( /*#__PURE__*/React.isValidElement(filter)) {
+        if ( /*#__PURE__*/React.isValidElement(filter) || /*#__PURE__*/React.isValidElement(filter === null || filter === void 0 ? void 0 : filter.dom)) {
           names = new Set(((filter === null || filter === void 0 ? void 0 : filter.items) || []).filter(function (item) {
             return !item.isHidden;
           }).map(function (item) {

package/es/components/table/hooks/useTransColumns.d.ts

@@ -4,7 +4,7 @@ declare type UseTransColumnsProps = {
     form: FormInstance;
     localPagination: boolean;
     handleSave?: (row: Record<string, any>) => void;
-    handleResize?: (index: number) => (e: any, p2: any) => void;
+    handleResize?: (index: number, record: Record<string, any>) => (e: any, p2: any) => void;
     dragSort: boolean;
     bordered: boolean;
 };

package/es/components/table/hooks/useTransColumns.js

@@ -186,7 +186,7 @@ var useTransColumns = function useTransColumns(params) {
           return _objectSpread(_objectSpread({
             record: record
           }, item), {}, {
-            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index),
+            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index, record),
             position: position
           });
         }

package/es/components/table/index.js

@@ -252,7 +252,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
         try {
           if (!tableId) return {};
           var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
-          return (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          var filters = (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          filters.order_by = (setting === null || setting === void 0 ? void 0 : setting.order_by) || '';
+          return filters;
         } catch (e) {
           return {};
         }

package/es/components/table/serve.js

@@ -26,6 +26,14 @@ var defaultUrl = {
  * @Date: 2024-09-05 12:01
  */
 var formatApiParams = function formatApiParams(params, type) {
+  if (params instanceof FormData) {
+    var url = params.get('url');
+    params.delete('url');
+    return {
+      url: url || (defaultUrl === null || defaultUrl === void 0 ? void 0 : defaultUrl[type]),
+      params: params
+    };
+  }
   var _url = (params === null || params === void 0 ? void 0 : params.url) || (defaultUrl === null || defaultUrl === void 0 ? void 0 : defaultUrl[type]);
   var _params = _objectSpread({}, params);
   delete _params.url;

package/es/components/tabs/index.js

@@ -100,6 +100,15 @@ var Tabs = /*#__PURE__*/function (_Component) {
     value: function componentDidMount() {
       document.body.id = 'body'; // 解决 antd tabs 样式问题
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.activeKey !== this.props.activeKey) {
+        this.setState({
+          activeKey: this.props.activeKey
+        });
+      }
+    }
   }, {
     key: "render",
     value: function render() {

package/es/components/time-picker/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const TimePicker: (props: any) => JSX.Element;
 export default TimePicker;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Upload: (props: any) => JSX.Element;
 export default Upload;

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

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

package/es/components/virtual-keyboard/Time/utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const formatStringToTime: (value: string) => {
     valueArray: string[];
     valueString: string;

package/es/components/walletCard/Guest/index.d.ts

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

package/es/components/walletCard/Guide/index.d.ts

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

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

@@ -1,19 +1,19 @@
 import React from 'react';
 import './index.less';
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            [elemName: string]: any;
-        }
-    }
-}
 export interface WalletCardItem {
-    key: string;
-    label?: string;
-    hidden?: boolean;
+    type: string;
+    custom_title?: string | {
+        original: string;
+        en: string;
+        'zh-CN': string;
+        'zh-HK': string;
+    };
+    display?: 0 | 1;
     value?: number;
 }
 export interface WalletCardProps {
+    /** 钱包ID */
+    id?: string;
     /** 二维码弹窗适配平台 */
     platform?: 'pc' | 'h5' | 'ipad';
     /** 卡片主题 */
@@ -21,7 +21,7 @@ export interface WalletCardProps {
     /** 默认还是完整显示code */
     cardStyle?: 'normal' | 'full';
     /** 条形码还是二维码 */
-    codeType?: 'barCode' | 'orCode';
+    codeType?: 'barCode' | 'qrCode';
     /** 二维码方向 */
     codeDirection?: 'bottom' | 'top';
     /** 自定义背景图 */
@@ -62,6 +62,10 @@ export interface WalletCardProps {
     isLogin?: boolean;
     /** 是否是引导页 */
     isGuide?: boolean;
+    /** 是否显示查看PIN */
+    showViewPin?: boolean;
+    /** 查看PIN的回调 */
+    onViewPinClick?: () => void;
 }
 declare const WalletCard: React.FC<WalletCardProps>;
 export default WalletCard;

package/es/components/walletCard/index.js

@@ -4,10 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 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); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,6 +14,7 @@ import { Card, QRCode } from 'antd';
 import classNames from 'classnames';
 import React, { useMemo, useState } from 'react';
 import Barcode from 'react-barcode';
+import EyeOff from '@pisell/icon/es/EyeOff';
 import { getText } from "../../locales/index";
 import Iconfont from "./../iconfont";
 import PisellModal from "./../pisellModal";
@@ -27,8 +24,6 @@ import Guest from "./Guest";
 import Guide from "./Guide";
 import "./index.less";
 
-// 添加JSX类型声明
-
 // 类型定义
 
 // 默认值
@@ -40,7 +35,7 @@ var DEFAULT_PROPS = {
   showWalletName: true,
   shopName: 'Store name',
   showShopName: true,
-  cardNo: 'Wallet number',
+  cardNo: 'WL0000000001',
   cardStyle: 'normal',
   codeType: 'barCode',
   platform: 'pc',
@@ -50,21 +45,41 @@ var DEFAULT_PROPS = {
   walletName: 'Level',
   isLogin: true,
   items: [{
-    key: 'rechargeable',
-    label: 'rechargeable',
-    value: 0
+    type: 'rechargeable',
+    display: 1,
+    custom_title: {
+      original: 'Balance',
+      'zh-CN': '充值卡',
+      'zh-HK': '充值卡',
+      en: 'Balance'
+    }
   }, {
-    key: 'piont',
-    label: 'piont',
-    value: 10
+    type: 'point',
+    display: 1,
+    custom_title: {
+      original: 'Points',
+      'zh-CN': '积分卡',
+      'zh-HK': '積分卡',
+      en: 'Points'
+    }
   }, {
-    key: 'voucher',
-    label: 'Discount cardvoucher',
-    value: 0
+    type: 'voucher',
+    display: 1,
+    custom_title: {
+      original: 'Voucher',
+      'zh-CN': '代金券',
+      'zh-HK': '代金券',
+      en: 'Voucher'
+    }
   }, {
-    key: 'discount',
-    label: 'discount',
-    value: 0
+    type: 'discount',
+    display: 1,
+    custom_title: {
+      original: 'Discount',
+      'zh-CN': '折扣卡',
+      'zh-HK': '折扣卡',
+      en: 'Discount'
+    }
   }]
 };
 
@@ -92,7 +107,7 @@ var useCodeModal = function useCodeModal(cardNo, onCodeClick, codeType) {
     if (interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils)) {
       var _interaction$utils2, _interaction$utils2$p;
       var typeMap = {
-        orCode: 'qrCode',
+        qrCode: 'qrCode',
         barCode: 'barCode'
       };
       interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
@@ -148,13 +163,17 @@ var CardHeader = function CardHeader(_ref2) {
     codeType = _ref2$codeType === void 0 ? 'barCode' : _ref2$codeType,
     onCodeClick = _ref2.onCodeClick,
     _ref2$isLogin = _ref2.isLogin,
-    isLogin = _ref2$isLogin === void 0 ? false : _ref2$isLogin;
+    isLogin = _ref2$isLogin === void 0 ? false : _ref2$isLogin,
+    _ref2$showViewPin = _ref2.showViewPin,
+    showViewPin = _ref2$showViewPin === void 0 ? false : _ref2$showViewPin,
+    onViewPinClick = _ref2.onViewPinClick;
   // 处理可能为0/1的布尔值
   var processedShowIcon = toBooleanValue(showIcon);
   var processedShowWalletName = toBooleanValue(showWalletName);
   var processedShowShopName = toBooleanValue(showShopName);
   var processedShowCardNo = toBooleanValue(showCardNo);
   var processedShowCode = toBooleanValue(showCode);
+  var processedShowViewPin = toBooleanValue(showViewPin);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-header"
   }, /*#__PURE__*/React.createElement("div", {
@@ -172,7 +191,12 @@ var CardHeader = function CardHeader(_ref2) {
     }
   })) : null, processedShowWalletName && walletName && /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-header-level-text"
-  }, walletName)), processedShowShopName && shopName && /*#__PURE__*/React.createElement("div", null, shopName), processedShowCardNo && cardNo && /*#__PURE__*/React.createElement("div", null, cardNo)), /*#__PURE__*/React.createElement("div", {
+  }, walletName)), processedShowShopName && shopName && /*#__PURE__*/React.createElement("div", null, shopName), processedShowCardNo && cardNo && /*#__PURE__*/React.createElement("div", null, cardNo), processedShowViewPin && /*#__PURE__*/React.createElement("div", {
+    className: "pisell-wallet-card-header-view-pin",
+    onClick: onViewPinClick
+  }, getText('walletCard-viewPin'), /*#__PURE__*/React.createElement(EyeOff, {
+    className: "pisell-wallet-card-header-view-pin-icon"
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-header-right"
   }, processedShowCode && cardStyle === 'normal' && /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-icon-wrapper",
@@ -188,49 +212,44 @@ var CardHeader = function CardHeader(_ref2) {
 
 // 子组件：卡片内容项
 var CardItem = function CardItem(_ref3) {
+  var _context$appHelper2;
   var item = _ref3.item,
     symbol = _ref3.symbol;
-  var key = item.key,
-    label = item.label,
+  var type = item.type,
+    custom_title = item.custom_title,
     value = item.value;
+  var context = useEngineContext();
+  var utils = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils;
+  var translationOriginal = (utils === null || utils === void 0 ? void 0 : utils.translationOriginal) || (utils === null || utils === void 0 ? void 0 : utils.translation);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-item-label"
-  }, getText("walletCard-".concat(label)) || ''), /*#__PURE__*/React.createElement("div", {
+  }, translationOriginal(custom_title || '') || ''), /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-item-value"
-  }, key === 'rechargeable' ? /*#__PURE__*/React.createElement(Amount, {
+  }, type === 'rechargeable' ? /*#__PURE__*/React.createElement(Amount, {
     className: "pisell-card-amount-item-value",
     platform: "h5",
     symbol: symbol,
     useThousandsSeparator: true,
     showCurrencySymbol: true,
     value: value
-  }) : value));
+  }) : value || '0'));
 };
 
 // 子组件：卡片内容
 var CardContent = function CardContent(_ref4) {
   var items = _ref4.items,
     symbol = _ref4.symbol;
-  // 定义期望的顺序
-  var expectedOrder = ['piont', 'balance', 'discount', 'voucher'];
-
-  // 对 items 进行排序
-  var sortedItems = useMemo(function () {
-    if (!(items !== null && items !== void 0 && items.length)) return [];
-    return _toConsumableArray(items).sort(function (a, b) {
-      var indexA = expectedOrder.indexOf(a.key);
-      var indexB = expectedOrder.indexOf(b.key);
-      return indexA - indexB;
-    });
-  }, [items]);
+  var filteredItems = (items || []).filter(function (item) {
+    return item.display !== 0;
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-card-list",
     style: {
-      justifyContent: (sortedItems || []).length > 1 ? 'space-between' : 'flex-start'
+      justifyContent: filteredItems.length > 1 ? 'space-between' : 'flex-start'
     }
-  }, (sortedItems || []).map(function (item, index) {
+  }, filteredItems.map(function (item, index) {
     return /*#__PURE__*/React.createElement(CardItem, {
       key: index,
       item: item,
@@ -339,6 +358,7 @@ var WalletCard = function WalletCard(props) {
   var showCardNo = toBooleanValue(mergedProps.showCardNo);
   var showCode = toBooleanValue(mergedProps.showCode);
   var isLogin = toBooleanValue(mergedProps.isLogin);
+  var showViewPin = toBooleanValue(mergedProps === null || mergedProps === void 0 ? void 0 : mergedProps.showViewPin);
   var context = useEngineContext();
   var _ref7 = context.appHelper || {},
     utils = _ref7.utils;
@@ -347,6 +367,7 @@ var WalletCard = function WalletCard(props) {
     isModalOpen = _useCodeModal.isModalOpen,
     handleCodeClick = _useCodeModal.handleCodeClick,
     closeModal = _useCodeModal.closeModal;
+  console.log('showViewPin', props);
 
   // 计算背景样式
   var backgroundStyle = useMemo(function () {
@@ -374,10 +395,24 @@ var WalletCard = function WalletCard(props) {
     }
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.goWallet',
-      data: {},
+      data: {
+        id: props.id
+      },
       callback: function callback() {}
     });
   };
+
+  /**
+   * 查看PIN的回调
+   */
+  var onViewPinClick = function onViewPinClick(e) {
+    e.stopPropagation();
+    if (props !== null && props !== void 0 && props.onViewPinClick) {
+      props.onViewPinClick();
+    } else {
+      console.error('onViewPinClick方法需要传入');
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-wallet-card-wrapper', className),
     style: style,
@@ -415,7 +450,9 @@ var WalletCard = function WalletCard(props) {
     cardStyle: cardStyle,
     codeType: codeType,
     onCodeClick: handleCodeClick,
-    isLogin: isLogin
+    isLogin: isLogin,
+    showViewPin: showViewPin,
+    onViewPinClick: onViewPinClick
   }), /*#__PURE__*/React.createElement(CardContent, {
     items: items,
     symbol: symbol

package/es/components/walletCard/index.less

@@ -106,6 +106,33 @@
           margin-bottom: 0;
         }
       }
+
+      .pisell-wallet-card-header-view-pin {
+        position: relative;
+        color: #53b1fd;
+        cursor: pointer;
+        font-size: 12px;
+        font-weight: 400;
+        display: flex;
+        align-items: center;
+        gap: 4px;
+
+        .pisell-wallet-card-header-view-pin-icon {
+          width: 16px;
+          height: 16px;
+          color: #53b1fd;
+          font-size: 16px;
+        }
+
+        &:after {
+          content: '';
+          position: absolute;
+          top: -5px;
+          left: -5px;
+          right: -5px;
+          bottom: -5px; /* 向外扩展5px */
+        }
+      }
     }
 
     // 头部右侧

package/es/index.d.ts

@@ -26,6 +26,7 @@ export { default as DataSourceTypography } from './components/dataSourceComponen
 export { default as DataSourceTable } from './components/dataSourceComponents/dataSourceTable';
 export { default as DataSourceWrapper } from './components/dataSourceComponents/dataSourceWrapper';
 export { default as FormItemCheckbox } from './components/dataSourceComponents/fields/Checkbox';
+export { default as FormItemSwitch } from './components/dataSourceComponents/fields/Switch';
 export { default as FormItemColorPicker } from './components/dataSourceComponents/fields/ColorPicker';
 export { default as FormItemDatePicker } from './components/dataSourceComponents/fields/DatePicker';
 export { default as FormItemInput } from './components/dataSourceComponents/fields/Input';

package/es/index.js

@@ -28,6 +28,7 @@ export { default as DataSourceTypography } from "./components/dataSourceComponen
 export { default as DataSourceTable } from "./components/dataSourceComponents/dataSourceTable";
 export { default as DataSourceWrapper } from "./components/dataSourceComponents/dataSourceWrapper";
 export { default as FormItemCheckbox } from "./components/dataSourceComponents/fields/Checkbox";
+export { default as FormItemSwitch } from "./components/dataSourceComponents/fields/Switch";
 export { default as FormItemColorPicker } from "./components/dataSourceComponents/fields/ColorPicker";
 export { default as FormItemDatePicker } from "./components/dataSourceComponents/fields/DatePicker";
 export { default as FormItemInput } from "./components/dataSourceComponents/fields/Input";