@pisell/materials 6.3.7 → 6.3.9

package/dist/umd/static/DotsSix.57d66266.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M8 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM8 6a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM8 20a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 6a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 20a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

package/dist/umd/static/arrow-left.e542294f.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.707 4.293a1 1 0 0 1 0 1.414L7.414 11H19a1 1 0 1 1 0 2H7.414l5.293 5.293a1 1 0 0 1-1.414 1.414l-7-7a1 1 0 0 1 0-1.414l7-7a1 1 0 0 1 1.414 0Z"/></svg>

package/dist/umd/static/arrow-right.763f03e0.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.293 4.293a1 1 0 0 1 1.414 0l7 7a1 1 0 0 1 0 1.414l-7 7a1 1 0 0 1-1.414-1.414L16.586 13H5a1 1 0 1 1 0-2h11.586l-5.293-5.293a1 1 0 0 1 0-1.414Z"/></svg>

package/dist/umd/static/filter-lines.04a54ae9.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M2 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm3 6a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm3 6a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2H9a1 1 0 0 1-1-1Z"/></svg>

package/dist/umd/static/help-circle.31c9be40.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 3a9 9 0 1 0 0 18 9 9 0 0 0 0-18ZM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm11.258-3.976a2 2 0 0 0-2.225 1.308 1 1 0 1 1-1.886-.664 4 4 0 0 1 7.773 1.333c0 1.53-1.135 2.54-1.945 3.081a8.044 8.044 0 0 1-1.686.848l-.035.013-.011.003-.004.002h-.002L11.92 13l.316.949a1 1 0 0 1-.633-1.897l.016-.006.074-.027a6.051 6.051 0 0 0 1.172-.6c.69-.46 1.055-.95 1.055-1.419v-.001a2 2 0 0 0-1.662-1.975ZM11 17a1 1 0 0 1 1-1h.01a1 1 0 1 1 0 2H12a1 1 0 0 1-1-1Z"/></svg>

package/dist/umd/static/switch-vertical-01.7ebe3ba8.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.293 3.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414L8 6.414V20a1 1 0 1 1-2 0V6.414L3.707 8.707a1 1 0 0 1-1.414-1.414l4-4ZM16 17.586V4a1 1 0 1 1 2 0v13.586l2.293-2.293a1 1 0 0 1 1.414 1.414l-4 4a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 1.414-1.414L16 17.586Z"/></svg>

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

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

