@pointcloud/pcloud-components 0.1.5 → 0.1.7

package/dist/esm/DTable/index.js

@@ -1,12 +1,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", "columnsProp", "actionColumn", "showErrorMsg", "extraParams", "dataSource", "rowKey", "scroll", "className", "pagination", "columns", "loading"];
+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-07-11 17:22:24
+ * @LastEditTime : 2023-08-16 16:45:15
  * @Description  : 基于antd的Table组件
  */
 import React, { forwardRef, useEffect, useRef, useState, useContext } from 'react';
@@ -31,20 +31,33 @@ var defaultPagination = {
   }
 };
 
+// 数据列
+function getColumns(columns, defaultColumnProps) {
+  return columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
+    var _item = _objectSpread(_objectSpread({
+      align: 'center',
+      ellipsis: {
+        showTitle: false
+      },
+      cellEllipsis: true
+    }, defaultColumnProps), item);
+    if (_item.cellEllipsis === false) {
+      _item.className = _item !== null && _item !== void 0 && _item.className ? 'd-table-cell-wrap ' + _item.className : 'd-table-cell-wrap';
+    }
+    return _item;
+  });
+}
+
 // 操作列
-function getActionColumnProps(props, columnsProp) {
+function getActionColumnProps(props, defaultColumnProps) {
   var defaultProps = {
     width: 140,
     title: '操作',
     dataIndex: 'action'
   };
-  if (typeof props === 'function') {
-    return _objectSpread(_objectSpread(_objectSpread({}, columnsProp), defaultProps), {}, {
-      render: props
-    });
-  } else {
-    return _objectSpread(_objectSpread(_objectSpread({}, columnsProp), defaultProps), props);
-  }
+  return typeof props === 'function' ? _objectSpread(_objectSpread(_objectSpread({}, defaultColumnProps), defaultProps), {}, {
+    render: props
+  }) : _objectSpread(_objectSpread(_objectSpread({}, defaultColumnProps), defaultProps), props);
 }
 
 // 分页配置
@@ -61,7 +74,7 @@ function getTablePage(_pagination) {
 }
 function InternalTable(props, ref) {
   var loadMore = props.loadMore,
-    columnsProp = props.columnsProp,
+    defaultColumnProps = props.defaultColumnProps,
     actionColumn = props.actionColumn,
     _props$showErrorMsg = props.showErrorMsg,
     showErrorMsg = _props$showErrorMsg === void 0 ? true : _props$showErrorMsg,
@@ -100,17 +113,13 @@ function InternalTable(props, ref) {
     y: 'calc(100% - 56px)'
   };
 
-  // 修改列对齐方式为居中
-  var _columns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-    return _objectSpread(_objectSpread({
-      align: 'center',
-      ellipsis: true
-    }, columnsProp), item);
-  });
+  // 合并列属性
+  var _columns = getColumns(columns, defaultColumnProps);
 
   // 加入操作列
-  var _actionColumn = actionColumn ? getActionColumnProps(actionColumn, columnsProp) : undefined;
-  _actionColumn && ((_columns === null || _columns === void 0 ? void 0 : _columns.push(_actionColumn)) || []);
+  // 加入操作列
+  var _actionColumn = actionColumn ? getActionColumnProps(actionColumn, defaultColumnProps) : undefined;
+  if (_actionColumn && _columns instanceof Array) _columns.push(_actionColumn);
 
   // pcf-table 样式中已经包含对_scroll的支持
   var _className = "".concat(getPrefixCls('table'), " ").concat(className || '', " ").concat(_pagination ? 'height-on-page' : '');
