linkmore-design 1.0.68 → 1.0.71

package/es/LmSelect/useCheckboxOptions.js

@@ -14,11 +14,11 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-import { useEvent } from '../hooks';
 import { useControllableValue } from 'ahooks';
 import classNames from 'classnames';
 import { Checkbox, VirtualList } from 'linkmore-design';
 import React, { useMemo } from 'react';
+import { useEvent } from '../hooks';
 import { onStringSearch } from './utils';
 
 var imgEmpty = require('./icon_placeholder.png');
@@ -53,7 +53,7 @@ export var useCheckboxOptions = function useCheckboxOptions(options, _ref) {
 
   var renderOptions = useMemo(function () {
     return options.filter(function (v) {
-      return onStringSearch(filter, v.label);
+      return !v.disabled && onStringSearch(filter, v.label);
     });
   }, [options, filter]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
 
@@ -124,4 +124,5 @@ export var useCheckboxOptions = function useCheckboxOptions(options, _ref) {
       className: "filter_item-content"
     }, item.label));
   }), !renderOptions.length && /*#__PURE__*/React.createElement(FilterEmpty, null)));
-};
+};
+export default useCheckboxOptions;

package/es/LmTable/Table.js

@@ -158,7 +158,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var newIndex = columns.findIndex(function (item) {
       return item.dataIndex === over;
     });
