linkmore-design 1.0.58 → 1.0.62

package/es/LmEditTable/EditTable.js

@@ -238,10 +238,11 @@ var EditableCell = function EditableCell(props) {
       handleSave = props.handleSave,
       handleAdd = props.handleAdd,
       handleDelete = props.handleDelete,
+      handleCopy = props.handleCopy,
       itemProps = props.itemProps,
       setValid = props.setValid,
       reWriteOriginSource = props.reWriteOriginSource,
-      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "handleTableRowDelete", "handleTableRowAdd", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "itemProps", "setValid", "reWriteOriginSource"]);
+      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "handleTableRowDelete", "handleTableRowAdd", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps", "setValid", "reWriteOriginSource"]);
   /** 去除移入移出功能，保留最纯粹的功能，优化性能 */
 
 
@@ -265,44 +266,45 @@ var EditableCell = function EditableCell(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log(row, 'rrr', form.getFieldsValue(), record);
-              _context.prev = 1;
+              _context.prev = 0;
               _context.t0 = row;
 
               if (_context.t0) {
-                _context.next = 7;
+                _context.next = 6;
                 break;
               }
 
-              _context.next = 6;
+              _context.next = 5;
               return form.getFieldsValue();
 
-            case 6:
+            case 5:
               _context.t0 = _context.sent;
 
-            case 7:
+            case 6:
               values = _context.t0;
-              console.log(Object.assign(Object.assign({}, values), _defineProperty({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), 'vvvv');
+              console.log(Object.assign(Object.assign({
+                record: record
+              }, values), _defineProperty({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), 'vvvv');
               console.time('testForEach');
-              handleSave(Object.assign(Object.assign({}, values), _defineProperty({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
+              handleSave(Object.assign(Object.assign(Object.assign({}, record), values), _defineProperty({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
               console.timeEnd('testForEach');
-              _context.next = 14;
+              _context.next = 13;
               return form.validateFields();
 
-            case 14:
-              _context.next = 18;
+            case 13:
+              _context.next = 17;
               break;
 
-            case 16:
-              _context.prev = 16;
-              _context.t1 = _context["catch"](1);
+            case 15:
+              _context.prev = 15;
+              _context.t1 = _context["catch"](0);
 
-            case 18:
+            case 17:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 16]]);
+      }, _callee, null, [[0, 15]]);
     }));
   }; // 触发保存
 
@@ -310,6 +312,15 @@ var EditableCell = function EditableCell(props) {
   var handleFormItemChange = function handleFormItemChange(e) {
     save === null || save === void 0 ? void 0 : save();
   };
+  /** 快捷刷子，把当前的所有列的值，刷成当前的选中的列 */
+
+
+  var copyKey = function copyKey(e) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
+    console.log(rowKey, record[rowKey], 'fff');
+    var dataIndex = col.dataIndex;
+    handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
+  };
 
   var Control = function Control(con) {
     switch (con) {
@@ -331,6 +342,10 @@ var EditableCell = function EditableCell(props) {
             noStyle: true
           }, /*#__PURE__*/React.cloneElement(componentProps.addonAfter, {
             onChange: handleFormItemChange
+          })) : null,
+          suffix: componentProps.quickcopy ? /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(IconFont, {
+            onClick: copyKey,
+            type: 'lmweb-icon_m_brush'
           })) : null
         }));
 
@@ -714,6 +729,20 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   };
 
+  var handleCopy = function handleCopy(key, value) {
+    var res = produce(dataSourceRef.current, function (draft) {
+      draft.forEach(function (item) {
+        return item[key] = value;
+      });
+    });
+
+    if (onChange) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(res);
+    } else {
+      setDataSource(res);
+    }
+  };
+
   var resultColumns = useMemo(function () {
     var localColumns = [sortOpen ? {
       title: '',
@@ -787,6 +816,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
             isHoverEdit: isHoverEdit,
             handleAdd: handleAdd,
             handleDelete: handleDelete,
+            handleCopy: handleCopy,
             editEnum: typeof col.editEnum === 'function' ? col.editEnum(record) : col.editEnum,
             valueType: typeof col.valueType === 'function' ? col.valueType(record) : col.valueType,
             handleSave: handleSave,

package/es/LmFilter/LmFilter.js

@@ -19,7 +19,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
-var _localization = require("./localization.tsx");
+var _localization = require("./localization");
 
 var _excluded = ["localization"];
 
@@ -28,10 +28,28 @@ var LmFilter = function LmFilter(_ref, ref) {
       localization = _ref$localization === void 0 ? {} : _ref$localization,
       resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var defaultRef = (0, _react.useRef)(null);
-  return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
-    ref: ref || defaultRef,
+  var defaultProps = {
+    dataSource: [],
+    // 数据源
+    enableSearch: true,
+    // 是否启用模糊查询
+    enableBaisc: true,
+    // 是否启用基础筛选
+    enableComplex: false,
+    // 是否启用高级筛选
+    enableCustom: false,
+    // 是否启用自定义筛选
+    size: 'middle',
+    // 尺寸
+    searchKey: 'search',
+    // 搜索的key值
+    placeholder: '请输入',
+    // 搜索占位符
     localization: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _localization.DefaultLocalization), localization)
-  }, resetProps));
+  };
+  return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
+    ref: ref || defaultRef
+  }, defaultProps, resetProps));
 };
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);

