linkmore-design 1.0.57 → 1.0.60

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/Controls/index.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,12 +15,18 @@ var _input = _interopRequireDefault(require("antd/es/input"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _CheckboxTags = _interopRequireDefault(require("./CheckboxTags"));
 
+var _CascaderFilter = _interopRequireDefault(require("../components/CascaderFilter"));
+
+var _DateFilter = _interopRequireDefault(require("../components/DateFilter"));
+
 var _excluded = ["item", "options"];
 
 var Controls = function Controls(props) {
@@ -27,6 +35,19 @@ var Controls = function Controls(props) {
       options = props.options,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var type = item.type;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var instance = {
+    filterValue: resetProps.value,
+    setFilterValue: resetProps.onChange,
+    visible: visible,
+    setVisible: setVisible,
+    children: null
+  };
   var obj = {
     'select': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
       options: options
@@ -34,7 +55,16 @@ var Controls = function Controls(props) {
     'checkbox': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
       options: options
     }, resetProps)),
-    // 'cascader': <CascaderFilter options={options} {...resetProps} />,
+    'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, {
+      instance: instance,
+      item: item,
+      options: options
+    }),
+    'date': /*#__PURE__*/_react.default.createElement(_DateFilter.default, {
+      instance: instance,
+      item: item,
+      options: options
+    }),
     'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
       placeholder: "\u8BF7\u8F93\u5165"
     }, resetProps)) // 'nested': <Nested options={options} {...resetProps} />,

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"];
 

package/es/LmFilter/baseFilter/index.js

@@ -22,7 +22,8 @@ var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
   }, /*#__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

@@ -49,31 +49,8 @@ var ListItemChecked = function ListItemChecked(_ref) {
   }, [field, valueObj.originField, dataSource]); // 选中值的处理
 
   var resetValue = (0, _react.useMemo)(function () {
-    if (getItem.type === 'cascader') {
-      var _valueObj$value;
-
-      return (_valueObj$value = valueObj.value) === null || _valueObj$value === void 0 ? void 0 : _valueObj$value.map(function (v) {
-        return v[v.length - 1];
-      });
-    }
-
     return valueObj.value;
-  }, [getItem, valueObj.value]); // 遍历树结构
-
-  var deepChildren = function deepChildren(arr, preArr) {
-    arr.forEach(function (item) {
-      var _item$children;
-
-      if (resetValue.includes(item.value)) {
-        preArr.push(item);
-      }
-
-      if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
-        deepChildren(item.children, preArr);
-      }
-    });
-  }; // 选中的数据
-
+  }, [valueObj.value]); // 选中的数据
 
   var checkedValues = (0, _react.useMemo)(function () {
     var checkedValue = valueObj.value;
@@ -81,14 +58,21 @@ var ListItemChecked = function ListItemChecked(_ref) {
     if (Array.isArray(checkedValue)) {
       var _getItem$data;
 
+      if (['date'].includes(getItem.type)) {
+        return [{
+          value: resetValue,
+          label: "".concat(resetValue[0], " ~ ").concat(resetValue[1])
+        }];
+      }
+
       if (getItem.type === 'nested') {
         return checkedValue;
       }
 
       if (getItem.type === 'cascader') {
-        var arr = [];
-        deepChildren(getItem.data, arr);
-        return arr;
+        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) {
@@ -96,7 +80,7 @@ var ListItemChecked = function ListItemChecked(_ref) {
       });
     }
 
-    if (getItem.type === 'input') {
+    if (['input', 'date'].includes(getItem.type)) {
       return resetValue ? [{
         value: resetValue,
         label: resetValue
@@ -137,10 +121,24 @@ var ListItemChecked = function ListItemChecked(_ref) {
 
   var onTagClose = function onTagClose(val) {
     var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
-    var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
-      value: originData[field].value.filter(function (v) {
+    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
     })));
     dispatch({
       type: 'changeComplexDrawer',
@@ -304,7 +302,10 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       complexFilter: complexDrawer.data
     });
     onClose();
-    onChange === null || onChange === void 0 ? void 0 : onChange(null, complexDrawer.data);
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      complexFilter: complexDrawer.data,
+      type: 'complex'
+    });
   }; // 初始化筛选
 
 

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"));
@@ -21,14 +23,15 @@ var _linkmoreDesign = require("linkmore-design");
 
 var _InputSearchClose = _interopRequireDefault(require("./InputSearchClose"));
 
+var _hooks = require("../hooks");
+
 // 重置级联弹框
 var DropdownRender = function DropdownRender(_ref) {
   var dom = _ref.dom,
       instance = _ref.instance,
       item = _ref.item,
       setOptions = _ref.setOptions,
-      checkedValues = _ref.checkedValues,
-      setCheckedValues = _ref.setCheckedValues;
+      checkedValues = _ref.checkedValues;
   var _instance$filterValue = instance.filterValue,
       filterValue = _instance$filterValue === void 0 ? [] : _instance$filterValue,
       setFilterValue = instance.setFilterValue,
@@ -37,6 +40,12 @@ var DropdownRender = function DropdownRender(_ref) {
   var _item$data = item.data,
       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) {
@@ -48,28 +57,23 @@ var DropdownRender = function DropdownRender(_ref) {
 
   var handleSure = function handleSure() {
     setFilterValue(checkedValues);
-    setVisible(false);
+    setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
   }; // 取消
 
 
   var handleReset = function handleReset() {
-    setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+    return setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
   };
 
   (0, _react.useEffect)(function () {
     if (visible) {
-      var _inputRef$current2, _inputRef$current2$se;
-
-      setTimeout(function () {
-        var _inputRef$current;
+      delayedFn(function () {
+        var _inputRef$current, _inputRef$current$foc;
 
-        (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus({
+        return (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : (_inputRef$current$foc = _inputRef$current.focus) === null || _inputRef$current$foc === void 0 ? void 0 : _inputRef$current$foc.call(_inputRef$current, {
           cursor: 'all'
         });
-      }, 200);
-      setCheckedValues(filterValue);
-      (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : (_inputRef$current2$se = _inputRef$current2.setValue) === null || _inputRef$current2$se === void 0 ? void 0 : _inputRef$current2$se.call(_inputRef$current2, '');
-      handleFilter('');
+      });
     }
   }, [visible]);
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -80,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",
@@ -99,7 +103,9 @@ var CascaderFilter = function CascaderFilter(_ref2) {
       filterValue = _instance$filterValue2 === void 0 ? [] : _instance$filterValue2,
       setFilterValue = instance.setFilterValue,
       visible = instance.visible,
-      setVisible = instance.setVisible;
+      setVisible = instance.setVisible,
+      _instance$children = instance.children,
+      children = _instance$children === void 0 ? /*#__PURE__*/_react.default.createElement("div", null) : _instance$children;
   var _itemProps$data = itemProps.data,
       filters = _itemProps$data === void 0 ? [] : _itemProps$data;
 
