linkmore-design 1.1.32 → 1.1.33

package/lib/LmFilter/components/index.js

@@ -1,72 +1,82 @@
 "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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _DropdownFIlter = _interopRequireDefault(require("./DropdownFIlter"));
+
 var _utils = require("../utils");
+
 var _excluded = ["instance", "item", "value", "onChange", "options"],
-  _excluded2 = ["getFilterValue", "setFilterValue"];
+    _excluded2 = ["getFilterValue", "setFilterValue"];
+
 // 下拉筛选组件
-/*
- * 筛选组件使用时只传入 instance, item
- * 其余参数皆为单独使用时传入
+
+/*
+ * 筛选组件使用时只传入 instance, item
+ * 其余参数皆为单独使用时传入
  */
 var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
   var _props$instance = props.instance,
-    instance = _props$instance === void 0 ? {} : _props$instance,
-    _props$item = props.item,
-    item = _props$item === void 0 ? {} : _props$item,
-    value = props.value,
-    onChange = props.onChange,
-    options = props.options,
-    resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+      instance = _props$instance === void 0 ? {} : _props$instance,
+      _props$item = props.item,
+      item = _props$item === void 0 ? {} : _props$item,
+      value = props.value,
+      onChange = props.onChange,
+      options = props.options,
+      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var getFilterValue = instance.getFilterValue,
-    _setFilterValue = instance.setFilterValue,
-    resetInstanceProps = (0, _objectWithoutProperties2.default)(instance, _excluded2);
+      _setFilterValue = instance.setFilterValue,
+      resetInstanceProps = (0, _objectWithoutProperties2.default)(instance, _excluded2); // 重组item值
 
-  // 重组item值
   var resetItem = (0, _react.useMemo)(function () {
     var data = item.data;
     return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), resetProps), {}, {
       data: data || options
     });
-  }, [item, resetProps, options]);
+  }, [item, resetProps, options]); // 单独使用时的缓存数据(非受控模式) 默认值: [] || ''
 
-  // 单独使用时的缓存数据(非受控模式) 默认值: [] || ''
   var _useState = (0, _react.useState)(function () {
-      return (0, _utils.getValueForType)(resetItem.type);
-    }),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    aliveValue = _useState2[0],
-    setAliveValue = _useState2[1];
+    return (0, _utils.getValueForType)(resetItem.type);
+  }),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      aliveValue = _useState2[0],
+      setAliveValue = _useState2[1]; // 单独使用 检查是否受控模式
+
 
-  // 单独使用 检查是否受控模式
   var transformFilterValue = (0, _react.useMemo)(function () {
     return value || aliveValue;
   }, [value, aliveValue]);
   var filterValue = (0, _react.useMemo)(function () {
     var val = getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem);
+
     if ((0, _utils.getIsHas)(val)) {
       return val;
     }
+
     return val || transformFilterValue;
-  }, [getFilterValue, resetItem, transformFilterValue]);
+  }, [getFilterValue, resetItem, transformFilterValue]); // 单独使用时抛出选中的值
 
-  // 单独使用时抛出选中的值
   var handleChange = function handleChange(val) {
     setAliveValue === null || setAliveValue === void 0 ? void 0 : setAliveValue(val);
     onChange === null || onChange === void 0 ? void 0 : onChange(val);
-  };
+  }; // 重组instance
+
 
-  // 重组instance
   var resetInstance = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetInstanceProps), {}, {
     filterValue: filterValue,
     setFilterValue: function setFilterValue(val) {
@@ -78,5 +88,6 @@ var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
     item: resetItem
   });
 });
+
 var _default = FilterControl;
 exports.default = _default;

package/lib/LmFilter/customFilter/drawer.js

@@ -1,84 +1,105 @@
 "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 _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 require("antd/es/form/style");
+
 var _form = _interopRequireDefault(require("antd/es/form"));
+
 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 _SelectFilter = _interopRequireDefault(require("../components/SelectFilter"));
+
 var _valueDrawer = _interopRequireDefault(require("./valueDrawer"));
+
 var _excluded = ["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',
@@ -87,9 +108,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);
@@ -101,23 +122,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
     })));
