iglooform 2.5.47 → 2.5.49

package/es/checkbox/index.d.ts

@@ -16,6 +16,7 @@ export interface IProps extends IglooComponentProps, Omit<CheckboxGroupProps, 'o
     radioType?: string;
     options: Option[];
     preview?: boolean;
+    mutuallyExclusions?: Record<string, string[]>;
 }
 declare const IglooCheckbox: FC<Props>;
 export default IglooCheckbox;

package/es/checkbox/index.js

@@ -4,8 +4,9 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
-var _excluded = ["className", "options", "value", "clearWhenOptionsUpdated", "preview"],
-    _excluded2 = ["label", "value", "extraInfo"];
+var _excluded = ["value"],
+    _excluded2 = ["className", "options", "value", "clearWhenOptionsUpdated", "preview", "mutuallyExclusions"],
+    _excluded3 = ["label", "value", "extraInfo"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -19,16 +20,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useRef, useContext } from 'react';
 import Typography from '../typography';
@@ -38,7 +39,27 @@ import classnames from 'classnames';
 import { compareOptions, optionsHOC, previewSelectedOptions } from '../utils/option-utils';
 import LocaleContext from '../locale/locale-context';
 import emptyIcon from '../radio/style/empty.svg';
-import './style/index.less';
+import './style/index.less'; // add disabled attributes to checkbox options based on mutually exclusion config
+
+var addDisabledAttr = function addDisabledAttr(options, mutuallyExclusions, checkedValues) {
+  if (!mutuallyExclusions || !checkedValues) return options;
+  checkedValues = Array.isArray(checkedValues) ? checkedValues : [checkedValues];
+  return options.map(function (_ref) {
+    var _checkedValues;
+
+    var value = _ref.value,
+        rest = _objectWithoutProperties(_ref, _excluded);
+
+    return _objectSpread(_objectSpread({}, rest), {}, {
+      value: value,
+      disabled: !!value && !!((_checkedValues = checkedValues) === null || _checkedValues === void 0 ? void 0 : _checkedValues.some(function (v) {
+        var _mutuallyExclusions$S, _mutuallyExclusions$v;
+
+        return ((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v)));
+      }))
+    });
+  });
+};
 
 var IglooCheckbox = function IglooCheckbox(props) {
   return _jsx(_Checkbox, _objectSpread({}, omit(props, formMethods)));
@@ -55,15 +76,16 @@ IglooCheckbox.formItemPropsHandler = function (config) {
 
 export default IglooCheckbox;
 
-var InnerCheckboxGroup = function InnerCheckboxGroup(_ref) {
-  var className = _ref.className,
-      _ref$options = _ref.options,
-      options = _ref$options === void 0 ? [] : _ref$options,
-      value = _ref.value,
-      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
-      preview = _ref.preview,
-      rest = _objectWithoutProperties(_ref, _excluded);
+var InnerCheckboxGroup = function InnerCheckboxGroup(_ref2) {
+  var className = _ref2.className,
+      _ref2$options = _ref2.options,
+      options = _ref2$options === void 0 ? [] : _ref2$options,
+      value = _ref2.value,
+      _ref2$clearWhenOption = _ref2.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref2$clearWhenOption === void 0 ? false : _ref2$clearWhenOption,
+      preview = _ref2.preview,
+      mutuallyExclusions = _ref2.mutuallyExclusions,
+      rest = _objectWithoutProperties(_ref2, _excluded2);
 
   var _useState = useState(value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -106,11 +128,11 @@ var InnerCheckboxGroup = function InnerCheckboxGroup(_ref) {
     value: value,
     children: [_jsx(_Row, {
       gutter: [8, 8],
-      children: options.map(function (_ref2) {
-        var label = _ref2.label,
-            key = _ref2.value,
-            extraInfo = _ref2.extraInfo,
-            rest = _objectWithoutProperties(_ref2, _excluded2);
+      children: addDisabledAttr(options, mutuallyExclusions, value).map(function (_ref3) {
+        var label = _ref3.label,
+            key = _ref3.value,
+            extraInfo = _ref3.extraInfo,
+            rest = _objectWithoutProperties(_ref3, _excluded3);
 
         return _jsxs(_Col, {
           span: 24,

package/es/confirmation/index.js

@@ -81,7 +81,7 @@ var Confirmation = function Confirmation(_ref) {
           return;
         }
 
-        onChange && onChange(!value);
+        onChange && onChange(!value || undefined);
       },
       style: {
         cursor: 'pointer',

package/es/types.d.ts

@@ -35,7 +35,7 @@ export interface FormBasicConfig {
 export declare type FormItemAssert = {
     field: NamePath;
     value?: any;
-    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled';
+    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled' | 'co-some' | 'co-every' | 'some-in' | 'every-in';
 };
 export declare type FormItemCopyValue = {
     assert: FormItemAssert;

package/es/utils/form-utils.js

@@ -99,6 +99,50 @@ export var testAssert = function testAssert(form, assert) {
     case 'eq':
       return v === value;
 
+    case 'co-every':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return value.every(function (i) {
+          return v.includes(i);
+        });
+      }
+
+    case 'co-some':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return value.some(function (i) {
+          return v.includes(i);
+        });
+      }
+
+    case 'every-in':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return v.every(function (i) {
+          return value.includes(i);
+        });
+      }
+
+    case 'some-in':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return v.some(function (i) {
+          return value.includes(i);
+        });
+      }
+
     default:
       if (value !== undefined) return v === value;
       return v !== undefined;

package/es/utils/option-utils.js

@@ -205,6 +205,7 @@ export function optionsHOC(Component) {
                   }
 
                   if (datasourceFilters) {
+                    query = dependFieldValue ? "".concat(query, "&") : query;
                     query += datasourceFilters.map(function (f) {
                       return "filter=".concat(f);
                     }).join('&');

package/lib/checkbox/index.d.ts

@@ -16,6 +16,7 @@ export interface IProps extends IglooComponentProps, Omit<CheckboxGroupProps, 'o
     radioType?: string;
     options: Option[];
     preview?: boolean;
+    mutuallyExclusions?: Record<string, string[]>;
 }
 declare const IglooCheckbox: FC<Props>;
 export default IglooCheckbox;

package/lib/checkbox/index.js

@@ -37,8 +37,9 @@ var _empty = _interopRequireDefault(require("../radio/style/empty.svg"));
 
 require("./style/index.less");
 
-var _excluded = ["className", "options", "value", "clearWhenOptionsUpdated", "preview"],
-    _excluded2 = ["label", "value", "extraInfo"];
+var _excluded = ["value"],
+    _excluded2 = ["className", "options", "value", "clearWhenOptionsUpdated", "preview", "mutuallyExclusions"],
+    _excluded3 = ["label", "value", "extraInfo"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -54,16 +55,37 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+// add disabled attributes to checkbox options based on mutually exclusion config
+var addDisabledAttr = function addDisabledAttr(options, mutuallyExclusions, checkedValues) {
+  if (!mutuallyExclusions || !checkedValues) return options;
+  checkedValues = Array.isArray(checkedValues) ? checkedValues : [checkedValues];
+  return options.map(function (_ref) {
+    var _checkedValues;
+
+    var value = _ref.value,
+        rest = _objectWithoutProperties(_ref, _excluded);
+
+    return _objectSpread(_objectSpread({}, rest), {}, {
+      value: value,
+      disabled: !!value && !!((_checkedValues = checkedValues) === null || _checkedValues === void 0 ? void 0 : _checkedValues.some(function (v) {
+        var _mutuallyExclusions$S, _mutuallyExclusions$v;
+
+        return ((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v)));
+      }))
+    });
+  });
+};
+
 var IglooCheckbox = function IglooCheckbox(props) {
   return (0, _jsxRuntime.jsx)(_checkbox.default, _objectSpread({}, (0, _omit.default)(props, _formMethods.default)));
 };
@@ -80,15 +102,16 @@ IglooCheckbox.formItemPropsHandler = function (config) {
 var _default = IglooCheckbox;
 exports.default = _default;
 
-var InnerCheckboxGroup = function InnerCheckboxGroup(_ref) {
-  var className = _ref.className,
-      _ref$options = _ref.options,
-      options = _ref$options === void 0 ? [] : _ref$options,
-      value = _ref.value,
-      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
-      preview = _ref.preview,
-      rest = _objectWithoutProperties(_ref, _excluded);
+var InnerCheckboxGroup = function InnerCheckboxGroup(_ref2) {
+  var className = _ref2.className,
+      _ref2$options = _ref2.options,
+      options = _ref2$options === void 0 ? [] : _ref2$options,
+      value = _ref2.value,
+      _ref2$clearWhenOption = _ref2.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref2$clearWhenOption === void 0 ? false : _ref2$clearWhenOption,
+      preview = _ref2.preview,
+      mutuallyExclusions = _ref2.mutuallyExclusions,
+      rest = _objectWithoutProperties(_ref2, _excluded2);
 
   var _useState = (0, _react.useState)(value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -131,11 +154,11 @@ var InnerCheckboxGroup = function InnerCheckboxGroup(_ref) {
     value: value,
     children: [(0, _jsxRuntime.jsx)(_row.default, {
       gutter: [8, 8],
-      children: options.map(function (_ref2) {
-        var label = _ref2.label,
-            key = _ref2.value,
-            extraInfo = _ref2.extraInfo,
-            rest = _objectWithoutProperties(_ref2, _excluded2);
+      children: addDisabledAttr(options, mutuallyExclusions, value).map(function (_ref3) {
+        var label = _ref3.label,
+            key = _ref3.value,
+            extraInfo = _ref3.extraInfo,
+            rest = _objectWithoutProperties(_ref3, _excluded3);
 
         return (0, _jsxRuntime.jsxs)(_col.default, {
           span: 24,

package/lib/confirmation/index.js

@@ -96,7 +96,7 @@ var Confirmation = function Confirmation(_ref) {
           return;
         }
 
-        onChange && onChange(!value);
+        onChange && onChange(!value || undefined);
       },
       style: {
         cursor: 'pointer',

package/lib/types.d.ts

@@ -35,7 +35,7 @@ export interface FormBasicConfig {
 export declare type FormItemAssert = {
     field: NamePath;
     value?: any;
-    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled';
+    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled' | 'co-some' | 'co-every' | 'some-in' | 'every-in';
 };
 export declare type FormItemCopyValue = {
     assert: FormItemAssert;

package/lib/utils/form-utils.js

@@ -116,6 +116,50 @@ var testAssert = function testAssert(form, assert) {
     case 'eq':
       return v === value;
 
+    case 'co-every':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return value.every(function (i) {
+          return v.includes(i);
+        });
+      }
+
+    case 'co-some':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return value.some(function (i) {
+          return v.includes(i);
+        });
+      }
+
+    case 'every-in':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return v.every(function (i) {
+          return value.includes(i);
+        });
+      }
+
+    case 'some-in':
+      {
+        if (!Array.isArray(v) || !Array.isArray(value)) {
+          return false;
+        }
+
+        return v.some(function (i) {
+          return value.includes(i);
+        });
+      }
+
     default:
       if (value !== undefined) return v === value;
       return v !== undefined;

package/lib/utils/option-utils.js

@@ -226,6 +226,7 @@ function optionsHOC(Component) {
                   }
 
                   if (datasourceFilters) {
+                    query = dependFieldValue ? "".concat(query, "&") : query;
                     query += datasourceFilters.map(function (f) {
                       return "filter=".concat(f);
                     }).join('&');

package/package.json

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