linkmore-design 1.0.83 → 1.0.85

package/lib/LmTable/Table.js

@@ -13,12 +13,12 @@ require("antd/es/config-provider/style");
 
 var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -29,10 +29,6 @@ var _sortable = require("@dnd-kit/sortable");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _Empty = _interopRequireDefault(require("../Empty"));
-
-var _IconFont = _interopRequireDefault(require("../IconFont"));
-
 var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -43,7 +39,9 @@ var _immer = require("immer");
 
 var _reactSortableHoc = require("react-sortable-hoc");
 
-var _hooks = require("../hooks");
+var _IconFont = _interopRequireDefault(require("../IconFont"));
+
+var _Empty = _interopRequireDefault(require("../Empty"));
 
 var _DndContainer = _interopRequireDefault(require("./components/DndContainer"));
 
@@ -113,8 +111,8 @@ var sortDefaultColumnItem = {
   }
 };
 var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var columns = props.columns,
-      dataSource = props.dataSource,
+  var customizeColumns = props.columns,
+      customizeDataSource = props.dataSource,
       autoSize = props.autoSize,
       rowClick = props.rowClick,
       _onDoubleClick = props.onDoubleClick,
@@ -185,6 +183,30 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setExpandedRowKeys = _useState8[1];
 
   var deepDataSourceRef = (0, _react.useRef)([]);
+  /** 行分组 */
+
+  var groupDataSource = (0, _react.useMemo)(function () {
+    if (!(groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length)) {
+      return customizeDataSource;
+    }
+
+    return (0, _util.transformWithRowGroup)(customizeDataSource, groupInfo);
+  }, [customizeDataSource, groupInfo]);
+  /** 列分组 */
+
+  var _useMemo = (0, _react.useMemo)(function () {
+    if (!(columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length)) {
+      return {
+        dataSource: groupDataSource,
+        columns: customizeColumns
+      };
+    }
+
+    return (0, _util.transformWithColGroup)(customizeColumns, groupDataSource, columnKeys);
+  }, [customizeColumns, groupDataSource, columnKeys]),
+      columns = _useMemo.columns,
+      dataSource = _useMemo.dataSource;
+
   (0, _react.useEffect)(function () {
     setExpandedRowKeys([]);
   }, [groupInfo]);
@@ -266,33 +288,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     dataSourceRef.current = dataSource;
   }, [dataSource]);
-
-  var groupBy = function groupBy(lastFilter, oGroup) {
-    if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
-    var group = oGroup.slice();
-    var filterKey = group.shift();
-    var map = lastFilter.reduce(function (acc, el) {
-      var value = el[filterKey];
-      acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
-      return acc;
-    }, {});
-    return Object.keys(map).map(function (item) {
-      return {
-        type: filterKey,
-        group: item,
-        key: "".concat(item, "_").concat(filterKey),
-        children: groupBy(map[item], group)
-      };
-    });
-  };
-
-  var groupDataSource = (0, _react.useMemo)(function () {
-    if (!(groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length)) {
-      return dataSource;
-    }
-
-    return groupBy(dataSource, groupInfo);
-  }, [dataSource, groupInfo]);
   (0, _react.useEffect)(function () {
     var source = [];
 
@@ -306,12 +301,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       });
     };
 
-    deepChildren(groupDataSource);
+    deepChildren(dataSource);
     deepDataSourceRef.current = source;
-  }, [groupDataSource, expandedRowKeys]);
-  var dataEffect = (0, _react.useMemo)(function () {
-    return openSheet ? [dataSource] : [];
-  }, [openSheet]);
+  }, [dataSource, expandedRowKeys]);
 
   var onSortEnd = function onSortEnd(_ref) {
     var oldIndex = _ref.oldIndex,
@@ -458,7 +450,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var onMouseOver = function onMouseOver(i, j) {
-    var _shellStatusRef$curre4;
+    var _shellStatusRef$curre4, _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
 
     if (isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting)) {
       var _shellStatusRef$curre5, _shellStatusRef$curre6;
@@ -477,23 +469,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           }
         }));
       }
