linkmore-design 1.1.7 → 1.1.8

package/lib/LmTable/hooks/useRowSelectControllableValue.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _utils = require("ahooks/lib/utils");
+
+var _ahooks = require("ahooks");
+
+function useControllableValue() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var defaultValue = options.defaultValue,
+      _options$defaultValue = options.defaultValuePropName,
+      defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
+      _options$valuePropNam = options.valuePropName,
+      valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
+      _options$trigger = options.trigger,
+      trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
+  var value = props[valuePropName];
+  var isControlled = props === null || props === void 0 ? void 0 : props.hasOwnProperty(valuePropName);
+  var isControlledOnChange = props[trigger];
+  var initialValue = (0, _react.useMemo)(function () {
+    if (isControlled) {
+      return value;
+    }
+
+    if (props === null || props === void 0 ? void 0 : props.hasOwnProperty(defaultValuePropName)) {
+      return props[defaultValuePropName];
+    }
+
+    return defaultValue;
+  }, []);
+  var stateRef = (0, _react.useRef)(initialValue);
+
+  if (isControlled && isControlledOnChange) {
+    stateRef.current = value;
+  }
+
+  var update = (0, _ahooks.useUpdate)();
+
+  function setState(v) {
+    var r = (0, _utils.isFunction)(v) ? v(stateRef.current) : v;
+
+    if (!isControlledOnChange) {
+      stateRef.current = r;
+      update();
+    }
+
+    if (props[trigger]) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      props[trigger].apply(props, [r].concat(args));
+    }
+  }
+
+  return [stateRef.current, (0, _ahooks.useMemoizedFn)(setState)];
+}
+
+var _default = useControllableValue;
+exports.default = _default;

package/lib/LmTable/style/index.css

@@ -1237,6 +1237,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;
@@ -1589,9 +1592,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/lib/LmTable/style/variables.css

@@ -726,6 +726,9 @@
   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;
@@ -1078,9 +1081,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/lib/LmUpload/UploadList/ItemPictureCard.js

@@ -91,11 +91,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
     });

package/lib/LmUpload/UploadList/index.js

@@ -18,7 +18,7 @@ var LmUploadList = function LmUploadList(_ref) {
 
   var _a, _b;
 
-  var uid = instance.uid,
+  var getFileHasValue = instance.getFileHasValue,
       getFileList = instance.getFileList,
       itemRender = instance.itemRender,
       listType = instance.listType,
@@ -29,7 +29,7 @@ var LmUploadList = function LmUploadList(_ref) {
   })) === null || _b === void 0 ? void 0 : _b.map(function (file, idx) {
     return (0, _utils.render)(itemRender || _RenderItem.default, {
       type: listType,
-      key: file[uid] || idx,
+      key: getFileHasValue(file) || idx,
       file: file,
       instance: instance
     });

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/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,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"