linkmore-design 1.0.60 → 1.0.64

package/lib/LmFilter/complexFilter/drawer.js

@@ -188,20 +188,32 @@ var ListItemChecked = function ListItemChecked(_ref) {
 
 
 var ListGroup = function ListGroup(_ref2) {
-  var instance = _ref2.instance;
+  var instance = _ref2.instance,
+      filterItemData = _ref2.filterItemData;
   var state = instance.state,
       dispatch = instance.dispatch,
       dataSource = instance.dataSource;
+  var inputRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)(function () {
     return dataSource;
   }),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       options = _useState2[0],
-      setOptions = _useState2[1];
+      setOptions = _useState2[1]; // 未过滤的筛选项
+
+
+  var getNotFilters = (0, _react.useCallback)(function () {
+    return dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (v) {
+      return !(filterItemData === null || filterItemData === void 0 ? void 0 : filterItemData.some(function (s) {
+        return s.field === v.field;
+      }));
+    });
+  }, [dataSource, filterItemData]);
 
   var handleSearch = function handleSearch(val) {
-    setOptions(dataSource.filter(function (v) {
+    var arr = getNotFilters();
+    setOptions(arr.filter(function (v) {
       var _v$title;
 
       return ((_v$title = v.title) === null || _v$title === void 0 ? void 0 : _v$title.indexOf(val)) > -1;
@@ -228,6 +240,12 @@ var ListGroup = function ListGroup(_ref2) {
     });
   };
 
+  (0, _react.useEffect)(function () {
+    var _inputRef$current, _inputRef$current$inp;
+
+    var val = ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : (_inputRef$current$inp = _inputRef$current.input) === null || _inputRef$current$inp === void 0 ? void 0 : _inputRef$current$inp.value) || '';
+    handleSearch(val);
+  }, [filterItemData]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "list_group"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -235,6 +253,7 @@ var ListGroup = function ListGroup(_ref2) {
   }, "\u9009\u62E9\u67E5\u8BE2\u9879"), /*#__PURE__*/_react.default.createElement("div", {
     className: "list_group_search"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
+    ref: inputRef,
     allowClear: true,
     size: "default",
     placeholder: "\u8BF7\u8F93\u5165",
@@ -267,9 +286,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]); // 过滤的内容转数组
@@ -286,24 +305,16 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
   var onClose = function onClose() {
     dispatch({
       type: 'changeComplexDrawer',
-      complexDrawer: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, state.complexDrawer), {}, {
+      complexDrawer: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, complexDrawer), {}, {
         visible: false
       })
     });
   };
 
   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'
     });
   }; // 初始化筛选
@@ -314,7 +325,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       dispatch({
         type: 'changeComplexDrawer',
         complexDrawer: {
-          data: complexFilter,
+          data: state.complexFilter,
           visible: complexDrawer.visible
         }
       });
@@ -332,7 +343,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',
@@ -341,10 +352,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
     extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onClose,
       size: "small"
-    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(SaveModal, {
-      state: state,
-      dispatch: dispatch
-    }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSearch,
       size: "small"
@@ -367,7 +375,8 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       item: item
     }));
   })), /*#__PURE__*/_react.default.createElement(ListGroup, {
-    instance: instance
+    instance: instance,
+    filterItemData: filterItemData
   })), /*#__PURE__*/_react.default.createElement(_valueDrawer.default, {
     instance: instance
   })));

package/lib/LmFilter/components/CheckboxFilter.js

@@ -171,7 +171,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
       }
     }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
       value: item.value,
-      className: "filter_item-content"
+      className: "filter_item_content"
     }, item.label));
   }), !options.length && /*#__PURE__*/_react.default.createElement(_EmptyFilter.default, null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"

package/lib/LmFilter/components/CustomSelectFilter.js

@@ -0,0 +1,139 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var _InputSearchClose = _interopRequireDefault(require("./InputSearchClose"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _hooks = require("../hooks");
+
+var _excluded = ["item"];
+
+// 自定义筛选使用
+var CustomSelect = function CustomSelect(_ref) {
+  var instance = _ref.instance;
+  var dispatch = instance.dispatch,
+      _instance$filters = instance.filters,
+      filters = _instance$filters === void 0 ? [] : _instance$filters,
+      _instance$filterValue = instance.filterValue,
+      filterValue = _instance$filterValue === void 0 ? '' : _instance$filterValue,
+      setFilterValue = instance.setFilterValue,
+      visible = instance.visible,
+      setVisible = instance.setVisible,
+      onEdit = instance.onEdit,
+      onAdd = instance.onAdd;
+  var delayedFn = (0, _hooks.useDelayedFn)();
+  var inputRef = (0, _react.useRef)(null); // 搜索后的筛选项
+
+  var _useState = (0, _react.useState)(filters),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1]; // 是否存在搜索, 当数据大于8时存在搜索
+
+
+  var isSearch = (0, _react.useMemo)(function () {
+    return filters.length > 8;
+  }, [filters.length]);
+
+  var handleFilter = function handleFilter() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var serachValues = filters.filter(function (v) {
+      return v.label.indexOf(val) > -1;
+    });
+    setOptions(serachValues);
+  }; // 单选事件
+
+
+  var onChange = function onChange(e, obj) {
+    e.preventDefault();
+    setFilterValue === null || setFilterValue === void 0 ? void 0 : setFilterValue(obj.value, obj);
+  };
+
+  var handleAdd = function handleAdd() {
+    onAdd();
+  };
+
+  var handleEdit = function handleEdit(e, obj) {
+    e.stopPropagation();
+    onEdit(obj);
+  }; // 展开下拉时触发: 赋值 && 聚焦 && 重置显示内容
+
+
+  (0, _react.useEffect)(function () {
+    if (visible) {
+      delayedFn(function () {
+        var _inputRef$current, _inputRef$current$foc;
+
+        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'
+        });
+      });
+    }
+  }, [visible]);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_dropdown"
+  }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_header"
+  }, /*#__PURE__*/_react.default.createElement(_InputSearchClose.default, {
+    ref: inputRef,
+    onSearch: handleFilter,
+    onChange: handleFilter
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_body"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.VirtualList, {
+    options: options,
+    className: "filter_list"
+  }, function (_ref2) {
+    var item = _ref2.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
+      className: (0, _classnames.default)('filter_item', {
+        checked: item.value === filterValue
+      }),
+      onClick: function onClick(e) {
+        return onChange(e, item);
+      }
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter_item_content"
+    }, item.label), /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter_item_operate"
+    }, item.value && /*#__PURE__*/_react.default.createElement("div", {
+      className: "icon_hover",
+      onClick: function onClick(e) {
+        return handleEdit(e, item);
+      }
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: "lmweb-edit"
+    })), item.default && /*#__PURE__*/_react.default.createElement("div", null, "\u9ED8\u8BA4")));
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item last_item",
+    onClick: function onClick(e) {
+      return handleAdd(e);
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item-content"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-plus"
+  }), "\u65B0\u589E\u81EA\u5B9A\u4E49\u67E5\u8BE2"))));
+};
+
+var _default = CustomSelect;
+exports.default = _default;