-    } else {
-      var _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
-
-      if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
-        shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
-          end: {
-            i: i,
-            j: j
-          }
-        });
-        setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
-          end: {
-            i: i,
-            j: j
-          }
-        }));
-      }
+    } else if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
+      shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
+        end: {
+          i: i,
+          j: j
+        }
+      });
+      setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
+        end: {
+          i: i,
+          j: j
+        }
+      }));
     }
   };
   /** sheel 表格 鼠标松开 */
@@ -1189,7 +1177,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }, [])
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
-    dataSource: groupDataSource || dataSource,
+    dataSource: dataSource,
     components: tableComponents,
     onChange: onTableChange,
     expandable: {
@@ -1215,7 +1203,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
-    dataSource: groupDataSource || dataSource,
+    dataSource: dataSource,
     components: tableComponents,
     onChange: onTableChange,
     expandable: {
@@ -1361,9 +1349,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var handResize = (0, _lodash.throttle)(changeSize, 600);
   (0, _react.useEffect)(function () {
-    var hiddenPage = props.hiddenPage,
-        customCheck = props.customCheck,
-        summary = props.summary;
+    var summary = props.summary;
     setTimeout(function () {
       var _tableWarpRef$current5;
 

package/lib/LmTable/components/sheelTableCell.js

@@ -98,7 +98,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
 
   var handleContextMenu = function handleContextMenu(e) {
     if (!col.disableEvents) {
-      onContextMenu(e, rowIndex, colIndex);
+      onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, rowIndex, colIndex);
     }
   };
   /** 鼠标松开 */
@@ -114,7 +114,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
 
   var handleDoubleClick = function handleDoubleClick(e) {
     if (!(col === null || col === void 0 ? void 0 : col.disableEvents)) {
-      onDoubleClick(rowIndex, colIndex, col);
+      onDoubleClick === null || onDoubleClick === void 0 ? void 0 : onDoubleClick(rowIndex, colIndex, col);
     }
   };
 

package/lib/LmTable/style/index.css

@@ -944,6 +944,7 @@ p {
   padding: 8px;
   font-size: 12px;
   background: var(--color-4);
+  text-align: left;
 }
 #lm_protable_warp .lm_protable .ant-table.ant-table-small {
   font-size: 12px;

package/lib/LmTable/util.js

@@ -8,11 +8,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.checkIsSelectd = checkIsSelectd;
 exports.checkStatus = checkStatus;
 exports.transformWithColGroup = transformWithColGroup;
+exports.transformWithRowGroup = transformWithRowGroup;
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
+/**
+ * 对数据进行分组
+ * @param {Array} data
+ * @param {string} key
+ * @return {Object}
+ */
+function dataGroup(data, key) {
+  var result = {};
+  data.forEach(function (item) {
+    if (item.children) {
+      var temp = dataGroup(item.children, key);
+      Object.keys(temp).forEach(function (k) {
+        if (!result[k]) result[k] = [];
+        result[k] = result[k].concat(temp[k]);
+      });
+    } else {
+      var value = item[key];
+      result[value] = [].concat((0, _toConsumableArray2.default)(result[value] || []), [item]);
+    }
+  });
+  return result;
+}
 /**
  * 列分组数据转换
  * @param columns 表格的columns属性值
@@ -20,21 +45,28 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
  * @param columnKeys 列分组的keys
  * @returns
  */
+
+
 function transformWithColGroup(columns, dataSource, columnKeys) {
   if (!Array.isArray(columnKeys) || !columnKeys.length) {
     return {
       columns: columns,
       dataSource: dataSource
     };
-  } // 去重
+  }
+
+  var columnsCopy = _lodash.default.cloneDeep(columns);
+
+  var dataSourceCopy = _lodash.default.cloneDeep(dataSource); // 去重
 
 
-  columnKeys = (0, _toConsumableArray2.default)(new Set(columnKeys));
+  var columnKeysCopy = (0, _toConsumableArray2.default)(new Set(columnKeys));
+  debugger;
 
-  var groupBy = function groupBy(lastFilter, columns, oGroup, markStr) {
+  var groupBy = function groupBy(source, columns, oGroup, markStr) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {
       return columns.filter(function (c) {
-        return columnKeys.indexOf(c.dataIndex) === -1;
+        return columnKeysCopy.indexOf(c.dataIndex) === -1;
       }).map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           dataIndex: "".concat(markStr, "_").concat(item.dataIndex)
@@ -44,26 +76,21 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
 
     var group = oGroup.slice();
     var filterKey = group.shift();
-    var map = lastFilter.reduce(function (acc, el) {
-      var value = el[filterKey];
-      acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
-      return acc;
-    }, {});
+    var map = dataGroup(source, filterKey);
     return Object.keys(map).map(function (item) {
       return {
         type: filterKey,
         title: item,
         key: "".concat(item, "_").concat(filterKey),
-        children: groupBy(map[item], columns, group, "".concat(markStr ? markStr + '_' : '').concat(filterKey, "_").concat(item))
+        children: groupBy(map[item], columns, group, "".concat(markStr ? "".concat(markStr, "_") : '').concat(filterKey, "_").concat(item))
       };
     });
   };
 
-  var _columns = groupBy(dataSource, columns, columnKeys, null);
-
-  var _dataSource = [dataSource.reduce(function (prev, cur) {
+  var tempColumns = groupBy(dataSourceCopy, columnsCopy, columnKeysCopy, null);
+  var tempDataSource = [dataSourceCopy.reduce(function (prev, cur) {
     var str = '';
-    columnKeys.forEach(function (dataIndex, i) {
+    columnKeysCopy.forEach(function (dataIndex, i) {
       if (i !== 0) {
         str += '_';
       }
@@ -76,10 +103,40 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, prev), cur);
   }, {})];
   return {
-    columns: _columns,
-    dataSource: _dataSource
+    columns: tempColumns,
+    dataSource: tempDataSource
   };
 }
+/**
+ * 行分组
+ * @param {Array} dataSource 数据源
+ * @param {Array} groupInfo 行分组的keys
+ * @returns
+ */
+
+
+function transformWithRowGroup(dataSource, groupInfo) {
+  var groupBy = function groupBy(lastFilter, oGroup) {
+    if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
+    var group = oGroup.slice();
+    var filterKey = group.shift();
+    var map = lastFilter.reduce(function (acc, el) {
+      var value = el[filterKey];
+      acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
+      return acc;
+    }, {});
+    return Object.keys(map).map(function (item) {
+      return {
+        type: filterKey,
+        group: item,
+        key: "".concat(item, "_").concat(filterKey),
+        children: groupBy(map[item], group)
+      };
+    });
+  };
+
+  return groupBy(dataSource, groupInfo);
+}
 
 function checkIsSelectd(i, j) {
   var start = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

package/lib/LmTable/virTual/VirtualTable.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const VirtualTable: React.NamedExoticComponent<object>;
+import React, { PropsWithChildren } from 'react';
+declare const VirtualTable: React.MemoExoticComponent<(tableProps: PropsWithChildren<any>) => JSX.Element>;
 export default VirtualTable;

package/lib/LmTable/virTual/VirtualTable.js

@@ -18,7 +18,7 @@ var _reactVirtual = require("react-virtual");
 var _context = require("./context");
 
 var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
-  var _a, _b;
+  var _a, _b, _c, _d;
 
   var bodyRef = (0, _react.useRef)(null);
 
@@ -45,9 +45,11 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
     parentRef: {
       current: (_b = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _b === void 0 ? void 0 : _b.parentNode
     },
-    estimateSize: _react.default.useCallback(function () {
-      return 200;
-    }, [200]),
+    estimateSize: _react.default.useCallback(function (i) {
+      var _a, _b;
+
+      return (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths[i];
+    }, [(_d = (_c = tableProps.children[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.colWidths]),
     overscan: 5
   });
   var instance = {

package/lib/LmUpload/LmUpload.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<Pick<{
     [x: string]: any;
     fileConfig: any;
+    fileNames: any;
     components: any;
     ossConfig: any;
 }, string | number> & React.RefAttributes<unknown>>;

package/lib/LmUpload/LmUpload.js

@@ -27,24 +27,41 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 var LmUpload = function LmUpload(_a, ref) {
-  var fileConfig = _a.fileConfig,
+  var _fileConfig = _a.fileConfig,
+      fileNames = _a.fileNames,
       components = _a.components,
       _ossConfig = _a.ossConfig,
-      resetProps = __rest(_a, ["fileConfig", "components", "ossConfig"]);
+      resetProps = __rest(_a, ["fileConfig", "fileNames", "components", "ossConfig"]);
 
   var defaultRef = (0, _react.useRef)(null); // 仅在初始化触发一次
 
   var initConfig = (0, _react.useMemo)(function () {
     return {
-      // 文件配置单独存储
-      // fileConfig: {
-      //   size: 10,
-      //   type: ['jpg', 'jpeg', 'png'],
-      //   maxCount: 99,
-      //   ...(fileConfig || {}),
-      // },
-      // 读取字段配置
-      fileNames: {
+      // 文件参数配置: 存储时的数据
+      fileConfig: function fileConfig(fileConfigProps) {
+        var file = fileConfigProps.file,
+            timestamp = fileConfigProps.timestamp,
+            fileName = fileConfigProps.fileName,
+            filePath = fileConfigProps.filePath,
+            shortlink = fileConfigProps.shortlink,
+            url = fileConfigProps.url;
+        return Object.assign({
+          uid: timestamp,
+          fileTypeCode: file.type,
+          fileTypeName: file.type,
+          fileName: fileName,
+          realFileName: file.name,
+          fileSize: file.size,
+          internalUrl: shortlink,
+          externalUrl: shortlink,
+          filePath: filePath,
+          seq: 0,
+          url: url,
+          status: 'done'
+        }, _fileConfig === null || _fileConfig === void 0 ? void 0 : _fileConfig(fileConfigProps));
+      },
+      // 读取字段配置: 读取存储的参数字段
+      fileNames: Object.assign({
         uid: 'uid',
         fileTypeCode: 'fileTypeCode',
         fileTypeName: 'fileTypeName',
@@ -55,32 +72,31 @@ var LmUpload = function LmUpload(_a, ref) {
         externalUrl: 'externalUrl',
         filePath: 'filePath',
         seq: 'seq',
-        url: 'url'
-      },
+        url: 'url',
+        status: 'status'
+      }, fileNames),
       // 初始化
       components: Object.assign({
         wrapper: null
       }, components || {})
     };
   }, []);
-  var defaultProps = {
+  var defaultProps = Object.assign({
+    size: 100,
+    fileSize: 10,
     uid: 'uid',
-    fileList: null,
-    type: ['jpg', 'jpeg', 'png'],
     accept: '',
-    fileSize: 10,
+    type: ['jpg', 'jpeg', 'png'],
     listType: 'card',
-    size: 100,
+    readOnly: false,
     disabled: false,
-    maxCount: null,
     showUploadList: true,
-    children: null,
+    fileList: null,
     defaultFileList: [],
+    limit: null,
+    maxCount: null,
+    children: null,
     itemRender: null,
-    readOnly: false,
-    onRemove: function onRemove() {
-      return true;
-    },
     enabledOss: false,
     // oss配置
     ossConfig: function ossConfig() {
@@ -93,11 +109,15 @@ var LmUpload = function LmUpload(_a, ref) {
         bucket: 'linkmore-scm-test',
         shortlink: 'https://linkmore-scm-test.oss-cn-hangzhou.aliyuncs.com'
       }, typeof _ossConfig === 'function' ? _ossConfig() : _ossConfig);
+    },
+    // 根据返回值决定是否可删除
+    onRemove: function onRemove() {
+      return true;
     }
-  };
+  }, resetProps);
   return /*#__PURE__*/_react.default.createElement(_UploadRoot.default, Object.assign({
     ref: ref || defaultRef
-  }, initConfig, defaultProps, resetProps));
+  }, initConfig, defaultProps));
 };
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(LmUpload);

package/lib/LmUpload/UploadList/ItemPicture.js

@@ -22,9 +22,10 @@ var PictureItem = function PictureItem(_ref) {
   var readOnly = instance.readOnly,
       remove = instance.remove,
       preview = instance.preview,
-      download = instance.download;
+      download = instance.download,
+      fileNames = instance.fileNames;
   return /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames.default)('lm_upload_item lm_upload_item_picture', file.status === 'error' && 'error')
+    className: (0, _classnames.default)('lm_upload_item lm_upload_item_picture', file[fileNames.status] === 'error' && 'lm_upload_item_error')
   }, /*#__PURE__*/React.createElement("div", {
     className: "picture_left"
   }, /*#__PURE__*/React.createElement("div", {
@@ -33,14 +34,14 @@ var PictureItem = function PictureItem(_ref) {
       return preview(file);
     }
   }, /*#__PURE__*/React.createElement("img", {
-    src: file.url,
+    src: file[fileNames.url],
     alt: ""
   })), /*#__PURE__*/React.createElement("div", {
     className: "lm_upload_item_name",
     onClick: function onClick() {
       return download(file);
     }
-  }, file.fileName)), !readOnly && /*#__PURE__*/React.createElement("div", {
+  }, file[fileNames.fileName])), !readOnly && /*#__PURE__*/React.createElement("div", {
     className: "picture_right lm_upload_item_action"
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_delete",

package/lib/LmUpload/UploadList/ItemPictureCard.js

@@ -28,13 +28,22 @@ var renderThumb = function renderThumb(file) {
     case 'png':
     case 'jpg':
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: "lm_upload_item_error"
+        className: "lm_upload_item_thumb_error"
       }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
         type: "lmweb-image"
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: "lm_upload_item_name"
       }, file.realFileName));
 
+    case 'mp4':
+    case 'm2v':
+    case 'mkv':
+    case 'ogm':
+    case 'webm':
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        type: "lmweb-video"
+      });
+
     case 'doc':
     case 'docx':
       return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -72,24 +81,29 @@ var PictureItem = function PictureItem(_ref) {
   var readOnly = instance.readOnly,
       size = instance.size,
       remove = instance.remove,
-      preview = instance.preview;
+      preview = instance.preview,
+      getFileFields = instance.getFileFields;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       isError = _useState2[0],
-      setIsError = _useState2[1]; // 文件信息重组
+      setIsError = _useState2[1]; // 文件信息重组 获取文件名称 => 截取后缀文件名
 
 
   var resetFile = (0, _react.useMemo)(function () {
-    var fileExtension = file.realFileName.replace(/.*\./, '').toLowerCase();
-    return Object.assign(Object.assign({}, file), {
+    var fileParams = getFileFields(file);
+    var realFileName = fileParams.realFileName,
+        fileName = fileParams.fileName,
+        filename = fileParams.filename;
+    var fileExtension = (realFileName || fileName || filename).replace(/.*\./, '').toLowerCase();
+    return Object.assign(Object.assign({}, fileParams), {
       fileExtension: fileExtension
     });
-  }, [file]); // 预览小图
+  }, [getFileFields, file]); // 预览小图
 
   var thumbUrl = (0, _react.useMemo)(function () {
-    return "".concat(file.url, "?x-oss-process=image/resize,w_").concat(size);
-  }, [file.url, size]); // 根据文件名后缀判断
+    return "".concat(resetFile.url, "?x-oss-process=image/resize,w_").concat(size);
+  }, [resetFile.url, size]); // 根据文件名后缀判断
 
   var isImg = (0, _react.useMemo)(function () {
     return ['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(resetFile.fileExtension);
@@ -98,7 +112,7 @@ var PictureItem = function PictureItem(_ref) {
   var resetSize = (0, _react.useMemo)(function () {
     var width = size - 16;
     var padding = size > 60 ? 8 : 4;
-    var fontSize = size > 60 ? 16 : 14;
+    var fontSize = size > 60 ? 16 : 12;
     return {
       width: width,
       padding: padding,
@@ -106,7 +120,7 @@ var PictureItem = function PictureItem(_ref) {
     };
   }, [size]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('lm_upload_item', 'lm_upload_item_card', isError && 'error'),
+    className: (0, _classnames.default)('lm_upload_item', 'lm_upload_item_card', isError && 'lm_upload_item_error'),
     style: {
       height: size,
       width: size
@@ -132,7 +146,7 @@ var PictureItem = function PictureItem(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-eye",
     style: {
-      fontSize: size > 48 ? 16 : 12
+      fontSize: resetSize.fontSize
     }
   })), !readOnly && /*#__PURE__*/_react.default.createElement("div", {
     className: "action_delete",
@@ -142,7 +156,7 @@ var PictureItem = function PictureItem(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-delete",
     style: {
-      fontSize: size > 48 ? 16 : 12
+      fontSize: resetSize.fontSize
     }
   })))));
 };