@hw-component/form 1.9.47 → 1.9.48

package/es/Form/modal.d.ts

@@ -18,8 +18,9 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import { HFormTextProps } from "../Text";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
-export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
+export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps | HFormTextProps;
 export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;

package/es/Text/index.d.ts

@@ -1,3 +1,9 @@
-import type { HFormItemProps } from "../Form/modal";
-declare const _default: ({ value }: HFormItemProps) => JSX.Element;
+import { TextProps } from "antd/lib/typography/Text";
+import React from "react";
+export interface HFormTextProps<V = any> extends TextProps {
+    value?: V;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
+}
+declare const _default: ({ value, addonBefore, addonAfter, ...props }: HFormTextProps) => JSX.Element;
 export default _default;

package/es/Text/index.js

@@ -1,12 +1,29 @@
 // welcome to hoo hoo hoo
-import { jsx } from 'react/jsx-runtime';
-import { Typography } from 'antd';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { Typography, Space } from 'antd';
 
+var _excluded = ["value", "addonBefore", "addonAfter"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var HText = (function (_ref) {
-  var value = _ref.value;
-  return jsx(Typography.Text, {
-    children: value
-  });
+  var value = _ref.value,
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return jsx(Typography.Text, _objectSpread(_objectSpread({}, props), {}, {
+    children: jsxs(Space, {
+      size: 2,
+      children: [jsx("div", {
+        children: addonBefore
+      }), jsx("div", {
+        children: value
+      }), jsx("div", {
+        children: addonAfter
+      })]
+    })
+  }));
 });
 
 export { HText as default };

package/lib/Form/modal.d.ts

@@ -18,8 +18,9 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import { HFormTextProps } from "../Text";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
-export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
+export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps | HFormTextProps;
 export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;

package/lib/Text/index.d.ts

@@ -1,3 +1,9 @@
-import type { HFormItemProps } from "../Form/modal";
-declare const _default: ({ value }: HFormItemProps) => JSX.Element;
+import { TextProps } from "antd/lib/typography/Text";
+import React from "react";
+export interface HFormTextProps<V = any> extends TextProps {
+    value?: V;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
+}
+declare const _default: ({ value, addonBefore, addonAfter, ...props }: HFormTextProps) => JSX.Element;
 export default _default;

package/lib/Text/index.js

@@ -2,14 +2,31 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 
+var _excluded = ["value", "addonBefore", "addonAfter"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var HText = (function (_ref) {
-  var value = _ref.value;
-  return jsxRuntime.jsx(antd.Typography.Text, {
-    children: value
-  });
+  var value = _ref.value,
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return jsxRuntime.jsx(antd.Typography.Text, _objectSpread(_objectSpread({}, props), {}, {
+    children: jsxRuntime.jsxs(antd.Space, {
+      size: 2,
+      children: [jsxRuntime.jsx("div", {
+        children: addonBefore
+      }), jsxRuntime.jsx("div", {
+        children: value
+      }), jsxRuntime.jsx("div", {
+        children: addonAfter
+      })]
+    })
+  }));
 });
 
 exports.default = HText;

package/package.json

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

package/src/components/Form/modal.ts

@@ -35,8 +35,8 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
-import { NamePath } from "rc-field-form/es/interface";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import {HFormTextProps} from "../Text";
 
 type RenderFun = (
   props: HItemProps,
@@ -58,7 +58,7 @@ export type ItemPropsType =
   | TextAreaProps
   | IUpLoadProps
   | CascaderProps<any>
-  | IUrlUploadProps;
+  | IUrlUploadProps|HFormTextProps;
 
 export interface HoverModal {
   text?: string;

package/src/components/Text/index.tsx

@@ -1,6 +1,19 @@
-import { Typography } from "antd";
-import type { HFormItemProps } from "../Form/modal";
-
-export default ({ value }: HFormItemProps) => {
-  return <Typography.Text>{value}</Typography.Text>;
+import {Space, Typography} from "antd";
+import {TextProps} from "antd/lib/typography/Text";
+import React from "react";
+export interface HFormTextProps<V=any> extends TextProps{
+  value?: V;
+  addonBefore?:React.ReactNode;
+  addonAfter?:React.ReactNode;
+}
+export default ({ value ,addonBefore,addonAfter,...props}: HFormTextProps) => {
+  return <Typography.Text {...props}>
+    <Space size={2}>
+      <div>
+        {addonBefore}
+      </div>
+      <div>{value}</div>
+      <div>{addonAfter}</div>
+    </Space>
+  </Typography.Text>;
 };

package/src/pages/Form/index.tsx

@@ -240,19 +240,25 @@ export default () => {
               render:()=>{
                 return <div style={{width:"100%",backgroundColor:'black',height:"100%"}}></div>
               }
+            },{
+              label:"文字",
+              type:"text",
+              name:"text",
+              itemProps:{
+                addonBefore:<div style={{height:100,backgroundColor:"red"}}>nihao</div>,
+                addonAfter:<div style={{height:200,backgroundColor:"red"}}>wohao</div>,
+              }
             }]}
             dismissOnPressEnter={false}
             labelWidth={88}
             form={form}
-            itemSpan={{
-              span:8
-            }}
             infoRequest={{
               request: async () => {
                 if (id === 1) {
                   return {
                     name: "你好",
                     select: 1,
+                    text:"hdj"
                   };
                 }
                 return {};