-    console.log((0, _sortable.arrayMove)(columns, oldIndex, newIndex), 222);
     filterChange === null || filterChange === void 0 ? void 0 : filterChange((0, _sortable.arrayMove)(columns, oldIndex, newIndex).map(function (item, index) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         order: index

package/es/LmTable/autosize.js

@@ -48,7 +48,6 @@ var AutoSizer = /*#__PURE__*/function (_React$Component) {
     _this._detectElementResize = void 0;
 
     _this._onResize = function () {
-      console.log(11);
       var _this$props = _this.props,
           disableHeight = _this$props.disableHeight,
           disableWidth = _this$props.disableWidth,
@@ -109,8 +108,6 @@ var AutoSizer = /*#__PURE__*/function (_React$Component) {
 
         this._detectElementResize.addResizeListener(this._parentNode, this.handleResize);
 
-        console.log(3);
-
         this._onResize();
       }
     }

package/es/LmTable/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .z_container {
   position: relative;
   display: flex;

package/es/LmUpload/LmUpload.d.ts

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

package/es/LmUpload/LmUpload.js

@@ -11,17 +11,49 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-import React, { useRef, forwardRef } from 'react';
+import React, { useRef, useMemo, forwardRef } from 'react';
 import LmFilterRoot from './wrapper/UploadRoot';
-var stsToken = 'CAISjgJ1q6Ft5B2yfSjIr5eDGdHdi5RigKuYR2fGhUcBaOEfmKHYijz2IH5IenZuA+gYtf8ymm1Q5v8ZloAvFs4YbR3KPJco48QJtA/9aoGE5cW7tfkIhJasXDPCBRPyjJ+OaLn0RYseuA94rQiW+BVoyJ7WKB+APTX8Q7Dr5LdjatMIJHraCRNNGNZRICZ7tcYeLgG/HP2xMxns8AGyZQgSzWgas25k7rmlycCx8wfXiEaAqtUYvIPsOJOpHaIOVdVdK47tgr0pLfeRinQNukYSpPhM4fYaqWudjLa0GEJM5hiKCe3Q/+B0IRVxDqpAQPAY8qeiz6Um4beOydmvm08WJ49SSD/FTYWwXwx6zT9crb8agAE/AmQIq01ud7Oe11GaycEGpfRMjSM7w3GYv7WZPtY7dlVJemeghJDOuoOjPuu+WigsrFqJr4LCXB44EvoV4tTBz9NrFdJ8T1JPD5nCQ15TSifXJMjym4tWeOTVRiZk04N27cXgD3YYj7s9wOFMsUsenZR6WulrHhyUEwyjb9fGcQ==';
 
 var LmUpload = function LmUpload(_a, ref) {
-  var ossConfig = _a.ossConfig,
-      resetProps = __rest(_a, ["ossConfig"]);
+  var fileConfig = _a.fileConfig,
+      components = _a.components,
+      _ossConfig = _a.ossConfig,
+      resetProps = __rest(_a, ["fileConfig", "components", "ossConfig"]);
 
-  var defaultRef = useRef(null);
+  var defaultRef = useRef(null); // 仅在初始化触发一次
+
+  var initConfig = useMemo(function () {
+    return {
+      // 文件配置单独存储
+      fileConfig: Object.assign({
+        size: 10,
+        type: ['jpg', 'jpeg', 'png'],
+        maxCount: 99
+      }, fileConfig || {}),
+      // 读取字段配置
+      fileNames: {
+        uid: 'uid',
+        fileTypeCode: 'fileTypeCode',
+        fileTypeName: 'fileTypeName',
+        fileName: 'fileName',
+        realFileName: 'realFileName',
+        fileSize: 'fileSize',
+        internalUrl: 'internalUrl',
+        externalUrl: 'externalUrl',
+        filePath: 'filePath',
+        seq: 'seq',
+        url: 'url'
+      },
+      // 初始化
+      components: Object.assign({
+        itemRender: null,
+        wrapper: null
+      }, components || {})
+    };
+  }, []);
   var defaultProps = {
-    value: [],
+    uid: 'uid',
+    fileList: null,
     type: ['jpg', 'jpeg', 'png'],
     accept: '',
     fileSize: 10,
@@ -29,30 +61,30 @@ var LmUpload = function LmUpload(_a, ref) {
     size: 100,
     disabled: false,
     maxCount: null,
+    showUploadList: true,
     children: null,
     defaultFileList: [],
     itemRender: null,
-    components: {
-      // 包装结构体: 上传, 列表
-      wrapper: function wrapper(upload, fileList) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, upload, fileList);
-      }
+    onRemove: function onRemove() {
+      return true;
     },
+    enabledOss: false,
     // oss配置
-    ossConfig: Object.assign({
-      dir: '/BizFile/4595/Supplier/',
-      region: 'oss-cn-hangzhou',
-      accessKeyId: 'STS.NT6RkifKC7isEAwaGTdn3wdsh',
-      accessKeySecret: '2iKmXAauEr1M8W8ZaRGgfVABJJWsb2cBFYP7s9rPGJT8',
-      // aks
-      stsToken: stsToken,
-      bucket: 'linkmore-scm-test',
-      shortlink: 'https://linkmore-scm-test.oss-cn-hangzhou.aliyuncs.com'
-    }, ossConfig)
+    ossConfig: function ossConfig() {
+      return Object.assign({
+        dir: '/BizFile/4595/Supplier/',
+        region: 'oss-cn-hangzhou',
+        accessKeyId: '',
+        accessKeySecret: '',
+        stsToken: '',
+        bucket: 'linkmore-scm-test',
+        shortlink: 'https://linkmore-scm-test.oss-cn-hangzhou.aliyuncs.com'
+      }, typeof _ossConfig === 'function' ? _ossConfig() : _ossConfig);
+    }
   };
   return /*#__PURE__*/React.createElement(LmFilterRoot, Object.assign({
     ref: ref || defaultRef
-  }, defaultProps, resetProps));
+  }, initConfig, defaultProps, resetProps));
 };
 
 export default /*#__PURE__*/forwardRef(LmUpload);

package/es/LmUpload/UploadList/ItemPicture.d.ts

@@ -1,4 +1,5 @@
-declare const PictureItem: ({ file }: {
+declare const PictureItem: ({ file, instance }: {
     file: any;
+    instance: any;
 }) => JSX.Element;
 export default PictureItem;

package/es/LmUpload/UploadList/ItemPicture.js

@@ -1,22 +1,37 @@
 import * as React from 'react';
+import cn from 'classnames';
 import { IconFont } from 'linkmore-design'; // 图片列表项
 
 var PictureItem = function PictureItem(_ref) {
-  var file = _ref.file;
+  var file = _ref.file,
+      instance = _ref.instance;
+  var remove = instance.remove,
+      preview = instance.preview,
+      download = instance.download;
   return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item lm_upload_item_picture'
+    className: cn('lm_upload_item lm_upload_item_picture', file.status === 'error' && 'error')
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'picture_left'
+    className: "picture_left"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_thumb'
+    className: "lm_upload_item_thumb",
+    onClick: function onClick() {
+      return preview(file);
+    }
   }, /*#__PURE__*/React.createElement("img", {
-    src: file.url
+    src: file.url,
+    alt: ""
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_name'
+    className: "lm_upload_item_name",
+    onClick: function onClick() {
+      return download(file);
+    }
   }, file.fileName)), /*#__PURE__*/React.createElement("div", {
-    className: 'picture_right lm_upload_item_action'
+    className: "picture_right lm_upload_item_action"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'action_delete'
+    className: "action_delete",
+    onClick: function onClick() {
+      return remove(file);
+    }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-delete"
   }))));

