@pointcloud/pcloud-components 0.1.21 → 0.1.24

package/dist/esm/DForm/helper.js

@@ -1,14 +1,4 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-06-07 15:08:06
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-12 17:35:15
- * @Description  : 合并两个对象中的所有字段
- */
-
-import mergeWith from 'lodash/mergeWith';
-import cloneDeep from 'lodash/cloneDeep';
 var TYPES = {
   OPTION_TYPE_PRIMARY: 'primary',
   OPTION_TYPE_OBJECT: 'object',
@@ -45,6 +35,39 @@ var defaultCustomizer = function defaultCustomizer(objValue, srcValue) {
     return srcValue;
   }
 };
+export function cloneDeep(value) {
+  if (value === null || _typeof(value) !== 'object') return value;
+  if (Array.isArray(value)) return value.map(cloneDeep);
+  var result = {};
+  for (var key in value) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) {
+      result[key] = cloneDeep(value[key]);
+    }
+  }
+  return result;
+}
+export function mergeWith(object, source, customizer) {
+  var result = cloneDeep(object);
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      var objValue = result[key];
+      var srcValue = source[key];
+      if (customizer) {
+        var customized = customizer(objValue, srcValue, key);
+        if (customized !== undefined) {
+          result[key] = customized;
+          continue;
+        }
+      }
+      if (objValue && srcValue && _typeof(objValue) === 'object' && _typeof(srcValue) === 'object' && !Array.isArray(objValue) && !Array.isArray(srcValue)) {
+        result[key] = mergeWith(objValue, srcValue, customizer);
+      } else {
+        result[key] = cloneDeep(srcValue);
+      }
+    }
+  }
+  return result;
+}
 
 /** 合并对象 */
 function merge(object, sources) {

package/dist/esm/DForm/index.js

@@ -20,22 +20,25 @@ import "./index.less";
 // eslint-disable-next-line no-unused-vars
 import { jsx as _jsx } from "react/jsx-runtime";
 function getChildren(items, children, _defaultItemProps, layout) {
+  var _Object$keys;
   var list = [];
+  var hasPropsValue = _defaultItemProps && ((_Object$keys = Object.keys(_defaultItemProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0;
   if (items instanceof Array && items.length > 0) {
     if (layout === 'grid') {
       list.push( /*#__PURE__*/_jsx(Row, {
+        className: "grid-row",
         children: items.map(function (item, index) {
           var _item$formItemProps;
-          var _item = helper.merge(_defaultItemProps, item);
+          var _item = hasPropsValue ? helper.merge(_defaultItemProps, item) : item;
           var _gridProps = (_item === null || _item === void 0 || (_item$formItemProps = _item.formItemProps) === null || _item$formItemProps === void 0 ? void 0 : _item$formItemProps.grid) || {};
           return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, _gridProps), {}, {
             children: /*#__PURE__*/_jsx(DItem, _objectSpread({}, _item))
           }), (item === null || item === void 0 ? void 0 : item.name) || index);
         })
-      }));
+      }, "row"));
     } else {
       list = items.map(function (item, index) {
-        var _item = helper.merge(_defaultItemProps, item);
+        var _item = hasPropsValue ? helper.merge(_defaultItemProps, item) : item;
         return /*#__PURE__*/_jsx(DItem, _objectSpread({}, _item), (item === null || item === void 0 ? void 0 : item.name) || index);
       });
     }
@@ -44,7 +47,7 @@ function getChildren(items, children, _defaultItemProps, layout) {
     var childrenList = children instanceof Array ? children : [children];
     var _childrenList = childrenList.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        props: helper.merge(_defaultItemProps, item.props)
+        props: hasPropsValue ? helper.merge(_defaultItemProps, item.props) : item.props
       });
     });
     list = list.concat(_childrenList);

package/dist/esm/DForm/index.less

@@ -28,6 +28,7 @@
   flex-wrap: wrap;
   align-items: flex-end;
   height: min-content;
+  flex: 1;
 
   > .ant-form-item {
     padding-right: 16px;
@@ -42,4 +43,8 @@
       text-align: left;
     }
   }