@@ -128,9 +153,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"
@@ -145,9 +170,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
         }
       }, v.label);
     }));
-  };
+  }; // 模式
+
 
-  // 模式
   var modeLabel = (0, _react.useMemo)(function () {
     return valueObj.mode === 'and' ? '且' : '或';
   }, [valueObj.mode]);
@@ -165,17 +190,19 @@ var ListItemChecked = function ListItemChecked(_ref) {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "item_tags"
   }, tagElem())));
-};
+}; // 新增筛选项按钮
+
 
-// 新增筛选项按钮
 var DropdownBtn = function DropdownBtn(_ref2) {
   var instance = _ref2.instance;
   var dispatch = instance.dispatch,
-    dataSource = instance.dataSource;
+      dataSource = instance.dataSource;
+
   var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
   var selectInstance = {
     filterValue: '',
     setFilterValue: function setFilterValue(_, valObj) {
@@ -220,16 +247,18 @@ var DropdownBtn = function DropdownBtn(_ref2) {
     size: "middle"
   }, "\u65B0\u589E\u7B5B\u9009\u9879"));
 };
+
 var Index = function Index(_ref3) {
   var instance = _ref3.instance;
   var state = instance.state,
-    dispatch = instance.dispatch;
+      dispatch = instance.dispatch;
   var customDrawer = state.customDrawer;
+
   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 filterItemData = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(customDrawer.data) ? Object.entries(customDrawer.data).map(function (v) {
       return {
@@ -237,9 +266,8 @@ var Index = function Index(_ref3) {
         value: v[1]
       };
     }) : [];
-  }, [customDrawer.data]);
+  }, [customDrawer.data]); // 关闭抽屉
 
-  // 关闭抽屉
   var onClose = function onClose() {
     dispatch({
       type: 'changeCustomDrawer',
@@ -247,27 +275,30 @@ var Index = function Index(_ref3) {
         visible: false
       })
     });
-  };
+  }; // 保存数据
+
 
-  // 保存数据
   var onSave = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var val, nValue;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
               _context.next = 3;
               return form.validateFields();
+
             case 3:
               val = _context.sent;
               nValue = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, customDrawer), val);
+
               if (!nValue.value) {
                 Object.assign(nValue, {
                   value: "diy".concat(Date.now())
                 });
               }
+
               dispatch({
                 type: 'changeSaveModal',
                 saveModal: {
@@ -277,9 +308,11 @@ var Index = function Index(_ref3) {
               });
               _context.next = 11;
               break;
+
             case 9:
               _context.prev = 9;
               _context.t0 = _context["catch"](0);
+
             case 11:
             case "end":
               return _context.stop();
@@ -287,12 +320,13 @@ var Index = function Index(_ref3) {
         }
       }, _callee, null, [[0, 9]]);
     }));
+
     return function onSave() {
       return _ref4.apply(this, arguments);
     };
-  }();
+  }(); // 弹窗配置项
+
 
-  // 弹窗配置项
   var config = {
     title: customDrawer.type === 'edit' ? "\u7F16\u8F91".concat(customDrawer.label) : '创建自定义查询',
     visible: customDrawer.visible,
@@ -359,7 +393,7 @@ var Index = function Index(_ref3) {
     className: "filter_drawer_group_list"
   }, function (_ref5) {
     var item = _ref5.item,
-      resetProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
+        resetProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItemChecked, {
@@ -370,5 +404,6 @@ var Index = function Index(_ref3) {
     instance: instance
   })));
 };
+
 var _default = Index;
 exports.default = _default;

package/lib/LmFilter/customFilter/index.js

@@ -1,40 +1,51 @@
 "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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _linkmoreDesign = require("linkmore-design");
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _CustomSelectFilter = _interopRequireDefault(require("../components/CustomSelectFilter"));
+
 var _drawer = _interopRequireDefault(require("./drawer"));
+
 var _saveModal = _interopRequireDefault(require("./saveModal"));
+
 var CustomDiy = function CustomDiy(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    size = instance.size,
-    customOptions = instance.customOptions,
-    setCustomFilter = instance.setCustomFilter;
+      dispatch = instance.dispatch,
+      size = instance.size,
+      customOptions = instance.customOptions,
+      setCustomFilter = instance.setCustomFilter;
   var customFilter = state.customFilter;
+
   var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1]; // 下拉数据
