Skip to content

Commit 4506990

Browse files
author
astrid
committed
fix(form): labelBrick 位置不对
refs DASHBOARD-522
1 parent 61790c8 commit 4506990

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

bricks/form/src/form-item/index.spec.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,22 @@ describe("eo-form-item", () => {
3030
element.trigger = "change";
3131
element.label = "测试";
3232
element.required = true;
33+
element.labelBrick = {
34+
useBrick: {
35+
brick: "span",
36+
properties: {
37+
textContent: "labelBrick",
38+
},
39+
},
40+
};
41+
element.helpBrick = {
42+
useBrick: {
43+
brick: "span",
44+
properties: {
45+
textContent: "helpBrick",
46+
},
47+
},
48+
};
3349

3450
expect(element.shadowRoot).toBeFalsy();
3551
act(() => {

bricks/form/src/form-item/index.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,12 @@ export function FormItemComponent(props: FormItemProps) {
317317
<label>
318318
{required && <span className="required">*</span>}
319319
{label}
320+
{labelBrick?.useBrick ? (
321+
<ReactUseMultipleBricks
322+
{...labelBrick}
323+
></ReactUseMultipleBricks>
324+
) : null}
320325
</label>
321-
{labelBrick?.useBrick ? (
322-
<ReactUseMultipleBricks {...labelBrick}></ReactUseMultipleBricks>
323-
) : null}
324326
</div>
325327
</div>
326328
)}

bricks/form/src/upload/upload-image/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ class UploadImage extends FormItemElementBase implements UploadImageProps {
144144
helpBrick={this.helpBrick}
145145
onChange={this.handleChange}
146146
trigger="handleChange"
147+
labelBrick={this.labelBrick}
147148
/>
148149
);
149150
}

0 commit comments

Comments
 (0)