linkmore-design 1.1.6 → 1.1.8

package/es/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/es/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/es/LmUpload/UploadList/ItemPictureCard.js

@@ -77,11 +77,13 @@ var PictureItem = function PictureItem(_ref) {
 
 
   var resetFile = 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/es/LmUpload/UploadList/index.js

@@ -7,7 +7,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,
@@ -18,7 +18,7 @@ var LmUploadList = function LmUploadList(_ref) {
   })) === null || _b === void 0 ? void 0 : _b.map(function (file, idx) {
     return render(itemRender || RenderItem, {
       type: listType,
-      key: file[uid] || idx,
+      key: getFileHasValue(file) || idx,
       file: file,
       instance: instance
     });

package/es/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/es/LmUpload/fns/index.js

@@ -49,7 +49,25 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取当前的文件列表
+      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+
+  var getHasEqual = 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 = useCallback(function (obj) {
+    var extend = [uid, 'fileName'];
+    var val = '';
+    extend.forEach(function (v) {
+      if (!val) val = obj[v];
+    });
+    return val;
+  }, [uid]); // 获取当前的文件列表
 
   var getFileList = useCallback(function () {
     return props.fileList || state.fileList;
@@ -416,7 +434,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',
@@ -435,7 +453,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee4);
     }));
-  }, [props.onRemove, getFileList, onChange, dispatch, uid]); // 点击文件链接或预览图标时的回调
+  }, [props.onRemove, getFileList, onChange, dispatch, getHasEqual]); // 点击文件链接或预览图标时的回调
 
   var preview = useCallback(function (file) {
     var _a;
@@ -450,6 +468,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [props.onDownload]);
   var CoreMethods = {
     getIsMaxCount: getIsMaxCount,
+    getFileHasValue: getFileHasValue,
     getFileFields: getFileFields,
     beforeUpload: beforeUpload,
     checkOver: checkOver,

package/es/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/lib/CustomTableOption/index.js

@@ -27,27 +27,18 @@ var _filterSort = _interopRequireDefault(require("./filterSort"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var SmallImg = require('./assets/option1.png');
-
-var DefaultImg = require('./assets/option2.png');
-
-var MiddleImg = require('./assets/option3.png');
-
 var TabPane = _linkmoreDesign.Tabs.TabPane;
 var optionsWithDisabled = [{
   label: '默认',
   value: 'default',
-  imgUrl: DefaultImg,
   icon: 'lmweb-icon_default'
 }, {
   label: '紧凑',
   value: 'small',
-  imgUrl: SmallImg,
   icon: 'lmweb-icon_compact'
 }, {
   label: '宽松',
   value: 'middle',
-  imgUrl: MiddleImg,
   icon: 'lmweb-icon_large'
 }];
 var prefixCls = 'lm_custom-table-option';

package/lib/LmEditTable/style/index.css

@@ -576,6 +576,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;

package/lib/LmEditTable/style/variables.css

@@ -65,6 +65,9 @@
 .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;

package/lib/LmFilter/clearFilter/index.js

@@ -14,7 +14,8 @@ var _linkmoreDesign = require("linkmore-design");
 var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var onClearChange = instance.onClearChange,
-      getHasFilter = instance.getHasFilter;
+      getHasFilter = instance.getHasFilter,
+      size = instance.size;
   if (!getHasFilter()) return null;
 
   var handleClear = function handleClear() {
@@ -25,6 +26,7 @@ var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
     className: "lm_filter_clear"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
+    size: size,
     onClick: handleClear
   }, "\u4E00\u952E\u6E05\u7A7A"));
 });

package/lib/LmFilter/complexFilter/index.js

@@ -24,7 +24,8 @@ var _utils = require("../utils");
 var LmFilterComplex = function LmFilterComplex(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-      dispatch = instance.dispatch;
+      dispatch = instance.dispatch,
+      size = instance.size;
   var expand = (0, _react.useMemo)(function () {
     return state.complexDrawer.visible;
   }, [state.complexDrawer.visible]);
@@ -44,7 +45,7 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter_complex"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', {
+    className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', size, {
       expand: expand,
       active: active
     }),

package/lib/LmFilter/components/DropdownFIlter.js

@@ -98,7 +98,8 @@ var getPlacehodler = function getPlacehodler(props) {
 }; // 根据不同的类型展示文本内容
 
 
-var getLabel = function getLabel(filterValue, item) {
+var getLabel = function getLabel(resetInstance, item) {
+  var filterValue = resetInstance.filterValue;
   var type = item.type,
       data = item.data; // 不存在筛选时
 
@@ -151,7 +152,7 @@ var getLabel = function getLabel(filterValue, item) {
 
 
       var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
-        return filterValue.includes(v.value);
+        return (0, _utils.toStringIsEqual)(v.value, filterValue, 'includes');
       })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
         return v.label;
       });
@@ -180,7 +181,7 @@ var getLabel = function getLabel(filterValue, item) {
 
 
     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;
+      return (0, _utils.toStringIsEqual)(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) {
@@ -203,7 +204,8 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var filterValue = instance.filterValue; // 触发查询时关闭下拉框
+  var filterValue = instance.filterValue,
+      size = instance.size; // 触发查询时关闭下拉框
 
   var setFilterValue = function setFilterValue(obj) {
     instance.setFilterValue(obj);
@@ -244,7 +246,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
     ,
     destroyPopupOnHide: true
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('lm_filter_basic_item', {
+    className: (0, _classnames.default)('lm_filter_basic_item', size, {
       expand: visible,
       active: active
     })
@@ -252,7 +254,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
     className: "filter_item_label"
   }, item === null || item === void 0 ? void 0 : item.title, ":"), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_value"
-  }, getLabel(filterValue, item)), /*#__PURE__*/_react.default.createElement("div", {
+  }, getLabel(resetInstance, item)), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_icon addon_after"
   }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',

package/lib/LmFilter/style/index.css

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

package/lib/LmFilter/style/variables.css

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

package/lib/LmFilter/utils.js

@@ -11,6 +11,7 @@ exports.getFlatItem = getFlatItem;
 exports.getIsHas = getIsHas;
 exports.getRanges = getRanges;
 exports.getValueForType = getValueForType;
+exports.toStringIsEqual = toStringIsEqual;
 exports.uniqueFunc = uniqueFunc;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -33,6 +34,23 @@ function getIsHas(val) {
   }
 
   return flag;
+}
+/*
+ * 数据(布尔值、数值)转字符串后对比是否相等 str, strs, type
+ * @params {Array | String} strs
+ * @params {String} type 比对类型
+ * @type includes 是否包含在数组内
+ */
+
+
+function toStringIsEqual(str, strs, type) {
+  if (type === 'includes') {
+    return strs === null || strs === void 0 ? void 0 : strs.some(function (v) {
+      return toStringIsEqual(str, v);
+    });
+  }
+
+  return String(str) === String(strs);
 } // 根据类型返回对应的值
 
 

package/lib/LmFilter/wrapper/Filter.js

@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _baseFilter = _interopRequireDefault(require("../baseFilter"));
 
 var _customFilter = _interopRequireDefault(require("../customFilter"));
@@ -22,10 +26,10 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var enableBaisc = instance.enableBaisc,
       enableComplex = instance.enableComplex,
-      enableCustom = instance.enableCustom,
+      size = instance.size,
       enableClear = instance.enableClear;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_filter"
+    className: (0, _classnames.default)('lm_filter', (0, _defineProperty2.default)({}, "lm_filter_".concat(size), size))
   }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
     instance: instance
   }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {