linkmore-design 1.0.18 → 1.0.21

package/es/Button/style/style.css

@@ -44,8 +44,8 @@
   max-width: 120px;
 }
 .ant-btn.lm-button-default {
-  border: 1px solid rgba(0, 0, 0, 0.25);
-  color: rgba(0, 0, 0, 0.85);
+  border: 1px solid var(--stroke-color);
+  color: var(--font-color);
 }
 .ant-btn.lm-button-default-hover,
 .ant-btn.lm-button-default:hover {

package/es/CkFilter/baseFilter/moreFilters.js

@@ -73,11 +73,36 @@ var MoreFilters = function MoreFilters() {
         });
         (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, filterValues, state.customFilterValues); // 触发外部查询事件
       }
+    }
+
+    if (type === 'sure') {
+      var _state$instance$onCha2, _state$instance2;
+
+      var flag = false; // 是否触发查询
+
+      dispatch({
+        type: 'changeVisibleFields',
+        visibleFields: item
+      }); // 收起时，仅当存在筛选条件时, 才会触发筛选改变事件
+
+      var _filterValues = (0, _objectSpread2.default)({}, state.filterValues);
+
+      Object.keys(_filterValues).forEach(function (v) {
+        if (!item.includes(v)) {
+          flag = true;
+          delete _filterValues[v];
+        }
+      });
+      dispatch({
+        type: 'changeFilterValues',
+        filterValues: _filterValues
+      });
+      flag && ((_state$instance$onCha2 = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha2 === void 0 ? void 0 : _state$instance$onCha2.call(_state$instance2, _filterValues, state.customFilterValues)); // 触发外部查询事件
     } // 重置操作: 输入框的内容不重置
 
 
     if (type === 'reset') {
-      var _state$instance$onCha2, _state$instance2;
+      var _state$instance$onCha3, _state$instance3;
 
       var searchKey = state.instance.searchKey;
       var searchValue = state.filterValues[searchKey];
@@ -104,7 +129,7 @@ var MoreFilters = function MoreFilters() {
         type: 'initOptions',
         options: options
       });
-      (_state$instance$onCha2 = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha2 === void 0 ? void 0 : _state$instance$onCha2.call(_state$instance2, obj, state.customFilterValues); // 触发外部查询事件
+      (_state$instance$onCha3 = (_state$instance3 = state.instance).onChange) === null || _state$instance$onCha3 === void 0 ? void 0 : _state$instance$onCha3.call(_state$instance3, obj, state.customFilterValues); // 触发外部查询事件
     }
 
     if (type === 'top') {
@@ -132,7 +157,7 @@ var MoreFilters = function MoreFilters() {
         var searchObj = (0, _defineProperty2.default)({}, _searchKey, _searchValue); // 判断是否存在选中的筛选数据
 
         if (JSON.stringify(searchObj) !== JSON.stringify(state.filterValues)) {
-          var _state$instance$onCha3, _state$instance3;
+          var _state$instance$onCha4, _state$instance4;
 
           var _obj = {};
           (0, _utils.getIsHas)(_searchValue) && (_obj[_searchKey] = _searchValue);
@@ -140,7 +165,7 @@ var MoreFilters = function MoreFilters() {
             type: 'changeFilterValues',
             filterValues: _obj
           });
-          (_state$instance$onCha3 = (_state$instance3 = state.instance).onChange) === null || _state$instance$onCha3 === void 0 ? void 0 : _state$instance$onCha3.call(_state$instance3, _obj, state.customFilterValues); // 触发外部查询事件
+          (_state$instance$onCha4 = (_state$instance4 = state.instance).onChange) === null || _state$instance$onCha4 === void 0 ? void 0 : _state$instance$onCha4.call(_state$instance4, _obj, state.customFilterValues); // 触发外部查询事件
         }
       }
     } // 人性化设计,位置不变无需收起

package/es/CkFilter/components/Controls.js

@@ -34,7 +34,9 @@ var Controls = function Controls(props) {
     'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, (0, _extends2.default)({
       options: options
     }, resetProps)),
-    'input': /*#__PURE__*/_react.default.createElement(_input.default, resetProps)
+    'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      placeholder: "\u8BF7\u8F93\u5165"
+    }, resetProps))
   };
   return obj[type] || null;
 };

