@pisell/materials 6.5.9 → 6.7.1

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

@@ -36,12 +36,20 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_select = __toESM(require("../../../select"));
-var import_serve = require("./serve");
+var import_serve = require("./../Input.Phone/serve");
 var import_ReadPretty = __toESM(require("./ReadPretty"));
 var import_utils2 = require("../../dataSourceForm/utils");
 var import_useTranslationOriginal = __toESM(require("../../../../hooks/useTranslationOriginal"));
+var import_useSetRequest = __toESM(require("../../../../hooks/useSetRequest"));
 var { Option } = import_select.default;
-var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) => {
+var MobileNumberInput = ({
+  value: propsValue,
+  onChange,
+  disabled,
+  returnFormat = "string",
+  ...props
+}) => {
+  (0, import_useSetRequest.default)();
   const { data: countries = [] } = (0, import_serve.useCountries)();
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const value = (0, import_react.useMemo)(() => {
@@ -50,20 +58,46 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     }
     return propsValue;
   }, [propsValue]);
+  const handleChange = (prefix, phoneNumber2, countryCode2) => {
+    if (returnFormat === "string") {
+      const newValue = phoneNumber2 ? `${prefix}${phoneNumber2}` : "";
+      onChange == null ? void 0 : onChange(newValue);
+    } else {
+      onChange == null ? void 0 : onChange({
+        phone: phoneNumber2,
+        countryCallingCode: prefix,
+        countryCode: countryCode2
+      });
+    }
+  };
   const parseExternalValue = (val) => {
     if (!val) return { countryCode: "AU", phoneNumber: "" };
-    const matchedPrefix = countries.find(
-      (country) => val.startsWith(country.prefix)
-    );
-    if (matchedPrefix) {
+    let srtValue = "";
+    if ((0, import_utils.isString)(val)) {
+      srtValue = val;
+    } else if ("phone" in val) {
+      srtValue = `${val.countryCallingCode || ""}${val.phone || ""}`;
+    }
+    let matchedContry = null;
+    if (!(0, import_utils.isString)(val) && (val == null ? void 0 : val.countryCode)) {
+      matchedContry = countries.find(
+        (country) => (country == null ? void 0 : country.code) === (val == null ? void 0 : val.countryCode)
+      );
+    }
+    if (!matchedContry) {
+      matchedContry = countries.find(
+        (country) => 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, "")
     };
   };
   const [countryCode, setCountryCode] = (0, import_react.useState)(
@@ -83,12 +117,9 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
   }, [value, countries]);
   const handleCountryChange = (value2) => {
     setCountryCode(value2);
-    const selectedCountry = countries.find(
-      (c) => c.code === value2
-    );
+    const selectedCountry = countries.find((c) => c.code === value2);
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
-    const newValue = `${prefix}${phoneNumber}`;
-    onChange == null ? void 0 : onChange(newValue);
+    handleChange(prefix, phoneNumber, selectedCountry == null ? void 0 : selectedCountry.code);
     setTimeout(() => {
       const formInstance = props.form;
       const fieldName = props.fieldKey;
@@ -104,8 +135,7 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
       (c) => c.code === countryCode
     );
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
-    const newValue = cleanNumber ? `${prefix}${cleanNumber}` : "";
-    onChange == null ? void 0 : onChange(newValue);
+    handleChange(prefix, cleanNumber, selectedCountry == null ? void 0 : selectedCountry.code);
     if (!cleanNumber) {
       const formInstance = props.form;
       const fieldName = props.fieldKey;
@@ -132,9 +162,24 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
     return `${prefix}${phoneNumber}`;
   }, [countryCode, phoneNumber, countries]);
+  const objValue = (0, import_react.useMemo)(() => {
+    const selectedCountry = countries.find(
+      (c) => c.code === countryCode
+    );
+    const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
+    return {
+      phone: phoneNumber || "",
+      countryCallingCode: prefix,
+      countryCode
+    };
+  }, [countryCode, phoneNumber, countries]);
   const handleBlur = () => {
     const finalValue = concatenatedNumber;
-    onChange == null ? void 0 : onChange(finalValue);
+    if (returnFormat === "string") {
+      onChange == null ? void 0 : onChange(finalValue);
+    } else {
+      onChange == null ? void 0 : onChange(objValue);
+    }
   };
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, { block: true }, /* @__PURE__ */ import_react.default.createElement(
     import_select.default,
@@ -157,6 +202,7 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     import_antd.Input,
     {
       ...props,
+      ref: props == null ? void 0 : props.inputRef,
       disabled,
       type: "tel",
       value: phoneNumber,
@@ -166,5 +212,8 @@ var MobileNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     }
   ));
 };
