linkmore-design 1.1.22-beta.2 → 1.1.23

package/lib/LmFilter/complexFilter/drawer.js

@@ -1,80 +1,96 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _linkmoreDesign = require("linkmore-design");
+
 var _utils = require("../utils");
+
 var _valueDrawer = _interopRequireDefault(require("./valueDrawer"));
+
 var _excluded = ["item"],
-  _excluded2 = ["item"];
+    _excluded2 = ["item"];
+
 // 选中的筛选项
 var ListItemChecked = function ListItemChecked(_ref) {
   var instance = _ref.instance,
-    itemProps = _ref.item;
+      itemProps = _ref.item;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    dataSource = instance.dataSource;
+      dispatch = instance.dispatch,
+      dataSource = instance.dataSource;
   var complexDrawer = state.complexDrawer;
   var field = itemProps.field,
-    _itemProps$value = itemProps.value,
-    valueObj = _itemProps$value === void 0 ? {} : _itemProps$value;
+      _itemProps$value = itemProps.value,
+      valueObj = _itemProps$value === void 0 ? {} : _itemProps$value; // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
 
-  // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
   var getItem = (0, _react.useMemo)(function () {
     return dataSource.find(function (v) {
       return [field, valueObj.originField].includes(v.field);
     });
-  }, [field, valueObj.originField, dataSource]);
+  }, [field, valueObj.originField, dataSource]); // 选中值的处理
 
-  // 选中值的处理
   var resetValue = (0, _react.useMemo)(function () {
     return valueObj.value;
-  }, [valueObj.value]);
+  }, [valueObj.value]); // 选中的数据
 
-  // 选中的数据
   var checkedValues = (0, _react.useMemo)(function () {
     var checkedValue = valueObj.value;
+
     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') {
         return (0, _utils.getFlatItem)(getItem, checkedValue, 'parent');
       }
+
       return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
         return checkedValue.includes(v.value);
       });
     }
+
     if (['input', 'date'].includes(getItem.type)) {
       return resetValue ? [{
         value: resetValue,
         label: resetValue
       }] : [];
     }
+
     var filterValue = getItem.data.find(function (v) {
       return v.value === checkedValue;
     });
     return filterValue ? [filterValue] : [];
-  }, [getItem, valueObj.value]);
+  }, [getItem, valueObj.value]); // 编辑
 
-  // 编辑
   var handleEdit = function handleEdit() {
     dispatch({
       type: 'changeValueDrawer',
@@ -83,9 +99,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
         data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), valueObj)
       }
     });
-  };
+  }; // 删除
+
 
-  // 删除
   var handleDelete = function handleDelete(e) {
     e.stopPropagation();
     var filterValues = (0, _objectSpread3.default)({}, complexDrawer.data);
@@ -97,23 +113,27 @@ var ListItemChecked = function ListItemChecked(_ref) {
         data: filterValues
       }
     });
-  };
+  }; // 删除Tag
+
 
-  // 删除Tag
   var onTagClose = function onTagClose(val) {
     var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
     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
     })));
@@ -124,9 +144,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
         data: filterValues
       }
     });
-  };
+  }; // Tags显示
+
 
-  // Tags显示
   var tagElem = function tagElem() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Tag, {
       className: "add_tags"
@@ -141,9 +161,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
         }
       }, v.label);
     }));
-  };
+  }; // 模式
+
 
-  // 模式
   var modeLabel = (0, _react.useMemo)(function () {
     return valueObj.mode === 'and' ? '且' : '或';
   }, [valueObj.mode]);
@@ -161,24 +181,25 @@ var ListItemChecked = function ListItemChecked(_ref) {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "item_tags"
   }, tagElem())));
-};
+}; // 全部筛选项
+
 
-// 全部筛选项
 var ListGroup = function ListGroup(_ref2) {
   var instance = _ref2.instance,
-    filterItemData = _ref2.filterItemData;
+      filterItemData = _ref2.filterItemData;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    dataSource = instance.dataSource;
+      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];
+    return dataSource;
+  }),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      options = _useState2[0],
+      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) {
@@ -186,22 +207,24 @@ var ListGroup = function ListGroup(_ref2) {
       }));
     });
   }, [dataSource, filterItemData]);
+
   var handleSearch = function handleSearch(val) {
     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;
     }));
-  };
+  }; // 编辑
+
 