package/es/CkFilter/components/filterTypes.js

@@ -337,7 +337,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
 
   var handleSure = function handleSure() {
     setFilterValue(checkedValues);
-  }; // 清空
+  }; // 取消
 
 
   var handleReset = function handleReset() {
@@ -405,14 +405,13 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
     }, item.label));
   }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
     onClick: handleReset
-  }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "primary",
-    disabled: !checkedValues.length,
     size: "small",
     onClick: handleSure
   }, "\u786E\u5B9A")));
@@ -423,10 +422,13 @@ var MoreFilter = function MoreFilter(_ref12) {
   var filters = _ref12.filters,
       getFilterValue = _ref12.getFilterValue,
       setFilterValue = _ref12.setFilterValue;
+
   // 选中的数据
-  var checkedValues = (0, _react.useMemo)(function () {
-    return getFilterValue;
-  }, [getFilterValue]); // 排序后的数组
+  var _useState9 = (0, _react.useState)(getFilterValue || []),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      checkedValues = _useState10[0],
+      setCheckedValues = _useState10[1]; // 排序后的数组
+
 
   var options = (0, _react.useMemo)(function () {
     return filters;
@@ -446,15 +448,29 @@ var MoreFilter = function MoreFilter(_ref12) {
     return checkedValues.length === options.length;
   }, [checkedValues.length, options.length]); // 全选事件
 
-  var onCheckAllChange = function onCheckAllChange() {
-    // const nValue = checkAll ? [] : options.map(v => v.field);
-    // setCheckedValues(nValue);
-    setFilterValue(options, checkAll ? 'hidden' : 'show');
+  var onCheckAllChange = function onCheckAllChange(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    var nValue = checkAll ? [] : options.map(function (v) {
+      return v.field;
+    });
+    console.log('nValue', checkAll, nValue, nValue.length);
+    setCheckedValues(nValue); // setFilterValue(options, checkAll ? 'hidden' : 'show')
   }; // 重置
 
 
   var handleReset = function handleReset() {
     return setFilterValue(null, 'reset');
+  }; // 确定
+
+
+  var handleSure = function handleSure() {
+    setFilterValue(checkedValues, 'sure');
+  }; // 取消
+
+
+  var handleCancel = function handleCancel() {
+    setFilterValue(checkedValues, 'cancel');
   }; // 置顶操作, 防止频繁操作, 建议加上节流
 
 
@@ -466,7 +482,13 @@ var MoreFilter = function MoreFilter(_ref12) {
 
   var onChange = function onChange(e, item) {
     e.preventDefault();
-    setFilterValue(item);
+    e.stopPropagation(); // setFilterValue(item)
+
+    var nValue = checkedValues.includes(item.field) ? checkedValues.filter(function (v) {
+      return v !== item.field;
+    }) : [].concat((0, _toConsumableArray2.default)(checkedValues), [item.field]);
+    console.log('item', getFilterValue, nValue, checkedValues, item);
+    setCheckedValues(nValue);
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -475,11 +497,13 @@ var MoreFilter = function MoreFilter(_ref12) {
     className: "filter_header"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_header_operate"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    onClick: onCheckAllChange,
+    className: "filter_header_operate_checked"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: indeterminate,
-    onChange: onCheckAllChange,
     checked: checkAll
-  }, "\u5168\u90E8"), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
+  }, "\u5168\u90E8")), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
     className: "filter_reset",
     onClick: handleReset
   }, "\u91CD\u7F6E")))), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, {
@@ -508,7 +532,16 @@ var MoreFilter = function MoreFilter(_ref12) {
         return handleTop(e, item);
       }
     })));
-  })));
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_footer"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "footer_clear",
+    onClick: handleCancel
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "primary",
+    size: "small",
+    onClick: handleSure
+  }, "\u786E\u5B9A")));
 }; // 日期范围选择器
 
 
