@carefrees/form-utils-react-hooks 0.0.4 → 0.0.6

package/esm/hooks/register/register.FormHideItem.js

@@ -2,11 +2,10 @@ import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
 import * as __WEBPACK_EXTERNAL_MODULE__carefrees_form_utils_f42d2666__ from "@carefrees/form-utils";
 import * as __WEBPACK_EXTERNAL_MODULE__useFormItemParentName_js_a729dfb1__ from "../useFormItemParentName.js";
 import * as __WEBPACK_EXTERNAL_MODULE__useForm_js_2c14e707__ from "../useForm.js";
-import * as __WEBPACK_EXTERNAL_MODULE__useUpdate_js_b5f1687a__ from "../useUpdate.js";
 const useRegisterFormHideItem = (options)=>{
     const { name, sort, isJoinParentField = true } = options;
     const form = (0, __WEBPACK_EXTERNAL_MODULE__useForm_js_2c14e707__.useFormInstance)();
-    const _update = (0, __WEBPACK_EXTERNAL_MODULE__useUpdate_js_b5f1687a__.useUpdate)();
+    const [, setValue] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)({});
     const { newName, newSort } = (0, __WEBPACK_EXTERNAL_MODULE__useFormItemParentName_js_a729dfb1__.useFormItemParentName)({
         name,
         sort,
@@ -14,8 +13,9 @@ const useRegisterFormHideItem = (options)=>{
     });
     const hideItemInstance = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(new __WEBPACK_EXTERNAL_MODULE__carefrees_form_utils_f42d2666__.FormHideItemInstanceBase().ctor(newName)).current;
     const isHide = form.getFieldHideValue(newName);
+    hideItemInstance.preHideValue = isHide;
     hideItemInstance.instance = form;
-    hideItemInstance.updated = _update.current;
+    hideItemInstance.updatedItem = setValue;
     hideItemInstance.sort = newSort;
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
         const unMount = form.registerFormHideItem(hideItemInstance);

package/esm/hooks/register/register.FormItem.js

@@ -1,6 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
 import * as __WEBPACK_EXTERNAL_MODULE__carefrees_form_utils_f42d2666__ from "@carefrees/form-utils";
-import * as __WEBPACK_EXTERNAL_MODULE__useUpdate_js_b5f1687a__ from "../useUpdate.js";
 import * as __WEBPACK_EXTERNAL_MODULE__useForm_js_2c14e707__ from "../useForm.js";
 import * as __WEBPACK_EXTERNAL_MODULE__useFormItem_js_cd5761e5__ from "../useFormItem.js";
 import * as __WEBPACK_EXTERNAL_MODULE__useFormItemParentName_js_a729dfb1__ from "../useFormItemParentName.js";
@@ -12,6 +11,7 @@ const useRegisterFormItem = (options)=>{
         sort,
         isJoinParentField
     });