-  // 编辑
   var handleEdit = function handleEdit(_ref3) {
     var field = _ref3.field;
     // 单项匹配数据, 根据字段名查找
     var getItem = dataSource.find(function (v) {
       return v.field === field;
-    });
-    // 编辑
+    }); // 编辑
+
     dispatch({
       type: 'changeValueDrawer',
       valueDrawer: {
@@ -213,8 +236,10 @@ 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]);
@@ -235,7 +260,7 @@ var ListGroup = function ListGroup(_ref2) {
     className: "filter_drawer_group_list"
   }, function (_ref4) {
     var item = _ref4.item,
-      resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+        resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement("div", {
@@ -253,18 +278,18 @@ var ListGroup = function ListGroup(_ref2) {
     }))));
   })));
 };
+
 var ComplexDrawer = function ComplexDrawer(_ref5) {
   var instance = _ref5.instance;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    onQuery = instance.onQuery,
-    dataSource = instance.dataSource;
+      dispatch = instance.dispatch,
+      onQuery = instance.onQuery,
+      dataSource = instance.dataSource;
   var complexDrawer = state.complexDrawer;
   var isHas = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(complexDrawer.data);
-  }, [complexDrawer.data]);
+  }, [complexDrawer.data]); // 过滤的内容转数组
 
-  // 过滤的内容转数组
   var filterItemData = (0, _react.useMemo)(function () {
     return isHas ? Object.entries(complexDrawer.data).map(function (v) {
       return {
@@ -273,6 +298,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       };
     }) : [];
   }, [complexDrawer.data, isHas]);
+
   var onClose = function onClose() {
     dispatch({
       type: 'changeComplexDrawer',
@@ -281,15 +307,16 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       })
     });
   };
+
   var onSearch = function onSearch() {
     var complexFilter = complexDrawer.data;
     onQuery === null || onQuery === void 0 ? void 0 : onQuery({
       complexFilter: complexFilter,
       type: 'complex'
     });
-  };
+  }; // 初始化筛选
+
 
-  // 初始化筛选
   (0, _react.useEffect)(function () {
     if (complexDrawer.visible) {
       dispatch({
@@ -301,13 +328,14 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       });
     }
   }, [dispatch, complexDrawer.visible]);
+
   var Tit = function Tit() {
     return /*#__PURE__*/_react.default.createElement("div", {
       onClick: function onClick() {}
     }, "\u9AD8\u7EA7\u67E5\u8BE2");
-  };
+  }; // 弹窗配置项
+
 
-  // 弹窗配置项
   var config = {
     title: /*#__PURE__*/_react.default.createElement(Tit, null),
     visible: complexDrawer.visible,
@@ -334,7 +362,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
     className: "filter_drawer_group_list"
   }, function (_ref6) {
     var item = _ref6.item,
-      resetProps = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
+        resetProps = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItemChecked, {
@@ -348,5 +376,6 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
     instance: instance
   })));
 };
+
 var _default = ComplexDrawer;
 exports.default = _default;

package/lib/LmFilter/complexFilter/index.js

@@ -1,28 +1,38 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _linkmoreDesign = require("linkmore-design");
+
 var _drawer = _interopRequireDefault(require("./drawer"));
+
 var _utils = require("../utils");
+
 var LmFilterComplex = function LmFilterComplex(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    size = instance.size;
+      dispatch = instance.dispatch,
+      size = instance.size;
   var expand = (0, _react.useMemo)(function () {
     return state.complexDrawer.visible;
   }, [state.complexDrawer.visible]);
   var active = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(state.complexFilter);
   }, [state.complexFilter]);
+
   var handleClick = function handleClick() {
     dispatch({
       type: 'changeComplexDrawer',
@@ -31,6 +41,7 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
       })
     });
   };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter_complex"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -49,5 +60,6 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
     instance: instance
   }));
 };
+
 var _default = LmFilterComplex;
 exports.default = _default;

package/lib/LmFilter/complexFilter/valueDrawer.js