@@ -618,47 +651,52 @@ var CascaderFilter = function CascaderFilter(props) {
       itemProps = _props$itemProps === void 0 ? {} : _props$itemProps,
       isFiltering = props.isFiltering;
 
-  var _useState9 = (0, _react.useState)(false),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      visible = _useState10[0],
-      setVisible = _useState10[1];
-
-  var _useState11 = (0, _react.useState)(filters),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      options = _useState12[0],
-      setOptions = _useState12[1];
+      visible = _useState12[0],
+      setVisible = _useState12[1];
 
-  var _useState13 = (0, _react.useState)('全部'),
+  var _useState13 = (0, _react.useState)(filters),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      text = _useState14[0],
-      setText = _useState14[1];
+      options = _useState14[0],
+      setOptions = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
+  var _useState15 = (0, _react.useState)('全部'),
       _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      checkedValues = _useState16[0],
-      setCheckedValues = _useState16[1];
+      text = _useState16[0],
+      setText = _useState16[1];
+
+  var _useState17 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
+      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+      checkedValues = _useState18[0],
+      setCheckedValues = _useState18[1]; // const isSearch = useMemo(() => filters.length > 8, [filters.length]);
 
-  var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]);
 
   var handleFilter = function handleFilter(val) {
     setOptions(filters.filter(function (v) {
       return v.label.indexOf(val) > -1;
     }));
-  };
+  }; // 重置级联弹框
+
 
   var dropdownRender = function dropdownRender(menus) {
     var inputRef = (0, _react.useRef)(null); // 确定
 
     var handleSure = function handleSure() {
-      setFilterValue(checkedValues);
-    }; // 清空
+      setFilterValue(itemProps.multiple ? checkedValues.map(function (v) {
+        return v[v.length - 1];
+      }) : checkedValues);
+      setVisible(false);
+    }; // 取消
 
 
     var handleReset = function handleReset() {
-      inputRef.current.input.value = '';
+      if (inputRef.current) {
+        inputRef.current.input.value = '';
+      }
+
       setFilterValue(undefined);
+      setCheckedValues(itemProps.multiple ? [] : '');
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -674,15 +712,16 @@ var CascaderFilter = function CascaderFilter(props) {
       onChange: (0, _lodash.debounce)(function (e) {
         return handleFilter(e.target.value);
       }, 500)
-    })), menus, isSearch && /*#__PURE__*/_react.default.createElement("div", {
+    })), menus, itemProps.multiple && /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_footer"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "footer_clear",
       onClick: handleReset
-    }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       size: "small",
-      onClick: handleSure
+      onClick: handleSure,
+      disabled: !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)
     }, "\u786E\u5B9A")));
   };
 
@@ -705,9 +744,6 @@ var CascaderFilter = function CascaderFilter(props) {
       });
       var showLabel = arr.length < 3 ? arr.join('、') : "".concat(arr[0], "\u3001+").concat(arr.length);
       setText(showLabel);