+    const [, setValue] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)({});
     const ruleInstance = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(new __WEBPACK_EXTERNAL_MODULE__carefrees_form_utils_f42d2666__.RuleInstanceBase()).current;
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>ruleInstance.ctor(newName, rules), [
         rules,
@@ -24,9 +24,8 @@ const useRegisterFormItem = (options)=>{
     formItemInstance.instance = form;
     formItemInstance.sort = newSort;
     formItemInstance.parentDataField = parentName;
-    const _updated = (0, __WEBPACK_EXTERNAL_MODULE__useUpdate_js_b5f1687a__.useUpdate)();
-    formItemInstance.updated = _updated.current;
-    ruleInstance.updated = _updated.current;
+    formItemInstance.updated = setValue;
+    ruleInstance.updated = setValue;
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
         const unMount = form.registerFormItem(formItemInstance);
         return ()=>unMount();

package/esm/index.d.ts

@@ -9,5 +9,4 @@ export * from './hooks/useFormItemParentName';
 export * from './hooks/useFormList';
 export * from './hooks/useHtmlFor';
 export * from './hooks/useMultipleForm';
-export * from './hooks/useUpdate';
 export * from './hooks/useWatch';

package/esm/index.js

@@ -9,5 +9,4 @@ export * from "./hooks/useFormItemParentName.js";
 export * from "./hooks/useFormList.js";
 export * from "./hooks/useHtmlFor.js";
 export * from "./hooks/useMultipleForm.js";
-export * from "./hooks/useUpdate.js";
 export * from "./hooks/useWatch.js";

package/lib/hooks/register/register.FormHideItem.js

@@ -30,11 +30,10 @@ const external_react_namespaceObject = require("react");
 const form_utils_namespaceObject = require("@carefrees/form-utils");
 const external_useFormItemParentName_js_namespaceObject = require("../useFormItemParentName.js");
 const external_useForm_js_namespaceObject = require("../useForm.js");
-const external_useUpdate_js_namespaceObject = require("../useUpdate.js");
 const useRegisterFormHideItem = (options)=>{
     const { name, sort, isJoinParentField = true } = options;
     const form = (0, external_useForm_js_namespaceObject.useFormInstance)();
-    const _update = (0, external_useUpdate_js_namespaceObject.useUpdate)();
+    const [, setValue] = (0, external_react_namespaceObject.useState)({});
     const { newName, newSort } = (0, external_useFormItemParentName_js_namespaceObject.useFormItemParentName)({
         name,
         sort,
@@ -42,8 +41,9 @@ const useRegisterFormHideItem = (options)=>{
     });
     const hideItemInstance = (0, external_react_namespaceObject.useRef)(new form_utils_namespaceObject.FormHideItemInstanceBase().ctor(newName)).current;
     const isHide = form.getFieldHideValue(newName);
+    hideItemInstance.preHideValue = isHide;
     hideItemInstance.instance = form;
-    hideItemInstance.updated = _update.current;
+    hideItemInstance.updatedItem = setValue;
     hideItemInstance.sort = newSort;
     (0, external_react_namespaceObject.useEffect)(()=>{
         const unMount = form.registerFormHideItem(hideItemInstance);

package/lib/hooks/register/register.FormItem.js

@@ -28,7 +28,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const form_utils_namespaceObject = require("@carefrees/form-utils");
-const external_useUpdate_js_namespaceObject = require("../useUpdate.js");
 const external_useForm_js_namespaceObject = require("../useForm.js");
 const external_useFormItem_js_namespaceObject = require("../useFormItem.js");
 const external_useFormItemParentName_js_namespaceObject = require("../useFormItemParentName.js");
@@ -40,6 +39,7 @@ const useRegisterFormItem = (options)=>{
         sort,
         isJoinParentField
     });
+    const [, setValue] = (0, external_react_namespaceObject.useState)({});
     const ruleInstance = (0, external_react_namespaceObject.useRef)(new form_utils_namespaceObject.RuleInstanceBase()).current;
     (0, external_react_namespaceObject.useMemo)(()=>ruleInstance.ctor(newName, rules), [
         rules,
@@ -52,9 +52,8 @@ const useRegisterFormItem = (options)=>{
     formItemInstance.instance = form;
     formItemInstance.sort = newSort;
     formItemInstance.parentDataField = parentName;
-    const _updated = (0, external_useUpdate_js_namespaceObject.useUpdate)();
-    formItemInstance.updated = _updated.current;
-    ruleInstance.updated = _updated.current;
+    formItemInstance.updated = setValue;
+    ruleInstance.updated = setValue;
     (0, external_react_namespaceObject.useEffect)(()=>{
         const unMount = form.registerFormItem(formItemInstance);
         return ()=>unMount();

package/lib/index.d.ts

@@ -9,5 +9,4 @@ export * from './hooks/useFormItemParentName';
 export * from './hooks/useFormList';
 export * from './hooks/useHtmlFor';
 export * from './hooks/useMultipleForm';
-export * from './hooks/useUpdate';
 export * from './hooks/useWatch';

package/lib/index.js

@@ -33,9 +33,6 @@ var __webpack_modules__ = {
     "./hooks/useMultipleForm": function(module) {
         module.exports = require("./hooks/useMultipleForm.js");
     },
-    "./hooks/useUpdate": function(module) {
-        module.exports = require("./hooks/useUpdate.js");
-    },
     "./hooks/useWatch": function(module) {
         module.exports = require("./hooks/useWatch.js");
     }
@@ -149,16 +146,10 @@ var __webpack_exports__ = {};
         return _hooks_useMultipleForm__WEBPACK_IMPORTED_MODULE_10__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _hooks_useUpdate__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("./hooks/useUpdate");
-    var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _hooks_useUpdate__WEBPACK_IMPORTED_MODULE_11__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _hooks_useUpdate__WEBPACK_IMPORTED_MODULE_11__[key];
-    }).bind(0, __WEBPACK_IMPORT_KEY__);
-    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _hooks_useWatch__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("./hooks/useWatch");
+    var _hooks_useWatch__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("./hooks/useWatch");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _hooks_useWatch__WEBPACK_IMPORTED_MODULE_12__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _hooks_useWatch__WEBPACK_IMPORTED_MODULE_12__[key];
+    for(var __WEBPACK_IMPORT_KEY__ in _hooks_useWatch__WEBPACK_IMPORTED_MODULE_11__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _hooks_useWatch__WEBPACK_IMPORTED_MODULE_11__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "表单组件公共hooks",
   "homepage": "https://github.com/SunLxy/carefrees-form-utils",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "esm/index.js",
@@ -21,10 +21,10 @@
     "esm"
   ],
   "dependencies": {
-    "@carefrees/form-utils": "^0.0.4"
+    "@carefrees/form-utils": "^0.0.6"
   },
   "devDependencies": {
     "@types/react": "18.2.21",
     "react": "^18.2.0"
   }
-}
+}

package/src/hooks/register/register.FormHideItem.ts

@@ -1,9 +1,8 @@
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { RegisterFormItemOptions } from './register.FormItem';
 import { FormHideItemInstanceBase } from '@carefrees/form-utils';
 import { useFormItemParentName } from '../useFormItemParentName';
 import { useFormInstance } from '../useForm';
-import { useUpdate } from '../useUpdate';
 
 interface RegisterFormHideItemOptions extends Omit<RegisterFormItemOptions, 'rules'> {}
 
@@ -11,13 +10,13 @@ interface RegisterFormHideItemOptions extends Omit<RegisterFormItemOptions, 'rul
 export const useRegisterFormHideItem = (options: RegisterFormHideItemOptions) => {
   const { name, sort, isJoinParentField = true } = options;
   const form = useFormInstance();
-  const _update = useUpdate();
+  const [, setValue] = useState({});
   const { newName, newSort } = useFormItemParentName({ name, sort, isJoinParentField });
   const hideItemInstance = useRef(new FormHideItemInstanceBase().ctor(newName)).current;
   const isHide = form.getFieldHideValue(newName);
-
+  hideItemInstance.preHideValue = isHide;
   hideItemInstance.instance = form;
-  hideItemInstance.updated = _update.current;
+  hideItemInstance.updatedItem = setValue;
   hideItemInstance.sort = newSort;
 
   useEffect(() => {

package/src/hooks/register/register.FormItem.ts

@@ -2,10 +2,9 @@
  * @description 注册组件
  */
 
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { RuleInstanceBase } from '@carefrees/form-utils';
 import type { RuleItem } from 'async-validator';
-import { useUpdate } from '../useUpdate';
 import { useFormInstance } from '../useForm';
 import { useFormItem } from '../useFormItem';
 import { useFormItemParentName } from '../useFormItemParentName';
@@ -26,6 +25,8 @@ export const useRegisterFormItem = (options: RegisterFormItemOptions) => {
   const { name, rules, sort, isJoinParentField = true } = options;
   const form = useFormInstance();
   const { newName, newSort, parentName } = useFormItemParentName({ name, sort, isJoinParentField });
+  const [, setValue] = useState({});
+
   // 注册规则
   // 注册单个实例
   const ruleInstance = useRef(new RuleInstanceBase()).current;
@@ -39,9 +40,8 @@ export const useRegisterFormItem = (options: RegisterFormItemOptions) => {
   formItemInstance.sort = newSort;
   formItemInstance.parentDataField = parentName;
 
-  const _updated = useUpdate();
-  formItemInstance.updated = _updated.current;
-  ruleInstance.updated = _updated.current;
+  formItemInstance.updated = setValue;
+  ruleInstance.updated = setValue;
 
   useEffect(() => {
     const unMount = form.registerFormItem(formItemInstance);

package/src/index.ts

@@ -9,5 +9,4 @@ export * from './hooks/useFormItemParentName';
 export * from './hooks/useFormList';
 export * from './hooks/useHtmlFor';
 export * from './hooks/useMultipleForm';
-export * from './hooks/useUpdate';
 export * from './hooks/useWatch';

package/esm/hooks/useUpdate.d.ts

@@ -1,2 +0,0 @@
-/**更新页面状态*/
-export declare const useUpdate: () => import("react").MutableRefObject<Function>;

package/esm/hooks/useUpdate.js

@@ -1,10 +0,0 @@
-import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
-const useUpdate = ()=>{
-    const [, _update] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)({});
-    const refUpdate = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(()=>void 0);
-    refUpdate.current = ()=>{
-        _update({});
-    };
-    return refUpdate;
-};
-export { useUpdate };

package/lib/hooks/useUpdate.d.ts

@@ -1,2 +0,0 @@
-/**更新页面状态*/
-export declare const useUpdate: () => import("react").MutableRefObject<Function>;

package/lib/hooks/useUpdate.js

@@ -1,44 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    useUpdate: ()=>useUpdate
-});
-const external_react_namespaceObject = require("react");
-const useUpdate = ()=>{
-    const [, _update] = (0, external_react_namespaceObject.useState)({});
-    const refUpdate = (0, external_react_namespaceObject.useRef)(()=>void 0);
-    refUpdate.current = ()=>{
-        _update({});
-    };
-    return refUpdate;
-};
-exports.useUpdate = __webpack_exports__.useUpdate;
-for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "useUpdate"
-].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/src/hooks/useUpdate.ts

@@ -1,12 +0,0 @@
-import { useState, useRef } from 'react';
-
-/**更新页面状态*/
-export const useUpdate = () => {
-  const [, _update] = useState({});
-  /**为了防止 hooks 闭包问题*/
-  const refUpdate = useRef<Function>(() => void 0);
-  refUpdate.current = () => {
-    _update({});
-  };
-  return refUpdate;
-};