+
 
-  // 下拉数据
   var filterOptions = customOptions || [{
     label: '不限',
     value: '',
     default: true
-  }];
+  }]; // 默认展示
 
-  // 默认展示
   var defaultValue = (0, _react.useMemo)(function () {
     return filterOptions.find(function (v) {
       return v.value === (customFilter === null || customFilter === void 0 ? void 0 : customFilter.value);
@@ -104,10 +115,11 @@ var CustomDiy = function CustomDiy(_ref) {
     instance: instance
   }));
 };
+
 var LmFilterCustom = function LmFilterCustom(_ref2) {
   var instance = _ref2.instance;
   var customRender = instance.customRender,
-    enableCustom = instance.enableCustom;
+      enableCustom = instance.enableCustom;
   if (!customRender && !enableCustom) return null;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter_custom"
@@ -119,5 +131,6 @@ var LmFilterCustom = function LmFilterCustom(_ref2) {
     className: "lm_filter_custom_line"
   }));
 };
+
 var _default = LmFilterCustom;
 exports.default = _default;

package/lib/LmFilter/customFilter/saveModal.js

@@ -1,27 +1,39 @@
 "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 _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _linkmoreDesign = require("linkmore-design");
+
 var Save = function Save(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-    dispatch = instance.dispatch,
-    customOptions = instance.customOptions;
+      dispatch = instance.dispatch,
+      customOptions = instance.customOptions;
   var saveModal = state.saveModal;
+
   var _Form$useForm = _linkmoreDesign.Form.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: 'changeSaveModal',
@@ -30,14 +42,14 @@ var Save = function Save(_ref) {
       })
     });
     form.resetFields();
-  };
+  }; // 下拉选择数据处理
+
 
-  // 下拉选择数据处理
   var resetOptions = function resetOptions(item) {
     var isHas = customOptions.some(function (v) {
       return v.value === item.value;
-    });
-    // 新增数据
+    }); // 新增数据
+
     if (!isHas) {
       var nArr = item.default ? customOptions.map(function (v) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, v), {}, {
@@ -45,41 +57,48 @@ var Save = function Save(_ref) {
         });
       }) : customOptions;
       return [].concat((0, _toConsumableArray2.default)(nArr), [item]);
-    }
-    // 设为默认
+    } // 设为默认
+
+
     if (item.default) {
       return customOptions.map(function (v) {
         return v.value === item.value ? item : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, v), {}, {
           default: false
         });
       });
-    }
-    // 修改数据
+    } // 修改数据
+
+
     return customOptions.map(function (v) {
       return v.value === item.value ? item : v;
     });
   };
+
   var onSave = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var _instance$onSave, val, nValue;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+
+      return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
               _context.next = 3;
               return form.validateFields();
+
             case 3:
               val = _context.sent;
               nValue = (0, _objectSpread2.default)({
                 data: state.customDrawer.data,
                 value: state.customDrawer.value
               }, val);
+
               if (!nValue.value) {
                 Object.assign(nValue, {
                   value: "diy".concat(Date.now())
                 });
               }
+
               onClose();
               dispatch({
                 type: 'changeCustomDrawer',
@@ -90,9 +109,11 @@ var Save = function Save(_ref) {
               (_instance$onSave = instance.onSave) === null || _instance$onSave === void 0 ? void 0 : _instance$onSave.call(instance, resetOptions(nValue));
               _context.next = 13;
               break;
+
             case 11:
               _context.prev = 11;
               _context.t0 = _context["catch"](0);
+
             case 13:
             case "end":
               return _context.stop();
@@ -100,10 +121,12 @@ var Save = function Save(_ref) {
         }
       }, _callee, null, [[0, 11]]);
     }));
+
     return function onSave() {
       return _ref2.apply(this, arguments);
     };
   }();
+
   var modalProps = {
     title: '保存查询',
     size: 'small',
@@ -157,5 +180,6 @@ var Save = function Save(_ref) {
     value: false
   }, "\u5426"))))))));
 };
+
 var _default = Save;
 exports.default = _default;