@innoways/hooks 9.0.6 → 9.0.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 9.0.8
+
+### Patch Changes
+
+- feat: add dynamic variable support for form data in ActionField and utility functions 9.0.8
+- Updated dependencies
+  - @innoways/utils@9.0.8
+
+## 9.0.7
+
+### Patch Changes
+
+- fix: add function to collect required-field errors for null or empty values in validation 9.0.7
+- Updated dependencies
+  - @innoways/utils@9.0.7
+
 ## 9.0.6
 
 ### Patch Changes

package/dist/index.js

@@ -3,8 +3,8 @@ import { useState, useCallback, useRef, useEffect, createContext, useContext, us
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _useDebounceFn2 from 'ahooks/es/useDebounceFn';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import produce, { produce as produce$1 } from 'immer';
 import _typeof from '@babel/runtime/helpers/typeof';
+import produce, { produce as produce$1 } from 'immer';
 import moment from 'moment';
 import { isEmpty, typeCheck, generateReg, fetchFnJsonKey } from '@innoways/utils';
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
@@ -98,6 +98,60 @@ function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if
 
 function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+/**
+ * Recursively collect required-field errors for values that are null or "".
+ * AJV's `required` keyword only checks property existence; a property present
+ * with value null or "" passes required even though it is effectively empty.
+ * This function generates the same errorMessage-style errors for those cases.
+ */
+function collectEmptyRequiredErrors(data, schema, errorsMap) {
+  var prefix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+  if (!data || _typeof(data) !== 'object' || Array.isArray(data)) return;
+  var required = (schema === null || schema === void 0 ? void 0 : schema.required) || [];
+
+  var _iterator = _createForOfIteratorHelper(required),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      var fullKey = prefix ? "".concat(prefix, ".").concat(key) : key; // Skip if AJV already recorded an error for this field
+
+      if (errorsMap[fullKey]) continue;
+      var val = data[key];
+
+      if (val === null || val === '') {
+        var _schema$errorMessage, _schema$errorMessage$, _schema$properties, _schema$properties$ke, _schema$properties$ke2;
+
+        var message = (schema === null || schema === void 0 ? void 0 : (_schema$errorMessage = schema.errorMessage) === null || _schema$errorMessage === void 0 ? void 0 : (_schema$errorMessage$ = _schema$errorMessage.required) === null || _schema$errorMessage$ === void 0 ? void 0 : _schema$errorMessage$[key]) || (schema === null || schema === void 0 ? void 0 : (_schema$properties = schema.properties) === null || _schema$properties === void 0 ? void 0 : (_schema$properties$ke = _schema$properties[key]) === null || _schema$properties$ke === void 0 ? void 0 : (_schema$properties$ke2 = _schema$properties$ke.errorMessage) === null || _schema$properties$ke2 === void 0 ? void 0 : _schema$properties$ke2.$required) || '未知错误';
+        errorsMap[fullKey] = message;
+      }
+    } // Recurse into nested object properties
+
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  if (schema !== null && schema !== void 0 && schema.properties) {
+    for (var _i = 0, _Object$keys = Object.keys(schema.properties); _i < _Object$keys.length; _i++) {
+      var propKey = _Object$keys[_i];
+      var nestedData = data[propKey];
+
+      if (nestedData !== null && nestedData !== undefined && _typeof(nestedData) === 'object' && !Array.isArray(nestedData)) {
+        var nestedPrefix = prefix ? "".concat(prefix, ".").concat(propKey) : propKey;
+        collectEmptyRequiredErrors(nestedData, schema.properties[propKey], errorsMap, nestedPrefix);
+      }
+    }
+  }
+}
 /**
  *
  * @param {json} schema 校验数据的json schema
@@ -109,6 +163,8 @@ function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) {
  *  error {} 校验错误信息
  * }
  */
+
+
 var validate = function validate(_ref) {
   var schema = _ref.schema,
       formData = _ref.formData,
@@ -173,9 +229,11 @@ var validate = function validate(_ref) {
         // 根目录required错误
         errorsMap[error.params.errors[0].params.missingProperty] = error.message || '未知错误';
       }
-    }); // 如果该字段不展示在界面上，比如通过开关控制显隐的一些必填项
-    // 则从校验中移除这些错误
+    }); // Additionally validate required fields for null/"" values.
+    // AJV's `required` keyword only checks property existence, so a field
+    // present with value null or "" passes required. We catch those here.
 
+    collectEmptyRequiredErrors(newFormData, schema, errorsMap);
     Object.keys(errorsMap).map(function (key) {
       if (visibleFieldKey && !(visibleFieldKey !== null && visibleFieldKey !== void 0 && visibleFieldKey.includes(key))) {
         delete errorsMap[key];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@innoways/hooks",
-	"version": "9.0.6",
+	"version": "9.0.8",
 	"description": "drip-form通用hooks",
 	"keywords": [
 		"hooks",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.10.2",
-		"@innoways/utils": "^9.0.6",
+		"@innoways/utils": "^9.0.8",
 		"ahooks": "^2.10.12",
 		"ajv": "^8.6.2",
 		"immer": "^9.0.5",