-var MobileNumberInputWithMode = (0, import_utils2.withMode)(MobileNumberInput, import_ReadPretty.default);
+var MobileNumberInputWithMode = (0, import_utils2.withMode)(
+  MobileNumberInput,
+  import_ReadPretty.default
+);
 var WithMode_default = MobileNumberInputWithMode;

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

@@ -39,13 +39,17 @@ var import_utils = require("../../../table/utils");
 var import_usePlatform = require("../../hooks/usePlatform");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var getCountryDataList = async () => {
-  const { data } = await import_utils.request.getRequest().get(`/country:list`, {}, {
-    isNocobase: true,
-    fullResult: true,
-    headers: {
-      "x-data-source": "pisell2"
+  const { data } = await import_utils.request.getRequest().get(
+    `/country:list`,
+    {},
+    {
+      isNocobase: true,
+      fullResult: true,
+      headers: {
+        "x-data-source": "pisell2"
+      }
     }
-  });
+  );
   return data.map((item) => ({
     ...item,
     prefix: `+${item.calling_code}`
@@ -53,6 +57,8 @@ var getCountryDataList = async () => {
 };
 var useCountries = () => {
   const isShop = (0, import_usePlatform.useIsShop)();
+  const isH5 = (0, import_usePlatform.useIsH5)();
+  const isPc = (0, import_usePlatform.useIsPc)();
   const { appHelper } = (0, import_useEngineContext.default)();
   const { data, run } = (0, import_ahooks.useRequest)(getCountryDataList, {
     cacheKey: "phone-countries",
@@ -63,12 +69,14 @@ var useCountries = () => {
     manual: true
   });
   (0, import_react.useEffect)(() => {
+    debugger;
     if (!isShop) {
       run();
     }
   }, [isShop]);
   const currentData = (0, import_react.useMemo)(() => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    debugger;
     if (isShop) {
       const codeList = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.store) == null ? void 0 : _b.getState()) == null ? void 0 : _c.global) == null ? void 0 : _d.codeList;
       if (codeList) {
@@ -77,6 +85,22 @@ var useCountries = () => {
           prefix: `+${item.calling_code}`
         }));
       }
+    } else if (isPc) {
+      const codeList = (_h = (_g = (_f = (_e = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _e.store) == null ? void 0 : _f.getState()) == null ? void 0 : _g.country) == null ? void 0 : _h.country;
+      if (codeList) {
+        return codeList.map((item) => ({
+          ...item,
+          prefix: `+${item.calling_code}`
+        }));
+      }
+    } else if (isH5) {
+      const codeList = (_l = (_k = (_j = (_i = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _i.getStore()) == null ? void 0 : _j.getState()) == null ? void 0 : _k.country) == null ? void 0 : _l.country;
+      if (codeList) {
+        return codeList.map((item) => ({
+          ...item,
+          prefix: `+${item.calling_code}`
+        }));
+      }
     }
     return data;
   }, [isShop, data]);

package/lib/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/lib/components/dataSourceComponents/fields/Input.Phone/WithMode.js

@@ -40,8 +40,10 @@ var import_serve = require("./serve");
 var import_ReadPretty = __toESM(require("./ReadPretty"));
 var import_utils2 = require("../../dataSourceForm/utils");
 var import_useTranslationOriginal = __toESM(require("../../../../hooks/useTranslationOriginal"));
+var import_useSetRequest = __toESM(require("../../../../hooks/useSetRequest"));
 var { Option } = import_select.default;
-var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) => {
+var PhoneNumberInput = ({ value: propsValue, onChange, disabled, returnFormat = "string", ...props }) => {
+  (0, import_useSetRequest.default)();
   const { data: countries = [] } = (0, import_serve.useCountries)();
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const value = (0, import_react.useMemo)(() => {
@@ -52,18 +54,24 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
   }, [propsValue]);
   const parseExternalValue = (val) => {
     if (!val) return { countryCode: "AU", phoneNumber: "" };
+    let srtValue = "";
+    if ((0, import_utils.isString)(val)) {
+      srtValue = val;
+    } else if ("phone" in val) {
+      srtValue = `${val.countryCallingCode || ""}${val.phone || ""}`;
+    }
     const matchedPrefix = countries.find(
-      (country) => val.startsWith(country.prefix)
+      (country) => 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, "")
     };
   };
   const [countryCode, setCountryCode] = (0, import_react.useState)(
@@ -77,6 +85,17 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     setCountryCode(newCountryCode);
     setPhoneNumber(newPhoneNumber);
   }, [value, countries]);
+  const handleChange = (prefix, phoneNumber2) => {
+    if (returnFormat === "string") {
+      const newValue = phoneNumber2 ? `${prefix}${phoneNumber2}` : "";
+      onChange == null ? void 0 : onChange(newValue);
+    } else {
+      onChange == null ? void 0 : onChange({
+        phone: phoneNumber2,
+        countryCallingCode: prefix
+      });
+    }
+  };
   const handlePhoneNumberChange = (e) => {
     const cleanNumber = e.target.value.replace(/\D/g, "");
     setPhoneNumber(cleanNumber);
@@ -84,8 +103,7 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
       (c) => c.code === countryCode
     );
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
-    const newValue = cleanNumber ? `${prefix}${cleanNumber}` : "";
-    onChange == null ? void 0 : onChange(newValue);
+    handleChange(prefix, cleanNumber);
     if (!cleanNumber) {
       setTimeout(() => {
         const formInstance = props.form;
@@ -102,8 +120,7 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
       (c) => c.code === value2
     );
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
-    const newValue = `${prefix}${phoneNumber}`;
-    onChange == null ? void 0 : onChange(newValue);
+    handleChange(prefix, phoneNumber);
     setTimeout(() => {
       const formInstance = props.form;
       const fieldName = props.fieldKey;
@@ -122,9 +139,23 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
     return `${prefix}${phoneNumber}`;
   }, [countryCode, phoneNumber, countries]);
+  const objValue = (0, import_react.useMemo)(() => {
+    const selectedCountry = countries.find(
+      (c) => c.code === countryCode
+    );
+    const prefix = (selectedCountry == null ? void 0 : selectedCountry.prefix) || "";
+    return {
+      phone: phoneNumber || "",
+      countryCallingCode: prefix
+    };
+  }, [countryCode, phoneNumber, countries]);
   const handleBlur = () => {
     const finalValue = concatenatedNumber;
-    onChange == null ? void 0 : onChange(finalValue);
+    if (returnFormat === "string") {
+      onChange == null ? void 0 : onChange(finalValue);
+    } else {
+      onChange == null ? void 0 : onChange(objValue);
+    }
   };
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, { block: true }, /* @__PURE__ */ import_react.default.createElement(
     import_select.default,
@@ -147,6 +178,7 @@ var PhoneNumberInput = ({ value: propsValue, onChange, disabled, ...props }) =>
     import_antd.Input,
     {
       ...props,
+      ref: props == null ? void 0 : props.inputRef,
       disabled,
       type: "tel",
       value: phoneNumber,

package/lib/components/dataSourceComponents/fields/Input.Phone/serve.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   getCountryDataList: () => getCountryDataList,
+  getShopCountryDataList: () => getShopCountryDataList,
   useCountries: () => useCountries
 });
 module.exports = __toCommonJS(serve_exports);
@@ -39,13 +40,24 @@ var import_utils = require("../../../table/utils");
 var import_usePlatform = require("../../hooks/usePlatform");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var getCountryDataList = async () => {
-  const { data } = await import_utils.request.getRequest().get(`/country:list`, {}, {
-    isNocobase: true,
-    fullResult: true,
-    headers: {
-      "x-data-source": "pisell2"
+  const { data } = await import_utils.request.getRequest().get(
+    `/country:list`,
+    {},
+    {
+      isNocobase: true,
+      fullResult: true,
+      headers: {
+        "x-data-source": "pisell2"
+      }
     }
-  });
+  );
+  return data.map((item) => ({
+    ...item,
+    prefix: `+${item.calling_code}`
+  }));
+};
+var getShopCountryDataList = async (locale) => {
+  const { data } = await import_utils.request.getRequest().get("/shop/area/country", { "translate-locale": locale || "en" });
   return data.map((item) => ({
     ...item,
     prefix: `+${item.calling_code}`
@@ -53,7 +65,9 @@ var getCountryDataList = async () => {
 };
 var useCountries = () => {
   const isShop = (0, import_usePlatform.useIsShop)();
-  const { appHelper } = (0, import_useEngineContext.default)();
+  const isH5 = (0, import_usePlatform.useIsH5)();
+  const isPc = (0, import_usePlatform.useIsPc)();
+  const { appHelper, ...others } = (0, import_useEngineContext.default)();
   const { data, run } = (0, import_ahooks.useRequest)(getCountryDataList, {
     cacheKey: "phone-countries",
     staleTime: 1e3 * 60 * 5,
@@ -62,28 +76,220 @@ var useCountries = () => {
     // 1小时后清除缓存
     manual: true
   });
+  const { data: shopData, run: runShop } = (0, import_ahooks.useRequest)(getShopCountryDataList, {
+    cacheKey: "phone-shop-countries",
+    staleTime: 1e3 * 60 * 5,
+    // 5分钟后数据过期
+    cacheTime: 1e3 * 60 * 60,
+    // 1小时后清除缓存
+    manual: true
+  });
   (0, import_react.useEffect)(() => {
-    if (!isShop) {
+    if (!isShop && !isPc && !isH5) {
       run();
     }
   }, [isShop]);
+  (0, import_react.useEffect)(() => {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (isShop && !((_e = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.store) == null ? void 0 : _b.getState()) == null ? void 0 : _c.global) == null ? void 0 : _d.codeList) == null ? void 0 : _e.length)) {
+      runShop((_g = (_f = others == null ? void 0 : others.engine) == null ? void 0 : _f.props) == null ? void 0 : _g.locale);
+    }
+  }, [isShop]);
   const currentData = (0, import_react.useMemo)(() => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    let codeList = null;
     if (isShop) {
-      const codeList = (_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.store) == null ? void 0 : _b.getState()) == null ? void 0 : _c.global) == null ? void 0 : _d.codeList;
-      if (codeList) {
-        return codeList.map((item) => ({
-          ...item,
-          prefix: `+${item.calling_code}`
-        }));
-      }
+      codeList = ((_d = (_c = (_b = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.store) == null ? void 0 : _b.getState()) == null ? void 0 : _c.global) == null ? void 0 : _d.codeList) || shopData;
+    } else if (isPc) {
+      codeList = (_h = (_g = (_f = (_e = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _e.store) == null ? void 0 : _f.getState()) == null ? void 0 : _g.country) == null ? void 0 : _h.country;
+    } else if (isH5) {
+      codeList = (_l = (_k = (_j = (_i = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _i.getStore()) == null ? void 0 : _j.getState()) == null ? void 0 : _k.country) == null ? void 0 : _l.country;
+    }
+    if (isShop || isPc || isH5) {
+      codeList = (codeList == null ? void 0 : codeList.length) > 0 ? codeList : defaultData;
+      console.log("codeList", codeList);
+      return codeList.map((item) => ({
+        ...item,
+        prefix: `+${item.calling_code}`
+      }));
     }
     return data;
-  }, [isShop, data]);
+  }, [isShop, isPc, isH5, data, shopData]);
   return { data: currentData };
 };
+var defaultData = [
+  {
+    name: "Mexico",
+    code: "MX",
+    calling_code: "52",
+    currency_code: "MXN"
+  },
+  {
+    name: "美国",
+    code: "US",
+    calling_code: "1",
+    currency_code: "USD"
+  },
+  {
+    name: "加拿大",
+    code: "CA",
+    calling_code: "1",
+    currency_code: "CAD"
+  },
+  {
+    name: "澳大利亚",
+    code: "AU",
+    calling_code: "61",
+    currency_code: "AUD"
+  },
+  {
+    name: "新西兰",
+    code: "NZ",
+    calling_code: "64",
+    currency_code: "NZD"
+  },
+  {
+    name: "新加坡",
+    code: "SG",
+    calling_code: "65",
+    currency_code: "SGD"
+  },
+  {
+    name: "香港特别行政区",
+    code: "HK",
+    calling_code: "852",
+    currency_code: "HKD"
+  },
+  {
+    name: "台湾",
+    code: "TW",
+    calling_code: "886",
+    currency_code: "TWD"
+  },
+  {
+    name: "中国",
+    code: "CN",
+    calling_code: "86",
+    currency_code: "AUD"
+  },
+  {
+    name: "日本",
+    code: "JP",
+    calling_code: "81",
+    currency_code: "JPY"
+  },
+  {
+    name: "韩国",
+    code: "KR",
+    calling_code: "82",
+    currency_code: "KRW"
+  },
+  {
+    name: "马来西亚",
+    code: "MY",
+    calling_code: "60",
+    currency_code: "USD"
+  },
+  {
+    name: "英国",
+    code: "GB",
+    calling_code: "44",
+    currency_code: "GBP"
+  },
+  {
+    name: "法国",
+    code: "FR",
+    calling_code: "33",
+    currency_code: "EUR"
+  },
+  {
+    name: "意大利",
+    code: "IT",
+    calling_code: "39",
+    currency_code: "EUR"
+  },
+  {
+    name: "Ireland",
+    code: "IE",
+    calling_code: "353",
+    currency_code: "EUR"
+  },
+  {
+    name: "Netherlands",
+    code: "NL",
+    calling_code: "31",
+    currency_code: "EUR"
+  },
+  {
+    name: "Germany",
+    code: "DE",
+    calling_code: "49",
+    currency_code: "EUR"
+  },
+  {
+    name: "Spain",
+    code: "ES",
+    calling_code: "34",
+    currency_code: "EUR"
+  },
+  {
+    name: "Finland",
+    code: "FI",
+    calling_code: "358",
+    currency_code: "EUR"
+  },
+  {
+    name: "Hungary",
+    code: "HU",
+    calling_code: "36",
+    currency_code: "HUF"
+  },
+  {
+    name: "Indonesia",
+    code: "ID",
+    calling_code: "62",
+    currency_code: "IDR"
+  },
+  {
+    name: "India",
+    code: "IND",
+    calling_code: "91",
+    currency_code: "INR"
+  },
+  {
+    name: "Nigeria",
+    code: "NG",
+    calling_code: "234",
+    currency_code: "NGN"
+  },
+  {
+    name: "Islamic Republic of Pakistan‎",
+    code: "PAK",
+    calling_code: "92",
+    currency_code: "PRK"
+  },
+  {
+    name: "Philippines",
+    code: "PH",
+    calling_code: "63",
+    currency_code: "PHP"
+  },
+  {
+    name: "Thailand",
+    code: "TH",
+    calling_code: "66",
+    currency_code: "THB"
+  },
+  {
+    name: "South Africa",
+    code: "ZA",
+    calling_code: "27",
+    currency_code: "ZAR"
+  }
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getCountryDataList,
+  getShopCountryDataList,
   useCountries
 });

package/lib/components/dataSourceComponents/fields/Select/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SelectWithDataSource: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
     optionSourceType?: "default" | "custom" | "api" | undefined;

package/lib/components/dataSourceComponents/fields/Upload/index.js

@@ -55,8 +55,9 @@ var Upload = (0, import_utils.withFormItem)(import_WithMode.default, {
           }
         }
       };
+      return { rules: [...(others == null ? void 0 : others.rules) || [], rule] };
     }
-    return { rules: [...(others == null ? void 0 : others.rules) || [], rule] };
+    return {};
   }
 });
 var Upload_default = Upload;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -59,7 +60,7 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -97,5 +98,5 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     dataSource?: any;
 }) => JSX.Element) | import("react").FC<any> | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
     onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };