@pisell/materials 6.4.13 → 6.4.15

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

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

package/es/components/cardPro/index.js

@@ -1,9 +1,3 @@
-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 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; }
-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 React from 'react';
 import { withWrap } from "../../utils/hoc";
 import { Card, Flex } from 'antd';
@@ -25,13 +19,12 @@ var CardPro = function CardPro(props) {
     isShowHead = props.isShowHead,
     className = props.className,
     coverHeight = props.coverHeight,
-    badge = props.badge,
-    style = props.style;
+    badge = props.badge;
   return /*#__PURE__*/React.createElement(Card, {
     title: null,
-    style: _objectSpread({
+    style: {
       padding: 0
-    }, style),
+    },
     className: classNames('pisell-cardPro-wrap', className, cover && 'pisell-cardPro-wrap-with-cover')
   }, !!cover && /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-cardPro-cover'),

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 {

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

@@ -30,7 +30,10 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     columns: import("./useColumns").Column[];
     subTitle: number | boolean | React.ReactFragment | JSX.Element | (() => 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;

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

@@ -300,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/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;

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

@@ -10,7 +10,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useEffect, useMemo } from 'react';
 import { useRequest } from 'ahooks';
 import { request } from "../../../table/utils";
-import { useIsShop } from "../../hooks/usePlatform";
+import { useIsShop, useIsH5, useIsPc } from "../../hooks/usePlatform";
 import useEngineContext from "../../../../hooks/useEngineContext";
 
 /**
@@ -27,7 +27,7 @@ export var getCountryDataList = /*#__PURE__*/function () {
             isNocobase: true,
             fullResult: true,
             headers: {
-              "x-data-source": "pisell2"
+              'x-data-source': 'pisell2'
             }
           });
         case 2:
@@ -50,6 +50,8 @@ export var getCountryDataList = /*#__PURE__*/function () {
 }();
 export var useCountries = function useCountries() {
   var isShop = useIsShop();
+  var isH5 = useIsH5();
+  var isPc = useIsPc();
   var _useEngineContext = useEngineContext(),
     appHelper = _useEngineContext.appHelper;
   var _useRequest = useRequest(getCountryDataList, {
@@ -78,6 +80,26 @@ export var useCountries = function useCountries() {
           });
         });
       }
+    } else if (isPc) {
+      var _appHelper$utils2;
+      var _codeList = appHelper === null || appHelper === void 0 || (_appHelper$utils2 = appHelper.utils) === null || _appHelper$utils2 === void 0 || (_appHelper$utils2 = _appHelper$utils2.store) === null || _appHelper$utils2 === void 0 || (_appHelper$utils2 = _appHelper$utils2.getState()) === null || _appHelper$utils2 === void 0 || (_appHelper$utils2 = _appHelper$utils2.country) === null || _appHelper$utils2 === void 0 ? void 0 : _appHelper$utils2.country;
+      if (_codeList) {
+        return _codeList.map(function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            prefix: "+".concat(item.calling_code)
+          });
+        });
+      }
+    } else if (isH5) {
+      var _appHelper$utils3;
+      var _codeList2 = appHelper === null || appHelper === void 0 || (_appHelper$utils3 = appHelper.utils) === null || _appHelper$utils3 === void 0 || (_appHelper$utils3 = _appHelper$utils3.getStore()) === null || _appHelper$utils3 === void 0 || (_appHelper$utils3 = _appHelper$utils3.getState()) === null || _appHelper$utils3 === void 0 || (_appHelper$utils3 = _appHelper$utils3.country) === null || _appHelper$utils3 === void 0 ? void 0 : _appHelper$utils3.country;
+      if (_codeList2) {
+        return _codeList2.map(function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            prefix: "+".concat(item.calling_code)
+          });
+        });
+      }
     }
     return data;
   }, [isShop, data]);

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

@@ -1,10 +1,16 @@
 import React from 'react';
 import { InputProps } from 'antd';
 import { ModeType } from "../../dataSourceForm/type";
+declare type PhoneValue = string | {
+    phone: string;
+    countryCallingCode: 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 PhoneNumberInputWithMode: React.FC<PhoneInputProps & import("../../dataSourceForm/utils").WithModeProps>;
 export default PhoneNumberInputWithMode;

package/es/components/dataSourceComponents/fields/Input.Phone/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,12 +10,13 @@ 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 ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
+import useSetRequest from "../../../../hooks/useSetRequest";
 var Option = Select.Option;
 /**
  * 电话号码输入组件
@@ -45,7 +46,10 @@ var PhoneNumberInput = function PhoneNumberInput(_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;
@@ -63,18 +67,24 @@ var PhoneNumberInput = function PhoneNumberInput(_ref) {
       countryCode: 'AU',
       phoneNumber: ''
     };
+    var srtValue = "";
+    if (isString(val)) {
+      srtValue = val;
+    } else if ('phone' in val) {
+      srtValue = "".concat(val.countryCallingCode || "").concat(val.phone || "");
+    }
     var matchedPrefix = countries.find(function (country) {
-      return val.startsWith(country.prefix);
+      return srtValue.startsWith(country.prefix);
     });
     if (matchedPrefix) {
       return {
         countryCode: matchedPrefix.code,
-        phoneNumber: val.slice(matchedPrefix.prefix.length)
+        phoneNumber: srtValue.slice(matchedPrefix.prefix.length)
       };
     }
     return {
       countryCode: 'AU',
-      phoneNumber: val.replace(/\D/g, '')
+      phoneNumber: srtValue.replace(/\D/g, '')
     };
   };
   var _useState = useState(function () {
@@ -98,6 +108,18 @@ var PhoneNumberInput = function PhoneNumberInput(_ref) {
     setCountryCode(newCountryCode);
     setPhoneNumber(newPhoneNumber);
   }, [value, countries]);
+  var handleChange = function handleChange(prefix, phoneNumber) {
+    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
+      });
+    }
+  };
   var handlePhoneNumberChange = function handlePhoneNumberChange(e) {
     var cleanNumber = e.target.value.replace(/\D/g, '');
     setPhoneNumber(cleanNumber);
@@ -107,12 +129,8 @@ var PhoneNumberInput = function PhoneNumberInput(_ref) {
       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);
+    handleChange(prefix, cleanNumber);
 
     // 如果实际号码部分为空，立即触发验证以清除错误信息
     if (!cleanNumber) {
@@ -133,10 +151,9 @@ var PhoneNumberInput = function PhoneNumberInput(_ref) {
       return c.code === value;
     });
     var prefix = (selectedCountry === null || selectedCountry === void 0 ? void 0 : selectedCountry.prefix) || "";
-    var newValue = "".concat(prefix).concat(phoneNumber);
 
     // 先更新值
-    onChange === null || onChange === void 0 || onChange(newValue);
+    handleChange(prefix, phoneNumber);
 
     // 使用 setTimeout 确保值更新后再触发验证
     setTimeout(function () {
@@ -158,9 +175,23 @@ var PhoneNumberInput = function PhoneNumberInput(_ref) {
     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, 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
@@ -183,6 +214,7 @@ var PhoneNumberInput = function PhoneNumberInput(_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.Phone/serve.d.ts

@@ -2,12 +2,13 @@
  * 获取nocobase数据列表
  */
 export declare const getCountryDataList: () => Promise<any>;
+export declare const getShopCountryDataList: (locale?: any) => Promise<any>;
 export interface Country {
     id: number;
     name: {
         en: string;
-        "zh-CN": string;
-        "zh-HK": string;
+        'zh-CN': string;
+        'zh-HK': string;
         original: string;
     };
     code: string;