linkmore-design 1.1.7 → 1.1.9

package/lib/LmUpload/UploadList/ItemPictureCard.js

@@ -77,8 +77,10 @@ var renderThumb = function renderThumb(file) {
 
 var PictureItem = function PictureItem(_ref) {
   var file = _ref.file,
+      index = _ref.index,
       instance = _ref.instance;
-  var readOnly = instance.readOnly,
+  var dispatch = instance.dispatch,
+      readOnly = instance.readOnly,
       size = instance.size,
       remove = instance.remove,
       preview = instance.preview,
@@ -91,11 +93,13 @@ var PictureItem = function PictureItem(_ref) {
 
 
   var resetFile = (0, _react.useMemo)(function () {
+    var _a;
+
     var fileParams = getFileFields(file);
     var realFileName = fileParams.realFileName,
         fileName = fileParams.fileName,
         filename = fileParams.filename;
-    var fileExtension = (realFileName || fileName || filename).replace(/.*\./, '').toLowerCase();
+    var fileExtension = (_a = (realFileName || fileName || filename).replace(/.*\./, '')) === null || _a === void 0 ? void 0 : _a.toLowerCase();
     return Object.assign(Object.assign({}, fileParams), {
       fileExtension: fileExtension
     });
@@ -119,6 +123,18 @@ var PictureItem = function PictureItem(_ref) {
       fontSize: fontSize
     };
   }, [size]);
+
+  var handlePreview = function handlePreview() {
+    preview === null || preview === void 0 ? void 0 : preview(file);
+    dispatch({
+      type: 'changePreview',
+      preview: {
+        visible: true,
+        index: index
+      }
+    });
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('lm_upload_item', 'lm_upload_item_card', isError && 'lm_upload_item_error'),
     style: {
@@ -140,9 +156,7 @@ var PictureItem = function PictureItem(_ref) {
     className: "lm_upload_item_action"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "action_preview",
-    onClick: function onClick() {
-      return preview(file);
-    }
+    onClick: handlePreview
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-eye",
     style: {

package/lib/LmUpload/UploadList/index.js

@@ -2,12 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../utils");
 
@@ -15,22 +17,26 @@ var _RenderItem = _interopRequireDefault(require("./RenderItem"));
 
 var LmUploadList = function LmUploadList(_ref) {
   var instance = _ref.instance;
-
-  var _a, _b;
-
-  var uid = instance.uid,
+  var getFileHasValue = instance.getFileHasValue,
       getFileList = instance.getFileList,
       itemRender = instance.itemRender,
       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 || _b === void 0 ? void 0 : _b.map(function (file, idx) {
+  var fileList = (0, _react.useMemo)(function () {
+    var _a;
+
+    return (_a = getFileList()) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) {
+      return a.seq - b.seq;
+    });
+  }, [getFileList]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fileList === null || fileList === void 0 ? void 0 : fileList.map(function (file, idx) {
     return (0, _utils.render)(itemRender || _RenderItem.default, {
       type: listType,
-      key: file[uid] || idx,
+      key: getFileHasValue(file) || idx,
+      index: idx,
       file: file,
+      fileList: fileList,
       instance: instance
     });
   }));

package/lib/LmUpload/components/Preview.d.ts

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

package/lib/LmUpload/components/Preview.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var Preview = function Preview(_ref) {
+  var instance = _ref.instance;
+  var enabledPreview = instance.enabledPreview,
+      state = instance.state,
+      dispatch = instance.dispatch,
+      getFileList = instance.getFileList;
+  if (!enabledPreview) return null; // 与展示顺序保持一致
+
+  var fileList = (0, _react.useMemo)(function () {
+    var _a;
+
+    return (_a = getFileList()) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) {
+      return a.seq - b.seq;
+    });
+  }, [getFileList]);
+  var config = (0, _react.useMemo)(function () {
+    var _state$preview = state.preview,
+        index = _state$preview.index,
+        visible = _state$preview.visible;
+    return {
+      urlList: fileList === null || fileList === void 0 ? void 0 : fileList.map(function (_ref2) {
+        var url = _ref2.url;
+        return url;
+      }),
+      initialIndex: index,
+      visible: visible,
+      close: function close() {
+        dispatch({
+          type: 'changePreview',
+          preview: {
+            visible: false
+          }
+        });
+      }
+    };
+  }, [fileList, state.preview]);
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.ImageViewer, Object.assign({}, config));
+};
+
+var _default = /*#__PURE__*/_react.default.memo(Preview);
+
+exports.default = _default;

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

@@ -5,6 +5,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
 }) => {
     CoreMethods: {
         getIsMaxCount: () => boolean;
+        getFileHasValue: (obj: any) => string;
         getFileFields: (fileParams: any) => {};
         beforeUpload: (e: any) => Promise<void>;
         checkOver: (file: any) => Promise<void>;

package/lib/LmUpload/fns/index.js

@@ -61,7 +61,25 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取当前的文件列表
+      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+
+  var getHasEqual = (0, _react.useCallback)(function (obj1, obj2) {
+    var extend = [uid, 'fileName'];
+    var flag = false;
+    extend.forEach(function (v) {
+      if (!flag) flag = obj1[v] === obj2[v];
+    });
+    return flag;
+  }, []); // 从对象中读取存在的指定属性
+
+  var getFileHasValue = (0, _react.useCallback)(function (obj) {
+    var extend = [uid, 'fileName'];
+    var val = '';
+    extend.forEach(function (v) {
+      if (!val) val = obj[v];
+    });
+    return val;
+  }, [uid]); // 获取当前的文件列表
 
   var getFileList = (0, _react.useCallback)(function () {
     return props.fileList || state.fileList;
@@ -429,7 +447,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
               if (res) {
                 fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
-                  return v[uid] !== file[uid];
+                  return !getHasEqual(v, file);
                 });
                 dispatch({
                   type: 'changeFileList',
@@ -448,7 +466,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee4);
     }));
-  }, [props.onRemove, getFileList, onChange, dispatch, uid]); // 点击文件链接或预览图标时的回调
+  }, [props.onRemove, getFileList, onChange, dispatch, getHasEqual]); // 点击文件链接或预览图标时的回调
 
   var preview = (0, _react.useCallback)(function (file) {
     var _a;
@@ -463,6 +481,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [props.onDownload]);
   var CoreMethods = {
     getIsMaxCount: getIsMaxCount,
+    getFileHasValue: getFileHasValue,
     getFileFields: getFileFields,
     beforeUpload: beforeUpload,
     checkOver: checkOver,

package/lib/LmUpload/wrapper/UploadWrapper.js

@@ -15,6 +15,8 @@ var _view = _interopRequireDefault(require("../view"));
 
 var _Crop = _interopRequireDefault(require("../components/Crop"));
 
+var _Preview = _interopRequireDefault(require("../components/Preview"));
+
 // 包裹上传组件区域： 拓展其他结构
 var LmUploadWrapper = function LmUploadWrapper(_ref) {
   var instance = _ref.instance;
@@ -26,6 +28,8 @@ var LmUploadWrapper = function LmUploadWrapper(_ref) {
     instance: instance
   }), /*#__PURE__*/_react.default.createElement(_Crop.default, {
     instance: instance
+  }), /*#__PURE__*/_react.default.createElement(_Preview.default, {
+    instance: instance
   }));
 };
 