package/es/LmUpload/UploadList/ItemPictureCard.js

@@ -14,11 +14,11 @@ var renderThumb = function renderThumb(file) {
     case 'png':
     case 'jpg':
       return /*#__PURE__*/React.createElement("div", {
-        className: 'lm_upload_item_error'
+        className: "lm_upload_item_error"
       }, /*#__PURE__*/React.createElement(IconFont, {
         type: "lmweb-image"
       }), /*#__PURE__*/React.createElement("div", {
-        className: 'lm_upload_item_name'
+        className: "lm_upload_item_name"
       }, file.realFileName));
 
     case 'doc':
@@ -55,7 +55,9 @@ var renderThumb = function renderThumb(file) {
 var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
       instance = _ref.instance;
-  var size = instance.size;
+  var size = instance.size,
+      remove = instance.remove,
+      preview = instance.preview;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -72,7 +74,8 @@ var PictureItem = function PictureItem(_ref) {
 
   var thumbUrl = useMemo(function () {
     return "".concat(file.url, "?x-oss-process=image/resize,w_").concat(size);
-  }, [file.url, size]);
+  }, [file.url, size]); // 根据文件名后缀判断
+
   var isImg = useMemo(function () {
     return ['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(resetFile.fileExtension);
   }, [resetFile]); // 重置尺寸大小
@@ -94,7 +97,7 @@ var PictureItem = function PictureItem(_ref) {
       width: size
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_thumb'
+    className: "lm_upload_item_thumb"
   }, isError || !isImg ? renderThumb(resetFile) : /*#__PURE__*/React.createElement(Image, {
     width: resetSize.width,
     height: resetSize.width,
@@ -103,18 +106,24 @@ var PictureItem = function PictureItem(_ref) {
       return setIsError(true);
     }
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_mask'
+    className: "lm_upload_item_mask"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_action'
+    className: "lm_upload_item_action"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'action_preview'
+    className: "action_preview",
+    onClick: function onClick() {
+      return preview(file);
+    }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-eye",
     style: {
       fontSize: size > 48 ? 16 : 12
     }
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'action_delete'
+    className: "action_delete",
+    onClick: function onClick() {
+      return remove(file);
+    }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-delete",
     style: {

package/es/LmUpload/UploadList/ItemText.d.ts

@@ -1,4 +1,5 @@
-declare const TextItem: ({ file }: {
+declare const TextItem: ({ file, instance }: {
     file: any;
+    instance: any;
 }) => JSX.Element;
 export default TextItem;

package/es/LmUpload/UploadList/ItemText.js

@@ -1,22 +1,28 @@
 import * as React from 'react';
+import cn from 'classnames';
 import { IconFont } from 'linkmore-design';
 
 var TextItem = function TextItem(_ref) {
-  var file = _ref.file;
+  var file = _ref.file,
+      instance = _ref.instance;
+  var remove = instance.remove;
   return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item lm_upload_item_text'
+    className: cn('lm_upload_item lm_upload_item_text', file.status === 'error' && 'error')
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'text_left'
+    className: "text_left"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'prefix'
+    className: "prefix"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-attachment"
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_item_name'
+    className: "lm_upload_item_name"
   }, file.fileName)), /*#__PURE__*/React.createElement("div", {
-    className: 'text_right lm_upload_item_text_action'
+    className: "text_right lm_upload_item_text_action"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'action_delete'
+    className: "action_delete",
+    onClick: function onClick() {
+      return remove(file);
+    }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-delete"
   }))));

package/es/LmUpload/UploadList/RenderItem.d.ts

@@ -1,6 +1,2 @@
-export interface RenderCellProps<T = any> {
-    type?: string;
-    instance: any;
-}
-declare const RenderCell: (props: RenderCellProps) => any;
+declare const RenderCell: (props: any) => any;
 export default RenderCell;

package/es/LmUpload/UploadList/RenderItem.js

@@ -21,9 +21,9 @@ var RenderCell = function RenderCell(props) {
       resetProsp = __rest(props, ["type"]);
 
   var types = {
-    'text': TextItem,
-    'picture': PictureItem,
-    'card': PictureCardItem
+    text: TextItem,
+    picture: PictureItem,
+    card: PictureCardItem
   };
   return render(types[type] || PictureItem, resetProsp);
 };

package/es/LmUpload/UploadList/index.d.ts

@@ -1,4 +1,5 @@
-declare const LmUploadList: ({ instance }: {
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ instance }: {
     instance: any;
-}) => JSX.Element;
-export default LmUploadList;
+}) => JSX.Element>;
+export default _default;