+
+  .grid-row {
+    flex: 1;
+  }
 }

package/dist/esm/DInput/index.js

@@ -12,7 +12,19 @@ var _excluded = ["className", "onChange", "onCompositionStart", "onCompositionEn
 import React, { useRef, forwardRef, useState, useEffect, useContext } from 'react';
 import { Input } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
+
+// 获取防抖超时时间，debounce: 默认800ms，false或0表示不开启
 import { jsx as _jsx } from "react/jsx-runtime";
+function getDebounceTime(debounce) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
+  if (debounce === true) {
+    return defaultValue;
+  } else if (debounce === false) {
+    return 0;
+  } else {
+    return typeof debounce === 'number' ? debounce : defaultValue;
+  }
+}
 function InternalInput(props, ref) {
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
@@ -61,14 +73,14 @@ function InternalInput(props, ref) {
   // 监听合成输入开始事件(执行用户事件并置合成标记为true)
   var _onCompositionStart = function _onCompositionStart(e) {
     onCompositionStart === null || onCompositionStart === void 0 || onCompositionStart(e);
-    enableCompose && setComposeFlag(true);
+    setComposeFlag === null || setComposeFlag === void 0 || setComposeFlag(true);
   };
 
   // 监听合成输入结束事件(执行用户事件并置合成标记为false,同时触发用户onChange事件)
   var _onCompositionEnd = function _onCompositionEnd(e) {
     onCompositionEnd === null || onCompositionEnd === void 0 || onCompositionEnd(e);
     if (enableCompose) {
-      setComposeFlag(false);
+      setComposeFlag === null || setComposeFlag === void 0 || setComposeFlag(false);
       emitChange(e.target.value, e);
     }
   };
@@ -84,17 +96,5 @@ function InternalInput(props, ref) {
     onCompositionEnd: _onCompositionEnd
   }));
 }
-
-// 获取防抖超时时间，debounce: 默认800ms，false或0表示不开启
-function getDebounceTime(debounce) {
-  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 800;
-  if (debounce === true) {
-    return defaultValue;
-  } else if (debounce === false) {
-    return 0;
-  } else {
-    return typeof debounce === 'number' ? debounce : defaultValue;
-  }
-}
 var DInput = /*#__PURE__*/forwardRef(InternalInput);
 export default DInput;

package/dist/esm/DModal/interface.d.ts

@@ -7,8 +7,8 @@ export interface DModalProps extends IModalProps {
 }
 export interface DeleteModalProps {
     content?: React.ReactNode;
-    onOk?: (...args: any[]) => any;
-    onCancel?: (...args: any[]) => any;
+    onOk?: <T>(..._args: T[]) => T;
+    onCancel?: <T>(..._args: T[]) => T;
     zIndex?: number;
 }
 export {};

package/dist/esm/DModal/styles/index.less