package/lib/LmUpload/wrapper/reducer.d.ts

@@ -5,5 +5,9 @@ export declare const initialState: (props: any) => {
     status: string;
     fileList: any;
     cropFile: any;
+    preview: {
+        index: number;
+        visible: boolean;
+    };
 };
 export default reducer;

package/lib/LmUpload/wrapper/reducer.js

@@ -9,7 +9,8 @@ exports.reducer = exports.initialState = exports.default = void 0;
 var reducer = function reducer(state, action) {
   var fileList = action.fileList,
       percent = action.percent,
-      cropFile = action.cropFile;
+      cropFile = action.cropFile,
+      preview = action.preview;
 
   switch (action.type) {
     case 'changeFileList':
@@ -27,6 +28,11 @@ var reducer = function reducer(state, action) {
         cropFile: cropFile
       });
 
+    case 'changePreview':
+      return Object.assign(Object.assign({}, state), {
+        preview: Object.assign(Object.assign({}, state.preview), preview)
+      });
+
     default:
       throw new Error();
   }
@@ -43,8 +49,11 @@ var initialState = function initialState(props) {
     process: 0,
     status: 'done',
     fileList: defaultFileList,
-    cropFile: null // 需要裁剪的图片
-
+    cropFile: null,
+    preview: {
+      index: 0,
+      visible: false
+    }
   };
 };
 

package/lib/styles/variables.css

@@ -9764,6 +9764,9 @@ p {
 .lm_editTable_warpper .icon_drag:hover {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -9844,11 +9847,15 @@ p {
   background-color: var(--background-color-hover);
 }
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
+  width: 140px;
   max-width: 140px;
 }
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
   display: inline-flex;
 }
+.lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
+  height: 24px;
+}
 .lm_filter_basic_item {
   font-size: 12px;
   display: inline-flex;
@@ -11259,6 +11266,9 @@ p {
   height: 48px;
   font-size: 12px;
 }
+#lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .row-dragging {
   display: flex;
   align-items: center;
@@ -11611,9 +11621,6 @@ button.ant-table-row-expand-icon::before,
 button.ant-table-row-expand-icon::after {
   color: #bfbfbf;
 }
-.ant-table-tbody > tr.ant-table-measure-row > td {
-  padding: 0 !important;
-}
 .react-resizable-handle {
   position: absolute;
   right: -5px;

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign.git"
+  },
   "main": "lib/index.js",
   "module": "es/index.js",
   "unpkg": "dist/index.umd.min.js",
@@ -37,7 +41,8 @@
     "pub": "npm run build && npm version patch && npm publish",
     "rbc": "parcel build src/styles/main.less --no-source-maps",
     "cssrb": "node ./config/css.js",
-    "rbuild": "npm run cssrb && npm run build && node ./config/copy.js"
+    "rbuild": "npm run cssrb && npm run build && node ./config/copy.js",
+    "changelog": "conventional-changelog -p react -i CHANGELOG.md -s -r 0"
   },
   "lint-staged": {
     "gitDir": "../",
@@ -49,6 +54,11 @@
       "yarn run lint:js"
     ]
   },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
   "dependencies": {
     "@ant-design/charts": "^1.4.2",
     "@ant-design/compatible": "1.0.8",
@@ -67,6 +77,8 @@
     "antd-img-crop": "^4.2.5",
     "axios": "^0.21.0",
     "classnames": "^2.3.1",
+    "conventional-changelog": "^3.1.25",
+    "conventional-changelog-cli": "^2.2.2",
     "dayjs": "^1.9.7",
     "echarts": "^5.4.0",
     "hex-to-rgba": "^2.0.1",
@@ -103,7 +115,7 @@
     "@babel/plugin-transform-runtime": "^7.12.1",
     "@babel/preset-typescript": "^7.17.12",
     "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
+    "@linkmore/commitlint-config": "^1.0.2",
     "@types/react": "^18.0.19",
     "@types/react-dom": "^18.0.6",
     "autoprefixer": "^9.0.0",