Skip to content

Commit ceb8a8d

Browse files
committed
refactor(desingbale-antd): improve dir name
1 parent 5b568fc commit ceb8a8d

File tree

16 files changed

+52
-42
lines changed

16 files changed

+52
-42
lines changed

designable/antd/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"start": "webpack-dev-server --config playground/webpack.dev.ts"
3131
},
3232
"devDependencies": {
33-
"@designable/react-settings-form": "^0.1.32",
33+
"@designable/react-settings-form": "^0.1.33",
3434
"file-loader": "^5.0.2",
3535
"fs-extra": "^8.1.0",
3636
"html-webpack-plugin": "^3.2.0",
@@ -53,8 +53,8 @@
5353
"react-is": ">=16.8.0 || >=17.0.0"
5454
},
5555
"dependencies": {
56-
"@designable/core": "^0.1.32",
57-
"@designable/react": "^0.1.32",
56+
"@designable/core": "^0.1.33",
57+
"@designable/react": "^0.1.33",
5858
"@formily/shared": "2.0.0-beta.64",
5959
"@formily/antd": "2.0.0-beta.64",
6060
"@formily/core": "2.0.0-beta.64",

designable/antd/playground/main.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const App = () => {
6363
>
6464
<DragSourceWidget title="输入组件" name="inputs" />
6565
<DragSourceWidget title="布局组件" name="layouts" />
66-
<DragSourceWidget title="数组组件" name="arrays" />
66+
<DragSourceWidget title="自增列表" name="arrays" />
6767
</CompositePanel.Item>
6868
<CompositePanel.Item
6969
title="大纲树"

designable/antd/src/components/FormContainer/index.tsx designable/antd/src/components/DesignableContainer/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import './styles.less'
33
import { Droppable } from '../Droppable'
44

5-
export const createFormContainer = (
5+
export const createDesignableContainer = (
66
Target: React.JSXElementConstructor<any>
77
) => {
88
return (props: any) => {

designable/antd/src/components/DesignableField/index.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ import {
3838
import { clone } from '@formily/shared'
3939
import * as defaultSchema from '../../schemas'
4040
import { Card, Slider, Rate } from 'antd'
41-
import { createFormContainer } from '../FormContainer'
41+
import { createDesignableContainer } from '../DesignableContainer'
4242
import { FormItemSwitcher } from '../FormItemSwitcher'
43-
import { FormTab as DesignableFormTab } from '../FormTab'
44-
import { FormCollapse as DesignableFormCollapse } from '../FormCollapse'
45-
import { EmptyObject as DesignableEmptyObject } from '../EmptyObject'
43+
import { DesignableFormTab } from '../DesignableFormTab'
44+
import { DesignableFormCollapse } from '../DesignableFormCollapse'
45+
import { DesignableObject } from '../DesignableObject'
4646

4747
Schema.silent()
4848

@@ -99,9 +99,9 @@ export const createDesignableField = (options: IDesignableFieldProps = {}) => {
9999
},
100100
components: {
101101
...options.components,
102-
Space: createFormContainer(Space),
103-
FormGrid: createFormContainer(FormGrid),
104-
FormLayout: createFormContainer(FormLayout),
102+
Space: createDesignableContainer(Space),
103+
FormGrid: createDesignableContainer(FormGrid),
104+
FormLayout: createDesignableContainer(FormLayout),
105105
FormTab: DesignableFormTab,
106106
FormCollapse: DesignableFormCollapse,
107107
FormItem,
@@ -162,11 +162,11 @@ export const createDesignableField = (options: IDesignableFieldProps = {}) => {
162162
const fieldProps = getFieldProps()
163163
if (props.type === 'object') {
164164
return (
165-
<DesignableEmptyObject>
165+
<DesignableObject>
166166
<ObjectField {...fieldProps} name={node.id}>
167167
{props.children}
168168
</ObjectField>
169-
</DesignableEmptyObject>
169+
</DesignableObject>
170170
)
171171
} else if (props.type === 'array') {
172172
return <ArrayField {...fieldProps} name={node.id} />

designable/antd/src/components/DesignableForm/styles.less

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@
88
.@{ant-prefix}-picker-input,
99
.@{ant-prefix}-picker,
1010
.@{ant-prefix}-cascader-picker-label,
11+
.@{ant-prefix}-slider,
12+
.@{ant-prefix}-checkbox,
13+
.@{ant-prefix}-radio,
14+
.@{ant-prefix}-radio-wrapper,
15+
.@{ant-prefix}-checkbox-group,
16+
.@{ant-prefix}-checkbox-wrapper,
17+
.@{ant-prefix}-radio-group,
18+
.@{ant-prefix}-upload,
19+
.@{ant-prefix}-transfer,
1120
.@{ant-prefix}-select,
1221
.@{ant-prefix}-select-selector {
1322
pointer-events: none !important;

designable/antd/src/components/FormCollapse/index.tsx designable/antd/src/components/DesignableFormCollapse/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const getCorrectActiveKey = (
3939
return tabs[tabs.length - 1].id
4040
}
4141

42-
export const FormCollapse: React.FC<CollapseProps> & {
42+
export const DesignableFormCollapse: React.FC<CollapseProps> & {
4343
CollapsePanel?: React.FC<CollapsePanelProps>
4444
} = observer((props) => {
4545
const [activeKey, setActiveKey] = useState<string | string[]>([])
@@ -134,6 +134,6 @@ export const FormCollapse: React.FC<CollapseProps> & {
134134
)
135135
})
136136

137-
FormCollapse.CollapsePanel = (props) => {
137+
DesignableFormCollapse.CollapsePanel = (props) => {
138138
return <Fragment>{props.children}</Fragment>
139139
}

designable/antd/src/components/FormTab/index.tsx designable/antd/src/components/DesignableFormTab/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const getCorrectActiveKey = (activeKey: string, tabs: TreeNode[]) => {
2828
return tabs[tabs.length - 1].id
2929
}
3030

31-
export const FormTab: React.FC<TabsProps> & {
31+
export const DesignableFormTab: React.FC<TabsProps> & {
3232
TabPane?: React.FC<TabPaneProps>
3333
} = observer((props) => {
3434
const [activeKey, setActiveKey] = useState<string>()
@@ -121,6 +121,6 @@ export const FormTab: React.FC<TabsProps> & {
121121
)
122122
})
123123

124-
FormTab.TabPane = (props) => {
124+
DesignableFormTab.TabPane = (props) => {
125125
return <Fragment>{props.children}</Fragment>
126126
}

designable/antd/src/components/EmptyObject/index.tsx designable/antd/src/components/DesignableObject/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import { useNodeIdProps, useTreeNode } from '@designable/react'
33
import { Droppable } from '../Droppable'
44

5-
export const EmptyObject: React.FC = (props) => {
5+
export const DesignableObject: React.FC = (props) => {
66
const node = useTreeNode()
77
const nodeId = useNodeIdProps()
88
if (node.children.length === 0) return <Droppable {...nodeId} />

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
},
77
"workspaces": [
88
"packages/*",
9-
"designable/*"
9+
"designable/*",
10+
"devtools/*"
1011
],
1112
"scripts": {
1213
"bootstrap": "lerna bootstrap",

yarn.lock

+22-22
Original file line numberDiff line numberDiff line change
@@ -1155,12 +1155,12 @@
11551155
resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"
11561156
integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==
11571157

1158-
"@designable/[email protected].32", "@designable/core@^0.1.32":
1159-
version "0.1.32"
1160-
resolved "https://registry.yarnpkg.com/@designable/core/-/core-0.1.32.tgz#ef12a0e23d42d3052912376c468a217de3ca451a"
1161-
integrity sha512-FwWyRAH3iUCs5b31ceb1+NlBtbJ9vHGCB+EtoZAhOa+U1HXsSJENsiwrosD9gP4L2ZqoEivfmeqQFkwkekMV+g==
1158+
"@designable/[email protected].33", "@designable/core@^0.1.33":
1159+
version "0.1.33"
1160+
resolved "https://registry.yarnpkg.com/@designable/core/-/core-0.1.33.tgz#689f123b0417c739433436e5f65ab3944fc98d22"
1161+
integrity sha512-GSkqGLLEgzQcJeEVdyRYxqUYEgovn16Nj89WMNGc0H4wKOZYeCs26Cq32NBaFaRz5oy2LB/91fbHQrQ0tJxnjQ==
11621162
dependencies:
1163-
"@designable/shared" "0.1.32"
1163+
"@designable/shared" "0.1.33"
11641164
"@formily/json-schema" "^2.0.0-beta.50"
11651165
"@formily/path" "^2.0.0-beta.50"
11661166
"@formily/reactive" "^2.0.0-beta.50"
@@ -1176,28 +1176,28 @@
11761176
"@formily/reactive" "^2.0.0-beta.50"
11771177
"@juggle/resize-observer" "^3.3.1"
11781178

1179-
"@designable/react-settings-form@^0.1.32":
1180-
version "0.1.32"
1181-
resolved "https://registry.yarnpkg.com/@designable/react-settings-form/-/react-settings-form-0.1.32.tgz#dd67c5e1ed3cf92f374b4bbf1d11bc527c205257"
1182-
integrity sha512-cPZyhNJB9pHTuJY4olJ1gOnUUyzYezGMQRjU3Lu7WmY7fEGf22Q/Jiutrf7RiuNSUpg212P37I+KUSINoeN4xw==
1179+
"@designable/react-settings-form@^0.1.33":
1180+
version "0.1.33"
1181+
resolved "https://registry.yarnpkg.com/@designable/react-settings-form/-/react-settings-form-0.1.33.tgz#de102a3ec7ede4d5f0d24623171ec00805f477d4"
1182+
integrity sha512-bIoONlLLvYOb9rJIkRwYFhdDcu7p6aJ1sXyjuFNct139870QA3HSG0nCjwjB0MDxqtHItJLyNPnZ0QcKy4DUBQ==
11831183
dependencies:
1184-
"@designable/core" "0.1.32"
1185-
"@designable/react" "0.1.32"
1186-
"@designable/shared" "0.1.32"
1184+
"@designable/core" "0.1.33"
1185+
"@designable/react" "0.1.33"
1186+
"@designable/shared" "0.1.33"
11871187
"@formily/antd" "^2.0.0-beta.50"
11881188
"@formily/core" "^2.0.0-beta.50"
11891189
"@formily/react" "^2.0.0-beta.50"
11901190
"@formily/reactive" "^2.0.0-beta.50"
11911191
"@formily/reactive-react" "^2.0.0-beta.50"
11921192
react-color "^2.19.3"
11931193

1194-
"@designable/[email protected].32", "@designable/react@^0.1.32":
1195-
version "0.1.32"
1196-
resolved "https://registry.yarnpkg.com/@designable/react/-/react-0.1.32.tgz#e30b7e71b1deb13e0c59716c5f63e78527d42fba"
1197-
integrity sha512-IXlJdOpSv8zxnkrottz7P7E55coEbuV1swRB15yI5/J2S3W3Tap6AEVHZyJRbRPv4chxdNbllkasT9IeK/GDGQ==
1194+
"@designable/[email protected].33", "@designable/react@^0.1.33":
1195+
version "0.1.33"
1196+
resolved "https://registry.yarnpkg.com/@designable/react/-/react-0.1.33.tgz#ee22be6a2bd2fc4ba0a000b59917b9d83acafdae"
1197+
integrity sha512-0u8tQqzD0jC7jGI/cmLKhrinB0Ms9Pi86mcHMptnqwmtPd+R/wqqIw4n4FRLk3g0ARYOHHovY2Nnwo+Kp4L5qQ==
11981198
dependencies:
1199-
"@designable/core" "0.1.32"
1200-
"@designable/shared" "0.1.32"
1199+
"@designable/core" "0.1.33"
1200+
"@designable/shared" "0.1.33"
12011201
"@formily/reactive" "^2.0.0-beta.50"
12021202
"@formily/reactive-react" "^2.0.0-beta.50"
12031203
"@juggle/resize-observer" "^3.3.1"
@@ -1209,10 +1209,10 @@
12091209
dependencies:
12101210
requestidlecallback "^0.3.0"
12111211

1212-
"@designable/[email protected].32":
1213-
version "0.1.32"
1214-
resolved "https://registry.yarnpkg.com/@designable/shared/-/shared-0.1.32.tgz#105fd2650ddbd2c9f3665ca91c6ec5055152803b"
1215-
integrity sha512-dRR95iNt8UWNsGy72ym2SS2Kr8RVpItfDfTJ90+bzIJRVw8sGcJ060+Rm4XWZNFktGyMKpH+LunUtJmfZJysNg==
1212+
"@designable/[email protected].33":
1213+
version "0.1.33"
1214+
resolved "https://registry.yarnpkg.com/@designable/shared/-/shared-0.1.33.tgz#69a373e5a6bbcf3171f751ed28b8ca15fe19ab6d"
1215+
integrity sha512-LCOlLuqDAkvr34bPFoxfAVuQYfv3OqiW10aHOSvJU6CsaKrVgdYYVIwN5iV78B2TuIIYK2h7jYv5WhTsa384ng==
12161216
dependencies:
12171217
requestidlecallback "^0.3.0"
12181218

0 commit comments

Comments
 (0)