linkmore-design 1.0.3 → 1.0.6

package/lib/CkFilter/context.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -29,7 +29,7 @@ var initialState = {
     searchKey: 'search',
     levelGroupKey: 'levGroup',
     filter: true,
-    complex: true
+    complex: false
   },
   // 初始化数据
   visibleFields: [],
@@ -44,6 +44,8 @@ var initialState = {
   // 一级筛选过滤的内容
   complexFilterValues: {},
   // 高级筛选过滤的内容
+  nestedFilterValues: {},
+  // 嵌套结构的过滤内容 {objType: {field: 'supplier', value: 's1', label: '一号供应商'}, ...}
   customDrawer: {
     visible: false,
     data: {}
@@ -72,7 +74,8 @@ var reducer = function reducer(state, action) {
       customModal = action.customModal,
       complexDrawer = action.complexDrawer,
       customFilterValues = action.customFilterValues,
-      complexFilterValues = action.complexFilterValues;
+      complexFilterValues = action.complexFilterValues,
+      nestedFilterValues = action.nestedFilterValues;
 
   switch (action.type) {
     // 仅在初始化时触发
@@ -131,6 +134,12 @@ var reducer = function reducer(state, action) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         complexFilterValues: complexFilterValues
       });
+    // 设置嵌套结构的内容
+
+    case 'changeNestedFilterValues':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        nestedFilterValues: nestedFilterValues
+      });
 
     default:
       throw new Error();

package/lib/CkFilter/customFilter/drawer.js

@@ -1,40 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/drawer/style");
-
-var _drawer = _interopRequireDefault(require("antd/es/drawer"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-require("antd/es/radio/style");
-
-var _radio = _interopRequireDefault(require("antd/es/radio"));
-
-require("antd/es/input/style");
-
-var _input = _interopRequireDefault(require("antd/es/input"));
-
-require("antd/es/space/style");
-
-var _space = _interopRequireDefault(require("antd/es/space"));
-
-require("antd/es/button/style");
-
-var _button = _interopRequireDefault(require("antd/es/button"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 require("antd/es/form/style");
@@ -51,6 +31,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../../IconFont"));
@@ -72,8 +54,7 @@ var ListItem = function ListItem(props) {
       fullData = _state$instance$fullD === void 0 ? [] : _state$instance$fullD,
       customDrawer = state.customDrawer;
   var field = props.field,
-      value = props.value; // const [useCheckValue, setCheckValue] = useState(value); // 选中的数据
-  // 单项匹配数据, 根据字段名查找
+      value = props.value; // 单项匹配数据, 根据字段名查找
 
   var getItem = (0, _react.useMemo)(function () {
     return fullData.find(function (v) {
@@ -288,10 +269,10 @@ var Index = function Index() {
     placement: 'right',
     destroyOnClose: true,
     className: 'filter_drawer',
-    extra: /*#__PURE__*/_react.default.createElement(_space.default, null, /*#__PURE__*/_react.default.createElement(_button.default, {
+    extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onClose,
       size: "small"
-    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSave,
       size: "small"
@@ -302,7 +283,7 @@ var Index = function Index() {
       form.resetFields();
     }
   }, [customDrawer.visible, form]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_drawer.default, config, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_filter_body"
   }, /*#__PURE__*/_react.default.createElement(_form.default, {
     form: form,
@@ -321,7 +302,7 @@ var Index = function Index() {
       required: true,
       message: '请输入名称'
     }]
-  }, /*#__PURE__*/_react.default.createElement(_input.default, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, {
     placeholder: "\u8BF7\u8F93\u5165",
     size: "middle"
   }))), /*#__PURE__*/_react.default.createElement("div", {
@@ -329,18 +310,18 @@ var Index = function Index() {
   }, /*#__PURE__*/_react.default.createElement(_form.default.Item, {
     name: "default",
     label: "\u8BBE\u4E3A\u9ED8\u8BA4"
-  }, /*#__PURE__*/_react.default.createElement(_radio.default.Group, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
     onChange: onRadioChange,
     size: "small"
-  }, /*#__PURE__*/_react.default.createElement(_radio.default, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
     value: true
-  }, "\u662F"), /*#__PURE__*/_react.default.createElement(_radio.default, {
+  }, "\u662F"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
     value: false
   }, "\u5426"))))), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_drawer_group"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_drawer_group_add"
-  }, /*#__PURE__*/_react.default.createElement(_button.default, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "dashed",
     block: true,
     onClick: addEvent,

package/lib/CkFilter/customFilter/index.js

@@ -1,27 +1,23 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/dropdown/style");
-
-var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _linkmoreDesign = require("linkmore-design");
 
-var _IconFont = _interopRequireDefault(require("../../IconFont"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
 var _filterTypes = _interopRequireDefault(require("../components/filterTypes"));
 
@@ -101,7 +97,7 @@ var Custom = function Custom() {
       }, obj));
     });
   }, [checkValue, setFilterValue, state.instance.custom]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
     trigger: ['click'],
     visible: visible,
     placement: "bottomLeft",
@@ -121,7 +117,7 @@ var Custom = function Custom() {
     })
   }, filterItem.label)), /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_icon"