@@ -113,35 +119,29 @@ var CascaderFilter = function CascaderFilter(_ref2) {
       checkedValues = _useState4[0],
       setCheckedValues = _useState4[1];
 
-  var checkedKeys = (0, _react.useMemo)(function () {
-    return checkedValues.map(function (v) {
-      return v.value;
-    });
-  }, [checkedValues]);
   var defaultValue = (0, _react.useMemo)(function () {
-    var flatKeys = function flatKeys(arr) {
-      return arr.map(function (v) {
-        return v.value;
-      });
-    };
-
-    var nKey = filterValue.map(function (v) {
-      return Array.isArray(v) ? flatKeys(v) : v.value;
-    });
-    return nKey;
+    return filterValue;
   }, [filterValue]);
 
   var onChange = function onChange(item, selectedOptions) {
-    console.log('item', item, '===', selectedOptions);
-    setCheckedValues(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,
     open: visible,
+    onDropdownVisibleChange: function onDropdownVisibleChange(vis) {
+      return setVisible(vis);
+    },
     dropdownRender: function dropdownRender(dom) {
       return /*#__PURE__*/_react.default.createElement(DropdownRender, {
         dom: dom,
@@ -152,7 +152,7 @@ var CascaderFilter = function CascaderFilter(_ref2) {
         setOptions: setOptions
       });
     }
-  }, /*#__PURE__*/_react.default.createElement("div", null)));
+  }), children));
 };
 
 var _default = CascaderFilter;

package/es/LmFilter/components/CheckboxFilter.js

@@ -44,20 +44,16 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
       setVisible = instance.setVisible;
   var _itemProps$data = itemProps.data,
       filters = _itemProps$data === void 0 ? [] : _itemProps$data;
-  var inputRef = (0, _react.useRef)(); // 选中的数据项: [{}, {}, ...];
+  var inputRef = (0, _react.useRef)(); // 选中的数据项: [key, key, ...];
 
   var _useState = (0, _react.useState)(filterValue),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       checkedValues = _useState2[0],
       setCheckedValues = _useState2[1]; // 选中的数据的键
+  // const checkedKeys = useMemo(() => checkedValues.map(v => v), [checkedValues]);
+  // 搜索后的筛选项
 
 
-  var checkedKeys = (0, _react.useMemo)(function () {
-    return checkedValues.map(function (v) {
-      return v.value;
-    });
-  }, [checkedValues]); // 搜索后的筛选项
-
   var _useState3 = (0, _react.useState)(filters),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       options = _useState4[0],
@@ -74,7 +70,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
     return isAll && options.every(function (_ref2) {
       var value = _ref2.value;
       return checkedValues.some(function (v) {
-        return v.value === value;
+        return v === value;
       });
     });
   }, [checkedValues, options]); // 是否半选: 存在选中的数据 && 未全选
@@ -94,20 +90,17 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
 
   var onChange = function onChange(e, item) {
     e.preventDefault();
-    var nValue = checkedValues.some(function (_ref3) {
-      var value = _ref3.value;
+    var nValue = checkedValues.some(function (value) {
       return value === item.value;
-    }) ? checkedValues.filter(function (_ref4) {
-      var value = _ref4.value;
+    }) ? checkedValues.filter(function (value) {
       return value !== item.value;
-    }) : (0, _utils.uniqueFunc)([].concat((0, _toConsumableArray2.default)(checkedValues), [item]), 'value');
+    }) : (0, _utils.uniqueFunc)([].concat((0, _toConsumableArray2.default)(checkedValues), [item.value]), 'value');
     setCheckedValues(nValue);
   }; // 全选事件
 
 
   var onCheckAllChange = function onCheckAllChange() {
-    var nValue = checkAll ? checkedValues.filter(function (_ref5) {
-      var value = _ref5.value;
+    var nValue = checkAll ? checkedValues.filter(function (value) {
       return !options.some(function (v) {
         return v.value === value;
       });
@@ -159,18 +152,17 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
   }, "\u5168\u90E8"), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
     className: "filter_tip"
   }, "\u5DF2\u9009: ", checkedValues.length)))), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, {
-    value: checkedKeys,
+    value: checkedValues,
     className: "filter_body"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.VirtualList, {
     options: options,
     className: "filter_list"
-  }, function (_ref6) {
-    var item = _ref6.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref6, _excluded);
+  }, function (_ref3) {
+    var item = _ref3.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: (0, _classnames.default)('filter_item', {
-        checked: checkedValues.some(function (_ref7) {
-          var value = _ref7.value;
+        checked: checkedValues.some(function (value) {
           return value === item.value;
         })
       }),