@hw-component/form 1.9.41 → 1.9.42

package/es/Form/HFormConnect.js

@@ -37,29 +37,28 @@ var HFormConnect = (function (component) {
       form = _useFormContext.form,
       _useFormContext$value = _useFormContext.valueType,
       valueType = _useFormContext$value === void 0 ? "float" : _useFormContext$value;
+    var name = props.name;
+    var relName = Array.isArray(name) ? name.join(".") : name;
     useEffect(function () {
-      var name = props.name;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form === null || form === void 0 || form.addFormat(name, formatMaker(props, format[valueType]));
+      form === null || form === void 0 || form.addFormat(relName, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     var addFormat = function addFormat(aFormat) {
-      var name = props.name;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form === null || form === void 0 || form.addFormat(name, formatMaker(props, aFormat[valueType]));
+      form === null || form === void 0 || form.addFormat(relName, formatMaker(props, aFormat[valueType]));
     };
     var addDispatchListener = function addDispatchListener(key, fn) {
-      var name = props.name,
-        dispatch = props.dispatch;
-      if (!name) {
+      var dispatch = props.dispatch;
+      if (!relName) {
         return;
       }
       form === null || form === void 0 || form.addDispatchListener({
         key: key,
-        name: name,
+        name: relName,
         dispatch: dispatch
       }, fn);
     };

package/es/Form/config.d.ts

@@ -35,10 +35,7 @@ declare const componentConfig: {
         Component: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
     };
-    treeSelect: ({ request, options, ...props }: {
-        [x: string]: any;
-        request: any;
-        options: any;
-    }) => JSX.Element;
+    treeSelect: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: import("../Select/TreeSelect").HTreeSelectProps) => JSX.Element;
+    text: ({ value }: import("antd").FormItemProps) => JSX.Element;
 };
 export default componentConfig;

package/es/Form/config.js

@@ -22,6 +22,7 @@ import VerificationCodeInput from '../Input/VerificationCodeInput/index.js';
 import TrimInput from '../Input/TrimInput.js';
 import TrimTextArea from '../TextArea/TrimTextArea.js';
 import HInputNumberGroup from '../Input/InputNumberGroup.js';
+import HText from '../Text/index.js';
 
 var placeholderConfig = {
   inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload", "textArea"],
@@ -50,7 +51,8 @@ var componentConfig = {
   trimInput: TrimInput,
   trimTextArea: TrimTextArea,
   inputNumberGroup: HInputNumberGroup,
-  treeSelect: HTreeSelect
+  treeSelect: HTreeSelect,
+  text: HText
 };
 
 export { componentConfig as default, placeholderConfig };

package/es/Select/TreeSelect.d.ts

@@ -1,8 +1,8 @@
 import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
-interface IProps extends TreeSelectProps {
+export interface HTreeSelectProps extends TreeSelectProps {
     request?: PromiseFnResult;
     onlyCheckChild?: boolean;
 }
-declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: IProps) => JSX.Element;
+declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: HTreeSelectProps) => JSX.Element;
 export default _default;

package/es/Text/index.d.ts

@@ -0,0 +1,3 @@
+import { HFormItemProps } from "../Form/modal";
+declare const _default: ({ value }: HFormItemProps) => JSX.Element;
+export default _default;

package/es/Text/index.js

@@ -0,0 +1,13 @@
+// welcome to hoo hoo hoo
+import { jsx } from 'react/jsx-runtime';
+import { Typography } from 'antd';
+
+var HText = (function (_ref) {
+  var value = _ref.value;
+  return jsx(Typography.Text, {
+    children: value
+  });
+});
+
+export { HText as default };
+// powered by hdj

package/lib/Form/HFormConnect.js

@@ -40,29 +40,28 @@ var HFormConnect = (function (component) {
       form = _useFormContext.form,
       _useFormContext$value = _useFormContext.valueType,
       valueType = _useFormContext$value === void 0 ? "float" : _useFormContext$value;
+    var name = props.name;
+    var relName = Array.isArray(name) ? name.join(".") : name;
     React.useEffect(function () {
-      var name = props.name;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form === null || form === void 0 || form.addFormat(name, formatMaker(props, format[valueType]));
+      form === null || form === void 0 || form.addFormat(relName, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     var addFormat = function addFormat(aFormat) {
-      var name = props.name;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form === null || form === void 0 || form.addFormat(name, formatMaker(props, aFormat[valueType]));
+      form === null || form === void 0 || form.addFormat(relName, formatMaker(props, aFormat[valueType]));
     };
     var addDispatchListener = function addDispatchListener(key, fn) {
-      var name = props.name,
-        dispatch = props.dispatch;
-      if (!name) {
+      var dispatch = props.dispatch;
+      if (!relName) {
         return;
       }
       form === null || form === void 0 || form.addDispatchListener({
         key: key,
-        name: name,
+        name: relName,
         dispatch: dispatch
       }, fn);
     };

package/lib/Form/config.d.ts

@@ -35,10 +35,7 @@ declare const componentConfig: {
         Component: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
     };
-    treeSelect: ({ request, options, ...props }: {
-        [x: string]: any;
-        request: any;
-        options: any;
-    }) => JSX.Element;
+    treeSelect: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: import("../Select/TreeSelect").HTreeSelectProps) => JSX.Element;
+    text: ({ value }: import("antd").FormItemProps) => JSX.Element;
 };
 export default componentConfig;

package/lib/Form/config.js

@@ -25,6 +25,7 @@ var index$d = require('../Input/VerificationCodeInput/index.js');
 var TrimInput = require('../Input/TrimInput.js');
 var TrimTextArea = require('../TextArea/TrimTextArea.js');
 var InputNumberGroup = require('../Input/InputNumberGroup.js');
+var index$e = require('../Text/index.js');
 
 var placeholderConfig = {
   inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload", "textArea"],
@@ -53,7 +54,8 @@ var componentConfig = {
   trimInput: TrimInput.default,
   trimTextArea: TrimTextArea.default,
   inputNumberGroup: InputNumberGroup.default,
-  treeSelect: TreeSelect.default
+  treeSelect: TreeSelect.default,
+  text: index$e.default
 };
 
 exports.default = componentConfig;

package/lib/Select/TreeSelect.d.ts

@@ -1,8 +1,8 @@
 import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
-interface IProps extends TreeSelectProps {
+export interface HTreeSelectProps extends TreeSelectProps {
     request?: PromiseFnResult;
     onlyCheckChild?: boolean;
 }
-declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: IProps) => JSX.Element;
+declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: HTreeSelectProps) => JSX.Element;
 export default _default;

package/lib/Text/index.d.ts

@@ -0,0 +1,3 @@
+import { HFormItemProps } from "../Form/modal";
+declare const _default: ({ value }: HFormItemProps) => JSX.Element;
+export default _default;

package/lib/Text/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+var antd = require('antd');
+
+var HText = (function (_ref) {
+  var value = _ref.value;
+  return jsxRuntime.jsx(antd.Typography.Text, {
+    children: value
+  });
+});
+
+exports.default = HText;
+// powered by h

package/package.json

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

package/src/components/CheckboxGroup/index.tsx

@@ -43,15 +43,15 @@ const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [name]: resultObj,
+          [(name as string)]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal = {} } = outputValue;
+        const { [(name as string)]: itemVal = {} } = outputValue;
         if (Array.isArray(itemVal)) {
           return {
-            [name]: itemVal,
+            [(name as string)]: itemVal,
           };
         }
         return {

package/src/components/Form/HFormConnect.tsx

@@ -44,27 +44,26 @@ export default (
     ref
   ) => {
     const { form, valueType = "float" } = useFormContext();
-
+    const { name } = props;
+    const relName=Array.isArray(name)?name.join("."):name;
     useEffect(() => {
-      const { name } = props;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form?.addFormat(name, formatMaker(props, format[valueType]));
+      form?.addFormat(relName, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     const addFormat = (aFormat: Record<string, addFormatItemModal>) => {
-      const { name } = props;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form?.addFormat(name, formatMaker(props, aFormat[valueType]));
+      form?.addFormat(relName, formatMaker(props, aFormat[valueType]));
     };
     const addDispatchListener = (key: string, fn: argsFn) => {
-      const { name, dispatch } = props;
-      if (!name) {
+      const {dispatch } = props;
+      if (!relName) {
         return;
       }
-      form?.addDispatchListener({ key, name, dispatch }, fn);
+      form?.addDispatchListener({ key, name:relName, dispatch }, fn);
     };
     const Component = component as React.ForwardRefRenderFunction<
       any,

package/src/components/Form/config.ts

@@ -21,6 +21,7 @@ import VerificationCodeInput from "../Input/VerificationCodeInput";
 import TrimInput from "../Input/TrimInput";
 import TrimTextArea from "../TextArea/TrimTextArea";
 import HInputNumberGroup from "../Input/InputNumberGroup";
+import HText from '../Text'
 export const placeholderConfig = {
   inputType: [
     "input",
@@ -64,6 +65,7 @@ const componentConfig = {
   trimTextArea: TrimTextArea,
   inputNumberGroup: HInputNumberGroup,
   treeSelect: HTreeSelect,
+  text: HText,
 };
 
 export default componentConfig;

package/src/components/Input/InputNumberGroup.tsx

@@ -80,11 +80,11 @@ const InputNumberGroup = ({
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         const { min: minKey, max: maxKey } = valueMap;
-        const cuValue = initValue[valueName];
+        const cuValue = initValue[(valueName as string)];
         const minInitVal = initValue[minKey];
         const maxInitVal = initValue[maxKey];
         return {
-          [valueName]: {
+          [(valueName as string)]: {
             [min]: minInitVal,
             [max]: maxInitVal,
             ...cuValue,
@@ -93,7 +93,7 @@ const InputNumberGroup = ({
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = {} } = outputValue;
+        const { [(valueName as string)]: itemVal = {} } = outputValue;
         const { min: minKey, max: maxKey } = valueMap;
         const {
           [minKey]: minSubVal,
@@ -103,7 +103,7 @@ const InputNumberGroup = ({
         return {
           [maxKey]: maxSubVal,
           [minKey]: minSubVal,
-          [valueName]: oItemVal,
+          [(valueName as string)]: oItemVal,
         };
       },
     },

package/src/components/Input/SelectInput.tsx

@@ -38,12 +38,12 @@ export const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [name]: resultObj,
+          [(name as string)]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal = {} } = outputValue;
+        const { [(name as string)]: itemVal = {} } = outputValue;
         const newItemVal = { [itemVal[select]]: itemVal[input] };
         return {
           ...newItemVal,

package/src/components/Input/TrimInput.tsx

@@ -8,14 +8,14 @@ const Index = ({ addFormat, ...props }: HInputProps) => {
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         return {
-          [valueName]: initValue[valueName],
+          [(valueName as string)]: initValue[(valueName as string)],
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal } = outputValue;
+        const { [(name as string)]: itemVal } = outputValue;
         return {
-          [name]: itemVal?.trim(),
+          [(name as string)]: itemVal?.trim(),
         };
       },
     },

package/src/components/Select/TreeSelect.tsx

@@ -2,7 +2,7 @@ import { TreeSelect } from "antd";
 import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
 import { useRequest } from "ahooks";
-interface IProps extends TreeSelectProps {
+export interface HTreeSelectProps extends TreeSelectProps {
   request?: PromiseFnResult;
   onlyCheckChild?:boolean;
 }
@@ -29,7 +29,7 @@ const opMk=({options,onlyCheckChild=false,fieldNames}:OpMkParamsModal)=>{
         }
    })
 }
-export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: IProps) => {
+export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: HTreeSelectProps) => {
   const { loading, data } = useRequest(async () => {
     let options=treeData;
     if (request) {

package/src/components/Switch/index.tsx

@@ -56,18 +56,18 @@ const Index: React.FC<HSwitchProps> = ({
       inputValue: (item, initValue) => {
         const { close } = valueSwitchMap;
         const { name: valueName = "" } = item;
-        let val = initValue[valueName];
+        let val = initValue[(valueName as string)];
         if (typeof val === "undefined" || val === null) {
           val = close;
         }
         return {
-          [valueName]: val,
+          [(valueName as string)]: val,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
         return {
-          [name]: outputValue[name],
+          [(name as string)]: outputValue[(name as string)],
         };
       },
     },

package/src/components/TDPicker/RangePicker.tsx

@@ -62,12 +62,12 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
         });
         const hasKeys = Object.keys(resultObj).length !== 0;
         return {
-          [valueName]: hasKeys ? resultObj : null,
+          [(valueName as string)]: hasKeys ? resultObj : null,
         };
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = {} } = outputValue;
+        const { [(valueName as string)]: itemVal = {} } = outputValue;
         return {
           ...itemVal,
         };

package/src/components/Text/index.tsx

@@ -0,0 +1,6 @@
+import {Typography} from "antd";
+import {HFormItemProps} from "../Form/modal";
+
+export default ({value}:HFormItemProps)=>{
+    return <Typography.Text>{value}</Typography.Text>
+}

package/src/components/TextArea/TrimTextArea.tsx

@@ -12,14 +12,14 @@ const Index = ({ addFormat, ...props }: TrimTextAreaProps) => {
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         return {
-          [valueName]: initValue[valueName],
+          [(valueName as string)]: initValue[(valueName as string)],
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal } = outputValue;
+        const { [(name as string)]: itemVal } = outputValue;
         return {
-          [name]: itemVal?.trim(),
+          [(name as string)]: itemVal?.trim(),
         };
       },
     },

package/src/components/Upload/index.tsx

@@ -63,7 +63,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     float: {
       inputValue: (item, initValue) => {
         const { name = "" } = item;
-        const initFileList = initValue[name] || [];
+        const initFileList = initValue[(name as string)] || [];
         const relInitFileList =
           typeof initFileList === "string" ? [initFileList] : initFileList;
         const fileList = relInitFileList.map((itemData, index) => {
@@ -81,17 +81,17 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
           return { ...itemData };
         });
         return {
-          [name]: fileList,
+          [(name as string)]: fileList,
         };
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = [] } = outputValue;
+        const { [(valueName as string)]: itemVal = [] } = outputValue;
         const urls = itemVal.map((fileItem) => {
           return fileItem.response.url;
         });
         return {
-          [valueName]: maxCount === 1 ? urls[0] : urls,
+          [(valueName as string)]: maxCount === 1 ? urls[0] : urls,
         };
       },
     },