@@ -134,15 +143,15 @@ function InternalTable(props, ref) {
       var paramsString = JSON.stringify(_tableQuery);
       loadingParamsRef.current = paramsString;
       setTableParams(_tableQuery);
-      loadMore(_tableQuery).then(function (response) {
+      loadMore(_tableQuery, tableSource.records).then(function (response) {
         if (loadingParamsRef.current === paramsString) {
           var _response$total = response.total,
             total = _response$total === void 0 ? 0 : _response$total,
             _response$records = response.records,
-            records = _response$records === void 0 ? [] : _response$records;
+            _records = _response$records === void 0 ? [] : _response$records;
           setTableSource({
             total: total,
-            records: records,
+            records: _records,
             loading: false
           });
         }
@@ -184,6 +193,12 @@ function InternalTable(props, ref) {
       }));
     }
   };
+  var _tablePagination = _pagination ? _objectSpread(_objectSpread({}, _pagination), {}, {
+    total: tableSource.total,
+    current: tableParams.current,
+    pageSize: tableParams.size,
+    onChange: onChange
+  }) : _pagination;
 
   // 数据初始加载
   useEffect(function () {
@@ -195,12 +210,7 @@ function InternalTable(props, ref) {
     className: _className,
     columns: _columns,
     dataSource: tableSource.records,
-    pagination: _objectSpread(_objectSpread({}, _pagination), {}, {
-      total: tableSource.total,
-      current: tableParams.current,
-      pageSize: tableParams.size,
-      onChange: onChange
-    }),
+    pagination: _tablePagination,
     scroll: _scroll,
     loading: _objectSpread(_objectSpread({}, _loading), {}, {
       spinning: tableSource.loading

package/dist/esm/DTable/index.less

@@ -20,13 +20,14 @@
 
   .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.ant-table-cell-ellipsis {
+    // 表内单元格不省略
+    .ant-table-tbody > tr > td.ant-table-cell.d-table-cell-wrap {
       white-space: initial;
     }
 

package/dist/esm/DTreeSelect/index.js

@@ -3,12 +3,12 @@ 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", "treeData", "fieldNames", "loadData", "onLoadData", "loading"];
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-22 10:38:17
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-30 16:24:47
- * @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';

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;
+}

package/dist/esm/DUpload/helper.js

@@ -4,7 +4,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
  * @Author       : wangfeihu
  * @Date         : 2023-06-16 11:25:57
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-29 18:10:04
+ * @LastEditTime : 2023-08-30 11:26:22
  * @Description  : 辅助方法集合
  */
 
@@ -106,7 +106,10 @@ function imageToBase64(blob, options) {
 function getUploadFile(files, maxCount) {
   if (files) {
     var list = files instanceof Array ? files : [files];
-    return maxCount && maxCount > 0 ? list.slice(0, maxCount) : list;
+    var removedCount = list.filter(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.status) === 'removed';
+    }).length;
+    return maxCount && maxCount > 0 ? list.slice(0, maxCount + removedCount) : list;
   }
   return [];
 }

package/dist/esm/DUpload/index.js

@@ -10,11 +10,11 @@ var _excluded = ["value", "thumbOption", "uploadButton", "itemClassName", "enabl
  * @Author       : wangfeihu
  * @Date         : 2023-06-16 09:37:07
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-30 16:32:19
+ * @LastEditTime : 2023-08-16 16:32:55
  * @Description  : 基于antd的Upload组件
  */
 
-import React, { forwardRef, useEffect, useMemo, useRef, useState, useContext } from 'react';
+import React, { forwardRef, useEffect, useMemo, useState, useContext } from 'react';
 import { Upload } from 'antd';
 import helper from "./helper";
 import { ConfigContext } from "../ConfigProvider";
@@ -98,10 +98,10 @@ function InternalUpload(props, ref) {
     setFileList = _useState2[1];
 
   // 缓存的文件列表
-  var listRef = useRef({
-    timer: null,
-    list: []
-  });
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tempList = _useState4[0],
+    setTempList = _useState4[1];
 
   // 缩略图相关选项
   var _thumbOption = useMemo(function () {
@@ -113,7 +113,7 @@ function InternalUpload(props, ref) {
     file.status = status;
     file.thumbUrl = thumbUrl;
     file.id = file.uid;
-    var list = _toConsumableArray(listRef.current.list);
+    var list = _toConsumableArray(tempList);
     setFileList(list);
     if (onChange && needChange) {
       onChange(list, {
@@ -129,7 +129,7 @@ function InternalUpload(props, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             file = requestOption.file; // 若超出最大限制则不上传
-            if (!(listRef.current.list.filter(function (item) {
+            if (!(tempList.filter(function (item) {
               return (item === null || item === void 0 ? void 0 : item.status) !== 'removed';
             }).length >= maxCount)) {
               _context.next = 3;
@@ -145,12 +145,12 @@ function InternalUpload(props, ref) {
               _context.next = 9;
               break;
             }
-            _list = customRequest(file, listRef.current.list, requestOption);
+            _list = customRequest(file, tempList, requestOption);
             if (_list && 'then' in _list && typeof _list.then === 'function') {
               _list.then(function (list) {
                 if (list) {
                   setFileList(_toConsumableArray(list));
-                  listRef.current.list = _toConsumableArray(list);
+                  setTempList(_toConsumableArray(list));
                   onChange === null || onChange === void 0 ? void 0 : onChange(list, {
                     file: file,
                     fileList: list
@@ -160,69 +160,70 @@ function InternalUpload(props, ref) {
             } else if (_list instanceof Array) {
               if (_list) {
                 setFileList(_toConsumableArray(_list));
-                listRef.current.list = _toConsumableArray(_list);
+                setTempList(_toConsumableArray(_list));
                 onChange === null || onChange === void 0 ? void 0 : onChange(_list, {
                   file: file,
                   fileList: _list
                 });
               }
             }
-            _context.next = 42;
+            _context.next = 43;
             break;
           case 9:
             // 默认的上传逻辑
-            listRef.current.list.push(file);
+            tempList.push(file);
+            setTempList(_toConsumableArray(tempList));
             if (!(_thumbOption && typeof _thumbOption.getThumbUrl === 'function')) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
             updateFileList(file, 'uploading');
-            _context.prev = 12;
-            _context.next = 15;
+            _context.prev = 13;
+            _context.next = 16;
             return _thumbOption.getThumbUrl(file, _thumbOption);
-          case 15:
+          case 16:
             base64Url = _context.sent;
             updateFileList(file, 'done', false, base64Url);
-            _context.next = 23;
+            _context.next = 24;
             break;
-          case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](12);
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](13);
             (_thumbOption$onError = _thumbOption.onError) === null || _thumbOption$onError === void 0 ? void 0 : _thumbOption$onError.call(_thumbOption, _context.t0);
             updateFileList(file, 'done', false);
-          case 23:
-            _context.next = 42;
+          case 24:
+            _context.next = 43;
             break;
-          case 25:
+          case 26:
             if (!(_thumbOption && (_thumbOption$filter = _thumbOption.filter) !== null && _thumbOption$filter !== void 0 && _thumbOption$filter.call(_thumbOption, file))) {
-              _context.next = 41;
+              _context.next = 42;
               break;
             }
             _compress = file.size > _thumbOption.size ? _thumbOption.compress : null;
             updateFileList(file, 'uploading');
-            _context.prev = 28;
-            _context.next = 31;
+            _context.prev = 29;
+            _context.next = 32;
             return helper.imageToBase64(file, _compress);
-          case 31:
+          case 32:
             _base64Url = _context.sent;
             updateFileList(file, 'done', false, _base64Url);
-            _context.next = 39;
+            _context.next = 40;
             break;
-          case 35:
-            _context.prev = 35;
-            _context.t1 = _context["catch"](28);
+          case 36:
+            _context.prev = 36;
+            _context.t1 = _context["catch"](29);
             (_thumbOption$onError2 = _thumbOption.onError) === null || _thumbOption$onError2 === void 0 ? void 0 : _thumbOption$onError2.call(_thumbOption, _context.t1);
             updateFileList(file, 'done', false);
-          case 39:
-            _context.next = 42;
+          case 40:
+            _context.next = 43;
             break;
-          case 41:
-            updateFileList(file, 'done');
           case 42:
+            updateFileList(file, 'done');
+          case 43:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[12, 19], [28, 35]]);
+      }, _callee, null, [[13, 20], [29, 36]]);
     }));
     return function customRequestFun(_x) {
       return _ref.apply(this, arguments);
@@ -231,7 +232,7 @@ function InternalUpload(props, ref) {
   var onRemoveFun = function onRemoveFun(file) {
     // 用户自定义的删除逻辑
     if (typeof onRemove === 'function') {
-      var _list2 = onRemove(file, listRef.current.list);
+      var _list2 = onRemove(file, tempList);
       if (_list2 && 'then' in _list2 && typeof _list2.then === 'function') {
         _list2.then(function (list) {
           if (list) {
@@ -254,15 +255,15 @@ function InternalUpload(props, ref) {
     } else {
       // 默认的删除逻辑
       if (file.source === 'upload') {
-        var index = listRef.current.list.findIndex(function (item) {
+        var index = fileList.findIndex(function (item) {
           return item.uid === file.uid;
         });
-        if (index >= 0) listRef.current.list.splice(index, 1);
+        if (index >= 0) fileList.splice(index, 1);
       } else {
         file.status = 'removed';
       }
-      var _list3 = _toConsumableArray(listRef.current.list);
-      setFileList(_list3);
+      var _list3 = _toConsumableArray(fileList);
+      setTempList(_list3);
       onChange === null || onChange === void 0 ? void 0 : onChange(_list3, {
         file: file,
         fileList: _list3
@@ -337,7 +338,7 @@ function InternalUpload(props, ref) {
     showPreviewIcon: true,
     showDownloadIcon: true
   });
-  var _finalFileList = listRef.current.list.filter(function (item) {
+  var _finalFileList = fileList.filter(function (item) {
     return item.status !== 'removed';
   });
   var _props = _objectSpread({
@@ -356,7 +357,7 @@ function InternalUpload(props, ref) {
   var _uploadButton = uploadButton === null ? null : uploadButton || children || defaultUploadButton;
   useEffect(function () {
     var list = helper.getUploadFile(_fileList || value || defaultFileList, maxCount);
-    listRef.current.list = list;
+    setTempList(list);
     setFileList(list);
   }, [_fileList, value, defaultFileList]);
   return /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread({

package/dist/esm/DUpload/index.less

@@ -1,19 +1,19 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-upload {
-  .preview .ant-upload-list-item-actions a[target='_blank'][rel='noopener noreferrer'] {
-    opacity: initial !important;
-    pointer-events: initial !important;
-  }
-
-  .ant-upload-list.ant-upload-list-picture-card .ant-upload-span {
-    .ant-upload-list-item-thumbnail {
-      height: 46px;
-    }
-
-    .ant-upload-list-item-name {
-      position: absolute;
-      display: initial;
-    }
-  }
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-upload {
+  .preview .ant-upload-list-item-actions a[target='_blank'][rel='noopener noreferrer'] {
+    opacity: initial !important;
+    pointer-events: initial !important;
+  }
+
+  .ant-upload-list.ant-upload-list-picture-card .ant-upload-span {
+    .ant-upload-list-item-thumbnail {
+      height: 46px;
+    }
+
+    .ant-upload-list-item-name {
+      position: absolute;
+      display: initial;
+    }
+  }
+}

package/dist/esm/ErrorBoundary/index.less

@@ -1,44 +1,44 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-error-boundary {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: auto;
-  margin: 20px;
-  padding: 15px;
-  background-color: rgb(221, 127, 127);
-  border-radius: 10px;
-
-  .error-text {
-    margin-top: 20px;
-  }
-
-  .error-refresh {
-    width: 140px;
-    height: 40px;
-    color: white;
-    font-weight: bold;
-    line-height: 40px;
-    text-align: center;
-    background-color: #4593ef;
-    border-radius: 5px;
-    cursor: pointer;
-  }
-
-  .errorDetiles {
-    .detilesLink {
-      color: blue;
-    }
-
-    .errordetails {
-      padding: 10px;
-      color: #777;
-      font-size: 80%;
-      background-color: rgb(204, 198, 190);
-      border: 1px solid #777;
-      border-radius: 5px;
-    }
-  }
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-error-boundary {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: auto;
+  margin: 20px;
+  padding: 15px;
+  background-color: rgb(221, 127, 127);
+  border-radius: 10px;
+
+  .error-text {
+    margin-top: 20px;
+  }
+
+  .error-refresh {
+    width: 140px;
+    height: 40px;
+    color: white;
+    font-weight: bold;
+    line-height: 40px;
+    text-align: center;
+    background-color: #4593ef;
+    border-radius: 5px;
+    cursor: pointer;
+  }
+
+  .errorDetiles {
+    .detilesLink {
+      color: blue;
+    }
+
+    .errordetails {
+      padding: 10px;
+      color: #777;
+      font-size: 80%;
+      background-color: rgb(204, 198, 190);
+      border: 1px solid #777;
+      border-radius: 5px;
+    }
+  }
+}

package/dist/esm/LModal/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/LabelValue/styles/index.less

@@ -1,23 +1,23 @@
-@import '../../commonStyle/index.less';
-
-.@{prefix}-label-value {
-  display: inline-flex;
-
-  span {
-    &:first-child {
-      max-width: 120px;
-      padding-right: 4px;
-      white-space: nowrap;
-    }
-
-    &:last-child {
-      flex: 1;
-
-      &.no-wrap {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-    }
-  }
-}
+@import '../../commonStyle/index.less';
+
+.@{prefix}-label-value {
+  display: inline-flex;
+
+  span {
+    &:first-child {
+      max-width: 120px;
+      padding-right: 4px;
+      white-space: nowrap;
+    }
+
+    &:last-child {
+      flex: 1;
+
+      &.no-wrap {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+}