package/es/LmFilter/baseFilter/fuzzySearch.js

@@ -29,7 +29,12 @@ var FuzzySearch = function FuzzySearch(_ref) {
   }, [state.basicFilter]);
 
   var onSearch = function onSearch(val) {
-    setFilterValue(val, searchKey);
+    var item = {
+      field: searchKey,
+      operator: 'contains',
+      fieldType: 'string'
+    };
+    setFilterValue(val, item);
   };
 
   (0, _react.useEffect)(function () {

package/es/LmFilter/baseFilter/index.js

@@ -17,12 +17,11 @@ var _components = _interopRequireDefault(require("../components"));
 var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var dataSource = instance.dataSource;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_filter_basic"
-  }, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
     instance: instance
   }), dataSource.map(function (v, index) {
-    return /*#__PURE__*/_react.default.createElement(_components.default, {
+    var isHidden = !v.show && typeof v.show === 'boolean';
+    return isHidden ? null : /*#__PURE__*/_react.default.createElement(_components.default, {
       key: (v === null || v === void 0 ? void 0 : v.field) || index,
       instance: instance,
       item: v

package/es/LmFilter/complexFilter/drawer.js

@@ -70,7 +70,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
       }
 
       if (getItem.type === 'cascader') {
-        return (0, _utils.getFlatItem)(checkedValue, getItem.data, 'parent');
+        var _getItem$props;
+
+        return (0, _utils.getFlatItem)((getItem === null || getItem === void 0 ? void 0 : (_getItem$props = getItem.props) === null || _getItem$props === void 0 ? void 0 : _getItem$props.multiple) ? checkedValue : [checkedValue], getItem.data, 'parent');
       }
 
       return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
@@ -119,9 +121,22 @@ var ListItemChecked = function ListItemChecked(_ref) {
 
   var onTagClose = function onTagClose(val) {
     var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
-    var nValue = Array.isArray(originData[field].value) ? originData[field].value.filter(function (v) {
-      return !v.includes(val);
-    }) : '';
+    var nValue = '';
+
+    if (['select', 'checkbox'].includes(getItem.type)) {
+      nValue = originData[field].value.filter(function (v) {
+        return !v.includes(val);
+      });
+    }
+
+    if (['input'].includes(getItem.type)) {
+      nValue = '';
+    }
+
+    if (['cascader'].includes(getItem.type)) {
+      nValue = [];
+    }
+
     var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
       value: nValue
     })));
@@ -252,9 +267,9 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
   var instance = _ref5.instance;
   var state = instance.state,
       dispatch = instance.dispatch,
-      onChange = instance.onChange;
-  var complexDrawer = state.complexDrawer,
-      complexFilter = state.complexFilter;
+      onQuery = instance.onQuery,
+      dataSource = instance.dataSource;
+  var complexDrawer = state.complexDrawer;
   var isHas = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(complexDrawer.data);
   }, [complexDrawer.data]); // 过滤的内容转数组
@@ -278,17 +293,9 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
   };
 
   var onSearch = function onSearch() {
-    dispatch({
-      type: 'changeBasicFilter',
-      basicFilter: {}
-    });
-    dispatch({
-      type: 'changeComplexFilter',
-      complexFilter: complexDrawer.data
-    });
-    onClose();
-    onChange === null || onChange === void 0 ? void 0 : onChange({
-      complexFilter: complexDrawer.data,
+    var complexFilter = complexDrawer.data;
+    onQuery === null || onQuery === void 0 ? void 0 : onQuery({
+      complexFilter: complexFilter,
       type: 'complex'
     });
   }; // 初始化筛选
@@ -299,7 +306,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       dispatch({
         type: 'changeComplexDrawer',
         complexDrawer: {
-          data: complexFilter,
+          data: state.complexFilter,
           visible: complexDrawer.visible
         }
       });
@@ -317,7 +324,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
 
   var config = {
     title: /*#__PURE__*/_react.default.createElement(Tit, null),
-    visible: state.complexDrawer.visible,
+    visible: complexDrawer.visible,
     onClose: onClose,
     width: 440,
     placement: 'right',

package/es/LmFilter/components/CascaderFilter.js

@@ -13,6 +13,8 @@ require("antd/es/cascader/style");
 
 var _cascader = _interopRequireDefault(require("antd/es/cascader"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -39,6 +41,11 @@ var DropdownRender = function DropdownRender(_ref) {
       filters = _item$data === void 0 ? [] : _item$data;
   var inputRef = (0, _react.useRef)(null);
   var delayedFn = (0, _hooks.useDelayedFn)();
+  var isShowFoot = (0, _react.useMemo)(function () {
+    var _item$props;
+
+    return item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.multiple;
+  }, [item]);
 
   var handleFilter = function handleFilter(val) {
     var serachValues = filters.filter(function (v) {
@@ -77,7 +84,7 @@ var DropdownRender = function DropdownRender(_ref) {
     ref: inputRef,
     onSearch: handleFilter,
     onChange: handleFilter
-  })), dom, /*#__PURE__*/_react.default.createElement("div", {
+  })), dom, isShowFoot && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
@@ -117,11 +124,17 @@ var CascaderFilter = function CascaderFilter(_ref2) {
   }, [filterValue]);
 
   var onChange = function onChange(item, selectedOptions) {
+    var _itemProps$props;
+
+    console.log('item', item);
     setCheckedValues(item);
+
+    if (!(itemProps === null || itemProps === void 0 ? void 0 : (_itemProps$props = itemProps.props) === null || _itemProps$props === void 0 ? void 0 : _itemProps$props.multiple)) {
+      setFilterValue(item);
+    }
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, {
-    multiple: true,
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({}, itemProps.props, {
     options: options,
     onChange: onChange,
     defaultValue: defaultValue,
@@ -139,7 +152,7 @@ var CascaderFilter = function CascaderFilter(_ref2) {
         setOptions: setOptions
       });
     }
-  }, children));
+  }), children));
 };
 
 var _default = CascaderFilter;

