@lemon-fe/components 0.1.7 → 0.1.8

package/es/DurationPicker/index.js

@@ -136,11 +136,6 @@ export default function DurationPicker(props) {
       value = _useState2[0],
       setValue = _useState2[1];
 
-  useEffect(function () {
-    if (value !== defaultValue && value !== valueProp && onChange) {
-      onChange(value);
-    }
-  }, [value]);
   useEffect(function () {
     if (valueProp !== undefined) {
       setValue(valueProp);
@@ -164,40 +159,48 @@ export default function DurationPicker(props) {
   }, [value]);
 
   var handleChangeType = function handleChangeType(item) {
-    setValue(function (prev) {
-      if (item.value === prev.type) {
-        return prev;
-      }
-
-      return _objectSpread(_objectSpread({}, prev), {}, {
+    if (value.type !== item.value) {
+      var newValue = _objectSpread(_objectSpread({}, value), {}, {
         type: item.value
       });
-    });
-  };
 
-  var handleChangeOption = function handleChangeOption(item) {
-    setValue(function (prev) {
-      if (item.label === prev.option) {
-        return prev;
+      setValue(newValue);
+
+      if (onChange) {
+        onChange(newValue);
       }
+    }
+  };
 
-      return _objectSpread(_objectSpread({}, prev), {}, {
-        option: item.label,
+  var handleChangeOption = function handleChangeOption(item) {
+    if (value.option !== item.label) {
+      var newValue = _objectSpread(_objectSpread({}, value), {}, {
         dates: item.value !== null ? item.value().map(function (date) {
           return date.format(dateFormat);
-        }) : undefined
+        }) : undefined,
+        option: item.label
       });
-    });
+
+      setValue(newValue);
+
+      if (onChange) {
+        onChange(newValue);
+      }
+    }
   };
 
   var handleChangeDates = function handleChangeDates(dates) {
-    setValue(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, {
-        dates: dates ? dates.map(function (item) {
-          return item.format(dateFormat);
-        }) : undefined
-      });
+    var newValue = _objectSpread(_objectSpread({}, value), {}, {
+      dates: dates ? dates.map(function (item) {
+        return item.format(dateFormat);
+      }) : undefined
     });
+
+    setValue(newValue);
+
+    if (onChange) {
+      onChange(newValue);
+    }
   };
 
   return /*#__PURE__*/React.createElement("div", {

package/es/DurationPicker/index.less

@@ -23,7 +23,7 @@
   }
 
   &-type.ant-dropdown-trigger {
-    flex: 0 0 124px;
+    flex: 0 0 auto;
     margin-right: 8px;
     border: 1px solid @select-border-color;
     border-radius: @border-radius-base;

package/es/Filter/index.d.ts

@@ -2,5 +2,6 @@ import type { ComponentOption, FilterProps } from './typings';
 declare function Filter<T extends Record<string, any> = Record<string, any>>(props: FilterProps<T>): JSX.Element;
 declare namespace Filter {
     var setComponents: (items: ComponentOption[]) => void;
+    var setStorage: <T>(getData: (storageKey: string) => T | Promise<T>, setData: <T_1>(storageKey: string, data: T_1) => void | Promise<void>) => void;
 }
 export default Filter;

package/es/Filter/index.js

@@ -67,6 +67,21 @@ var components = [{
     }, item.extraProps));
   }
 }];
+
+var getStorageData = function getData(storageKey) {
+  var data = localStorage.getItem("filter-storage-".concat(storageKey));
+
+  if (data) {
+    return JSON.parse(data);
+  }
+
+  return null;
+};
+
+var setStorageData = function setData(storageKey, data) {
+  localStorage.setItem("filter-storage-".concat(storageKey), JSON.stringify(data));
+};
+
 var DEFAULT_TAB_TITLE = '默认';
 
 function setComponents(items) {
@@ -79,6 +94,11 @@ function setComponents(items) {
   components = _toConsumableArray(compMap.values());
 }
 
+function setStorage(getData, setData) {
+  getStorageData = getData;
+  setStorageData = setData;
+}
+
 function Filter(props) {
   var data = props.data,
       defaultValueProp = props.defaultValue,
@@ -144,7 +164,7 @@ function Filter(props) {
       form = _Form$useForm4[0];
 
   var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var tabsJson;
+    var tabsData;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -157,17 +177,12 @@ function Filter(props) {
             return _context.abrupt("return", null);
 
           case 2:
-            tabsJson = localStorage.getItem("filter-storage-".concat(storageKey));
+            _context.next = 4;
+            return getStorageData(storageKey);
 
-            if (!tabsJson) {
-              _context.next = 5;
-              break;
-            }
-
-            return _context.abrupt("return", JSON.parse(tabsJson));
-
-          case 5:
-            return _context.abrupt("return", null);
+          case 4:
+            tabsData = _context.sent;
+            return _context.abrupt("return", tabsData);
 
           case 6:
           case "end":
@@ -227,6 +242,10 @@ function Filter(props) {
       next.push(tab);
     }
 
+    if (!!storageKey) {
+      setStorageData(storageKey, next.slice(1));
+    }
+
     setTabs(next);
     setActive(index);
     setShowModal(false);
@@ -306,6 +325,12 @@ function Filter(props) {
           return next;
         });
         setActive(active - 1);
+
+        if (!!storageKey) {
+          setStorageData(storageKey, tabs.filter(function (item) {
+            return item.title !== tabs[active].title && item.title !== '默认';
+          }));
+        }
       }
     });
   };
@@ -525,4 +550,5 @@ function Filter(props) {
 }
 
 Filter.setComponents = setComponents;
+Filter.setStorage = setStorage;
 export default Filter;

package/es/Filter/index.less

@@ -74,6 +74,7 @@
 
   &-item {
     margin-top: 16px;
+    overflow: hidden;
 
     .ant-checkbox-wrapper {
       color: #888;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "84f94d37e2938930fa2c32d2da6573dfc517b458"
+  "gitHead": "4ccc4baa581c66b4820373dffec12433c3ae7712"
 }