linkmore-design 1.0.69 → 1.0.72

package/lib/LmFilter/components/DropdownFIlter.js

@@ -99,85 +99,93 @@ var getPlacehodler = function getPlacehodler(props) {
 
 
 var getLabel = function getLabel(filterValue, item) {
-  var _data$find;
-
   var type = item.type,
       data = item.data; // 不存在筛选时
 
   if (!(0, _utils.getIsHas)(filterValue)) {
     return getPlacehodler(item);
   } // 存在筛选数据时 ⬇️
-  // 级联数据转换平级结构
 
 
-  if (['cascader'].includes(type)) {
-    var nArr = (0, _utils.getFlatItem)(item, filterValue);
-    var labels = nArr.map(function (v) {
-      var _item$props, _item$props$fieldName;
+  try {
+    var _data$find;
+
+    // 级联数据转换平级结构
+    if (['cascader'].includes(type)) {
+      var nArr = (0, _utils.getFlatItem)(item, filterValue);
+      var labels = nArr === null || nArr === void 0 ? void 0 : nArr.map(function (v) {
+        var _item$props, _item$props$fieldName;
 
-      return v[(item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : (_item$props$fieldName = _item$props.fieldNames) === null || _item$props$fieldName === void 0 ? void 0 : _item$props$fieldName.label) || 'label'];
-    });
+        return v[(item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : (_item$props$fieldName = _item$props.fieldNames) === null || _item$props$fieldName === void 0 ? void 0 : _item$props$fieldName.label) || 'label'];
+      });
 
-    switch (labels.length) {
-      case 1:
-        return labels[0];
+      switch (labels.length) {
+        case 0:
+          // 数据未查找到时
+          return filterValue;
 
-      case 2:
-        return "".concat(labels[0], "\u3001").concat(labels[1]);
+        case 1:
+          return labels[0];
 
-      default:
-        return "".concat(labels[0], "\u3001+").concat(labels.length - 1, "...");
+        case 2:
+          return "".concat(labels[0], "\u3001").concat(labels[1]);
+
+        default:
+          return "".concat(labels[0], "\u3001+").concat(labels.length - 1, "...");
+      }
     }
-  }
 
-  if (Array.isArray(filterValue)) {
-    var _data$filter;
+    if (Array.isArray(filterValue)) {
+      var _data$filter;
 
-    // 日期
-    if (['date'].includes(type)) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, filterValue[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-        type: "lmweb-swap-right",
-        style: {
-          fontSize: 14,
-          color: 'var(--text-color)'
-        }
-      }), filterValue[1]);
-    } // 多选
+      // 日期
+      if (['date'].includes(type)) {
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, filterValue[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+          type: "lmweb-swap-right",
+          style: {
+            fontSize: 14,
+            color: 'var(--text-color)'
+          }
+        }), filterValue[1]);
+      } // 多选
 
 
-    var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
-      return filterValue.includes(v.value);
-    })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
-      return v.label;
-    });
+      var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
+        return filterValue.includes(v.value);
+      })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
+        return v.label;
+      });
 
