linkmore-design 1.0.56 → 1.0.59

package/lib/Form/index.d.ts

@@ -3,6 +3,9 @@ import { Form as AntdForm, FormInstance, FormProps, List } from 'antd';
 import useFormInstance from 'antd/lib/form/hooks/useFormInstance';
 import { FormProvider } from 'antd/lib/form/context';
 import { useForm, useWatch } from 'antd/lib/form/Form';
+export interface LmFormProps extends FormProps {
+    responsive?: Boolean;
+}
 declare const Reform: <Values = any>(props: FormProps<Values> & {
     children?: React.ReactNode;
 } & {

package/lib/Form/index.js

@@ -25,6 +25,8 @@ var _context = require("antd/lib/form/context");
 
 var _Form2 = require("antd/lib/form/Form");
 
+var _container = _interopRequireDefault(require("./container"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -43,7 +45,18 @@ var classNamePrefix = 'lm_form';
 var LMForm = function LMForm(props, ref) {
   var children = props.children,
       className = props.className,
-      restProps = __rest(props, ["children", "className"]);
+      responsive = props.responsive,
+      restProps = __rest(props, ["children", "className", "responsive"]);
+
+  if (responsive) {
+    return /*#__PURE__*/_react.default.createElement(_container.default, {
+      responsive: true
+    }, /*#__PURE__*/_react.default.createElement(_form.default, Object.assign({
+      ref: ref,
+      className: (0, _classnames.default)(classNamePrefix, className),
+      colon: false
+    }, restProps), children));
+  }
 
   return /*#__PURE__*/_react.default.createElement(_form.default, Object.assign({
     ref: ref,

package/lib/Form/style/index.css

@@ -506,6 +506,9 @@ html {
 .lm_form .ant-form-item {
   margin-bottom: 16px;
 }
+.lm_form .ant-form-item .ant-form-item-explain {
+  line-height: 24px;
+}
 .lm_form .ant-form-item-label {
   display: flex !important;
   align-items: center;
@@ -529,3 +532,35 @@ html {
 .lm_form .ant-form-item-control {
   width: 240px;
 }
+.lm_container_wrapper {
+  overflow: auto;
+}
+.lm_container_wrapper .lm_container.responsive {
+  min-width: 990px;
+}
+.lm_container_wrapper .lm_container.responsive .lm_form {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.lm_container_wrapper .lm_container.responsive .lm_form .ant-form-item {
+  margin-right: 24px;
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_3 .ant-form-item {
+  width: calc(33.3333% - 16px);
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_3 .ant-form-item:nth-of-type(3n) {
+  margin-right: 0;
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_4 .ant-form-item {
+  width: calc(25% - 18px);
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_4 .ant-form-item:nth-of-type(4n) {
+  margin-right: 0;
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item {
+  width: calc(20% - 96px / 5);
+}
+.lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item:nth-of-type(5n) {
+  margin-right: 0;
+}

package/lib/IconFont/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _icons = require("@ant-design/icons");
 
 var IconFont = (0, _icons.createFromIconfontCN)({
-  scriptUrl: '//at.alicdn.com/t/c/font_2966019_7jeb9gjjk63.js' // 在 iconfont.cn 上生成
+  scriptUrl: '//at.alicdn.com/t/c/font_2966019_sw56tprypkb.js' // 在 iconfont.cn 上生成
   // scriptUrl: require('./font/iconfont.js'),
 
 });

package/lib/LmEditTable/DragHandle.js

@@ -23,7 +23,7 @@ var Dragger = function Dragger(_ref) {
       isDragging = _useSortable.isDragging;
 
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, Object.assign({
-    type: "lmweb-icon-m-receipt"
+    type: "lmweb-icon-m-receipt1"
   }, listeners, {
     style: {
       touchAction: 'none'

package/lib/LmEditTable/EditTable.js

@@ -11,10 +11,6 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-require("antd/es/date-picker/style");
-
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -27,7 +23,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _icons = require("@ant-design/icons");
 
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 
 var _sortable = require("@dnd-kit/sortable");
 
@@ -230,7 +226,7 @@ var Opetate = function Opetate(_ref) {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-      type: "lmweb-plus-circle",
+      type: "lmweb-plus-circle-fill",
       style: {
         fontSize: 16
       }
@@ -283,8 +279,8 @@ var EditableCell = function EditableCell(props) {
       clearProps = __rest(restProps, ["onMouseEnter", "onMouseLeave"]);
 
   var _col$componentProps = col.componentProps,
-      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps;
-  var checkCellRef = (0, _react.useRef)(null); // const focusCapturedRef = useRef(false);
+      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps; // const checkCellRef = useRef(null)
+  // const focusCapturedRef = useRef(false);
   // const curValue = useMemo(() => {
   //   return record?.dataIndex
   // }, [record])
@@ -350,7 +346,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
           onBlur: handleFormItemChange,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps, {
           addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_form.default.Item, {
@@ -369,8 +365,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'number':
@@ -380,15 +375,13 @@ var EditableCell = function EditableCell(props) {
           style: {
             width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
           },
-          placeholder: "\u8BF7\u8F93\u5165",
-          ref: checkCellRef
+          placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps));
 
       case 'date':
         // @ts-ignore
-        return /*#__PURE__*/_react.default.createElement(_datePicker.default, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+        return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker, Object.assign({
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'select':
@@ -396,7 +389,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          ref: checkCellRef,
+          // ref={checkCellRef}
           filterOption: function filterOption(input, option) {
             var _a, _b;
 
@@ -412,7 +405,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          ref: checkCellRef,
+          // ref={checkCellRef}
           filterOption: function filterOption(input, option) {
             var _a;
 
@@ -424,20 +417,13 @@ var EditableCell = function EditableCell(props) {
 
       case 'checkbox':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'radio':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
-        }, componentProps), editEnum === null || editEnum === void 0 ? void 0 : editEnum.map(function (v) {
-          return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
-            key: v.value,
-            value: v.value
-          }, v.label);
-        }));
+          onChange: handleFormItemChange
+        }, componentProps));
 
       case 'switch':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
@@ -447,7 +433,7 @@ var EditableCell = function EditableCell(props) {
       case 'upload':
         return /*#__PURE__*/_react.default.createElement(UploadSingle, {
           editEnum: componentProps,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           onChange: handleFormItemChange
         });
 
@@ -456,7 +442,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength
@@ -473,8 +459,7 @@ var EditableCell = function EditableCell(props) {
       default:
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
-          onBlur: handleFormItemChange,
-          ref: checkCellRef
+          onBlur: handleFormItemChange
         }, componentProps));
     }
   };
@@ -516,7 +501,7 @@ var EditableCell = function EditableCell(props) {
         dataIndex = col.dataIndex;
 
     if (isEdit && editable && record[dataIndex] || isHoverEdit && editable && record[dataIndex]) {
-      form.setFieldsValue((0, _defineProperty2.default)({}, dataIndex, editable === 'date' ? (0, _dayjs.default)(record[dataIndex]) : record[dataIndex]));
+      form.setFieldsValue((0, _defineProperty2.default)({}, dataIndex, editable === 'date' ? (0, _moment.default)(record[dataIndex]) : record[dataIndex]));
     }
   }, [record]); // const isOpenEdit = (isEdit && focusCapturedRef.current) || (isHoverEdit && focusCapturedRef.current);
   // const classNames = cx({
@@ -604,7 +589,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var newIndex = cloneArr.findIndex(function (v) {
       return v[_rowKey] === over;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
+
+    if (onChange) {
+      onChange === null || onChange === void 0 ? void 0 : onChange((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
+    } else {
+      setDataSource((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
+    }
   }; // 删除
 
 
@@ -674,6 +664,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }
     });
     console.time('b');
+    console.log(res, 'rrrr');
 
     if (onChange) {
       onChange === null || onChange === void 0 ? void 0 : onChange(res);
@@ -910,13 +901,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   })), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     className: "lm_editTable_add_bar",
     type: "dashed",
-    block: true,
     onClick: handleAdd,
     style: {
       marginTop: 8
     }
   }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
-    className: "lm_editTable_add_icon"
+    className: "lmweb-plus"
   }), "\u65B0\u589E"));
 });
 

package/lib/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/extends"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/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/lib/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/lib/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/lib/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/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/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;