-  }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-down"
   })))), /*#__PURE__*/_react.default.createElement(_drawer.default, null));
 };

package/lib/CkFilter/customFilter/radioGroup.js

@@ -1,20 +1,18 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/radio/style");
-
-var _radio = _interopRequireDefault(require("antd/es/radio"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _context = require("../context");
@@ -49,12 +47,12 @@ var CustomGroup = function CustomGroup() {
     (_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, state.filterValues, nValue);
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_radio.default.Group, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
     defaultValue: defaultValue,
     onChange: onChange,
     size: "small"
   }, levelGroup.map(function (v) {
-    return /*#__PURE__*/_react.default.createElement(_radio.default.Button, {
+    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Button, {
       key: v.value,
       value: v.value
     }, v.label);

package/lib/CkFilter/filter.js

@@ -1,37 +1,41 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _context = require("./context");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _customFilter = _interopRequireDefault(require("./customFilter"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _baseFilter = _interopRequireDefault(require("./baseFilter"));
 
 var _complexFilter = _interopRequireDefault(require("./complexFilter"));
 
-var _utils = require("./utils");
+var _modal = _interopRequireDefault(require("./components/modal"));
+
+var _context = require("./context");
+
+var _customFilter = _interopRequireDefault(require("./customFilter"));
 
 var _radioGroup = _interopRequireDefault(require("./customFilter/radioGroup"));
 
-var _modal = _interopRequireDefault(require("./components/modal"));
+var _utils = require("./utils");
 
 /*
  * data
  *
  */
-var Filter = function Filter(props) {
+var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useContent = (0, _context.useContent)(),
       _useContent2 = (0, _slicedToArray2.default)(_useContent, 2),
       state = _useContent2[0],
@@ -40,15 +44,9 @@ var Filter = function Filter(props) {
   var _state$instance = state.instance,
       custom = _state$instance.custom,
       levelGroup = _state$instance.levelGroup,
-      complex = _state$instance.complex;
-  (0, _react.useEffect)(function () {
-    dispatch({
-      type: 'initOptions',
-      instance: props
-    });
-  }, []); // 初始化过滤的值
+      complex = _state$instance.complex; // 初始化
 
-  (0, _react.useEffect)(function () {
+  var setOptions = (0, _react.useCallback)(function () {
     var trigger = props.trigger,
         onChange = props.onChange,
         data = props.data,
@@ -92,13 +90,54 @@ var Filter = function Filter(props) {
     }); // 是否立即触发
 
     trigger === 'init' && (onChange === null || onChange === void 0 ? void 0 : onChange(filterValues, customFilterValues()));
+  }, [dispatch, props]); // 初始化过滤的值
+
+  (0, _react.useEffect)(function () {
+    setOptions();
   }, []);
   (0, _react.useEffect)(function () {
     dispatch({
       type: 'initInstance',
       instance: props
     });
-  }, [props]);
+  }, [props]); // 外部控制
+
+  var setFilter = function setFilter(_ref) {
+    var _state$instance$onCha, _state$instance2;
+
+    var field = _ref.field,
+        value = _ref.value,
+        label = _ref.label,
+        relation = _ref.relation;
+    var nValue = (0, _objectSpread2.default)({}, state.filterValues);
+    delete nValue[relation];
+    state.instance.data.find(function (v) {
+      return v.field === relation;
+    }).data.forEach(function (element) {
+      delete nValue[element.value];
+    });
+    (0, _utils.getIsHas)(value) ? nValue[field] = value : delete nValue[field];
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: nValue
+    });
+    label && dispatch({
+      type: 'changeNestedFilterValues',
+      nestedFilterValues: (0, _defineProperty2.default)({}, relation, {
+        value: value,
+        label: label,
+        field: field
+      })
+    });
+    (_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
+  };
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      setOptions: setOptions,
+      setFilter: setFilter
+    };
+  });
   return /*#__PURE__*/_react.default.createElement(_context.Context.Provider, {
     value: {
       state: state,
@@ -109,7 +148,6 @@ var Filter = function Filter(props) {
   }, custom && /*#__PURE__*/_react.default.createElement(_customFilter.default, null), levelGroup && /*#__PURE__*/_react.default.createElement(_radioGroup.default, null), (custom || levelGroup) && /*#__PURE__*/_react.default.createElement("div", {
     className: "line"
   }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
-};
-
+});
 var _default = Filter;
 exports.default = _default;

package/lib/CkFilter/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true