@pointcloud/pcloud-components 0.1.3 → 0.1.4

package/README.md

@@ -1,6 +1,6 @@
 # pcloud-components
 
-pcloud-components 是一套基于 Antd v4.19.3 + React v17.0.0 开发的业务组件库。
+pcloud-components 是一套基于 Antd v4.24.10 + React v17.0.0 开发的业务组件库。
 
 ## 开始
 
@@ -28,6 +28,12 @@ $ npm run docs:build
 $ npm run build
 ```
 
+发布 npm
+
+```bash
+$ npm publish
+```
+
 发布文档站点
 
 ```bash

package/dist/esm/DCascader/index.d.ts

@@ -1,15 +1,11 @@
 import React from 'react';
 import { DefaultOptionType, CascaderProps, CascaderRef } from 'antd/lib/cascader';
 import './index.less';
-/**
- *
- * 如何只显示选中的子节点
- */
 export declare type DCascaderProps = Omit<CascaderProps<any>, 'options' | 'loadData' | 'loading'> & {
     /** antd的options属性，同onSearch属性，可以是一个options数组，或一个返回等价options数组的promise */
-    options?: DefaultOptionType[] | ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | any[]>);
+    options?: DefaultOptionType[] | ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[]>);
     /** antd的loadData属性，动态加载子级列表数据,默认使用options所提供的方法，如果传入null，则表示不进行动态加载,该方法要求返回一个options数组或与其等价的Promise */
-    loadData?: ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | any[]>) | null;
+    loadData?: ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | DefaultOptionType[]>) | null;
     /** 等同antd的loadData属性,用于监听antd loadData事件*/
     onLoadData?: (value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => void;
     /** antd的loading属性，是否显示加载中：传入数字表示延迟加载,单位毫秒，0等同于false */
@@ -17,9 +13,9 @@ export declare type DCascaderProps = Omit<CascaderProps<any>, 'options' | 'loadD
 };
 declare const DCascader: React.ForwardRefExoticComponent<Omit<CascaderProps<any>, "options" | "loading" | "loadData"> & {
     /** antd的options属性，同onSearch属性，可以是一个options数组，或一个返回等价options数组的promise */
-    options?: DefaultOptionType[] | ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | any[]>) | undefined;
+    options?: DefaultOptionType[] | ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[]>) | undefined;
     /** antd的loadData属性，动态加载子级列表数据,默认使用options所提供的方法，如果传入null，则表示不进行动态加载,该方法要求返回一个options数组或与其等价的Promise */
-    loadData?: ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | any[]>) | null | undefined;
+    loadData?: ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => Promise<DefaultOptionType[] | DefaultOptionType[]>) | null | undefined;
     /** 等同antd的loadData属性,用于监听antd loadData事件*/
     onLoadData?: ((value?: string, option?: DefaultOptionType, options?: DefaultOptionType[]) => void) | undefined;
     /** antd的loading属性，是否显示加载中：传入数字表示延迟加载,单位毫秒，0等同于false */

package/dist/esm/DCascader/index.js

@@ -22,18 +22,35 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * @Author       : wangfeihu
  * @Date         : 2023-05-18 13:35:38
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-05-26 16:18:55
+ * @LastEditTime : 2023-06-30 16:19:18
  * @Description  : 基于antd的Cascader组件
  */
 import React, { useRef, forwardRef, useState, useEffect, useMemo, useContext } from 'react';
 import { Cascader } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import "./index.less";
