linkmore-design 1.0.46 → 1.0.47

package/dist/CardTable/LmCardTable.d.ts

@@ -1,4 +1,4 @@
-declare function _default({ cellKey, type, height, virtual, components, dataSource, cellConfig, checkboxConfig, ...resetProps }: {
+declare const _default: React.ForwardRefExoticComponent<Pick<{
     [x: string]: any;
     cellKey?: string;
     type?: string;
@@ -8,5 +8,6 @@ declare function _default({ cellKey, type, height, virtual, components, dataSour
     dataSource?: any[];
     cellConfig?: {};
     checkboxConfig?: {};
-}): JSX.Element;
+}, string | number> & React.RefAttributes<any>>;
 export default _default;
+import React from "react";

package/dist/CardTable/body/TableBodyCell.d.ts

@@ -1,5 +1,6 @@
 export default LmCardTableBodyCell;
-declare function LmCardTableBodyCell({ cell, table }: {
+declare function LmCardTableBodyCell({ index, cell, table }: {
+    index: any;
     cell: any;
     table: any;
 }): JSX.Element;

package/dist/CardTable/card/PictureTextColumn.d.ts

@@ -1,5 +1,6 @@
 export default PictureTextColumn;
-declare function PictureTextColumn({ cell, table, checked }: {
+declare function PictureTextColumn({ index, cell, table, checked }: {
+    index: any;
     cell: any;
     table: any;
     checked: any;

package/dist/CardTable/card/PictureTextRow.d.ts

@@ -1,5 +1,6 @@
 export default PictureTextRow;
-declare function PictureTextRow({ cell, table, checked }: {
+declare function PictureTextRow({ index, cell, table, checked }: {
+    index: any;
     cell: any;
     table: any;
     checked: any;

package/dist/CardTable/table/TableRoot.d.ts

@@ -1,9 +1,3 @@
-export default LmCardTableRoot;
-declare function LmCardTableRoot({ rowConfig, cellConfig, defaultConfig, checkboxConfig, checkboxClick, ...resetProps }: {
-    [x: string]: any;
-    rowConfig: any;
-    cellConfig: any;
-    defaultConfig: any;
-    checkboxConfig: any;
-    checkboxClick: any;
-}): JSX.Element;
+declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<any>>;
+export default _default;
+import React from "react";

package/dist/LmSelect/useCheckboxOptions.d.ts

@@ -1 +1,4 @@
-export declare const useCheckboxOptions: (options: any, controllable: any, filter?: string) => JSX.Element;
+export declare const useCheckboxOptions: (options: any, { value, onChange: onCheckChange }: {
+    value?: any[];
+    onChange: any;
+}, filter?: string) => JSX.Element;

package/dist/index.umd.js

@@ -30779,6 +30779,10 @@
 	    }); // 触发外部查询, 单击时不关闭菜单
 
 	    (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, nValue, state.customFilterValues);
+	    dispatch({
+	      type: 'changeComplexFilterValues',
+	      complexFilterValues: {}
+	    });
 	    !filterType && setVisible(false);
 	  }, [dispatch, field, state.filterValues, state.instance]); // 展示的内容
 
@@ -31030,15 +31034,18 @@
 	      filterValues = state.filterValues,
 	      visibleFields = state.visibleFields,
 	      orderFields = state.orderFields,
-	      customFilterValues = state.customFilterValues;
+	      customFilterValues = state.customFilterValues,
+	      complexFilterValues = state.complexFilterValues;
 	  var hasClear = React.useMemo(function () {
-	    var _Object$keys;
+	    var _Object$keys, _Object$keys2;
 
 	    var obj = _objectSpread({}, filterValues);
 
 	    delete obj[searchKey];
-	    return ((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) || false;
-	  }, [filterValues]);
+	    var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
+	    var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
+	    return hasBaseFilter || hasComplexFilter;
+	  }, [filterValues, complexFilterValues]);
 
 	  var handleFilter = function handleFilter(val) {
 	    var nValue = _objectSpread({}, filterValues);
@@ -31060,17 +31067,20 @@
 	  var handleClear = function handleClear() {
 	    var _inputRef$current;
 
-	    console.log('inputRef.current', inputRef.current.input.value);
-
 	    if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
 	      inputRef.current.input.value = '';
 	    }
 
+	    var baseFilter = filterValues[searchKey] ? _defineProperty({}, searchKey, filterValues[searchKey]) : {};
 	    dispatch({
 	      type: 'changeFilterValues',
-	      filterValues: _defineProperty({}, searchKey, filterValues[searchKey])
+	      filterValues: baseFilter
 	    });
-	    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, searchKey, filterValues[searchKey]), customFilterValues);
+	    dispatch({
+	      type: 'changeComplexFilterValues',
+	      complexFilterValues: {}
+	    });
+	    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
 	  };
 
 	  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, search && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -31089,10 +31099,10 @@
 	    return /*#__PURE__*/React__default['default'].createElement(FilterMenu, _extends({
 	      key: v.field
 	    }, v));
-	  }), hasClear && /*#__PURE__*/React__default['default'].createElement(LMButton, {
+	  })), /*#__PURE__*/React__default['default'].createElement(NestedFilter$1, null), hasClear && /*#__PURE__*/React__default['default'].createElement(LMButton, {
 	    type: "link",
 	    onClick: handleClear
-	  }, "\u4E00\u952E\u6E05\u7A7A")), /*#__PURE__*/React__default['default'].createElement(NestedFilter$1, null));
+	  }, "\u4E00\u952E\u6E05\u7A7A"));
 	};
 
 	var asyncToGenerator = createCommonjsModule(function (module) {
@@ -32370,9 +32380,11 @@
 	      dispatch = _useStore3.dispatch;
 
 	  var instance = state.instance,
+	      filterValues = state.filterValues,
 	      _state$complexDrawer = state.complexDrawer,
 	      visible = _state$complexDrawer.visible,
 	      data = _state$complexDrawer.data,
+	      customFilterValues = state.customFilterValues,
 	      complexFilterValues = state.complexFilterValues;
 	  var isHas = React.useMemo(function () {
 	    return getIsHas(data);
@@ -32399,11 +32411,17 @@
 
 	  var onSearch = function onSearch() {
 	    console.log('complexDrawer:', data);
+	    var baseFilter = filterValues[instance.searchKey] ? _defineProperty({}, instance.searchKey, filterValues[instance.searchKey]) : {};
+	    dispatch({
+	      type: 'changeFilterValues',
+	      filterValues: baseFilter
+	    });
 	    dispatch({
 	      type: 'changeComplexFilterValues',
 	      complexFilterValues: data
 	    });
 	    onClose();
+	    instance.onChange(baseFilter, customFilterValues, data);
 	  };
 
 	  React.useEffect(function () {
@@ -32453,9 +32471,9 @@
 	  }, /*#__PURE__*/React__default['default'].createElement(VirList, {
 	    options: filterItemData,
 	    className: "filter_drawer_group_list"
-	  }, function (_ref4) {
-	    var item = _ref4.item,
-	        resetProps = _objectWithoutProperties(_ref4, _excluded2$2);
+	  }, function (_ref5) {
+	    var item = _ref5.item,
+	        resetProps = _objectWithoutProperties(_ref5, _excluded2$2);
 
 	    return /*#__PURE__*/React__default['default'].createElement("div", _extends({}, resetProps, {
 	      className: "filter_drawer_group_item"
@@ -81674,11 +81692,17 @@
 	}; // todo 抽取出来, 后续做统一处理, 项目中多处用到类似的功能
 
 
-	var useCheckboxOptions = function useCheckboxOptions(options, controllable) {
+	var useCheckboxOptions = function useCheckboxOptions(options, _ref) {
+	  var _ref$value = _ref.value,
+	      value = _ref$value === void 0 ? [] : _ref$value,
+	      onCheckChange = _ref.onChange;
 	  var filter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
 
 	  // 将value和onChange改为受控，和父组件共享
-	  var _useControllableValue = useControllableValue(controllable),
+	  var _useControllableValue = useControllableValue({
+	    value: value,
+	    onChange: onCheckChange
+	  }),
 	      _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
 	      checkedValues = _useControllableValue2[0],
 	      setCheckedValues = _useControllableValue2[1];
@@ -81691,8 +81715,8 @@
 
 	  var checkAll = React.useMemo(function () {
 	    var isLen = checkedValues.length >= renderOptions.length;
-	    return isLen && renderOptions.every(function (_ref) {
-	      var value = _ref.value;
+	    return isLen && renderOptions.every(function (_ref2) {
+	      var value = _ref2.value;
 	      return checkedValues.includes(value);
 	    });
 	  }, [checkedValues.length, renderOptions]); // 是否半选: 存在选中的数据 && 未全选
@@ -81703,14 +81727,14 @@
 
 	  var onCheckAllChange = useEvent$2(function () {
 	    var nValue = checkAll ? checkedValues.filter(function (v) {
-	      return !renderOptions.some(function (_ref2) {
-	        var value = _ref2.value;
+	      return !renderOptions.some(function (_ref3) {
+	        var value = _ref3.value;
 	        return v === value;
 	      });
 	    }) : Array.from(new Set([].concat(_toConsumableArray(checkedValues), _toConsumableArray(renderOptions.map(function (v) {
 	      return v.value;
 	    })))));
-	    setCheckedValues(nValue);
+	    setCheckedValues(nValue || []);
 	  });
 	  var onChange = useEvent$2(function (e, item) {
 	    e.preventDefault();
@@ -81718,7 +81742,7 @@
 	    var arr = checkedValues.includes(item.value) ? checkedValues.filter(function (v) {
 	      return v !== item.value;
 	    }) : [].concat(_toConsumableArray(checkedValues), [item.value]);
-	    setCheckedValues(arr || undefined);
+	    setCheckedValues(arr || []);
 	  });
 	  return /*#__PURE__*/React__default['default'].createElement("div", {
 	    className: "select_dropdown"
@@ -81739,9 +81763,9 @@
 	  }, /*#__PURE__*/React__default['default'].createElement(VirList, {
 	    options: renderOptions,
 	    className: "filter_list"
-	  }, function (_ref3) {
-	    var item = _ref3.item,
-	        resetProps = _objectWithoutProperties(_ref3, _excluded$13);
+	  }, function (_ref4) {
+	    var item = _ref4.item,
+	        resetProps = _objectWithoutProperties(_ref4, _excluded$13);
 
 	    return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread(_objectSpread({}, resetProps), {}, {
 	      className: classnames('filter_item', {
@@ -81801,8 +81825,8 @@
 	    var _props$onChange;
 
 	    setCheckedValues(v);
-	    props === null || props === void 0 ? void 0 : (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, v, renderOptions.filter(function (item) {
-	      return v.includes(item.value);
+	    props === null || props === void 0 ? void 0 : (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, v, renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.filter(function (item) {
+	      return v === null || v === void 0 ? void 0 : v.includes(item.value);
 	    }));
 	  });
 	  var isSearch = React.useMemo(function () {
@@ -83941,7 +83965,6 @@
 	      className = props.className,
 	      restProps = _objectWithoutProperties(props, _excluded2$k);
 
-	  console.log(children, 'rrr');
 	  return /*#__PURE__*/React__default['default'].createElement(_Radio__default['default'].Group, _extends({
 	    className: classnames(className, 'lm-radio-group', "lm-radio-group-".concat(direction)),
 	    size: size
@@ -84593,7 +84616,7 @@
 	  value: 'default',
 	  imgUrl: DefaultImg
 	}, {
-	  label: '紧凑型',
+	  label: '紧凑',
 	  value: 'small',
 	  imgUrl: SmallImg
 	}, {