iglooform 2.5.6 → 2.5.7

package/es/filter/checkBox.d.ts

@@ -1,11 +1,12 @@
-declare const CratetCheckBoxFilter: (props: {
+declare const CreateCheckBoxFilter: (props: {
     title: any;
     configList: any[];
     optionKey: string;
     allSelected: any[];
-    valueConfirm: any;
+    handleOptionsChange: any;
     chooseed?: string[];
     onChange?: any;
     disabled?: any[];
+    setConfirmValue?: any;
 }) => JSX.Element;
-export default CratetCheckBoxFilter;
+export default CreateCheckBoxFilter;

package/es/filter/checkBox.js

@@ -7,6 +7,12 @@ import _Row from "antd/es/row";
 import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -37,7 +43,7 @@ function handleFilterDisable() {
   });
 }
 
-var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
+var CreateCheckBoxFilter = function CreateCheckBoxFilter(props) {
   var _useContext = useContext(LocaleContext),
       formatMessage = _useContext.formatMessage;
 
@@ -51,8 +57,10 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       chooseed = _props$chooseed === void 0 ? [] : _props$chooseed,
       disabled = props.disabled,
       _onChange = props.onChange,
-      _props$valueConfirm = props.valueConfirm,
-      valueConfirm = _props$valueConfirm === void 0 ? function () {} : _props$valueConfirm;
+      _props$setConfirmValu = props.setConfirmValue,
+      setConfirmValue = _props$setConfirmValu === void 0 ? function () {} : _props$setConfirmValu,
+      _props$handleOptionsC = props.handleOptionsChange,
+      handleOptionsChange = _props$handleOptionsC === void 0 ? function () {} : _props$handleOptionsC;
   var timeKey = new Date();
 
   var _useState = useState(false),
@@ -69,6 +77,22 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       setAllChoose(false);
     }
   }, [chooseed.length, allSelected]);