-
-/**
- *
- * 如何只显示选中的子节点
- */
+// 获取延时时间，默认800ms，true代表默认时间,false代表0
+function getDelayTime(value) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
+  if (value === true) {
+    return defaultValue;
+  } else if (value === false) {
+    return 0;
+  } else {
+    return typeof value === 'number' ? Number(value) || 0 : defaultValue;
+  }
+}
+function updateDropDom(dSelectDropDom, timestamp) {
+  var dSelectDom = document.querySelector(".d-cascader-".concat(timestamp));
+  var dSelectDropFirstMenu = dSelectDropDom.querySelector('ul.ant-cascader-menu');
+  if (dSelectDom) {
+    // 获取选择框宽度并恢复其初始样式
+    dSelectDropDom.style.minWidth = "".concat(dSelectDom.clientWidth, "px");
+    dSelectDropFirstMenu.style.minWidth = "".concat(dSelectDom.clientWidth, "px");
+    // className && dSelectDom.setAttribute('class', className.replace(`d-cascader-${timestamp}`, ''));
+    // dSelectDropDom.setAttribute('class', dSelectDropDom.className.replace(`d-cascader-dropdown-${timestamp}`, ''));
+  }
+}
 
 function InternalCascader(props, ref) {
   var _props$className = props.className,
@@ -70,7 +87,7 @@ function InternalCascader(props, ref) {
     value: 'value',
     children: 'children'
   }, fieldNames);
-  var _loadingState = getDelayTime(loading, 600); // loading: 默认600ms，false或0表示不开启
+  var _loadingState = getDelayTime(initLoading, 600); // loading: 默认600ms，false或0表示不开启
 
   var _loading = typeof initLoading === 'boolean' ? initLoading : loading;
 
@@ -84,37 +101,62 @@ function InternalCascader(props, ref) {
     // 设置加载中状态
     if (_loadingState > 0) {
       loadingRef.current.status = 'loading';
+      loadingParamsRef.current = value;
       clearTimeout(loadingRef.current.timer);
       loadingRef.current.timer = setTimeout(function () {
-        loadingRef.current.status === 'loading' && setLoading(true);
+        if (loadingRef.current.status === 'loading') {
+          setLoading(true);
+        }
       }, _loadingState);
     }
     // 发起请求
-    loadingParamsRef.current = value;
     fun === null || fun === void 0 ? void 0 : fun(value).then(function (response) {
       if (loadingParamsRef.current === value) {
         setOptions(response);
         setLoading(false);
+        loadingParamsRef.current = null;
         loadingRef.current.status = 'done';
       }
     }).catch(function () {
       if (loadingParamsRef.current === value) {
         setLoading(false);
+        loadingParamsRef.current = null;
         loadingRef.current.status = 'done';
       }
     });
   };
   var _loadData = function _loadData(selectedOptions) {
     var targetOption = selectedOptions[selectedOptions.length - 1];
-    onLoadData && onLoadData(targetOption[_fieldNames.value], targetOption, selectedOptions);
+    onLoadData === null || onLoadData === void 0 ? void 0 : onLoadData(targetOption[_fieldNames.value], targetOption, selectedOptions);
     var _getOptions = typeof initOptions === 'function' ? initOptions : null;
     var loadFn = loadData === null ? loadData : loadData || _getOptions;
     if (typeof loadFn === 'function') {
-      loadFn === null || loadFn === void 0 ? void 0 : loadFn(targetOption[_fieldNames.value], targetOption, selectedOptions).then(function (response) {
+      // 设置加载中状态
+      if (_loadingState > 0) {
+        loadingRef.current.status = 'loading';
+        loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current + 1 : 1;
+        clearTimeout(loadingRef.current.timer);
+        loadingRef.current.timer = setTimeout(function () {
+          if (loadingRef.current.status === 'loading') {
+            setLoading(true);
+          }
+        }, _loadingState);
+      }
+      loadFn(targetOption[_fieldNames.value], targetOption, selectedOptions).then(function (response) {
+        loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current - 1 : null;
+        if (!loadingParamsRef.current) {
+          setLoading(false);
+          loadingRef.current.status = 'done';
+        }
         targetOption[_fieldNames.children] = response;
         targetOption.loading = false;
         setOptions(_toConsumableArray(options));
       }).catch(function () {
+        loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current - 1 : null;
+        if (!loadingParamsRef.current) {
+          setLoading(false);
+          loadingRef.current.status = 'done';
+        }
         targetOption.loading = false;
         setOptions(_toConsumableArray(options));
       });
@@ -125,7 +167,6 @@ function InternalCascader(props, ref) {
   };
 
   // 初始加载数据
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(function () {
     return updateOptions(getOptionsFun);
   }, [getOptionsFun]);
@@ -168,29 +209,5 @@ function InternalCascader(props, ref) {
     onChange: _onChange
   }));
 }
-
-// 获取延时时间，默认800ms，true代表默认时间,false代表0
-function getDelayTime(value) {
-  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
-  if (value === true) {
-    return defaultValue;
-  } else if (value === false) {
-    return 0;
-  } else {
-    return typeof value === 'number' ? Number(value) || 0 : defaultValue;
-  }
-}
-function updateDropDom(dSelectDropDom, timestamp) {
-  var dSelectDom = document.querySelector(".d-cascader-".concat(timestamp));
-  var dSelectDropFirstMenu = dSelectDropDom.querySelector('ul.ant-cascader-menu');
-  if (dSelectDom) {
-    // 获取选择框宽度并恢复其初始样式
-    dSelectDropDom.style.minWidth = "".concat(dSelectDom.clientWidth, "px");
-    dSelectDropFirstMenu.style.minWidth = "".concat(dSelectDom.clientWidth, "px");
-    // className && dSelectDom.setAttribute('class', className.replace(`d-cascader-${timestamp}`, ''));
-    // dSelectDropDom.setAttribute('class', dSelectDropDom.className.replace(`d-cascader-dropdown-${timestamp}`, ''));
-  }
-}
-
 var DCascader = /*#__PURE__*/forwardRef(InternalCascader);
 export default DCascader;

package/dist/esm/DForm/DItem.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import { ReactNode } from 'react';
 import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps } from 'antd';
 import { PasswordProps, TextAreaProps } from 'antd/lib/input';
 import { RangePickerProps } from 'antd/lib/date-picker';