-    if (!_labels.length) {
-      _labels = filterValue;
-    } // 受控模式未查找到显示的内容时展示
+      if (!_labels.length) {
+        _labels = filterValue;
+      } // 受控模式未查找到显示的内容时展示
 
 
-    switch (_labels.length) {
-      case 1:
-        return _labels[0];
+      switch (_labels.length) {
+        case 1:
+          return _labels[0];
 
-      case 2:
-        return "".concat(_labels[0], "\u3001").concat(_labels[1]);
+        case 2:
+          return "".concat(_labels[0], "\u3001").concat(_labels[1]);
 
-      default:
-        return "".concat(_labels[0], "\u3001+").concat(_labels.length - 1, "...");
-    }
-  } // 输入框
+        default:
+          return "".concat(_labels[0], "\u3001+").concat(_labels.length - 1, "...");
+      }
+    } // 输入框
 
 
-  if (['input', 'date'].includes(type)) {
-    return filterValue;
-  } // 单选框 受控模式未查找到显示的内容时展示filterValue
+    if (['input', 'date'].includes(type)) {
+      return filterValue;
+    } // 单选框 受控模式未查找到显示的内容时展示filterValue
 
 
-  var label = (data === null || data === void 0 ? void 0 : (_data$find = data.find(function (v) {
-    return (v === null || v === void 0 ? void 0 : v.value) === filterValue;
-  })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
-  return label;
+    var label = (data === null || data === void 0 ? void 0 : (_data$find = data.find(function (v) {
+      return (v === null || v === void 0 ? void 0 : v.value) === filterValue;
+    })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
+    return label;
+  } catch (error) {
+    return filterValue;
+  }
 };
 /*
  * css样式控制

package/lib/LmFilter/components/index.js

@@ -62,12 +62,14 @@ var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
     return value || aliveValue;
   }, [value, aliveValue]);
   var filterValue = (0, _react.useMemo)(function () {
-    if ((0, _utils.getIsHas)(getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem))) {
-      return getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem);
+    var val = getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem);
+
+    if ((0, _utils.getIsHas)(val)) {
+      return val;
     }
 
-    return (getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem)) || transformFilterValue;
-  }, [resetItem, transformFilterValue]); // 单独使用时抛出选中的值
+    return val || transformFilterValue;
+  }, [getFilterValue, resetItem, transformFilterValue]); // 单独使用时抛出选中的值
 
   var handleChange = function handleChange(val) {
     setAliveValue === null || setAliveValue === void 0 ? void 0 : setAliveValue(val);

package/lib/LmFilter/filterFns/index.js

@@ -322,12 +322,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
   var getFilterValue = (0, _react.useCallback)(function (_ref3) {
     var field = _ref3.field,
         type = _ref3.type;
-    var defaultValue = (0, _utils.getValueForType)(type);
 
     if ((0, _utils.getIsHas)(state.basicFilter[field])) {
       return state.basicFilter[field];
     }
 
+    var defaultValue = (0, _utils.getValueForType)(type);
     return state.basicFilter[field] || defaultValue;
   }, [state.basicFilter]); // 获取查询结构
 

package/lib/LmFilter/utils.js

@@ -81,6 +81,8 @@ function getFlatItem(getItem, checkedValue) {
   var getChildren = function getChildren(item) {
     var _item$fieldNames$chil;
 
+    if (!item) return;
+
     if (type === 'parent') {
       nArr.push(item);
       return;

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -165,7 +165,7 @@ var LmFilterRoot = function LmFilterRoot(props, ref) {
     props: props
   }),
       CoreMethods = _useCoreOptions.CoreMethods,
-      RefMethods = _useCoreOptions.RefMethods; // 组件示例
+      RefMethods = _useCoreOptions.RefMethods; // 组件实例
 
 
   var instance = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), CoreMethods), RefMethods), {}, {

package/lib/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/lib/LmUpload/LmUpload.js

@@ -27,37 +27,45 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 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 = (0, _react.useRef)(null); // 仅在初始化触发一次
 
   var initConfig = (0, _react.useMemo)(function () {
     return {
       // 文件配置单独存储
-      fileConfig: {
+      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: {
+      components: Object.assign({
         itemRender: null,
-        wrapper: null // 结构定义
-        // 包装结构体: 上传, 列表
-        // wrapper: (upload, fileList) => (
-        //   <>
-        //     {upload}
-        //     {fileList}
-        //   </>
-        // ),
-
-      }
+        wrapper: null
+      }, components || {})
     };
   }, []);
   var defaultProps = {
     uid: 'uid',
-    fileList: [],
+    fileList: null,
     type: ['jpg', 'jpeg', 'png'],
     accept: '',
     fileSize: 10,
@@ -65,6 +73,7 @@ var LmUpload = function LmUpload(_a, ref) {
     size: 100,
     disabled: false,
     maxCount: null,
+    showUploadList: true,
     children: null,
     defaultFileList: [],
     itemRender: null,

package/lib/LmUpload/UploadList/ItemPicture.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
 Object.defineProperty(exports, "__esModule", {
@@ -9,24 +11,34 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _linkmoreDesign = require("linkmore-design");
 
 // 图片列表项
 var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
       instance = _ref.instance;
-  var remove = instance.remove;
+  var remove = instance.remove,
+      preview = instance.preview,
+      download = instance.download;
   return /*#__PURE__*/React.createElement("div", {
-    className: "lm_upload_item lm_upload_item_picture"
+    className: (0, _classnames.default)('lm_upload_item lm_upload_item_picture', file.status === 'error' && 'error')
   }, /*#__PURE__*/React.createElement("div", {
     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,
     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"
   }, /*#__PURE__*/React.createElement("div", {

package/lib/LmUpload/UploadList/ItemText.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
 Object.defineProperty(exports, "__esModule", {
@@ -9,6 +11,8 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _linkmoreDesign = require("linkmore-design");
 
 var TextItem = function TextItem(_ref) {
@@ -16,7 +20,7 @@ var TextItem = function TextItem(_ref) {
       instance = _ref.instance;
   var remove = instance.remove;
   return /*#__PURE__*/React.createElement("div", {
-    className: "lm_upload_item lm_upload_item_text"
+    className: (0, _classnames.default)('lm_upload_item lm_upload_item_text', file.status === 'error' && 'error')
   }, /*#__PURE__*/React.createElement("div", {
     className: "text_left"
   }, /*#__PURE__*/React.createElement("div", {

package/lib/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/lib/LmUpload/UploadList/index.js

@@ -2,14 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _utils = require("../utils");
 
@@ -18,24 +16,26 @@ var _RenderItem = _interopRequireDefault(require("./RenderItem"));
 var LmUploadList = function LmUploadList(_ref) {
   var instance = _ref.instance;
 
-  var _a;
+  var _a, _b;
 
   var uid = instance.uid,
-      fileList = instance.fileList,
+      getFileList = instance.getFileList,
       itemRender = instance.itemRender,
-      listType = instance.listType;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (_a = fileList === null || fileList === void 0 ? void 0 : fileList.sort(function (a, b) {
+      listType = instance.listType,
+      showUploadList = instance.showUploadList;
+  if (!showUploadList) return null;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_b = (_a = getFileList()) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) {
     return a.seq - b.seq;
-  })) === null || _a === void 0 ? void 0 : _a.map(function (file, idx) {
+  })) === null || _b === void 0 ? void 0 : _b.map(function (file, idx) {
     return (0, _utils.render)(itemRender || _RenderItem.default, {
       type: listType,
       key: file[uid] || idx,
       file: file,
-      fileList: fileList,
       instance: instance
     });
   }));
 };
 
-var _default = LmUploadList;
+var _default = /*#__PURE__*/_react.default.memo(LmUploadList);
+
 exports.default = _default;

package/lib/LmUpload/body/UploadCore.js

@@ -2,14 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _UploadPicture = _interopRequireDefault(require("./UploadPicture"));
 
@@ -21,15 +19,11 @@ var UploadCore = function UploadCore(_ref) {
 
   var inputRef = _react.default.useRef(null);
 
-  var fileList = instance.fileList,
-      accept = instance.accept,
-      maxCount = instance.maxCount,
+  var accept = instance.accept,
       children = instance.children,
       beforeUpload = instance.beforeUpload,
-      getUploadStatus = instance.getUploadStatus;
-  var isMaxCount = (0, _react.useMemo)(function () {
-    return !(fileList.length < maxCount);
-  }, []); // 点击事件触发文件上传
+      getUploadStatus = instance.getUploadStatus,
+      getIsMaxCount = instance.getIsMaxCount; // 点击事件触发文件上传
 
   var handleClick = function handleClick() {
     var _a;
@@ -59,7 +53,7 @@ var UploadCore = function UploadCore(_ref) {
       display: 'none'
     }
   };
-  return isMaxCount && /*#__PURE__*/_react.default.createElement("div", {
+  return !getIsMaxCount() && /*#__PURE__*/_react.default.createElement("div", {
     onClick: handleClick,
     className: "lm_upload_core"
   }, children || /*#__PURE__*/_react.default.createElement(_UploadPicture.default, {

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

@@ -4,15 +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;