-      setFilterValue(item.map(function (v) {
-        return v[v.length - 1];
-      }));
       setCheckedValues(item);
     } else {
       setText(selectedOptions.map(function (v) {
@@ -731,7 +767,8 @@ var CascaderFilter = function CascaderFilter(props) {
     options: options,
     value: checkedValues,
     onChange: onChange,
-    showCheckedStrategy: "Cascader.SHOW_CHILD",
+    open: visible // showCheckedStrategy="Cascader.SHOW_CHILD"
+    ,
     dropdownRender: dropdownRender,
     onDropdownVisibleChange: function onDropdownVisibleChange(v) {
       return setVisible(v);
@@ -747,7 +784,7 @@ var CascaderFilter = function CascaderFilter(props) {
     className: "filter_item_value"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "checked"
-  }, text), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+  }, isFiltering ? text : '全部'), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
     type: isFiltering ? 'lmweb-close-circle-fill' : 'lmweb-down',
     className: "addonAfter",
     onClick: handleClear

package/es/CkFilter/style/style.css

@@ -627,6 +627,9 @@ html {
   box-shadow: 0 2px 6px var(--box-shadow-color);
   background-color: #fff;
 }
+.filter_dropdown.filter_cascader_container {
+  box-shadow: none;
+}
 .filter_dropdown .filter_header {
   min-height: 40px;
   border-bottom: 1px solid #eee;
@@ -637,6 +640,10 @@ html {
   align-items: center;
   justify-content: space-between;
 }
+.filter_dropdown .filter_header .filter_header_operate .filter_header_operate_checked {
+  display: inline-flex;
+  align-items: center;
+}
 .filter_dropdown .filter_header .filter_header_operate .filter_reset {
   font-size: 12px;
   color: var(--primary-color);
@@ -792,7 +799,7 @@ html {
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box {
   line-height: 1;
-  border: 1px dashed transparent;
+  border: 1px solid transparent;
   background: var(--background-color);
   padding: calc(var(--gap) * 2);
   cursor: pointer;
@@ -929,7 +936,7 @@ html {
   margin-bottom: 16px;
 }
 .ant-drawer.lm_det_drawer .ant-form-item .ant-form-item-label > label {
-  font-size: 12px;
+  font-weight: 500;
 }
 .ant-drawer.lm_det_drawer .auto_height {
   max-height: 418px;
@@ -1021,3 +1028,6 @@ html {
 .lm_filter_dropdown_picker .filter_picker_box .filter_picker_main .filter_picker_header .ant-radio-button-wrapper.ant-radio-button-wrapper-checked {
   color: var(--primary-color);
 }
+.ant-select-dropdown.ant-cascader-dropdown {
+  padding: 0;
+}

package/es/Input/style/style.css

@@ -499,6 +499,7 @@ html {
 }
 .lm_input.ant-input-sm {
   height: 24px;
+  line-height: 20px;
 }
 .lm_input.ant-input-lg {
   height: 40px;
@@ -509,6 +510,7 @@ html {
 }
 .lm_input_search .ant-input.ant-input-sm {
   height: 24px;
+  line-height: 20px;
 }
 .lm_input_search .ant-input.ant-input-lg {
   height: 40px;
@@ -586,6 +588,16 @@ html {
   padding: 0 8px;
   height: auto;
 }
+.ant-input-affix-wrapper.lm_input .ant-input {
+  padding: 2px 0 !important;
+  height: 30px;
+}
+.ant-input-affix-wrapper.lm_input .ant-input.ant-input-sm {
+  height: 22px;
+}
+.ant-input-affix-wrapper.lm_input .ant-input.ant-input-lg {
+  height: 38px;
+}
 .ant-input-affix-wrapper .lm_input {
   padding: 2px 0 !important;
   height: 30px;
@@ -600,14 +612,14 @@ html {
   padding: 0;
   height: auto;
 }
-.ant-input-group-wrapper .lm_input {
+.ant-input-group-wrapper.lm_input .ant-input {
   padding: 2px 8px !important;
   height: 32px;
 }
-.ant-input-group-wrapper .lm_input.ant-input-sm {
+.ant-input-group-wrapper.lm_input .ant-input.ant-input-sm {
   height: 24px;
 }
-.ant-input-group-wrapper .lm_input.ant-input-lg {
+.ant-input-group-wrapper.lm_input .ant-input.ant-input-lg {
   height: 40px;
 }
 .ant-input-group.ant-input-group-lg .lm_input {
@@ -622,9 +634,8 @@ html {
   vertical-align: middle;
 }
 .ant-input {
-  color: var(--color-85);
-  border: 1px solid var(--color-15);
-  font-size: var(--font-size);
+  color: var(--color-85) !important;
+  font-size: var(--font-size) !important;
 }
 .ant-input:focus {
   border-color: var(--primary-color);
@@ -676,5 +687,8 @@ html {
   border-color: var(--primary-hover-color);
 }
 .ant-input-search-with-button .ant-input-group .ant-input:hover {
-  z-index: 2;
+  z-index: 2 !important;
+}
+.ant-input-search-with-button .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover {
+  z-index: 2 !important;
 }

package/es/InputNumber/style/index.css

@@ -501,6 +501,7 @@ html {
 }
 .lm_input-number .ant-input-number-handler-wrap .ant-input-number-handler-up-inner,
 .lm_input-number .ant-input-number-handler-wrap .ant-input-number-handler-down-inner {
+  color: var(--color-85);
   right: 8px;
 }
 .lm_input-number:hover {

package/es/LeftTable/style/style.css

@@ -499,6 +499,7 @@ html {
   height: calc(100% - 36px);
   width: 168px;
   border: 1px solid var(--line-color);
+  transition: all 0.5s;
 }
 .lm_grid_tree .grid_tree_title {
   display: flex;

package/es/LmTable/ImgList/body.js

@@ -0,0 +1,111 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualized-auto-sizer"));
+
+var _reactWindow = require("react-window");
+
+var _cardCell = _interopRequireDefault(require("./cardCell"));
+
+var _context = _interopRequireDefault(require("./context"));
+
+var _empty = _interopRequireDefault(require("./empty"));
+
+var _imgCell = _interopRequireDefault(require("./imgCell"));
+
+var ImgList = function ImgList(props) {
+  var widthCount = props.width,
+      heightCount = props.height;
+
+  var _useContext = (0, _react.useContext)(_context.default),
+      data = _useContext.data,
+      _useContext$heightCel = _useContext.heightCell,
+      heightCell = _useContext$heightCel === void 0 ? 375 : _useContext$heightCel,
+      _useContext$rowKey = _useContext.rowKey,
+      rowKey = _useContext$rowKey === void 0 ? 'id' : _useContext$rowKey,
+      _useContext$cell = _useContext.cell,
+      cell = _useContext$cell === void 0 ? 'img' : _useContext$cell; // 响应式列数量控制
+
+
+  var columnCount = (0, _react.useMemo)(function () {
+    return widthCount > 1800 ? 7 : widthCount > 1400 ? 6 : widthCount > 1000 ? 5 : 4;
+  }, [widthCount]);
+  var widthCell = (0, _react.useMemo)(function () {
+    return (widthCount - 8) / columnCount;
+  }, [widthCount]);
+  var rowCount = (0, _react.useMemo)(function () {
+    var rs = Math.ceil(data.length / columnCount);
+    return rs;
+  }, [data, widthCount]);
+
+  var Cell = _react.default.useCallback(function (_ref) {
+    var columnIndex = _ref.columnIndex,
+        rowIndex = _ref.rowIndex,
+        style = _ref.style;
+    var idx = rowIndex * columnCount + columnIndex;
+    var config = {
+      item: data[idx],
+      index: idx,
+      style: style
+    };
+    var r = rowIndex === 0 ? 'first_row' : rowIndex === rowCount - 1 ? 'last_row' : '';
+    var c = columnIndex === 0 ? 'first_column' : columnIndex + 1 === columnCount ? 'last_column' : '';
+    var classN = "".concat(r, " ").concat(c);
+    return data[idx] ? cell === 'img' ? /*#__PURE__*/_react.default.createElement(_imgCell.default, (0, _extends2.default)({
+      key: rowKey,
+      className: classN
+    }, config)) : /*#__PURE__*/_react.default.createElement(_cardCell.default, (0, _extends2.default)({
+      key: rowKey,
+      className: classN
+    }, config)) : '';
+  }, [data, widthCount]);
+
+  var Gd = _react.default.useCallback(function () {
+    return /*#__PURE__*/_react.default.createElement(_reactWindow.VariableSizeGrid, {
+      className: "virtual-grid lm_imgList",
+      columnCount: columnCount,
+      columnWidth: function columnWidth() {
+        return widthCell;
+      },
+      height: heightCount,
+      rowCount: rowCount,
+      rowHeight: function rowHeight() {
+        return heightCell;
+      },
+      width: widthCount
+    }, Cell);
+  }, [data, widthCount, heightCount]);
+
+  return data.length > 0 ? /*#__PURE__*/_react.default.createElement(Gd, null) : /*#__PURE__*/_react.default.createElement(_empty.default, null);
+}; // 监听大小
+
+
+var ResizeSize = function ResizeSize(props) {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactVirtualizedAutoSizer.default, {
+    style: {
+      width: '100%'
+    }
+  }, function (_ref2) {
+    var height = _ref2.height,
+        width = _ref2.width;
+    return /*#__PURE__*/_react.default.createElement(ImgList, (0, _extends2.default)({}, props, {
+      width: width,
+      height: height
+    }));
+  }));
+};
+
+var _default = ResizeSize;
+exports.default = _default;