@hw-component/form 1.10.28 → 1.10.30

package/es/Form/index.js

@@ -97,6 +97,7 @@ var HForm = (function (_ref) {
       children: jsxs(Form, _objectSpread(_objectSpread({}, props), {}, {
         form: hForm,
         onFinish: run,
+        initialValues: initialValues,
         onValuesChange: valuesChange,
         style: requiredMode ? _objectSpread({
           paddingLeft: 10

package/es/RichEditor/hooks.js

@@ -13,13 +13,12 @@ var useProps = function useProps(_ref) {
   var fileRequest = _ref.fileRequest,
     valueType = _ref.valueType;
   var _useFormConfigContext = useFormConfigContext("richEditorProps"),
-    _useFormConfigContext2 = _useFormConfigContext.fileRequest,
-    contextFileRequest = _useFormConfigContext2 === void 0 ? fileRequest : _useFormConfigContext2,
-    _useFormConfigContext3 = _useFormConfigContext.valueType,
-    contextValueType = _useFormConfigContext3 === void 0 ? valueType : _useFormConfigContext3;
+    contextFileRequest = _useFormConfigContext.fileRequest,
+    _useFormConfigContext2 = _useFormConfigContext.valueType,
+    contextValueType = _useFormConfigContext2 === void 0 ? valueType : _useFormConfigContext2;
   var cuRequest = fileRequest === null ? (_baseConfig$richEdito = baseConfig.richEditorProps) === null || _baseConfig$richEdito === void 0 ? void 0 : _baseConfig$richEdito.fileRequest : contextFileRequest;
   return {
-    fileRequest: cuRequest,
+    fileRequest: fileRequest || cuRequest,
     valueType: contextValueType
   };
 };
@@ -77,9 +76,10 @@ var useUploadFn = function useUploadFn(_ref4) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             file = params.file, id = params.id;
-            _context.next = 3;
+            console.log(params, "pppppp");
+            _context.next = 4;
             return fileRequest === null || fileRequest === void 0 ? void 0 : fileRequest(file, params);
-          case 3:
+          case 4:
             _yield$fileRequest = _context.sent;
             url = _yield$fileRequest.url;
             params.success({
@@ -94,7 +94,7 @@ var useUploadFn = function useUploadFn(_ref4) {
                 poster: url
               }
             });
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/config.js

@@ -78,7 +78,9 @@ var baseConfig = {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return fileToBase64(file);
+              return fileToBase64({
+                originFileObj: file
+              });
             case 2:
               url = _context2.sent;
               return _context2.abrupt("return", {

package/lib/Form/index.js

@@ -100,6 +100,7 @@ var HForm = (function (_ref) {
       children: jsxRuntime.jsxs(antd.Form, _objectSpread(_objectSpread({}, props), {}, {
         form: hForm,
         onFinish: run,
+        initialValues: initialValues,
         onValuesChange: valuesChange,
         style: requiredMode ? _objectSpread({
           paddingLeft: 10

package/lib/RichEditor/hooks.js

@@ -14,13 +14,12 @@ var useProps = function useProps(_ref) {
   var fileRequest = _ref.fileRequest,
     valueType = _ref.valueType;
   var _useFormConfigContext = FormConfigProvider.useFormConfigContext("richEditorProps"),
-    _useFormConfigContext2 = _useFormConfigContext.fileRequest,
-    contextFileRequest = _useFormConfigContext2 === void 0 ? fileRequest : _useFormConfigContext2,
-    _useFormConfigContext3 = _useFormConfigContext.valueType,
-    contextValueType = _useFormConfigContext3 === void 0 ? valueType : _useFormConfigContext3;
+    contextFileRequest = _useFormConfigContext.fileRequest,
+    _useFormConfigContext2 = _useFormConfigContext.valueType,
+    contextValueType = _useFormConfigContext2 === void 0 ? valueType : _useFormConfigContext2;
   var cuRequest = fileRequest === null ? (_baseConfig$richEdito = config.baseConfig.richEditorProps) === null || _baseConfig$richEdito === void 0 ? void 0 : _baseConfig$richEdito.fileRequest : contextFileRequest;
   return {
-    fileRequest: cuRequest,
+    fileRequest: fileRequest || cuRequest,
     valueType: contextValueType
   };
 };
@@ -78,9 +77,10 @@ var useUploadFn = function useUploadFn(_ref4) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             file = params.file, id = params.id;
-            _context.next = 3;
+            console.log(params, "pppppp");
+            _context.next = 4;
             return fileRequest === null || fileRequest === void 0 ? void 0 : fileRequest(file, params);
-          case 3:
+          case 4:
             _yield$fileRequest = _context.sent;
             url = _yield$fileRequest.url;
             params.success({
@@ -95,7 +95,7 @@ var useUploadFn = function useUploadFn(_ref4) {
                 poster: url
               }
             });
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/config.js

@@ -79,7 +79,9 @@ var baseConfig = {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return util.fileToBase64(file);
+              return util.fileToBase64({
+                originFileObj: file
+              });
             case 2:
               url = _context2.sent;
               return _context2.abrupt("return", {

package/package.json

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

package/src/components/Form/index.tsx

@@ -89,9 +89,10 @@ export default ({
         }}
       >
         <Form
-            {...props}
+          {...props}
           form={hForm}
           onFinish={run}
+          initialValues={initialValues}
           onValuesChange={valuesChange}
           style={requiredMode ? { paddingLeft: 10, ...style } : style}
         >

package/src/components/RichEditor/hooks.ts

@@ -8,15 +8,12 @@ import BraftEditor from "braft-editor";
 
 export const useProps = ({ fileRequest, valueType }: IHRichEditorProps) => {
   const {
-    fileRequest: contextFileRequest = fileRequest,
+    fileRequest: contextFileRequest,
     valueType: contextValueType = valueType,
   } = useFormConfigContext("richEditorProps");
-  const cuRequest =
-    fileRequest === null
-      ? baseConfig.richEditorProps?.fileRequest
-      : contextFileRequest;
+  const cuRequest = fileRequest === null ? baseConfig.richEditorProps?.fileRequest : contextFileRequest;
   return {
-    fileRequest: cuRequest,
+    fileRequest: fileRequest||cuRequest,
     valueType: contextValueType,
   };
 };
@@ -69,6 +66,7 @@ export const useVC = ({ value, onChange, valueType }: IHRichEditorProps) => {
 export const useUploadFn = ({ fileRequest }: IHRichEditorProps) => {
   return async (params) => {
     const { file, id } = params;
+    console.log(params,"pppppp")
     const { url } = await fileRequest?.(file, params);
     params.success({
       url,

package/src/components/config.ts

@@ -51,7 +51,9 @@ export const baseConfig: IFormConfigContextProps = {
   itemProps: {},
   richEditorProps: {
     fileRequest: async (file: any) => {
-      const url = await fileToBase64(file);
+      const url = await fileToBase64({
+        originFileObj:file
+      });
       return {
         url,
       };

package/src/pages/Form/index.tsx

@@ -5,7 +5,7 @@ import {
   HSelect,
   HBasicForm,
 } from "../../components";
-import { useState } from "react";
+import {useEffect, useState} from "react";
 import { Button, Form, Input, Space } from "antd";
 const Test3 = ({ value = {}, onChange }) => {
   const { fs, end } = value;
@@ -41,6 +41,9 @@ const TestItem = () => {
   );
 };
 const Test = (props) => {
+    useEffect(()=>{
+         console.log("ffff")
+    },[]);
   return <div>ffff</div>;
 };
 const Basic = () => {
@@ -52,6 +55,13 @@ const Basic = () => {
           type: "inputNumberGroup",
           name: "jgTime",
         },
+          {
+              label:"test",
+              name:"test",
+              render:()=>{
+                  return <Test/>
+              }
+          }
       ]}
     />
   );
@@ -96,6 +106,13 @@ export default () => {
                   return <Basic />;
                 },
               },
+                {
+                   type:"richEditor",
+                    name:"1",
+                    itemProps:{
+
+                    }
+                },
             ]}
             dismissOnPressEnter={false}
             labelWidth={88}