iglooform 2.4.7 → 2.4.11

package/lib/upload-preview/index.js

@@ -134,9 +134,8 @@ var UploadPreview = function UploadPreview(_ref) {
   if (!files || !files.length) return (0, _jsxRuntime.jsx)("div", {
     children: "-"
   }, void 0);
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: "igloo-upload-preview"
-  }, {
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: "igloo-upload-preview",
     children: [description || (files.length === 1 ? formatMessage({
       id: '1 file attached.'
     }) : formatMessage({
@@ -152,20 +151,18 @@ var UploadPreview = function UploadPreview(_ref) {
       style: {
         fontSize: 24
       }
-    }, void 0), (0, _jsxRuntime.jsxs)(_modal.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsxs)(_modal.default, {
       visible: preview,
-      title: (0, _jsxRuntime.jsxs)(_typography.default, Object.assign({
-        level: "h4"
-      }, {
+      title: (0, _jsxRuntime.jsxs)(_typography.default, {
+        level: "h4",
         children: [label, " (", current + 1, "/", files.length, ")"]
-      }), void 0),
+      }, void 0),
       className: "igloo-upload-preview-modal",
       footer: null,
       onCancel: function onCancel() {
         return setPreview(false);
       },
-      forceRender: false
-    }, {
+      forceRender: false,
       children: [(0, _jsxRuntime.jsx)(_button.default, {
         icon: (0, _jsxRuntime.jsx)(_iglooicon.ArrowLeftOutlined, {}, void 0),
         className: (0, _classnames.default)('igloo-upload-preview-modal-button', 'igloo-upload-preview-modal-button-left'),
@@ -180,8 +177,8 @@ var UploadPreview = function UploadPreview(_ref) {
         onClick: next,
         disabled: current >= files.length - 1
       }, void 0)]
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 };
 
 var _default = UploadPreview;

package/lib/upload-preview/media.js

@@ -70,11 +70,10 @@ var PDF = function PDF(_ref) {
     }, i));
   }
 
-  return (0, _jsxRuntime.jsx)("div", Object.assign({
-    className: "igloo-upload-preview-pdf"
-  }, {
+  return (0, _jsxRuntime.jsx)("div", {
+    className: "igloo-upload-preview-pdf",
     children: pages
-  }), void 0);
+  }, void 0);
 };
 
 var Media = function Media(_ref3) {
@@ -85,20 +84,18 @@ var Media = function Media(_ref3) {
   var _useContext = (0, _react.useContext)(_localeContext.default),
       formatMessage = _useContext.formatMessage;
 
-  var children = (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: "igloo-upload-prevew-not-supported"
-  }, {
+  var children = (0, _jsxRuntime.jsxs)("div", {
+    className: "igloo-upload-prevew-not-supported",
     children: [(0, _jsxRuntime.jsx)(_iglooicon.ErrorFilled, {
       className: "igloo-upload-prevew-not-supported-icon"
-    }, void 0), (0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsx)(_typography.default, {
       level: "body1",
-      className: "igloo-upload-prevew-not-supported-text"
-    }, {
+      className: "igloo-upload-prevew-not-supported-text",
       children: formatMessage({
         id: 'No preview for this file. Only support image, video or PDF file.'
       })
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 
   if (type === 'image') {
     children = (0, _jsxRuntime.jsx)("img", {
@@ -122,11 +119,10 @@ var Media = function Media(_ref3) {
     }, void 0);
   }
 
-  return (0, _jsxRuntime.jsx)("div", Object.assign({
-    className: (0, _classnames.default)('igloo-upload-preview-container', className)
-  }, {
+  return (0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames.default)('igloo-upload-preview-container', className),
     children: children
-  }), void 0);
+  }, void 0);
 };
 
 var _default = Media;

package/lib/upload-preview/style/index.less

@@ -4,8 +4,8 @@
 
   .igloo-upload-prevew-icon {
     cursor: pointer;
-    width: 22px;
-    height: 22px;
+    width: 24px;
+    height: 24px;
     margin-left: 8px;
   }
 }

package/lib/utils/form-utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.calcShouldRender = exports.calcSelectValue = exports.calcCopyValue = exports.calcDisabled = exports.calcFormItemProps = exports.testAssert = exports.calcNamePath = void 0;
+exports.testAssert = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = void 0;
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -13,16 +13,16 @@ var _typography = _interopRequireDefault(require("../typography"));
 
 var _formattedMessage = _interopRequireDefault(require("../locale/formatted-message"));
 
-var _excluded = ["type", "name", "required", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -49,7 +49,7 @@ var calcNamePath = function calcNamePath(parentName, name) {
     names.push(parentName);
   }
 
-  if (name) {
+  if (name !== undefined) {
     names.push(name);
   }
 
@@ -61,9 +61,8 @@ exports.calcNamePath = calcNamePath;
 var testAssert = function testAssert(form, assert) {
   var field = assert.field,
       value = assert.value,
-      _assert$operation = assert.operation,
-      operation = _assert$operation === void 0 ? 'eq' : _assert$operation;
-  var v = form.getFieldValue(field);
+      operation = assert.operation;
+  var v = form.getFieldValue(typeof field === 'string' ? field.split('.') : field);
 
   switch (operation) {
     case 'ne':
@@ -102,9 +101,15 @@ var testAssert = function testAssert(form, assert) {
       if (v === undefined || v < value) return false;
       break;
 
+    case 'filled':
+      return v !== undefined;
+
     case 'eq':
+      return v === value;
+
     default:
-      if (v !== value) return false;
+      if (value !== undefined) return v === value;
+      return v !== undefined;
   }
 
   return true;
@@ -112,11 +117,25 @@ var testAssert = function testAssert(form, assert) {
 
 exports.testAssert = testAssert;
 
+var calcRequired = function calcRequired() {
+  var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var form = arguments.length > 1 ? arguments[1] : undefined;
+  var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (Array.isArray(requiredAsserts)) {
+    return requiredAsserts.every(function (assert) {
+      return form && testAssert(form, assert);
+    });
+  }
+
+  return required;
+};
+
 var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
   var type = config.type,
       nameProp = config.name,
-      _config$required = config.required,
-      required = _config$required === void 0 ? true : _config$required,
+      required = config.required,
+      requiredAsserts = config.requiredAsserts,
       _config$showOptional = config.showOptional,
       showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
       _config$rules = config.rules,
@@ -180,7 +199,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       className = extraProps.className,
       extraRest = _objectWithoutProperties(extraProps, _excluded2);
 
-  var rules = required === true && extraRequired ? [{
+  var rules = calcRequired(required, form, requiredAsserts) ? [{
     required: true,
     message: requiredMessage || extraRequiredMessage
   }].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
@@ -225,40 +244,33 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       normalize: normalize || extraNormalize,
       rules: rules,
       validateTrigger: _toConsumableArray(new Set(validateTriggers)),
-      label: label ? (0, _jsxRuntime.jsxs)("div", Object.assign({
-        className: "igloo-form-label"
-      }, {
-        children: [(0, _jsxRuntime.jsxs)("div", Object.assign({
-          className: "igloo-form-label-text"
-        }, {
-          children: [(0, _jsxRuntime.jsx)(_typography.default, Object.assign({
-            level: "body1"
-          }, {
+      label: label ? (0, _jsxRuntime.jsxs)("div", {
+        className: "igloo-form-label",
+        children: [(0, _jsxRuntime.jsxs)("div", {
+          className: "igloo-form-label-text",
+          children: [(0, _jsxRuntime.jsx)(_typography.default, {
+            level: "body1",
             children: label
-          }), void 0), isRequired && requiredMark && (0, _jsxRuntime.jsx)("span", Object.assign({
-            className: "igloo-form-label-required"
-          }, {
+          }, void 0), isRequired && requiredMark && (0, _jsxRuntime.jsx)("span", {
+            className: "igloo-form-label-required",
             children: "*"
-          }), void 0), showOptional && (0, _jsxRuntime.jsxs)("span", Object.assign({
-            className: "igloo-form-label-optional"
-          }, {
+          }, void 0), showOptional && (0, _jsxRuntime.jsxs)("span", {
+            className: "igloo-form-label-optional",
             children: ["(", (0, _formattedMessage.default)({
               id: 'Optional'
             }), ")"]
-          }), void 0)]
-        }), void 0), extraLabel && (0, _jsxRuntime.jsx)("div", Object.assign({
-          className: "igloo-form-label-extra"
-        }, {
+          }, void 0)]
+        }, void 0), extraLabel && (0, _jsxRuntime.jsx)("div", {
+          className: "igloo-form-label-extra",
           children: typeof extraLabel === 'function' ? extraLabel(form) : extraLabel
-        }), void 0)]
-      }), void 0) : null,
+        }, void 0)]
+      }, void 0) : null,
       getValueFromEvent: getValueFromEvent || extraGetValueFromEvent,
       getValueProps: getValueProps,
-      extra: (extra || extraExtra) && (0, _jsxRuntime.jsx)(_typography.default, Object.assign({
-        level: "caption2"
-      }, {
+      extra: (extra || extraExtra) && (0, _jsxRuntime.jsx)(_typography.default, {
+        level: "caption2",
         children: extra || extraExtra
-      }), void 0),
+      }, void 0),
       help: help || extraHelp,
       valuePropName: valuePropName || extraValuePropName,
       messageVariables: _objectSpread({

package/package.json

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

package/es/free-form/context.d.ts

@@ -1,19 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd/es/form';
-import { FormItemName } from '@/types';
-declare const _default: React.Context<{
-    form?: FormInstance<any> | undefined;
-    onCancel?(): void;
-    cancelText?: string | undefined;
-    submitText?: string | undefined;
-    previewText?: string | undefined;
-    nextText?: string | undefined;
-    continueText?: string | undefined;
-    validateMessages?: Object | undefined;
-    submitting?: boolean | undefined;
-    requiredMark?: boolean | undefined;
-    showSubmitButton?: boolean | undefined;
-    getScrollContainer: () => HTMLElement | Window | null;
-    registerDependencies: (name: FormItemName | FormItemName[], updater: Function) => void;
-}>;
-export default _default;

package/es/free-form/context.js

@@ -1,7 +0,0 @@
-import React from 'react';
-export default /*#__PURE__*/React.createContext({
-  getScrollContainer: function getScrollContainer() {
-    return window;
-  },
-  registerDependencies: function registerDependencies() {}
-});

package/lib/free-form/context.d.ts

@@ -1,19 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd/es/form';
-import { FormItemName } from '@/types';
-declare const _default: React.Context<{
-    form?: FormInstance<any> | undefined;
-    onCancel?(): void;
-    cancelText?: string | undefined;
-    submitText?: string | undefined;
-    previewText?: string | undefined;
-    nextText?: string | undefined;
-    continueText?: string | undefined;
-    validateMessages?: Object | undefined;
-    submitting?: boolean | undefined;
-    requiredMark?: boolean | undefined;
-    showSubmitButton?: boolean | undefined;
-    getScrollContainer: () => HTMLElement | Window | null;
-    registerDependencies: (name: FormItemName | FormItemName[], updater: Function) => void;
-}>;
-export default _default;

package/lib/free-form/context.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = /*#__PURE__*/_react.default.createContext({
-  getScrollContainer: function getScrollContainer() {
-    return window;
-  },
-  registerDependencies: function registerDependencies() {}
-});
-
-exports.default = _default;