@@ -1,33 +1,49 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 require("antd/es/form/style");
+
 var _form = _interopRequireDefault(require("antd/es/form"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _linkmoreDesign = require("linkmore-design");
+
 var _utils = require("../utils");
+
 var _Controls = _interopRequireDefault(require("../Controls"));
+
 // 第二层抽屉，弹出数据选择
 var ValueDrawer = function ValueDrawer(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    dataSource = instance.dataSource;
+      dispatch = instance.dispatch,
+      dataSource = instance.dataSource;
   var valueDrawer = state.valueDrawer,
-    complexDrawer = state.complexDrawer;
+      complexDrawer = state.complexDrawer;
+
   var _Form$useForm = _form.default.useForm(),
-    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+      _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
   var onClose = function onClose() {
     dispatch({
       type: 'changeValueDrawer',
@@ -37,14 +53,16 @@ var ValueDrawer = function ValueDrawer(_ref) {
     });
     form.resetFields();
   };
-
   /*
    * customModal.data.type === 'nested' 时,处理不同(未增加)
    *
   */
+
+
   var onSave = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$form$validateF, field, mode, value, filterValues, currentItem, isNested, nField, nValue, _value$subValue;
+
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -52,6 +70,7 @@ var ValueDrawer = function ValueDrawer(_ref) {
               _context.prev = 0;
               _context.next = 3;
               return form.validateFields();
+
             case 3:
               _yield$form$validateF = _context.sent;
               field = _yield$form$validateF.field;
@@ -59,24 +78,29 @@ var ValueDrawer = function ValueDrawer(_ref) {
               value = _yield$form$validateF.value;
               // 选中的筛选数据
               filterValues = (0, _objectSpread2.default)({}, complexDrawer.data); // 查找当前筛选的值
+
               currentItem = valueDrawer.data; // 是否嵌套筛选
+
               isNested = currentItem.type === 'nested'; // 嵌套筛选的键值不同
+
               nField = valueDrawer.data.field;
               nValue = value;
+
               if (isNested) {
                 // 删除原有筛选
                 delete filterValues[currentItem.field];
                 currentItem.data.forEach(function (element) {
                   delete filterValues[element.value];
-                });
-                // 存在子级嵌套时,改变键值
+                }); // 存在子级嵌套时,改变键值
+
                 if (value === null || value === void 0 ? void 0 : (_value$subValue = value.subValue) === null || _value$subValue === void 0 ? void 0 : _value$subValue.children) {
                   nField = value.subValue.value;
                 }
+
                 nValue = (value === null || value === void 0 ? void 0 : value.value) || [];
-              }
+              } // 判断是新增还是编辑
+
 
-              // 判断是新增还是编辑
               Object.assign(filterValues, (0, _defineProperty2.default)({}, nField, {
                 mode: mode,
                 value: nValue,
@@ -91,9 +115,11 @@ var ValueDrawer = function ValueDrawer(_ref) {
               onClose();
               _context.next = 20;
               break;
+
             case 18:
               _context.prev = 18;
               _context.t0 = _context["catch"](0);
+
             case 20:
             case "end":
               return _context.stop();
@@ -101,26 +127,30 @@ var ValueDrawer = function ValueDrawer(_ref) {
         }
       }, _callee, null, [[0, 18]]);
     }));
+
     return function onSave() {
       return _ref2.apply(this, arguments);
     };
   }();
+
   var onValuesChange = function onValuesChange(values) {
     if (values.field) {
       form.setFieldsValue({
         value: []
       });
     }
+
     if (values.value) {
       var _values$value;
+
       // 嵌套筛选双击触发
       if ((values === null || values === void 0 ? void 0 : (_values$value = values.value) === null || _values$value === void 0 ? void 0 : _values$value.type) === 'dbclick') {
         onSave();
       }
     }
-  };
+  }; // 动态展示选择框
+
 
-  // 动态展示选择框
   var DynamicSelect = (0, _react.useCallback)(function (_ref3) {
     var getFieldValue = _ref3.getFieldValue;
     var field = getFieldValue('field');
@@ -128,6 +158,7 @@ var ValueDrawer = function ValueDrawer(_ref) {
       return v.field === field;
     })) || {};
     var options = (findItem === null || findItem === void 0 ? void 0 : findItem.data) || [];
+
     if (field) {
       return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
         name: "value",
@@ -138,6 +169,7 @@ var ValueDrawer = function ValueDrawer(_ref) {
         options: options
       }));
     }
+
     return false;
   }, [dataSource]);
   var config = {
@@ -157,9 +189,8 @@ var ValueDrawer = function ValueDrawer(_ref) {
       onClick: onSave,
       size: "small"
     }, "\u786E\u5B9A"))
-  };
+  }; // 初始化重置数据
 
-  // 初始化重置数据
   (0, _react.useEffect)(function () {
     if (valueDrawer.visible) {
       form.setFieldsValue(valueDrawer.data);
@@ -199,5 +230,6 @@ var ValueDrawer = function ValueDrawer(_ref) {
     }
   }, DynamicSelect))));
 };
+
 var _default = ValueDrawer;
 exports.default = _default;