@hw-component/form 0.0.4-beta-v6 → 0.0.4-beta-v7

package/es/Form/hooks/useHForm.js

@@ -9,8 +9,8 @@ import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _Promise from '@babel/runtime-corejs3/core-js/promise';
-import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
+import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import _Reflect$deleteProperty from '@babel/runtime-corejs3/core-js/reflect/delete-property';
 import _concatInstanceProperty from '@babel/runtime-corejs3/core-js/instance/concat';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
@@ -26,12 +26,12 @@ var useHForm = (function () {
   return useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
-    var initDispatch = [];
+    var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false && name) {
+        initDispatch[name] = fn;
       }
       if (!name) {
         return {
@@ -54,8 +54,9 @@ var useHForm = (function () {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        _forEachInstanceProperty(initDispatch).call(initDispatch, function (fn) {
-          fn({
+        var initKeys = _Object$keys(initDispatch);
+        _forEachInstanceProperty(initKeys).call(initKeys, function (key) {
+          initDispatch[key]({
             changedValues: newValue,
             oldValues: newValue
           });
@@ -136,6 +137,9 @@ var useHForm = (function () {
         } else {
           defaultFn.push(fn);
         }
+        if (manual === false && name) {
+          initDispatch[name] = fn;
+        }
         dispatchSourceData[key] = {
           keysFn: keysFn,
           defaultFn: defaultFn

package/es/Form/index.js

@@ -44,6 +44,7 @@ var HForm = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  console.log(dispatchSourceData, "dispatchSourceData");
   var _useInfoReq = useInfoReq({
       initialValues: initialValues,
       request: request,

package/lib/Form/hooks/useHForm.js

@@ -12,8 +12,8 @@ var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArr
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _Promise = require('@babel/runtime-corejs3/core-js/promise');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Reflect$deleteProperty = require('@babel/runtime-corejs3/core-js/reflect/delete-property');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/concat');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
@@ -29,12 +29,12 @@ var useHForm = (function () {
   return React.useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
-    var initDispatch = [];
+    var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false && name) {
+        initDispatch[name] = fn;
       }
       if (!name) {
         return {
@@ -57,8 +57,9 @@ var useHForm = (function () {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        _forEachInstanceProperty(initDispatch).call(initDispatch, function (fn) {
-          fn({
+        var initKeys = _Object$keys(initDispatch);
+        _forEachInstanceProperty(initKeys).call(initKeys, function (key) {
+          initDispatch[key]({
             changedValues: newValue,
             oldValues: newValue
           });
@@ -139,6 +140,9 @@ var useHForm = (function () {
         } else {
           defaultFn.push(fn);
         }
+        if (manual === false && name) {
+          initDispatch[name] = fn;
+        }
         dispatchSourceData[key] = {
           keysFn: keysFn,
           defaultFn: defaultFn

package/lib/Form/index.js

@@ -47,6 +47,7 @@ var HForm = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  console.log(dispatchSourceData, "dispatchSourceData");
   var _useInfoReq = index.useInfoReq({
       initialValues: initialValues,
       request: request,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.4-beta-v6",
+  "version": "0.0.4-beta-v7",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/hooks/useHForm.ts

@@ -13,12 +13,12 @@ export default () => {
   return useMemo<HFormInstance>(() => {
     const formatSourceData: Record<string, FormatItemModal> = {};
     let dispatchSourceData: Record<string, DispatchItemData> = {};
-    const initDispatch: argsFn[] = [];
+    const initDispatch: Record<string, argsFn> = {};
     let cacheValues: Record<string, any> = {};
     let isLoading = false;
     const norAddItemDispatch = (name, manual, fn) => {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false&&name) {
+        initDispatch[name]=fn;
       }
       if (!name) {
         return {
@@ -43,8 +43,9 @@ export default () => {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        initDispatch.forEach((fn) => {
-          fn({ changedValues: newValue, oldValues: newValue });
+        const initKeys=Object.keys(initDispatch);
+        initKeys.forEach((key) => {
+          initDispatch[key]({ changedValues: newValue, oldValues: newValue });
         });
         isLoading = true;
       },
@@ -110,6 +111,9 @@ export default () => {
         } else {
           defaultFn.push(fn);
         }
+        if (manual===false&&name){
+          initDispatch[name]=fn;
+        }
         dispatchSourceData[key] = {
           keysFn,
           defaultFn,

package/src/components/Form/index.tsx

@@ -26,6 +26,7 @@ export default ({
     configData,
     form: hForm,
   });
+  console.log(dispatchSourceData,"dispatchSourceData")
   const { subControl, infoControl } = useInfoReq({
     initialValues,
     request,

package/src/pages/ModalForm/index.tsx

@@ -96,6 +96,25 @@ const data = [
     type: "urlUpload",
     rules: [{ required: true }],
   },
+  {
+    label: "下拉框",
+    name: "select",
+    type: "select",
+    dispatch: {
+      fnKey: "reload",
+      dependencies: ["selectInput", "sz"],
+      manual: false,
+    },
+    itemProps: {
+      request: (params = {}, values) => {
+        console.log(values, "paramsparamsparams");
+        const { label = "123", value = 1 } = params;
+        return Promise.resolve([{ label, value }]);
+      },
+      showSearch: true,
+    },
+    rules: [{ required: true }],
+  },
 ];
 let num = 0;
 export default () => {