package/es/components/auto-complete-number/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { AutoCompleteProps, InputNumberProps } from "antd";
 interface AutoCompleteNumberProps {
     autoCompleteProps: AutoCompleteProps;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { BadgeProps as OriginalBadgeprops } from 'antd';
 import './index.less';
 export interface Badgeprops extends OriginalBadgeprops {

package/es/components/batch-editor/fields/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: {
     price: import("react").FC<import("./Price").PriceProps>;
     image: (props: import("./Image").ImageProps) => JSX.Element | null;

package/es/components/batch-editor/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface BatchEditorProps {
     columns: any[];

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

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

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

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

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

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

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

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

package/es/components/config-provider/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ConfigProviderProps as OriginalConfigProviderProps } from "antd/es/config-provider";
 import "dayjs/locale/zh-cn";
 export interface ConfigProviderProps extends OriginalConfigProviderProps {

package/es/components/dataSourceComponents/dataSourceForm/formItem.d.ts

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

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -1,7 +1,7 @@
-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); }
 var _excluded = ["renderMode", "value", "onChange"],
   _excluded2 = ["name", "label", "mode", "renderMode", "tooltip", "noStyle", "extra", "required", "requiredobj", "minLengthobj", "maxLengthobj", "typeobj", "maxobj", "minobj", "normalize", "getValueProps", "validator", "style", "validateTrigger", "__designMode", "labelCol", "hideLabel", "innerStyle"];
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 _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 _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); }
@@ -172,9 +172,27 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           break;
         case 'phone':
           rules.push({
-            validator: function validator(_, value) {
+            validator: function validator(_, originValue) {
+              var _value, _phone;
+              var value = "";
+              if (isString(originValue)) {
+                value = originValue;
+              } else if (originValue && 'phone' in originValue) {
+                value = "".concat((originValue === null || originValue === void 0 ? void 0 : originValue.countryCallingCode) || "").concat(originValue.phone || "");
+              }
+
               // 如果值为空或者只有空格，直接返回成功，不进行校验
-              if (!(value !== null && value !== void 0 && value.trim())) {
+              if (!((_value = value) !== null && _value !== void 0 && _value.trim())) {
+                if ((requiredobj === null || requiredobj === void 0 ? void 0 : requiredobj.required) === false) {
+                  return Promise.resolve();
+                } else if (_typeof(originValue) == 'object') {
+                  // 如果是object，存在phone和contryCallingCode都为空的场景，需要拦截
+                  return Promise.reject(new Error(requiredobj.message || getText('pisell-data-source-form-required-message')));
+                }
+              }
+
+              // 如果是object返回格式，非必填且phone为空，不进行校验
+              if (typeof originValue !== 'string' && (requiredobj === null || requiredobj === void 0 ? void 0 : requiredobj.required) === false && (originValue === null || originValue === void 0 || (_phone = originValue.phone) === null || _phone === void 0 ? void 0 : _phone.trim()) === '') {
                 return Promise.resolve();
               }
               try {
@@ -194,9 +212,17 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           break;
         case 'mobile':
           rules.push({
-            validator: function validator(_, value) {
+            validator: function validator(_, originValue) {
+              var _value2;
+              var value = "";
+              if (isString(originValue)) {
+                value = originValue;
+              } else if (originValue && 'phone' in originValue) {
+                value = "".concat((originValue === null || originValue === void 0 ? void 0 : originValue.countryCallingCode) || "").concat(originValue.phone || "");
+              }
+
               // 如果值为空或者只有空格，直接返回成功，不进行校验
-              if (!(value !== null && value !== void 0 && value.trim())) {
+              if (!((_value2 = value) !== null && _value2 !== void 0 && _value2.trim())) {
                 return Promise.resolve();
               }
               try {
@@ -363,7 +389,9 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
           rules: rules
         });
       }
-      return _objectSpread(_objectSpread({}, otherProps || {}), (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {}) || {};
+      return _objectSpread(_objectSpread(_objectSpread({}, otherProps || {}), (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {}), {}, {
+        onChange: undefined
+      });
     }, [overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /*#__PURE__*/React.createElement(Form.Item, _extends({
       required: required,

package/es/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.d.ts

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

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

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

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 declare const useDataSourceKey: () => {
-    dataSourceKey: string | undefined;
-    dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;
+    dataSourceKey: string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined;
+    dataSourceKeyRef: import("react").MutableRefObject<string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined>;
 };
 export default useDataSourceKey;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDrawerState.d.ts

@@ -8,7 +8,7 @@ declare const useDrawerState: (operationContent?: {
     openDrawer: (item: OperationItem) => void;
     closeDrawer: () => void;
     drawerContent: import("react").ReactNode;
-    Container: typeof Drawer | {
+    Container: {
         (props: import("../../../pisellModal").PisellModalProps): JSX.Element;
         confirm: (props: import("../../../pisellModal/components/functions").PisellModalFuncProps) => {
             destroy: () => void;
@@ -32,7 +32,7 @@ declare const useDrawerState: (operationContent?: {
             update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
         };
         Information: (props: import("../../../pisellModal/components/Information").InformationProps) => JSX.Element;
-    };
+    } | typeof Drawer;
     containerProps: {};
 };
 export default useDrawerState;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -19,7 +19,7 @@ interface UseTablePropsProps {
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
     currentComponentId: any;
-    title: number | boolean | React.ReactFragment | (() => React.ReactNode) | JSX.Element | null | undefined;
+    title: string | number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -28,9 +28,12 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.ReactFragment | (() => React.ReactNode) | JSX.Element | null | undefined;
+    subTitle: string | number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
-    filter: any;
+    filter: {
+        dom: any;
+        items: any;
+    } | null;
     onRow: (record: any) => any;
     actionButtons: any[] | null;
     __id?: string | undefined;
@@ -49,9 +52,9 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         show: boolean;
         title: string;
         width: number;
-        align: "left" | "center" | "right";
+        align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -112,7 +112,7 @@ var useTableProps = function useTableProps(props) {
 
   // 删除记录
   var handleDelete = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, softDelete) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, softDelete, customDeleteAction) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -125,27 +125,38 @@ var useTableProps = function useTableProps(props) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
+                      if (!customDeleteAction) {
+                        _context.next = 5;
+                        break;
+                      }
+                      _context.next = 3;
+                      return customDeleteAction(record);
+                    case 3:
+                      _context.next = 13;
+                      break;
+                    case 5:
                       if (!softDelete) {
-                        _context.next = 6;
+                        _context.next = 11;
                         break;
                       }
+                      // 软删除
                       deleteTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-                      _context.next = 4;
+                      _context.next = 9;
                       return update === null || update === void 0 ? void 0 : update.runAsync(_objectSpread(_objectSpread({}, record), {}, {
                         deleted_at: deleteTime
                       }));
-                    case 4:
-                      _context.next = 8;
+                    case 9:
+                      _context.next = 13;
                       break;
-                    case 6:
-                      _context.next = 8;
+                    case 11:
+                      _context.next = 13;
                       return destroy === null || destroy === void 0 ? void 0 : destroy.runAsync(record.id);
-                    case 8:
+                    case 13:
                       refreshData();
                       PisellToast({
                         content: getText('pisell-action-delete-success')
                       });
-                    case 10:
+                    case 15:
                     case "end":
                       return _context.stop();
                   }
@@ -163,7 +174,7 @@ var useTableProps = function useTableProps(props) {
         }
       }, _callee2);
     }));
-    return function (_x, _x2) {
+    return function (_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }());
@@ -195,7 +206,7 @@ var useTableProps = function useTableProps(props) {
                 okText: getText('pisell-delete-confirm-ok'),
                 cancelText: getText('pisell-delete-confirm-cancel'),
                 onOk: function onOk() {
-                  handleDelete(record, item === null || item === void 0 ? void 0 : item.softDelete);
+                  handleDelete(record, item === null || item === void 0 ? void 0 : item.softDelete, item === null || item === void 0 ? void 0 : item.customDeleteAction);
                 }
               });
               return;
@@ -289,8 +300,10 @@ var useTableProps = function useTableProps(props) {
       filterBy: filterBy,
       getInitialValues: getInitialValues
     }));
-    dom.__proto__.items = propsFilter === null || propsFilter === void 0 ? void 0 : propsFilter.items;
-    return dom;
+    return {
+      dom: dom,
+      items: propsFilter === null || propsFilter === void 0 ? void 0 : propsFilter.items
+    };
   }, [propsFilter, search]);
   var onRow = useMemoizedFn(function (record) {
     if (!(clickToDetail !== null && clickToDetail !== void 0 && clickToDetail.show)) {

package/es/components/dataSourceComponents/dataSourceWrapper/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSourceContextProps } from '../provider/dataSource/DataSourceContext';
 declare const DataSourceWrapper: (props: DataSourceContextProps) => JSX.Element;
 export default DataSourceWrapper;

package/es/components/dataSourceComponents/fields/ColorPicker/ReadPretty.d.ts

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

package/es/components/dataSourceComponents/fields/DateRangePicker/ReadPretty.d.ts

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

package/es/components/dataSourceComponents/fields/IconSelect/ReadPretty.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IconSelectProps } from './type';
 import './ReadPretty.less';
 declare const IconSelectReadPretty: (props: IconSelectProps) => JSX.Element | null;

package/es/components/dataSourceComponents/fields/Input/ReadPretty.d.ts

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

package/es/components/dataSourceComponents/fields/Input.Email/ReadPretty.d.ts

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

package/es/components/dataSourceComponents/fields/Input.Json/ReadPretty.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { JsonProps } from "./type";
 import "./ReadPretty.less";
 declare const JsonReadPretty: (props: JsonProps) => JSX.Element | null;

package/es/components/dataSourceComponents/fields/Input.Mobile/WithMode.d.ts

@@ -1,10 +1,17 @@
 import React from 'react';
 import { InputProps } from 'antd';
-import { ModeType } from "../../dataSourceForm/type";
+import { ModeType } from '../../dataSourceForm/type';
+declare type PhoneValue = string | {
+    phone: string;
+    countryCallingCode: string;
+    countryCode?: string;
+};
 export interface PhoneInputProps extends Omit<InputProps, 'value' | 'onChange'> {
     renderMode: ModeType;
-    value?: string;
-    onChange?: (value: string) => void;
+    value?: PhoneValue;
+    onChange?: (value: PhoneValue) => void;
+    returnFormat?: 'string' | 'object';
+    inputRef?: any;
 }
 declare const MobileNumberInputWithMode: React.FC<PhoneInputProps & import("../../dataSourceForm/utils").WithModeProps>;
 export default MobileNumberInputWithMode;

package/es/components/dataSourceComponents/fields/Input.Mobile/WithMode.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "disabled"];
+var _excluded = ["value", "onChange", "disabled", "returnFormat"];
 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 _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."); }
@@ -10,31 +10,32 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useState, useEffect, useMemo } from 'react';
 import { Input, Space } from 'antd';
-import { isNumber } from '@pisell/utils';
+import { isNumber, isString } from '@pisell/utils';
 import Select from "../../../select";
-import { useCountries } from "./serve";
+import { useCountries } from "./../Input.Phone/serve";
 import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
+import useSetRequest from "../../../../hooks/useSetRequest";
 var Option = Select.Option;
 /**
  * 手机号码输入组件
- * 
+ *
  * 校验规则：
  * 1. AU(+61) 验证规则：
  *    - 10位或9位数字
  *    - 前两位是04或者第一位是4
  *    - 格式示例：0412345678 或 412345678
- * 
+ *
  * 2. CN(+86) 验证规则：
  *    - 11位数字
  *    - 第一位必须是1
  *    - 格式示例：13812345678
- * 
+ *
  * 3. 其他国家验证规则：
  *    - 15位以内数字
  *    - 格式示例：123456789
- * 
+ *
  * 使用方式：
  * <Mobile
  *   name="mobile"
@@ -50,7 +51,10 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
   var propsValue = _ref.value,
     onChange = _ref.onChange,
     disabled = _ref.disabled,
+    _ref$returnFormat = _ref.returnFormat,
+    returnFormat = _ref$returnFormat === void 0 ? 'string' : _ref$returnFormat,
     props = _objectWithoutProperties(_ref, _excluded);
+  useSetRequest();
   var _useCountries = useCountries(),
     _useCountries$data = _useCountries.data,
     countries = _useCountries$data === void 0 ? [] : _useCountries$data;
@@ -61,6 +65,19 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
     }
     return propsValue;
   }, [propsValue]);
+  var handleChange = function handleChange(prefix, phoneNumber, countryCode) {
+    if (returnFormat === 'string') {
+      // 只有当实际输入的号码部分不为空时，才包含区号
+      var newValue = phoneNumber ? "".concat(prefix).concat(phoneNumber) : '';
+      onChange === null || onChange === void 0 || onChange(newValue);
+    } else {
+      onChange === null || onChange === void 0 || onChange({
+        phone: phoneNumber,
+        countryCallingCode: prefix,
+        countryCode: countryCode
+      });
+    }
+  };
 
   // 解析外部传入的value
   var parseExternalValue = function parseExternalValue(val) {
@@ -68,18 +85,34 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
       countryCode: 'AU',
       phoneNumber: ''
     };
-    var matchedPrefix = countries.find(function (country) {
-      return val.startsWith(country.prefix);
-    });
-    if (matchedPrefix) {
+    var srtValue = '';
+    if (isString(val)) {
+      srtValue = val;
+    } else if ('phone' in val) {
+      srtValue = "".concat(val.countryCallingCode || '').concat(val.phone || '');
+    }
+    var matchedContry = null;
+    // 如果外部传入了countryCode，则以countryCode为准进行countryCode匹配
+    if (!isString(val) && val !== null && val !== void 0 && val.countryCode) {
+      matchedContry = countries.find(function (country) {
+        return (country === null || country === void 0 ? void 0 : country.code) === (val === null || val === void 0 ? void 0 : val.countryCode);
+      });
+    }
+    // 如果外部没有传入countryCode或者匹配不到，则以srtValue为准进行prefix匹配
+    if (!matchedContry) {
+      matchedContry = countries.find(function (country) {
+        return srtValue.startsWith(country.prefix);
+      });
+    }
+    if (matchedContry) {
       return {
-        countryCode: matchedPrefix.code,
-        phoneNumber: val.slice(matchedPrefix.prefix.length)
+        countryCode: matchedContry.code,
+        phoneNumber: srtValue.slice(matchedContry.prefix.length)
       };
     }
     return {
       countryCode: 'AU',
-      phoneNumber: val.replace(/\D/g, '')
+      phoneNumber: srtValue.replace(/\D/g, '')
     };
   };
   var _useState = useState(function () {
@@ -116,11 +149,9 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
     var selectedCountry = countries.find(function (c) {
       return c.code === value;
     });
-    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || "";
-    var newValue = "".concat(prefix).concat(phoneNumber);
-
+    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || '';
     // 先更新值
-    onChange === null || onChange === void 0 || onChange(newValue);
+    handleChange(prefix, phoneNumber, selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.code);
 
     // 使用 setTimeout 确保值更新后再触发验证
     setTimeout(function () {
@@ -140,13 +171,8 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
     var selectedCountry = countries.find(function (c) {
       return c.code === countryCode;
     });
-    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || "";
-
-    // 只有当实际输入的号码部分不为空时，才包含区号
-    var newValue = cleanNumber ? "".concat(prefix).concat(cleanNumber) : '';
-
-    // 更新值
-    onChange === null || onChange === void 0 || onChange(newValue);
+    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || '';
+    handleChange(prefix, cleanNumber, selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.code);
 
     // 如果号码为空，只清除校验信息，不重置国家代码
     if (!cleanNumber) {
@@ -167,14 +193,29 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
       return c.code === countryCode;
     });
     if (phoneNumber.length === 0) {
-      return "";
+      return '';
     }
-    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || "";
+    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || '';
     return "".concat(prefix).concat(phoneNumber);
   }, [countryCode, phoneNumber, countries]);
+  var objValue = useMemo(function () {
+    var selectedCountry = countries.find(function (c) {
+      return c.code === countryCode;
+    });
+    var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || '';
+    return {
+      phone: phoneNumber || '',
+      countryCallingCode: prefix,
+      countryCode: countryCode
+    };
+  }, [countryCode, phoneNumber, countries]);
   var handleBlur = function handleBlur() {
     var finalValue = concatenatedNumber;
-    onChange === null || onChange === void 0 || onChange(finalValue);
+    if (returnFormat === 'string') {
+      onChange === null || onChange === void 0 || onChange(finalValue);
+    } else {
+      onChange === null || onChange === void 0 || onChange(objValue);
+    }
   };
   return /*#__PURE__*/React.createElement(Space.Compact, {
     block: true
@@ -197,6 +238,7 @@ var MobileNumberInput = function MobileNumberInput(_ref) {
       };
     })
   }), /*#__PURE__*/React.createElement(Input, _extends({}, props, {
+    ref: props === null || props === void 0 ? void 0 : props.inputRef,
     disabled: disabled,
     type: "tel",
     value: phoneNumber,

package/es/components/dataSourceComponents/fields/Input.Mobile/serve.d.ts

@@ -6,8 +6,8 @@ export interface Country {
     id: number;
     name: {
         en: string;
-        "zh-CN": string;
-        "zh-HK": string;
+        'zh-CN': string;
+        'zh-HK': string;
         original: string;
     };
     code: string;