package/lib/LmFilter/components/DropdownFIlter.js

@@ -106,6 +106,7 @@ var getLabel = function getLabel(filterValue, item) {
       data = item.data; // 不存在筛选时
 
   if (!(0, _utils.getIsHas)(filterValue)) {
+    console.log('label', filterValue, item);
     return getPlacehodler(item);
   } // 存在筛选数据时 ⬇️
   // 级联数据转换平级结构

package/lib/LmFilter/components/EmptyFilter.js

@@ -9,13 +9,13 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icon_placeholder = _interopRequireDefault(require("../icon_placeholder.png"));
+var _empty = _interopRequireDefault(require("../assets/empty.png"));
 
 var EmptyFilter = function EmptyFilter() {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_empty"
   }, /*#__PURE__*/_react.default.createElement("img", {
-    src: _icon_placeholder.default,
+    src: _empty.default,
     alt: "empty",
     width: 81
   }), /*#__PURE__*/_react.default.createElement("div", {

package/lib/LmFilter/components/SelectFilter.js

@@ -13,6 +13,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -49,12 +51,19 @@ var SelectFilter = function SelectFilter(_ref) {
 
   var isSearch = (0, _react.useMemo)(function () {
     return filters.length > 8;
-  }, [filters.length]);
+  }, [filters.length]); // 自定义节点字段
+
+  var fieldNames = (0, _react.useMemo)(function () {
+    return (0, _objectSpread2.default)({
+      label: 'label',
+      value: 'value'
+    }, itemProps.fieldNames);
+  }, [itemProps.fieldNames]);
 
   var handleFilter = function handleFilter() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var serachValues = filters.filter(function (v) {
-      return v.label.indexOf(val) > -1;
+      return v[fieldNames.label].indexOf(val) > -1;
     });
     setOptions(serachValues);
   }; // 单选事件
@@ -62,7 +71,7 @@ var SelectFilter = function SelectFilter(_ref) {
 
   var onChange = function onChange(e, obj) {
     e.preventDefault();
-    setFilterValue === null || setFilterValue === void 0 ? void 0 : setFilterValue(obj.value);
+    setFilterValue === null || setFilterValue === void 0 ? void 0 : setFilterValue(obj[fieldNames.value], obj);
   }; // 展开下拉时触发: 赋值 && 聚焦 && 重置显示内容
 
 
@@ -97,14 +106,14 @@ var SelectFilter = function SelectFilter(_ref) {
         resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: (0, _classnames.default)('filter_item', {
-        checked: item.value === filterValue
+        checked: item[fieldNames.value] === filterValue
       }),
       onClick: function onClick(e) {
         return onChange(e, item);
       }
     }), /*#__PURE__*/_react.default.createElement("div", {
-      className: "filter_item-content"
-    }, item.label));
+      className: "filter_item_content"
+    }, item[fieldNames.label]));
   }), !options.length && /*#__PURE__*/_react.default.createElement(_EmptyFilter.default, null)));
 };
 

package/lib/LmFilter/components/index.js

@@ -60,7 +60,14 @@ var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
 
   var transformFilterValue = (0, _react.useMemo)(function () {
     return value || aliveValue;
-  }, [value, aliveValue]); // 单独使用时抛出选中的值
+  }, [value, aliveValue]);
+  var filterValue = (0, _react.useMemo)(function () {
+    if ((0, _utils.getIsHas)(getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem))) {
+      return getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem);
+    }
+
+    return (getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem)) || transformFilterValue;
+  }, [resetItem, transformFilterValue]); // 单独使用时抛出选中的值
 
   var handleChange = function handleChange(val) {
     setAliveValue === null || setAliveValue === void 0 ? void 0 : setAliveValue(val);
@@ -69,9 +76,9 @@ 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,
+    filterValue: filterValue,
     setFilterValue: function setFilterValue(val) {
-      return (_setFilterValue || handleChange)(val, resetItem.field);
+      return (_setFilterValue || handleChange)(val, resetItem);
     }
   });
   return /*#__PURE__*/_react.default.createElement(_DropdownFIlter.default, {