Skip to content

Commit 494414d

Browse files
leonwgcleonwgc
committed
feat: upgrade deps
1 parent 1357204 commit 494414d

File tree

7 files changed

+524
-418
lines changed

7 files changed

+524
-418
lines changed

‎dist/index.esm.js‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ var ItemRender = function ItemRender(_ref) {
136136
_item = _item.getJSON();
137137
}
138138

139-
if (_typeof(_item) !== 'object' || !_item) return null; // elProps 组件的其他属性
140-
// itemProps Form.Item的其他属性
139+
if (_typeof(_item) !== 'object' || !_item) return null;
141140

142141
var _item2 = _item,
143142
type = _item2.type,
@@ -205,17 +204,12 @@ var renderTowDimensionLayout = function renderTowDimensionLayout(layoutData) {
205204
var len = arr.length;
206205

207206
if (24 % len !== 0) {
208-
throw new Error('数组的长度必须能被24整除');
207+
throw new Error('The length of the array must be divisible by 24');
209208
}
210209

211210
var span = 24 / len;
212211
return /*#__PURE__*/React.createElement(Row, {
213-
key: idx,
214-
gutter: {
215-
xs: 8,
216-
sm: 16,
217-
md: 24
218-
}
212+
key: idx
219213
}, arr.map(function (item, subIndex) {
220214
return /*#__PURE__*/React.createElement(ItemRender, {
221215
item: item,
@@ -244,7 +238,7 @@ var renderTowDimensionLayout = function renderTowDimensionLayout(layoutData) {
244238
*/
245239

246240

247-
function FormRenderer(_ref) {
241+
function FormRender(_ref) {
248242
var layoutData = _ref.layoutData,
249243
_ref$cols = _ref.cols,
250244
cols = _ref$cols === void 0 ? 1 : _ref$cols;
@@ -298,5 +292,5 @@ function FormRenderer(_ref) {
298292
})));
299293
}
300294

301-
export default FormRenderer;
302-
export { SpaceLayout as FormSpaceRender };
295+
export default FormRender;
296+
export { FormRender, SpaceLayout as FormSpaceRender };

‎dist/index.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ var ItemRender = function ItemRender(_ref) {
144144
_item = _item.getJSON();
145145
}
146146

147-
if (_typeof(_item) !== 'object' || !_item) return null; // elProps 组件的其他属性
148-
// itemProps Form.Item的其他属性
147+
if (_typeof(_item) !== 'object' || !_item) return null;
149148

150149
var _item2 = _item,
151150
type = _item2.type,
@@ -213,17 +212,12 @@ var renderTowDimensionLayout = function renderTowDimensionLayout(layoutData) {
213212
var len = arr.length;
214213

215214
if (24 % len !== 0) {
216-
throw new Error('数组的长度必须能被24整除');
215+
throw new Error('The length of the array must be divisible by 24');
217216
}
218217

219218
var span = 24 / len;
220219
return /*#__PURE__*/React__default['default'].createElement(antd.Row, {
221-
key: idx,
222-
gutter: {
223-
xs: 8,
224-
sm: 16,
225-
md: 24
226-
}
220+
key: idx
227221
}, arr.map(function (item, subIndex) {
228222
return /*#__PURE__*/React__default['default'].createElement(ItemRender, {
229223
item: item,
@@ -252,7 +246,7 @@ var renderTowDimensionLayout = function renderTowDimensionLayout(layoutData) {
252246
*/
253247

254248

255-
function FormRenderer(_ref) {
249+
function FormRender(_ref) {
256250
var layoutData = _ref.layoutData,
257251
_ref$cols = _ref.cols,
258252
cols = _ref$cols === void 0 ? 1 : _ref$cols;
@@ -306,5 +300,6 @@ function FormRenderer(_ref) {
306300
})));
307301
}
308302

303+
exports.FormRender = FormRender;
309304
exports.FormSpaceRender = SpaceLayout;
310-
exports.default = FormRenderer;
305+
exports.default = FormRender;

‎package.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "antd-form-render",
3-
"version": "1.6.2",
3+
"version": "2.0.0--alpha.0",
44
"description": "使用js配置，开发antd表单",
55
"keywords": [
66
"react",
@@ -26,20 +26,18 @@
2626
"start": "node pack --dev"
2727
},
2828
"peerDependencies": {
29-
"antd": ">=4.0.0",
30-
"react": ">=16.8.0",
31-
"react-dom": ">=16.8.0"
29+
"antd": ">=5.0.0"
3230
},
3331
"devDependencies": {
3432
"@ant-design/icons": "^4.7.0",
3533
"@commitlint/cli": "^12.1.1",
3634
"@commitlint/config-conventional": "^12.1.1",
37-
"@types/react": "^18.0.28",
35+
"@types/react": "^18.0.0",
3836
"@types/react-dom": "^18.0.10",
3937
"@types/styled-components": "^5.1.12",
4038
"@typescript-eslint/eslint-plugin": "^5.6.0",
4139
"@typescript-eslint/parser": "^5.6.0",
42-
"antd": "^4.24.7",
40+
"antd": "^5.0.0",
4341
"babel-eslint": "^10.1.0",
4442
"eslint": "^8.34.0",
4543
"eslint-plugin-react": "^7.19.0",

‎src/ItemRender.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ const ItemRender = ({
2020

2121
if (typeof _item !== 'object' || !_item) return null;
2222

23-
// elProps 组件的其他属性
24-
// itemProps Form.Item的其他属性
2523
const { type, name, rules, label, elProps = {}, itemProps = {}, render, ...props } = _item;
2624

2725
let wrapperProps: Record<string, unknown> = {};

‎src/index.tsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
1+
import React, { FC } from 'react';
22
import { Row } from 'antd';
33
import { FormRenderProps, Item } from './Types';
44
import ItemRender from './ItemRender';
5-
export { default as FormSpaceRender } from './SpaceLayout';
5+
import { default as FormSpaceRender } from './SpaceLayout';
66

77
const isType = (type) => (n) => {
88
return Object.prototype.toString.call(n) === `[object ${type}]`;
@@ -16,12 +16,12 @@ const renderTowDimensionLayout = (layoutData) => {
1616
{layoutData.map((arr, idx) => {
1717
const len = arr.length;
1818
if (24 % len !== 0) {
19-
throw new Error('数组的长度必须能被24整除');
19+
throw new Error('The length of the array must be divisible by 24');
2020
}
2121
const span = 24 / len;
2222

2323
return (
24-
<Row key={idx} gutter={{ xs: 8, sm: 16, md: 24 }}>
24+
<Row key={idx}>
2525
{arr.map((item, subIndex) => (
2626
<ItemRender item={item} key={subIndex} span={span} layoutType="row" />
2727
))}
@@ -48,7 +48,7 @@ const renderTowDimensionLayout = (layoutData) => {
4848
* }
4949
* @return {*} {React.ReactElement}
5050
*/
51-
export default function FormRenderer({
51+
const FormRender: FC<FormRenderProps> = ({
5252
/**
5353
* 1或2维数组，存储组件配置信息/自定义渲染组件
5454
*/
@@ -57,7 +57,7 @@ export default function FormRenderer({
5757
* 定义一行渲染几个组件，layoutData为一维数组时生效, 可以是: 1 | 2 | 3 | 4, 默认1,
5858
*/
5959
cols = 1,
60-
}: FormRenderProps): React.ReactElement {
60+
}) => {
6161
let isOneDimensionArray = false;
6262
const firstItem = layoutData[0];
6363
if (!Array.isArray(firstItem)) {
@@ -91,14 +91,20 @@ export default function FormRenderer({
9191
}
9292

9393
return !isOneDimensionArray ? (
94-
renderTowDimensionLayout(layoutData)
94+
<>{renderTowDimensionLayout(layoutData)}</>
9595
) : (
96-
<div className="afr-flex">
96+
<>
9797
<Row>
9898
{(layoutData as Item[]).map((item, idx) => (
9999
<ItemRender item={item} key={idx} span={24} layoutType="row" />
100100
))}
101101
</Row>
102-
</div>
102+
</>
103103
);
104-
}
104+
};
105+
106+
export default FormRender;
107+
108+
export { FormRender, FormSpaceRender };
109+
110+
export type { Item };

‎types/index.d.ts‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React from 'react';
2-
import { FormRenderProps } from './Types';
3-
export { default as FormSpaceRender } from './SpaceLayout';
1+
import { FC } from 'react';
2+
import { FormRenderProps, Item } from './Types';
3+
import { default as FormSpaceRender } from './SpaceLayout';
44
/**
55
* 等分空间布局, 每个组件等分一行空间
66
*
@@ -17,12 +17,7 @@ export { default as FormSpaceRender } from './SpaceLayout';
1717
* }
1818
* @return {*} {React.ReactElement}
1919
*/
20-
export default function FormRenderer({
21-
/**
22-
* 1或2维数组，存储组件配置信息/自定义渲染组件
23-
*/
24-
layoutData,
25-
/**
26-
* 定义一行渲染几个组件，layoutData为一维数组时生效, 可以是: 1 | 2 | 3 | 4, 默认1,
27-
*/
28-
cols, }: FormRenderProps): React.ReactElement;
20+
declare const FormRender: FC<FormRenderProps>;
21+
export default FormRender;
22+
export { FormRender, FormSpaceRender };
23+
export type { Item };

0 commit comments

Comments
 (0)