@hw-component/form 1.10.6 → 1.10.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/es/Form/Basic.js +4 -2
  2. package/es/Form/hooks/useDefaultRender.js +2 -1
  3. package/lib/Form/Basic.js +4 -2
  4. package/lib/Form/hooks/useDefaultRender.js +2 -1
  5. package/package.json +1 -1
  6. package/src/components/Form/Basic.tsx +3 -2
  7. package/src/components/Form/hooks/useDefaultRender.tsx +2 -0
  8. package/src/pages/Form/index.tsx +41 -49
package/es/Form/Basic.js CHANGED
@@ -45,6 +45,7 @@ var Basic = (function (_ref) {
45
45
  } : {
46
46
  width: "100%"
47
47
  };
48
+ console.log(wrapperCol, "wrapperColwrapperCol");
48
49
  return jsx(Row, {
49
50
  gutter: gutter,
50
51
  style: boxStyle,
@@ -68,11 +69,12 @@ var Basic = (function (_ref) {
68
69
  var arrayName = Array.isArray(name) ? name.join(".") : name;
69
70
  var key = arrayName || nameKey;
70
71
  var itemStyle = style || formItemStyle;
71
- return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
72
+ return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({
73
+ wrapperCol: wrapperCol
74
+ }, itemData), {}, {
72
75
  labelAlign: labelAlign,
73
76
  key: key || index,
74
77
  style: itemStyle,
75
- wrapperCol: wrapperCol,
76
78
  itemProps: defaultItemProps,
77
79
  hideLabel: hideLabel,
78
80
  itemSpan: configItemSpan || globalItemSpan,
package/es/Form/hooks/useDefaultRender.js CHANGED
@@ -32,7 +32,8 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
32
32
  }));
33
33
  if (render) {
34
34
  var resultNode = render(props, node, form);
35
- return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), {}, {
35
+ var nodeProps = resultNode.props;
36
+ return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), nodeProps), {}, {
36
37
  form: form
37
38
  }));
38
39
  }
package/lib/Form/Basic.js CHANGED
@@ -48,6 +48,7 @@ var Basic = (function (_ref) {
48
48
  } : {
49
49
  width: "100%"
50
50
  };
51
+ console.log(wrapperCol, "wrapperColwrapperCol");
51
52
  return jsxRuntime.jsx(antd.Row, {
52
53
  gutter: gutter,
53
54
  style: boxStyle,
@@ -71,11 +72,12 @@ var Basic = (function (_ref) {
71
72
  var arrayName = Array.isArray(name) ? name.join(".") : name;
72
73
  var key = arrayName || nameKey;
73
74
  var itemStyle = style || formItemStyle;
74
- return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
75
+ return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({
76
+ wrapperCol: wrapperCol
77
+ }, itemData), {}, {
75
78
  labelAlign: labelAlign,
76
79
  key: key || index,
77
80
  style: itemStyle,
78
- wrapperCol: wrapperCol,
79
81
  itemProps: defaultItemProps,
80
82
  hideLabel: hideLabel,
81
83
  itemSpan: configItemSpan || globalItemSpan,
package/lib/Form/hooks/useDefaultRender.js CHANGED
@@ -33,7 +33,8 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
33
33
  }));
34
34
  if (render) {
35
35
  var resultNode = render(props, node, form);
36
- return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), {}, {
36
+ var nodeProps = resultNode.props;
37
+ return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), nodeProps), {}, {
37
38
  form: form
38
39
  }));