@@ -1,27 +1,27 @@
-@import '../../commonStyle/index.less';
-
-.@{prefix}-modal-container {
-  .ant-modal-wrap {
-    .ant-modal {
-      max-width: unset;
-      height: 100%;
-
-      .ant-modal-content {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-}
-
-.@{prefix}-absolute-modal-container {
-  .ant-modal-wrap {
-    position: fixed;
-  }
-}
-
-.@{prefix}-relative-modal-container {
-  .ant-modal-wrap {
-    position: absolute;
-  }
-}
+@import '../../commonStyle/index.less';
+
+.@{prefix}-modal-container {
+  .ant-modal-wrap {
+    .ant-modal {
+      max-width: unset;
+      height: 100%;
+
+      .ant-modal-content {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+
+.@{prefix}-absolute-modal-container {
+  .ant-modal-wrap {
+    position: fixed;
+  }
+}
+
+.@{prefix}-relative-modal-container {
+  .ant-modal-wrap {
+    position: absolute;
+  }
+}

package/dist/esm/DSelect/index.js

@@ -2,17 +2,33 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "popupClassName", "fieldNames", "searchValue", "filterOption", "options", "onSearch", "loading", "debounce"];
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-17 08:41:25
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-11 15:44:04
- * @Description  : 基于antd的Select组件
- */
 import React, { forwardRef, useEffect, useRef, useState, useMemo, useContext } from 'react';
 import { Select } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
+// 获取延时时间，默认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 getFilterOption(showSearch, filterOption, fieldNames) {
+  if (filterOption) {
+    return filterOption;
+  } else {
+    return showSearch && function (value, option) {
+      var _option$fieldNames$la;
+      return (_option$fieldNames$la = option[fieldNames.label]) === null || _option$fieldNames$la === void 0 ? void 0 : _option$fieldNames$la.includes(value);
+    };
+  }
+}
 function InternalSelect(props, ref) {
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
@@ -57,29 +73,19 @@ function InternalSelect(props, ref) {
   var _loading = typeof initLoading === 'boolean' ? initLoading : loading;
   var _filterOption = getFilterOption(!_showSearch, filterOption, _fieldNames);
   var getOptions = useMemo(function () {
-    return typeof initOptions === 'function' ? initOptions : function (params) {
+    return typeof initOptions === 'function' ? initOptions : function () {
       return Promise.resolve(initOptions || []);
     };
   }, [initOptions]);
-  var _onSearch = function _onSearch(value) {
-    if (onSearch) {
-      if (_debounce > 0) {
-        clearTimeout(debounceRef.current);
-        debounceRef.current = setTimeout(function () {
-          updateOptions(onSearch, value);
-        }, _debounce);
-      } else {
-        updateOptions(onSearch, value);
-      }
-    }
-  };
   var updateOptions = function updateOptions(fun, value) {
     // 设置加载中状态
     if (_loadingState > 0) {
       loadingRef.current.status = 'loading';
       clearTimeout(loadingRef.current.timer);
       loadingRef.current.timer = setTimeout(function () {
-        loadingRef.current.status === 'loading' && setLoading(true);
+        if (loadingRef.current.status === 'loading') {
+          setLoading(true);
+        }
       }, _loadingState);
     }
 
@@ -101,6 +107,18 @@ function InternalSelect(props, ref) {
       }
     });
   };
+  var _onSearch = function _onSearch(value) {
+    if (onSearch) {
+      if (_debounce > 0) {
+        clearTimeout(debounceRef.current);
+        debounceRef.current = setTimeout(function () {
+          updateOptions(onSearch, value);
+        }, _debounce);
+      } else {
+        updateOptions(onSearch, value);
+      }
+    }
+  };
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(function () {
@@ -121,29 +139,5 @@ function InternalSelect(props, ref) {
     options: options
   }));
 }
-
-// 获取延时时间，默认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 getFilterOption(showSearch, filterOption, fieldNames) {
-  if (filterOption) {
-    return filterOption;
-  } else {
-    return showSearch && function (value, option) {
-      var _option$fieldNames$la;
-      return (_option$fieldNames$la = option[fieldNames.label]) === null || _option$fieldNames$la === void 0 ? void 0 : _option$fieldNames$la.includes(value);
-    };
-  }
-}
 var DSelect = /*#__PURE__*/forwardRef(InternalSelect);
 export default DSelect;

package/dist/esm/DTable/index.js

@@ -2,12 +2,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["loadMore", "defaultColumnProps", "actionColumn", "showErrorMsg", "extraParams", "dataSource", "rowKey", "scroll", "className", "pagination", "columns", "loading"];
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-09 15:04:48
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-08-16 16:45:15
- * @Description  : 基于antd的Table组件
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-05-09 15:04:48
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-08-16 16:45:15
+ * @Description  : 基于antd的Table组件
  */
 import React, { forwardRef, useEffect, useRef, useState, useContext, useMemo } from 'react';
 import { message, Table } from 'antd';

package/dist/esm/DTable/index.less

@@ -1,71 +1,71 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-table {
-  .ant-spin-nested-loading,
-  .ant-spin-container,
-  .ant-table-container,
-  .ant-table {
-    width: 100%;
-    height: 100%;
-  }
-
-  // 隐藏表头最后一个滚动样式单元格
-  // .ant-table-thead .ant-table-cell-scrollbar {
-  //     position: absolute;
-  //     top: -1px;
-  //     border: none;
-  //     box-shadow: none;
-  //     background-color: #2e404d;
-  // }
-
-  .ant-table-body {
-    position: absolute;
-    overflow-y: auto !important;
-    min-width: 100%;
-    max-width: 100%;
-    min-height: calc(100% - 56px);
-    max-height: calc(100% - 56px);
-
-    // 表内单元格不省略
-    .ant-table-tbody > tr > td.ant-table-cell.d-table-cell-wrap {
-      white-space: initial;
-    }
-
-    // x轨道的宽度和y轨道的高度
-    &::-webkit-scrollbar {
-      width: 4px;
-      height: 8px;
-    }
-
-    // 轨道拖动部分的背景颜色
-    &::-webkit-scrollbar-thumb {
-      background-color: #0084ff;
-    }
-
-    // 轨道背景颜色
-    &::-webkit-scrollbar-track {
-      background-color: #f1f1f1;
-      border-radius: 2px;
-    }
-
-    // x、y两条轨道的交叉处
-    &::-webkit-scrollbar-corner {
-      background-color: #f1f1f1;
-    }
-  }
-
-  .ant-spin-nested-loading > div > .ant-spin {
-    max-height: initial;
-  }
-
-  .ant-pagination-total-text span {
-    color: #40a9ff;
-    font-weight: bold;
-  }
-
-  &.height-on-page {
-    .ant-table {
-      height: calc(100% - 56px);
-    }
-  }
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-table {
+  .ant-spin-nested-loading,
+  .ant-spin-container,
+  .ant-table-container,
+  .ant-table {
+    width: 100%;
+    height: 100%;
+  }
+
+  // 隐藏表头最后一个滚动样式单元格
+  // .ant-table-thead .ant-table-cell-scrollbar {
+  //     position: absolute;
+  //     top: -1px;
+  //     border: none;
+  //     box-shadow: none;
+  //     background-color: #2e404d;
+  // }
+
+  .ant-table-body {
+    position: absolute;
+    overflow-y: auto !important;
+    min-width: 100%;
+    max-width: 100%;
+    min-height: calc(100% - 56px);
+    max-height: calc(100% - 56px);
+
+    // 表内单元格不省略
+    .ant-table-tbody > tr > td.ant-table-cell.d-table-cell-wrap {
+      white-space: initial;
+    }
+
+    // x轨道的宽度和y轨道的高度
+    &::-webkit-scrollbar {
+      width: 4px;
+      height: 8px;
+    }
+
+    // 轨道拖动部分的背景颜色
+    &::-webkit-scrollbar-thumb {
+      background-color: #0084ff;
+    }
+
+    // 轨道背景颜色
+    &::-webkit-scrollbar-track {
+      background-color: #f1f1f1;
+      border-radius: 2px;
+    }
+
+    // x、y两条轨道的交叉处
+    &::-webkit-scrollbar-corner {
+      background-color: #f1f1f1;
+    }
+  }
+
+  .ant-spin-nested-loading > div > .ant-spin {
+    max-height: initial;
+  }
+
+  .ant-pagination-total-text span {
+    color: #40a9ff;
+    font-weight: bold;
+  }
+
+  &.height-on-page {
+    .ant-table {
+      height: calc(100% - 56px);
+    }
+  }
+}

package/dist/esm/DTreeSelect/index.less

@@ -1,11 +1,11 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-tree-select-dropdown .ant-select-tree-node-content-wrapper {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.@{prefix}-tree-select-dropdown .ant-select-tree-node-content-wrapper .ant-select-tree-title {
-  overflow: hidden;
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-tree-select-dropdown .ant-select-tree-node-content-wrapper {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.@{prefix}-tree-select-dropdown .ant-select-tree-node-content-wrapper .ant-select-tree-title {
+  overflow: hidden;
+}