package/es/LmFilter/components/DateFilter.js

@@ -9,10 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("antd/es/date-picker/style");
-
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -73,7 +69,7 @@ var RangePicker = function RangePicker(_ref) {
       className: "filter_picker_header"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_picker_header_tip"
-    }, filterValue && "".concat(filterValue[0], " - ").concat(filterValue[1])), /*#__PURE__*/_react.default.createElement("div", {
+    }, defaultValue && "".concat(filterValue[0], " - ").concat(filterValue[1])), /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_picker_header_operate"
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
       value: activeValue,
@@ -87,7 +83,7 @@ var RangePicker = function RangePicker(_ref) {
     })))), panelNode));
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_datePicker.default.RangePicker, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker.RangePicker, (0, _extends2.default)({
     picker: "date",
     separator: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
       type: "lmweb-swap-right",
@@ -148,7 +144,7 @@ var DatePickerFilter = function DatePickerFilter(_ref2) {
     });
   }
 
-  return /*#__PURE__*/_react.default.createElement(_datePicker.default, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker, (0, _extends2.default)({
     placeholder: "\u9009\u62E9\u65F6\u95F4"
   }, props, {
     defaultValue: defaultValue,

package/es/LmFilter/components/DropdownFIlter.js

@@ -112,7 +112,9 @@ var getLabel = function getLabel(filterValue, item) {
 
 
   if (['cascader'].includes(type)) {
-    var nArr = (0, _utils.getFlatItem)(filterValue, data);
+    var _item$props;
+
+    var nArr = (0, _utils.getFlatItem)((item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.multiple) ? filterValue : [filterValue], data);
     var labels = nArr.map(function (v) {
       return v.label;
     });
@@ -150,6 +152,12 @@ var getLabel = function getLabel(filterValue, item) {
       return v.label;
     });
 
+    if (!_labels.length) {
+      _labels = filterValue;
+    }
+
+    ; // 受控模式未查找到显示的内容时展示
+
     switch (_labels.length) {
       case 1:
         return _labels[0];
@@ -165,12 +173,12 @@ var getLabel = function getLabel(filterValue, item) {
 
   if (['input', 'date'].includes(type)) {
     return filterValue;
-  } // 单选框
+  } // 单选框 受控模式未查找到显示的内容时展示filterValue
 
 
-  var label = (_data$find = data.find(function (v) {
+  var label = ((_data$find = data.find(function (v) {
     return v.value === filterValue;
-  })) === null || _data$find === void 0 ? void 0 : _data$find.label;
+  })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
   return label;
 };
 /*

package/es/LmFilter/components/index.js

@@ -71,7 +71,7 @@ var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
   var resetInstance = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetInstanceProps), {}, {
     filterValue: (getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem)) || transformFilterValue,
     setFilterValue: function setFilterValue(val) {
-      return (_setFilterValue || handleChange)(val, resetItem.field);
+      return (_setFilterValue || handleChange)(val, resetItem);
     }
   });
   return /*#__PURE__*/_react.default.createElement(_DropdownFIlter.default, {

package/es/LmFilter/customFilter/index.js

@@ -9,8 +9,9 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var LmFilterCustom = function LmFilterCustom(e) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "LmFilterCustom");
+var LmFilterCustom = function LmFilterCustom(_ref) {
+  var instance = _ref.instance;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
 
 var _default = LmFilterCustom;