package/es/LmUpload/UploadList/index.js

@@ -1,22 +1,28 @@
-import * as React from 'react';
+import React from 'react';
 import { render } from '../utils';
 import RenderItem from './RenderItem';
 
 var LmUploadList = function LmUploadList(_ref) {
   var instance = _ref.instance;
-  var state = instance.state,
+
+  var _a, _b;
+
+  var uid = instance.uid,
+      getFileList = instance.getFileList,
       itemRender = instance.itemRender,
-      listType = instance.listType;
-  var fileList = state.fileList;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, fileList.map(function (file, idx) {
+      listType = instance.listType,
+      showUploadList = instance.showUploadList;
+  if (!showUploadList) return null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (_b = (_a = getFileList()) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) {
+    return a.seq - b.seq;
+  })) === null || _b === void 0 ? void 0 : _b.map(function (file, idx) {
     return render(itemRender || RenderItem, {
       type: listType,
-      key: idx,
+      key: file[uid] || idx,
       file: file,
-      fileList: fileList,
       instance: instance
     });
   }));
 };
 
-export default LmUploadList;
+export default /*#__PURE__*/React.memo(LmUploadList);

package/es/LmUpload/body/Progress.js

@@ -4,9 +4,9 @@ var Progress = function Progress(_ref) {
   var instance = _ref.instance;
   var state = instance.state;
   return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_progress'
+    className: "lm_upload_progress"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'line',
+    className: "line",
     style: {
       width: "".concat(state.percent || 0, "%")
     }

package/es/LmUpload/body/UploadCore.js

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import UploadPicture from './UploadPicture'; // 上传核心
 // 渲染上传区域样式, 仅用于触发上传事件
 // type: 'card' 图片 | 'drag' 拖拽
@@ -9,7 +9,8 @@ var UploadCore = function UploadCore(_ref) {
   var accept = instance.accept,
       children = instance.children,
       beforeUpload = instance.beforeUpload,
-      getUploadStatus = instance.getUploadStatus; // 点击事件触发文件上传
+      getUploadStatus = instance.getUploadStatus,
+      getIsMaxCount = instance.getIsMaxCount; // 点击事件触发文件上传
 
   var handleClick = function handleClick() {
     var _a;
@@ -31,7 +32,7 @@ var UploadCore = function UploadCore(_ref) {
   };
 
   var inputConfig = {
-    type: "file",
+    type: 'file',
     accept: accept,
     title: '',
     onChange: uploadChange,
@@ -39,7 +40,7 @@ var UploadCore = function UploadCore(_ref) {
       display: 'none'
     }
   };
-  return /*#__PURE__*/React.createElement("div", {
+  return !getIsMaxCount() && /*#__PURE__*/React.createElement("div", {
     onClick: handleClick,
     className: "lm_upload_core"
   }, children || /*#__PURE__*/React.createElement(UploadPicture, {

package/es/LmUpload/body/UploadPicture.js

@@ -11,22 +11,22 @@ var uploadPicture = function uploadPicture(_ref) {
     return getUploadStatus().uploading;
   }, [getUploadStatus]);
   return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_core_picture',
+    className: "lm_upload_core_picture",
     style: {
       height: size,
       width: size
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_core_picture_action'
+    className: "lm_upload_core_picture_action"
   }, !isUploading && /*#__PURE__*/React.createElement("div", {
-    className: 'action_plus'
+    className: "action_plus"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-plus",
     style: {
       fontSize: size > 48 ? 16 : 12
     }
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'tip'
+    className: "tip"
   }, "\u4E0A\u4F20"), isUploading && /*#__PURE__*/React.createElement(Progress, {
     instance: instance
   })));

package/es/LmUpload/fns/index.d.ts

@@ -4,13 +4,18 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
     props: any;
 }) => {
     CoreMethods: {
+        getIsMaxCount: () => boolean;
         beforeUpload: (e: any) => false | import("../../message").MessageType;
         getUploadStatus: () => {
             uploading: boolean;
         };
+        remove: (file: any) => Promise<void>;
+        preview: (file: any) => void;
+        download: (file: any) => void;
     };
     RefMethods: {
         getState: () => any;
+        getFileList: () => any;
     };
 };
 export default useCoreOptions;