@hw-component/form 1.10.29 → 1.10.31

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
   };
 };
@@ -57,10 +56,6 @@ var useVC = function useVC(_ref3) {
   var richValue = valueType === "html" ? BraftEditor.createEditorState(value) : value;
   var change = function change(editorState) {
     var changeVal = valueType === "html" ? editorState.toHTML() : editorState;
-    var isEmpty = !!richValue ? richValue.isEmpty() : true;
-    if (isEmpty && editorState.isEmpty()) {
-      return;
-    }
     onChange === null || onChange === void 0 || onChange(changeVal);
   };
   return {

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/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
   };
 };
@@ -58,10 +57,6 @@ var useVC = function useVC(_ref3) {
   var richValue = valueType === "html" ? BraftEditor.createEditorState(value) : value;
   var change = function change(editorState) {
     var changeVal = valueType === "html" ? editorState.toHTML() : editorState;
-    var isEmpty = !!richValue ? richValue.isEmpty() : true;
-    if (isEmpty && editorState.isEmpty()) {
-      return;
-    }
     onChange === null || onChange === void 0 || onChange(changeVal);
   };
   return {

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.29",
+  "version": "1.10.31",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/RichEditor/hooks.ts

@@ -2,21 +2,18 @@ import { useFormConfigContext } from "../Form/Context/FormConfigProvider";
 import { baseConfig } from "../config";
 import type { IHRichEditorProps } from "src/components/RichEditor/modal";
 import { useClassName } from "../hooks";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useState } from "react";
 import type { EditorState } from "braft-editor";
 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,
   };
 };
@@ -49,15 +46,9 @@ export const useFocusClassname = ({
 
 export const useVC = ({ value, onChange, valueType }: IHRichEditorProps) => {
   const richValue: EditorState | undefined =
-    valueType === "html"
-      ? BraftEditor.createEditorState(value)
-      : (value as EditorState);
+    valueType === "html" ? BraftEditor.createEditorState(value) : (value as EditorState);
   const change = (editorState) => {
     const changeVal = valueType === "html" ? editorState.toHTML() : editorState;
-    const isEmpty = !!richValue ? richValue.isEmpty() : true;
-    if (isEmpty && editorState.isEmpty()) {
-      return;
-    }
     onChange?.(changeVal);
   };
   return {

package/src/components/RichEditor/index.tsx

@@ -49,7 +49,7 @@ const Index: React.ForwardRefRenderFunction<any, IHRichEditorProps> = (
       inputValue: (item, initValue) => {
         const { name = "" } = item;
         const keyName = name as string;
-        const itemVal = initValue[keyName];
+          const itemVal = initValue[keyName];
         const initVal =
           typeof itemVal === "string"
             ? BraftEditor.createEditorState(itemVal)

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

@@ -106,6 +106,13 @@ export default () => {
                   return <Basic />;
                 },
               },
+                {
+                   type:"richEditor",
+                    name:"1",
+                    itemProps:{
+
+                    }
+                },
             ]}
             dismissOnPressEnter={false}
             labelWidth={88}