iglooform 2.5.46 → 2.5.48

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.d.ts

@@ -13,6 +13,7 @@ export interface HOCProps extends IglooComponentProps {
         parentKey: string;
         options: Options;
     }[];
+    datasourceFilters?: string[];
     datasourceKey?: string;
     datasourceApi?: string;
     dependField?: NamePath;

package/es/utils/option-utils.js

@@ -1,4 +1,4 @@
-var _excluded = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "onSearch"];
+var _excluded = ["options", "optionGroups", "getOptions", "datasourceFilters", "datasourceKey", "dependField", "children", "onSearch"];
 
 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; }
 
@@ -86,6 +86,7 @@ export function optionsHOC(Component) {
     var options = props.options,
         optionGroups = props.optionGroups,
         getOptions = props.getOptions,
+        datasourceFilters = props.datasourceFilters,
         datasourceKey = props.datasourceKey,
         dependField = props.dependField,
         children = props.children,
@@ -127,6 +128,7 @@ export function optionsHOC(Component) {
       }
     }, [optionsFromGetOptions]);
     invariant(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
+    invariant(datasourceFilters && datasourceKey && selectDatasourceApi || !datasourceFilters, 'Please provide selectDatasourceApi in Form props');
     useEffect(function () {
       if (Array.isArray(optionsFromGetOptions)) {
         return;
@@ -190,7 +192,7 @@ export function optionsHOC(Component) {
 
                 case 9:
                   if (!(selectDatasourceApi && datasourceKey)) {
-                    _context.next = 27;
+                    _context.next = 28;
                     break;
                   }
 
@@ -202,35 +204,41 @@ export function optionsHOC(Component) {
                     query += "&search_keyword=".concat(searchKey);
                   }
 
+                  if (datasourceFilters) {
+                    query += datasourceFilters.map(function (f) {
+                      return "filter=".concat(f);
+                    }).join('&');
+                  }
+
                   api = "".concat(selectDatasourceApi, "/").concat(datasourceKey);
-                  _context.prev = 13;
-                  _context.next = 16;
+                  _context.prev = 14;
+                  _context.next = 17;
                   return fetch(query ? "".concat(api, "?").concat(query) : api);
 
-                case 16:
+                case 17:
                   rst = _context.sent;
-                  _context.next = 19;
+                  _context.next = 20;
                   return rst.json();
 
-                case 19:
+                case 20:
                   _yield$rst$json = _context.sent;
                   data = _yield$rst$json.data;
                   return _context.abrupt("return", data || []);
 
-                case 24:
-                  _context.prev = 24;
-                  _context.t0 = _context["catch"](13);
+                case 25:
+                  _context.prev = 25;
+                  _context.t0 = _context["catch"](14);
                   return _context.abrupt("return", []);
 
-                case 27:
+                case 28:
                   return _context.abrupt("return", []);
 
-                case 28:
+                case 29:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[13, 24]]);
+          }, _callee, null, [[14, 25]]);
         }));
 
         return function calcOptions() {

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.d.ts

@@ -13,6 +13,7 @@ export interface HOCProps extends IglooComponentProps {
         parentKey: string;
         options: Options;
     }[];
+    datasourceFilters?: string[];
     datasourceKey?: string;
     datasourceApi?: string;
     dependField?: NamePath;

package/lib/utils/option-utils.js

@@ -15,7 +15,7 @@ var _formContext = _interopRequireDefault(require("../form-context"));
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _excluded = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "onSearch"];
+var _excluded = ["options", "optionGroups", "getOptions", "datasourceFilters", "datasourceKey", "dependField", "children", "onSearch"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -107,6 +107,7 @@ function optionsHOC(Component) {
     var options = props.options,
         optionGroups = props.optionGroups,
         getOptions = props.getOptions,
+        datasourceFilters = props.datasourceFilters,
         datasourceKey = props.datasourceKey,
         dependField = props.dependField,
         children = props.children,
@@ -148,6 +149,7 @@ function optionsHOC(Component) {
       }
     }, [optionsFromGetOptions]);
     (0, _invariant.default)(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
+    (0, _invariant.default)(datasourceFilters && datasourceKey && selectDatasourceApi || !datasourceFilters, 'Please provide selectDatasourceApi in Form props');
     (0, _react.useEffect)(function () {
       if (Array.isArray(optionsFromGetOptions)) {
         return;
@@ -211,7 +213,7 @@ function optionsHOC(Component) {
 
                 case 9:
                   if (!(selectDatasourceApi && datasourceKey)) {
-                    _context.next = 27;
+                    _context.next = 28;
                     break;
                   }
 
@@ -223,35 +225,41 @@ function optionsHOC(Component) {
                     query += "&search_keyword=".concat(searchKey);
                   }
 
+                  if (datasourceFilters) {
+                    query += datasourceFilters.map(function (f) {
+                      return "filter=".concat(f);
+                    }).join('&');
+                  }
+
                   api = "".concat(selectDatasourceApi, "/").concat(datasourceKey);
-                  _context.prev = 13;
-                  _context.next = 16;
+                  _context.prev = 14;
+                  _context.next = 17;
                   return fetch(query ? "".concat(api, "?").concat(query) : api);
 
-                case 16:
+                case 17:
                   rst = _context.sent;
-                  _context.next = 19;
+                  _context.next = 20;
                   return rst.json();
 
-                case 19:
+                case 20:
                   _yield$rst$json = _context.sent;
                   data = _yield$rst$json.data;
                   return _context.abrupt("return", data || []);
 
-                case 24:
-                  _context.prev = 24;
-                  _context.t0 = _context["catch"](13);
+                case 25:
+                  _context.prev = 25;
+                  _context.t0 = _context["catch"](14);
                   return _context.abrupt("return", []);
 
-                case 27:
+                case 28:
                   return _context.abrupt("return", []);
 
-                case 28:
+                case 29:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[13, 24]]);
+          }, _callee, null, [[14, 25]]);
         }));
 
         return function calcOptions() {

package/package.json

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