@@ -7,8 +7,9 @@ import { DInputProps } from '../DInput';
 import { DSelectProps } from '../DSelect';
 import { DCascaderProps } from '../DCascader';
 import { DTreeSelectProps } from '../DTreeSelect';
-declare type RenderTypeProps = 'dInput' | 'input' | 'textArea' | 'password' | 'inputNumber' | 'autoComplete' | 'dSelect' | 'select' | 'dCascader' | 'cascader' | 'dTreeSelect' | 'treeSelect' | 'datePicker' | 'timePicker' | 'rangePicker' | 'mentions' | 'checkbox' | 'radio' | 'rate' | 'slider' | 'switch' | 'transfer' | 'upload' | 'other' | 'button' | 'divider' | 'custom';
-export declare type InternalItemProps = DCustomItemProps & DInputProps & InputProps & TextAreaProps & PasswordProps & InputNumberProps & AutoCompleteProps & DSelectProps & SelectProps & DCascaderProps & CascaderProps & DTreeSelectProps & TreeSelectProps & DatePickerProps & TimePickerProps & RangePickerProps & MentionProps & CheckboxProps & RadioProps & RateProps & SliderSingleProps & SliderRangeProps & SwitchProps & TransferProps<any> & UploadProps & ButtonProps & DividerProps;
+import { DUploadProps } from '../DUpload';
+declare type RenderTypeProps = 'dInput' | 'input' | 'textArea' | 'password' | 'inputNumber' | 'autoComplete' | 'dSelect' | 'select' | 'dCascader' | 'cascader' | 'dTreeSelect' | 'treeSelect' | 'datePicker' | 'timePicker' | 'rangePicker' | 'mentions' | 'checkbox' | 'radio' | 'rate' | 'slider' | 'switch' | 'transfer' | 'upload' | 'dupload' | 'other' | 'button' | 'divider' | 'custom';
+export declare type InternalItemProps = DCustomItemProps & FormItemProps & DInputProps & InputProps & TextAreaProps & PasswordProps & InputNumberProps & AutoCompleteProps & DSelectProps & SelectProps & DCascaderProps & CascaderProps & DTreeSelectProps & TreeSelectProps & DatePickerProps & TimePickerProps & RangePickerProps & MentionProps & CheckboxProps & RadioProps & RateProps & SliderSingleProps & SliderRangeProps & SwitchProps & TransferProps<any> & UploadProps & DUploadProps & ButtonProps & DividerProps;
 declare type DCustomItemProps = {
     /** 渲染类型 */
     renderType?: RenderTypeProps | 'other';
@@ -17,10 +18,11 @@ declare type DCustomItemProps = {
     /** name标签文本,同antd Form.Item的name */
     name?: string;
     /** 自定义渲染函数 renderType等于custom、other时生效 */
-    render?: (props: InternalItemProps, formItemProps: FormItemProps, allProps?: InternalItemProps) => ReactElement;
+    render?: (props: InternalItemProps, formItemProps: FormItemProps, allProps?: InternalItemProps) => ReactNode;
     /** Form.Item 的其他属性 */
     formItemProps?: FormItemProps;
+    children?: ReactNode;
 };
-export declare type DItemProps = DCustomItemProps | DInputProps | InputProps | TextAreaProps | PasswordProps | InputNumberProps | AutoCompleteProps | DSelectProps | SelectProps | DCascaderProps | CascaderProps | DTreeSelectProps | TreeSelectProps | DatePickerProps | TimePickerProps | RangePickerProps | MentionProps | CheckboxProps | RadioProps | RateProps | SliderSingleProps | SliderRangeProps | SwitchProps | TransferProps<any> | UploadProps | ButtonProps | DividerProps;
-declare function DItem(props: any): any;
+export declare type DItemProps = FormItemProps | DCustomItemProps | DInputProps | InputProps | TextAreaProps | PasswordProps | InputNumberProps | AutoCompleteProps | DSelectProps | SelectProps | DCascaderProps | CascaderProps | DTreeSelectProps | TreeSelectProps | DatePickerProps | TimePickerProps | RangePickerProps | MentionProps | CheckboxProps | RadioProps | RateProps | SliderSingleProps | SliderRangeProps | SwitchProps | TransferProps<any> | UploadProps | DUploadProps | ButtonProps | DividerProps;
+declare function DItem(props: InternalItemProps): string | number | boolean | import("react").ReactFragment | import("react").JSX.Element | null | undefined;
 export default DItem;

package/dist/esm/DForm/DItem.js

@@ -7,9 +7,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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 from 'react';
 import itemsMap from "./DItemsMap";
 function DItem(props) {
+  // @ts-ignore
   var formItemProps = props.formItemProps,
     _props$label = props.label,
     label = _props$label === void 0 ? '' : _props$label,

package/dist/esm/DForm/DItemsMap.d.ts

@@ -25,6 +25,7 @@ declare const renderMap: {
     switch: (props: InternalItemProps, formItemProps: FormItemProps) => ReactElement;
     transfer: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label'], render: InternalItemProps['render']) => ReactElement;
     upload: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label'], render: InternalItemProps['render'], children: InternalItemProps['children']) => ReactElement;
+    dupload: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label'], render: InternalItemProps['render'], children: InternalItemProps['children']) => ReactElement;
     other: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label'], render: InternalItemProps['render'], children: InternalItemProps['children'], allProps: InternalItemProps) => ReactElement;
     button: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label']) => ReactElement;
     divider: (props: InternalItemProps, formItemProps: FormItemProps, label: InternalItemProps['label']) => ReactElement;

package/dist/esm/DForm/DItemsMap.js

@@ -5,12 +5,12 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-06-12 17:35:10
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-15 08:36:23
- * @Description  : 根据renderType渲染对应的表单项组件
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-06-12 17:35:10
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-06-30 16:45:59
+ * @Description  : 根据renderType渲染对应的表单项组件
  */
 
 import React from 'react';
@@ -19,6 +19,7 @@ import DInput from "../DInput";
 import DSelect from "../DSelect";
 import DTreeSelect from "../DTreeSelect";
 import DCascader from "../DCascader";
+import DUpload from "../DUpload";
 var renderMap = {
   dInput: function dInput(props, formItemProps, label) {
     return /*#__PURE__*/React.createElement(Form.Item, formItemProps, /*#__PURE__*/React.createElement(DInput, _extends({
@@ -123,6 +124,9 @@ var renderMap = {
   upload: function upload(props, formItemProps, label, render, children) {
     return /*#__PURE__*/React.createElement(Form.Item, formItemProps, /*#__PURE__*/React.createElement(Upload, props, children || label || ''));
   },
+  dupload: function dupload(props, formItemProps, label, render, children) {
+    return /*#__PURE__*/React.createElement(Form.Item, formItemProps, /*#__PURE__*/React.createElement(DUpload, props, children));
+  },
   other: function other(props, formItemProps, label, render, children, allProps) {
     // rangePicker要求placeholder类型为string数组,在此对rangePicker类型做特殊处理
     var _placeholder = label ? "\u8BF7\u8F93\u5165".concat(label) : '';

package/dist/esm/DForm/index.js

@@ -6,7 +6,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
  * @Author       : wangfeihu
  * @Date         : 2023-06-02 09:29:11
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-15 08:28:12
+ * @LastEditTime : 2023-06-16 09:09:24
  * @Description  : 基于antd的Form组件
  */
 
@@ -42,7 +42,7 @@ function InternalForm(props, ref) {
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var _className = "".concat(getPrefixCls('d-form'), " ").concat(className, " ").concat(layout === 'inlineVertical' ? 'inlineVertical' : '');
+  var _className = "".concat(getPrefixCls('form'), " ").concat(className, " ").concat(layout === 'inlineVertical' ? 'inlineVertical' : '');
   var _layout = layout === 'inlineVertical' ? 'inline' : layout;
   var itemChildren = useMemo(function () {
     return getChildren(items, children, defaultItemProps);

package/dist/esm/DSelect/index.d.ts

@@ -12,7 +12,7 @@ export declare type DSelectProps = Omit<SelectProps, 'options' | 'onSearch' | 'l
     /** 是否开启防抖： true表示800毫秒，true表示默认值，false或0表示不开启 */
     debounce?: boolean | number;
 };
-declare const DSelect: React.ForwardRefExoticComponent<Omit<SelectProps<any, DefaultOptionType>, "onSearch" | "options" | "loading"> & {
+declare const DSelect: React.ForwardRefExoticComponent<Omit<SelectProps<any, DefaultOptionType>, "options" | "onSearch" | "loading"> & {
     /** antd的onSearch属性，onSearch有效时showSearch自动为true */
     onSearch?: ((params?: any) => Promise<DefaultOptionType[] | any[]>) | undefined;
     /** antd的options属性，可以是一个options数组，或一个返回等价options数组的promise */

package/dist/esm/DTreeSelect/index.d.ts

@@ -13,7 +13,7 @@ export declare type DTreeSelectProps = Omit<TreeSelectProps, 'treeData' | 'loadD
     /** antd的loading属性，是否显示加载中：传入数字表示延迟加载,单位毫秒，0等同于false */
     loading?: boolean | number;
 };
-declare const DTreeSelect: React.ForwardRefExoticComponent<Omit<TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType>, "loading" | "treeData" | "loadData"> & {
+declare const DTreeSelect: React.ForwardRefExoticComponent<Omit<TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType>, "loading" | "loadData" | "treeData"> & {
     /** antd的treeData属性，可以是一个treeData数组，或一个返回等价treeData数组的promise */
     treeData?: import("rc-tree-select/lib/TreeSelect").DefaultOptionType[] | ((node?: DefaultOptionType) => Promise<TreeSelectProps['treeData']>) | undefined;
     /** antd的loadData属性，动态加载子级列表数据,默认使用treeData所提供的方法，如果传入null，则表示不进行动态加载,该方法要求返回一个treeData数组或与其等价的Promise */

package/dist/esm/DTreeSelect/index.js

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["className", "popupClassName", "treeData", "fieldNames", "treeNodeFilterProp", "loadData", "onLoadData", "loading"];
+var _excluded = ["className", "popupClassName", "treeData", "fieldNames", "loadData", "onLoadData", "loading"];
 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 _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."); }
@@ -18,30 +18,53 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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; }
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-22 10:38:17
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-13 15:39:42
- * @Description  : 基于antd的TreeSelect组件
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-05-22 10:38:17
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-06-30 16:24:47
+ * @Description  : 基于antd的TreeSelect组件
  */
 
 import React, { useRef, forwardRef, useState, useEffect, useMemo, useContext } from 'react';
 import { TreeSelect } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import "./index.less";
-/**
- *
- * loading相关代码
- */
+// eslint-disable-next-line no-unused-vars
+function deepFind(node, fn) {
+  var childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+  if (fn instanceof Function) {
+    var treelist = node instanceof Array ? node : [node];
+    for (var i = 0; i < treelist.length; i++) {
+      if (fn(treelist[i], i)) {
+        return treelist[i];
+      } else {
+        var target = deepFind(treelist[i][childrenName] || [], fn, childrenName);
+        if (target) return target;
+      }
+    }
+  } else {
+    return undefined;
+  }
+}
 
+// 获取延时时间，默认800ms，true代表默认时间,false代表0
+function getDelayTime(value) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
+  if (value === true) {
+    return defaultValue;
+  } else if (value === false) {
+    return 0;
+  } else {
+    return typeof value === 'number' ? Number(value) || 0 : defaultValue;
+  }
+}
 function InternalTreeSelect(props, ref) {
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     popupClassName = props.popupClassName,
     initOptions = props.treeData,
     fieldNames = props.fieldNames,
-    treeNodeFilterProp = props.treeNodeFilterProp,
     loadData = props.loadData,
     onLoadData = props.onLoadData,
     initLoading = props.loading,
@@ -70,27 +93,31 @@ function InternalTreeSelect(props, ref) {
     children: 'children'
   }, fieldNames);
   var _treeNodeFilterProp = _fieldNames.label;
-  var _loadingState = getDelayTime(loading, 600); // loading: 默认600ms，false或0表示不开启
+  var _loadingState = getDelayTime(initLoading, 600); // loading: 默认600ms，false或0表示不开启
 
   var _loading = typeof initLoading === 'boolean' ? initLoading : loading;
 
   // 将外部传入的options转化为统一的异步请求方法
-  var getOptionsFun = useMemo(function () {
+  var getOptionsFun = useMemo(
+  // eslint-disable-next-line no-unused-vars,@typescript-eslint/no-unused-vars
+  function () {
     return typeof initOptions === 'function' ? initOptions : function (params) {
       return Promise.resolve(initOptions || []);
     };
   }, [initOptions]);
+
+  // eslint-disable-next-line no-unused-vars,@typescript-eslint/no-unused-vars
   var updateOptions = function updateOptions(fun, value) {
     // 设置加载中状态
     if (_loadingState > 0) {
       loadingRef.current.status = 'loading';
+      loadingParamsRef.current = value;
       clearTimeout(loadingRef.current.timer);
       loadingRef.current.timer = setTimeout(function () {
-        loadingRef.current.status === 'loading' && setLoading(true);
+        if (loadingRef.current.status === 'loading') setLoading(true);
       }, _loadingState);
     }
     // 发起请求
-    loadingParamsRef.current = value;
     fun === null || fun === void 0 ? void 0 : fun(value).then(function (response) {
       if (loadingParamsRef.current === value) {
         setTreeData(response);
@@ -105,19 +132,41 @@ function InternalTreeSelect(props, ref) {
     });
   };
   var _loadData = function _loadData(selectedOption) {
-    onLoadData && onLoadData(selectedOption);
+    if (onLoadData) onLoadData(selectedOption);
     var _getOptions = typeof initOptions === 'function' ? initOptions : null;
     var loadFn = loadData === null ? loadData : loadData || _getOptions;
     if (typeof loadFn === 'function') {
-      var loadFnPromise = loadFn === null || loadFn === void 0 ? void 0 : loadFn(selectedOption);
+      // 设置加载中状态
+      if (_loadingState > 0) {
+        loadingRef.current.status = 'loading';
+        loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current + 1 : 1;
+        clearTimeout(loadingRef.current.timer);
+        loadingRef.current.timer = setTimeout(function () {
+          if (loadingRef.current.status === 'loading') {
+            setLoading(true);
+          }
+        }, _loadingState);
+      }
+      var loadFnPromise = loadFn(selectedOption);
       if (typeof loadFnPromise['then'] === 'function') {
         loadFnPromise.then(function (response) {
+          loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current - 1 : null;
+          if (!loadingParamsRef.current) {
+            setLoading(false);
+            loadingRef.current.status = 'done';
+          }
           var list = treeData || [];
           var node = deepFind(list, function (item) {
             return item[_fieldNames.value] === selectedOption[_fieldNames.value];
           }, _fieldNames.children);
-          node && (node[_fieldNames.children] = response);
+          if (node) node[_fieldNames.children] = response;
           setTreeData(_toConsumableArray(list));
+        }).catch(function () {
+          loadingParamsRef.current = loadingParamsRef.current ? loadingParamsRef.current - 1 : null;
+          if (!loadingParamsRef.current) {
+            setLoading(false);
+            loadingRef.current.status = 'done';
+          }
         });
       }
       return loadFnPromise;
@@ -142,33 +191,5 @@ function InternalTreeSelect(props, ref) {
     loading: _loading
   }));
 }
-
-// 获取延时时间，默认800ms，true代表默认时间,false代表0
-function getDelayTime(value) {
-  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
-  if (value === true) {
-    return defaultValue;
-  } else if (value === false) {
-    return 0;
-  } else {
-    return typeof value === 'number' ? Number(value) || 0 : defaultValue;
-  }
-}
-function deepFind(node, fn) {
-  var childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
-  if (fn instanceof Function) {
-    var treelist = node instanceof Array ? node : [node];
-    for (var i = 0; i < treelist.length; i++) {
-      if (fn(treelist[i], i)) {
-        return treelist[i];
-      } else {
-        var target = deepFind(treelist[i][childrenName] || [], fn, childrenName);
-        if (target) return target;
-      }
-    }
-  } else {
-    return undefined;
-  }
-}
 var DTreeSelect = /*#__PURE__*/forwardRef(InternalTreeSelect);
 export default DTreeSelect;

package/dist/esm/DUpload/helper.d.ts

@@ -0,0 +1,105 @@
+import { UploadFile } from 'antd';
+declare type DUploadFile = Omit<UploadFile, 'uid'> & {
+    /** 文件id */
+    id?: string | number;
+    /** 文件uid,系统自动生成 */
+    uid?: string | number;
+    /** 文件来源 upload:文件对话框,remote:已上传的文件对象 */
+    source?: 'upload' | 'remote';
+};
+/** 转换base64时的参数 */
+declare type CompressProps = {
+    width?: number;
+    /** 图像高度 */
+    height?: number;
+    /** 图像质量 */
+    quality?: number;
+};
+declare type ThumbOptionProps = {
+    /** 对目标文件进行过滤，默认只对图片格式生成缩略图 */
+    filter?: ((file: DUploadFile) => boolean) | Array<string>;
+    /** 文件大小,当上传文件大于指定值时会对缩略图进行压缩,单位为字节，默认2MB */
+    size?: number;
+    /** 缩略图压缩参数,默认为 {width:300,height:200,quality:0.7} */
+    compress?: CompressProps | null;
+    /** 缩略图生成失败时的回调函数 */
+    onError?: (err: Error) => void;
+    /** 自定义生成base64缩略图的方法 */
+    getThumbUrl?: (file: DUploadFile, option: ThumbOptionProps) => Promise<string>;
+};
+/**
+ * @description  : 将图像文件转换为Base64格式
+ * @param         {Blob} blob 图像文件
+ * @param         {CompressProps} options 指定图像压缩参数,其格式为: {width:300,height:200,quality:0.7}
+ * @return        {Promise<string>} 包含Base64字符串的Promise对象
+ * @example      : imageToBase64(file,{ width: 300, height: 200, quality: 0.7 }).then( url => console.log( url ) )
+ */
+declare function imageToBase64(blob: Blob, options?: CompressProps | null): Promise<string>;
+/**
+ * @description  : 将传入的文件转换为UploadFile数组
+ * @param         {any} files 目标文件对象
+ * @return        {UploadFile[]} UploadFile数组
+ * @example      :
+ */
+declare function getUploadFile(files: any, maxCount?: number): any[];
+/**
+ * @description  : 根据传入的option对象获取缩略图参数
+ * @param         {ThumbOptionProps} option 缩略图参数对象
+ * @return        {ThumbOptionProps} ThumbOption对象
+ * @example      :
+ */
+declare function getThumbOption(option?: ThumbOptionProps | null): {
+    size: number;
+    filter: (file: DUploadFile) => boolean;
+    compress: {
+        width: number;
+        height: number;
+        quality: number;
+    } | null;
+    onError: ((err: Error) => void) | undefined;
+    getThumbUrl: ((file: DUploadFile, option: ThumbOptionProps) => Promise<string>) | undefined;
+};
+/**
+ * @description  : a标签下载文件
+ * @param         {Blob | string} url a标签的下载url或文件流
+ * @param         {string} fileName 下载文件的名称,如果缺省则尝试从url中获取，默认为: "新建文件"
+ * @return        {*}
+ * @example      :
+ */
+declare function downloadFile(url: Blob | string, fileName?: string): void;
+/**
+ * @description  : a标签预览文件
+ * @param         {Blob | string} url a标签的预览url或文件流
+ * @return        {*}
+ * @example      :
+ */
+declare function previewFile(url: Blob | string): void;
+/**
+ * @description  : 以递归方式深度查找一个对象
+ * @param         {Record} object 待查找的对象
+ * @param         {function} fn 查找函数,每次递归时执行，如果执行结果为true，则递归过程并返回当前对象
+ * @param         {number} maxDepth 递归的最大深度，默认10
+ * @return        {*} 查找到的对象,未查找到则返回undefined
+ * @example      :
+ */
+declare function deepFindObject(object: Record<string, any>, fn: (item: any, parent: any, fieldMap: any) => boolean, maxDepth?: number): any;
+/**
+ * @description  : 以递归方式深度查找一个Jsx对象
+ * @param         {Record} object 待查找的Jsx对象
+ * @param         {function} fn 查找函数,每次递归时执行，如果执行结果为true，则停止递归过程并返回当前对象
+ * @param         {number} maxDepth 递归的最大深度，默认10
+ * @return        {*} 查找到的对象,未查找到则返回undefined
+ * @example      :
+ */
+declare function deepFindJsx(object: Record<string, any>, fn: (item: any, parent: any) => boolean, maxDepth?: number): any;
+declare const _default: {
+    imageToBase64: typeof imageToBase64;
+    getUploadFile: typeof getUploadFile;
+    getThumbOption: typeof getThumbOption;
+    downloadFile: typeof downloadFile;
+    previewFile: typeof previewFile;
+    deepFindObject: typeof deepFindObject;
+    deepFindJsx: typeof deepFindJsx;
+};
+export default _default;
+export type { DUploadFile, ThumbOptionProps };