@pisell/materials 6.5.9 → 6.6.2

package/lib/components/dataSourceComponents/dataSourceTable/type.d.ts

@@ -0,0 +1,84 @@
+/// <reference types="react" />
+import { ColumnType } from 'antd/es/table';
+import { LocalSettingsType } from '../../table/types';
+import { DataSourceType } from '../provider/dataSource/DataSourceContext';
+export declare type OperationItem = {
+    label?: string;
+    openMode: 'modal' | 'drawer' | 'custom';
+    openContentSize: 'small' | 'middle' | 'large';
+    openTitle: string;
+    actionType: 'detail' | 'edit' | 'delete' | 'custom';
+    key: string;
+    buttonProps?: any;
+    onClick?: (record: any) => void;
+    afterClose?: () => void;
+};
+export interface DataSourceTableProps {
+    __id?: string;
+    currentComponentId?: string;
+    currentSettingKey?: string;
+    title?: string | React.ReactNode | (() => React.ReactNode);
+    subTitle?: string | React.ReactNode | (() => React.ReactNode);
+    titleButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
+    tableButtons?: {
+        show: boolean;
+        maxCount: number;
+        items: OperationItem[];
+    };
+    buttons?: any[];
+    operation?: {
+        show: boolean;
+        title: string;
+        width: number;
+        align: 'left' | 'center' | 'right';
+        fixed: 'left' | 'right' | false;
+        type: 'link' | 'button';
+        items: OperationItem[];
+    };
+    operationContent?: {
+        [key: string]: React.ReactNode;
+    };
+    dataSource: DataSourceType;
+    columns: ColumnType<any>[];
+    filter: any;
+    search?: {
+        show: boolean;
+        placeholder: string;
+    };
+    __designMode: string;
+    componentId: string;
+    clickToDetail?: {
+        show: boolean;
+        useCustomAction: boolean;
+        actionType: string;
+        openMode: 'modal' | 'drawer';
+        openContentSize: 'small' | 'middle' | 'large';
+        openTitle: string;
+        key: string;
+    };
+    onRow?: any;
+    filterBy?: Record<string, any>;
+    sortBy: string;
+    tabs?: {
+        show: boolean;
+        type: string;
+        items: {
+            name: string;
+            filterBy: Record<string, any>;
+            sortBy: string;
+        }[];
+    };
+    onValuesChange?: (changedValues: any, values: any) => void;
+    extraParams?: {
+        list?: Record<string, any>;
+        get?: Record<string, any>;
+        update?: Record<string, any>;
+        create?: Record<string, any>;
+        destroy?: Record<string, any>;
+    };
+    localSettings?: LocalSettingsType;
+}

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

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

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/dataSourceComponents/fields/Input.Json/ReadPretty.d.ts

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

package/lib/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/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.Password/ReadPretty.d.ts

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

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.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 获取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;
+        original: string;
+    };
+    code: string;
+    calling_code: string;
+    currency_code: string;
+    sort: number;
+    status: string;
+    created_at: string;
+    updated_at: string;
+    prefix: string;
+}
+export declare const useCountries: () => {
+    data: Country[];
+};