+  useEffect(function () {
+    var filterDisabled = chooseed.filter(function (e) {
+      return !(disabled === null || disabled === void 0 ? void 0 : disabled.includes(e));
+    });
+
+    if (filterDisabled.length !== chooseed.length) {
+      handleOptionsChange({
+        type: optionKey,
+        value: filterDisabled
+      });
+      setConfirmValue(function (old) {
+        return _objectSpread(_objectSpread({}, old), {}, _defineProperty({}, optionKey, filterDisabled));
+      });
+      typeof _onChange === 'function' && _onChange(filterDisabled);
+    }
+  }, [disabled]);
   return _jsxs("div", {
     className: "igloo-form-filter-drop-down-container-content-group",
     children: [_jsxs("div", {
@@ -80,7 +104,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
         className: "igloo-form-filter-drop-down-container-content-group-title-action",
         onClick: function onClick() {
           typeof _onChange === 'function' && _onChange([]);
-          valueConfirm({
+          handleOptionsChange({
             type: optionKey,
             value: []
           });
@@ -96,7 +120,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
         className: "igloo-form-filter-drop-down-container-content-group-title-action",
         onClick: function onClick() {
           typeof _onChange === 'function' && _onChange(nowValidList);
-          valueConfirm({
+          handleOptionsChange({
             type: optionKey,
             value: nowValidList
           });
@@ -116,7 +140,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       },
       onChange: function onChange(e) {
         typeof _onChange === 'function' && _onChange(e);
-        valueConfirm({
+        handleOptionsChange({
           type: optionKey,
           value: e
         });
@@ -145,4 +169,4 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
   }, optionKey);
 };
 
-export default CratetCheckBoxFilter;
+export default CreateCheckBoxFilter;

package/es/filter/index.js

@@ -687,7 +687,8 @@ var FilterComponent = function FilterComponent(props) {
                 allSelected: optionsAllSelected[key],
                 chooseed: optionsChanged[key],
                 disabled: disabled,
-                valueConfirm: dispatchOptionsChange,
+                handleOptionsChange: dispatchOptionsChange,
+                setConfirmValue: setConfimed,
                 onChange: onChangeProps
               }, key);
 
@@ -699,7 +700,8 @@ var FilterComponent = function FilterComponent(props) {
                 optionKey: key,
                 chooseed: optionsChanged[key],
                 disabled: disabled,
-                valueConfirm: dispatchOptionsChange,
+                handleOptionsChange: dispatchOptionsChange,
+                setConfirmValue: setConfimed,
                 onChange: onChangeProps
               }, key);
           }

package/es/filter/radioBox.d.ts

@@ -2,7 +2,8 @@ declare type IRadioBoxProps = {
     title: any;
     configList: any[];
     optionKey: string;
-    valueConfirm: any;
+    handleOptionsChange: any;
+    setConfirmValue: any;
     chooseed?: string[];
     disabled?: any[];
     onChange?: any;

package/es/filter/radioBox.js

@@ -6,17 +6,38 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/radio/style";
 import _Radio from "antd/es/radio";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Typography from '../typography';
+import { useEffect } from 'react';
 
 var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
   var optionKey = props.optionKey,
       title = props.title,
       configList = props.configList,
       disabled = props.disabled,
-      valueConfirm = props.valueConfirm,
+      handleOptionsChange = props.handleOptionsChange,
+      setConfirmValue = props.setConfirmValue,
       chooseed = props.chooseed,
       _onChange = props.onChange;
+  useEffect(function () {
+    if (disabled === null || disabled === void 0 ? void 0 : disabled.includes(chooseed)) {
+      typeof _onChange === 'function' && _onChange(undefined);
+      handleOptionsChange({
+        type: optionKey,
+        value: undefined
+      });
+      setConfirmValue(function (old) {
+        return _objectSpread(_objectSpread({}, old), {}, _defineProperty({}, optionKey, undefined));
+      });
+    }
+  }, [disabled]);
   return _jsxs("div", {
     className: "igloo-form-filter-drop-down-container-content-group",
     children: [_jsx("div", {
@@ -26,10 +47,10 @@ var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
         children: title
       })
     }), _jsx(_Radio.Group, {
-      value: chooseed,
+      value: (disabled === null || disabled === void 0 ? void 0 : disabled.includes(chooseed)) ? undefined : chooseed,
       onChange: function onChange(e) {
         typeof _onChange === 'function' && _onChange(e.target.value);
-        valueConfirm({
+        handleOptionsChange({
           type: optionKey,
           value: e.target.value
         });

package/es/select/style/index.less

@@ -237,6 +237,7 @@
     position: absolute;
     top: 0;
     right: 0;
+    margin-inline-end: 0;
   }
 
   .igloo-select-arrow-active {

package/lib/filter/checkBox.d.ts

@@ -1,11 +1,12 @@
-declare const CratetCheckBoxFilter: (props: {
+declare const CreateCheckBoxFilter: (props: {
     title: any;
     configList: any[];
     optionKey: string;
     allSelected: any[];
-    valueConfirm: any;
+    handleOptionsChange: any;
     chooseed?: string[];
     onChange?: any;
     disabled?: any[];
+    setConfirmValue?: any;
 }) => JSX.Element;
-export default CratetCheckBoxFilter;
+export default CreateCheckBoxFilter;

package/lib/filter/checkBox.js

@@ -31,6 +31,12 @@ var _typography = _interopRequireDefault(require("../typography"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -56,7 +62,7 @@ function handleFilterDisable() {
   });
 }
 
-var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
+var CreateCheckBoxFilter = function CreateCheckBoxFilter(props) {
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext.formatMessage;
 
@@ -70,8 +76,10 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       chooseed = _props$chooseed === void 0 ? [] : _props$chooseed,
       disabled = props.disabled,
       _onChange = props.onChange,
-      _props$valueConfirm = props.valueConfirm,
-      valueConfirm = _props$valueConfirm === void 0 ? function () {} : _props$valueConfirm;
+      _props$setConfirmValu = props.setConfirmValue,
+      setConfirmValue = _props$setConfirmValu === void 0 ? function () {} : _props$setConfirmValu,
+      _props$handleOptionsC = props.handleOptionsChange,
+      handleOptionsChange = _props$handleOptionsC === void 0 ? function () {} : _props$handleOptionsC;
   var timeKey = new Date();
 
   var _useState = (0, _react.useState)(false),
@@ -88,6 +96,22 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       setAllChoose(false);
     }
   }, [chooseed.length, allSelected]);
+  (0, _react.useEffect)(function () {
+    var filterDisabled = chooseed.filter(function (e) {
+      return !(disabled === null || disabled === void 0 ? void 0 : disabled.includes(e));
+    });
+
+    if (filterDisabled.length !== chooseed.length) {
+      handleOptionsChange({
+        type: optionKey,
+        value: filterDisabled
+      });
+      setConfirmValue(function (old) {
+        return _objectSpread(_objectSpread({}, old), {}, _defineProperty({}, optionKey, filterDisabled));
+      });
+      typeof _onChange === 'function' && _onChange(filterDisabled);
+    }
+  }, [disabled]);
   return (0, _jsxRuntime.jsxs)("div", {
     className: "igloo-form-filter-drop-down-container-content-group",
     children: [(0, _jsxRuntime.jsxs)("div", {
@@ -99,7 +123,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
         className: "igloo-form-filter-drop-down-container-content-group-title-action",
         onClick: function onClick() {
           typeof _onChange === 'function' && _onChange([]);
-          valueConfirm({
+          handleOptionsChange({
             type: optionKey,
             value: []
           });
@@ -115,7 +139,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
         className: "igloo-form-filter-drop-down-container-content-group-title-action",
         onClick: function onClick() {
           typeof _onChange === 'function' && _onChange(nowValidList);
-          valueConfirm({
+          handleOptionsChange({
             type: optionKey,
             value: nowValidList
           });
@@ -135,7 +159,7 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
       },
       onChange: function onChange(e) {
         typeof _onChange === 'function' && _onChange(e);
-        valueConfirm({
+        handleOptionsChange({
           type: optionKey,
           value: e
         });
@@ -164,5 +188,5 @@ var CratetCheckBoxFilter = function CratetCheckBoxFilter(props) {
   }, optionKey);
 };
 
-var _default = CratetCheckBoxFilter;
+var _default = CreateCheckBoxFilter;
 exports.default = _default;

package/lib/filter/index.js

@@ -720,7 +720,8 @@ var FilterComponent = function FilterComponent(props) {
                 allSelected: optionsAllSelected[key],
                 chooseed: optionsChanged[key],
                 disabled: disabled,
-                valueConfirm: dispatchOptionsChange,
+                handleOptionsChange: dispatchOptionsChange,
+                setConfirmValue: setConfimed,
                 onChange: onChangeProps
               }, key);
 
@@ -732,7 +733,8 @@ var FilterComponent = function FilterComponent(props) {
                 optionKey: key,
                 chooseed: optionsChanged[key],
                 disabled: disabled,
-                valueConfirm: dispatchOptionsChange,
+                handleOptionsChange: dispatchOptionsChange,
+                setConfirmValue: setConfimed,
                 onChange: onChangeProps
               }, key);
           }

package/lib/filter/radioBox.d.ts

@@ -2,7 +2,8 @@ declare type IRadioBoxProps = {
     title: any;
     configList: any[];
     optionKey: string;
-    valueConfirm: any;
+    handleOptionsChange: any;
+    setConfirmValue: any;
     chooseed?: string[];
     disabled?: any[];
     onChange?: any;

package/lib/filter/radioBox.js

@@ -25,16 +25,37 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _typography = _interopRequireDefault(require("../typography"));
 
+var _react = require("react");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
   var optionKey = props.optionKey,
       title = props.title,
       configList = props.configList,
       disabled = props.disabled,
-      valueConfirm = props.valueConfirm,
+      handleOptionsChange = props.handleOptionsChange,
+      setConfirmValue = props.setConfirmValue,
       chooseed = props.chooseed,
       _onChange = props.onChange;
+  (0, _react.useEffect)(function () {
+    if (disabled === null || disabled === void 0 ? void 0 : disabled.includes(chooseed)) {
+      typeof _onChange === 'function' && _onChange(undefined);
+      handleOptionsChange({
+        type: optionKey,
+        value: undefined
+      });
+      setConfirmValue(function (old) {
+        return _objectSpread(_objectSpread({}, old), {}, _defineProperty({}, optionKey, undefined));
+      });
+    }
+  }, [disabled]);
   return (0, _jsxRuntime.jsxs)("div", {
     className: "igloo-form-filter-drop-down-container-content-group",
     children: [(0, _jsxRuntime.jsx)("div", {
@@ -44,10 +65,10 @@ var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
         children: title
       })
     }), (0, _jsxRuntime.jsx)(_radio.default.Group, {
-      value: chooseed,
+      value: (disabled === null || disabled === void 0 ? void 0 : disabled.includes(chooseed)) ? undefined : chooseed,
       onChange: function onChange(e) {
         typeof _onChange === 'function' && _onChange(e.target.value);
-        valueConfirm({
+        handleOptionsChange({
           type: optionKey,
           value: e.target.value
         });

package/lib/select/style/index.less

@@ -237,6 +237,7 @@
     position: absolute;
     top: 0;
     right: 0;
+    margin-inline-end: 0;
   }
 
   .igloo-select-arrow-active {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",