39
40
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.10.6",
3
+ "version": "1.10.8",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/Form/Basic.tsx CHANGED
@@ -34,7 +34,8 @@ export default ({
34
34
  form.submit();
35
35
  };
36
36
  const globalItemSpan = itemSpan || formItemSpan;
37
- const boxStyle= requiredMode?{paddingLeft:10,width: "100%"}:{width: "100%"}
37
+ const boxStyle= requiredMode?{paddingLeft:10,width: "100%"}:{width: "100%"};
38
+ console.log(wrapperCol,"wrapperColwrapperCol")
38
39
  return (
39
40
  <Row gutter={gutter} style={boxStyle}>
40
41
  {newConfigData.map((itemData: HItemProps, index) => {
@@ -60,11 +61,11 @@ export default ({
60
61
  const itemStyle = style || formItemStyle;
61
62
  return (
62
63
  <Item
64
+ wrapperCol={wrapperCol}
63
65
  {...itemData}
64
66
  labelAlign={labelAlign}
65
67
  key={key || index}
66
68
  style={itemStyle}
67
- wrapperCol={wrapperCol}
68
69
  itemProps={defaultItemProps as ItemPropsType}
69
70
  hideLabel={hideLabel}
70
71
  itemSpan={configItemSpan || globalItemSpan}
package/src/components/Form/hooks/useDefaultRender.tsx CHANGED
@@ -34,9 +34,11 @@ export const useDefaultRender = (
34
34
  );
35
35
  if (render) {
36
36
  const resultNode = render(props, node, form);
37
+ const nodeProps=(resultNode as any).props;
37
38
  return React.cloneElement<any>(resultNode as any, {
38
39
  ...componentProps,
39
40
  ...itemProps,
41
+ ...nodeProps,
40
42
  form,
41
43
  });
42
44
  }
package/src/pages/Form/index.tsx CHANGED
@@ -1,8 +1,8 @@
1
1
  import {
2
- HForm,
3
- HFormConfigProvider,
4
- useHForm,
5
- HSelect,
2
+ HForm,
3
+ HFormConfigProvider,
4
+ useHForm,
5
+ HSelect, HBasicForm,
6
6
  } from "../../components";
7
7
  import { useState } from "react";
8
8
  import { Button, Form, Input, Space } from "antd";
@@ -75,55 +75,38 @@ export default () => {
75
75
  <div style={{ width: 1000 }}>
76
76
  <HForm
77
77
  configData={[
78
- {
79
- label: "tagSelect",
80
- type: "tagSelect",
81
- name: "wz",
82
- dispatch: {
83
- fnKey: "reload",
84
- dependencies: ["wz1"],
85
- },
86
- itemProps: {
87
- request: () => {
88
- return new Promise((resolve, reject) => {
89
- setTimeout(() => {
90
- resolve([
91
- {
92
- value: "你好",
93
- key: "1",
94
- },
95
- ]);
96
- }, 3000);
97
- });
98
- },
99
- },
100
- },
101
- {
102
- label: "文字1",
103
- name: "wz1",
104
- type:"timeRangePicker"
105
- },
106
78
  // {
107
- // label: "inputSelect",
108
- // type: "richEditor",
109
- // name: "richEditor",
110
- // rules: [
111
- // {
112
- // validator: (rule, value, callback) => {
113
- // console.log(value);
114
- // return Promise.resolve();
115
- // },
79
+ // label: "tagSelect",
80
+ // type: "tagSelect",
81
+ // name: "wz",
82
+ // dispatch: {
83
+ // fnKey: "reload",
84
+ // dependencies: ["wz1"],
85
+ // },
86
+ // itemProps: {
87
+ // request: () => {
88
+ // return new Promise((resolve, reject) => {
89
+ // setTimeout(() => {
90
+ // resolve([
91
+ // {
92
+ // value: "你好",
93
+ // key: "1",
94
+ // },
95
+ // ]);
96
+ // }, 3000);
97
+ // });
116
98
  // },
117
- // ],
99
+ // },
118
100
  // },
119
101
  // {
120
- // label: "富文本",
121
- // type: "timePicker",
122
- // name: "textArea",
123
- // itemProps: {
124
- // showCount: true,
125
- // maxLength: 100,
126
- // },
102
+ // label: "文字1",
103
+ // name: "wz1",
104
+ // type:"timeRangePicker"
105
+ // },
106
+ // {
107
+ // label: "inputSelect",
108
+ // type: "richEditor",
109
+ // name: "richEditor",
127
110
  // rules: [
128
111
  // {
129
112
  // validator: (rule, value, callback) => {
@@ -133,6 +116,15 @@ export default () => {
133
116
  // },
134
117
  // ],
135
118
  // },
119
+ {
120
+ hideLabel:true,
121
+ itemProps:{
122
+
123
+ },
124
+ render:()=>{
125
+ return <div>11</div>
126
+ }
127
+ },
136
128
  // {
137
129
  // label: "运营商账号",
138
130
  // name: "mobile",