Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix springcloud plugin‘s style display issues #284

Merged
merged 4 commits into from
May 25, 2023
Merged

fix springcloud plugin‘s style display issues #284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59bd937
fix springcloud plugin‘s style display issues
May 25, 2023
d7740b7
fix style
May 25, 2023
d8d4687
fix style
May 25, 2023
fd99b31
fix style
peng-heng May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 135 additions & 128 deletions src/routes/Plugin/Common/Selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,114 +349,117 @@ class AddModal extends Component {
required
key={key}
{...(index === 0
? { labelCol: { span: 3 }, wrapperCol: { span: 21 } }
: { wrapperCol: { span: 21, offset: 3 } })}
? { labelCol: { span: 4 }, wrapperCol: { span: 20 } }
: { wrapperCol: { span: 20, offset: 4 } })}
label={index === 0 ? "divideUpstreams" : ""}
>
<Card>
<div style={{ display: "flex", alignItems: "center" }}>
<Row gutter={8}>
<Col span={8}>
<Item label="protocol" wrapperCol={{ span: 16 }}>
{getFieldDecorator(`divideUpstreams[${key}].protocol`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].protocol
: "",
rules: [
{
required: true,
message: "protocol is required"
}
]
})(<Input />)}
</Item>
</Col>
<Col span={16}>
<Item label="upstreamUrl" wrapperCol={{ span: 19 }}>
{getFieldDecorator(`divideUpstreams[${key}].upstreamUrl`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].upstreamUrl
: "",
rules: [
{
required: true,
message: "upstreamUrl is required"
}
]
})(<Input />)}
</Item>
</Col>
<Col span={6}>
<Item label="weight" wrapperCol={{ span: 15 }}>
{getFieldDecorator(`divideUpstreams[${key}].weight`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].weight
: "",
rules: [
{
required: true,
message: "weight is required"
}
]
})(
<InputNumber
min={0}
max={100}
style={{ width: "100%" }}
/>
)}
</Item>
</Col>

<Col span={4}>
<Item label="status" wrapperCol={{ span: 11 }}>
{getFieldDecorator(`divideUpstreams[${key}].status`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].status
: false,
valuePropName: "checked",
rules: [
{
required: true,
message: "status is required"
}
]
})(<Switch />)}
</Item>
</Col>

<Col span={8}>
<Item label="timestamp" wrapperCol={{ span: 15 }}>
{getFieldDecorator(`divideUpstreams[${key}].timestamp`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].timestamp
: "",
rules: [
{
required: true,
message: "timestamp is required"
}
]
})(<InputNumber style={{ width: "100%" }} />)}
</Item>
</Col>

<Col span={6}>
<Item label="warmup" wrapperCol={{ span: 14 }}>
{getFieldDecorator(`divideUpstreams[${key}].warmup`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].warmup
: "",
rules: [
{
required: true,
message: "warmup is required"
}
]
})(<InputNumber style={{ width: "100%" }} />)}
</Item>
</Col>
</Row>
<div>
<Row gutter={30}>
<Col span={10}>
<Item label="protocol" {...{labelCol: { span: 8 }, wrapperCol: { span: 10 }}}>
{getFieldDecorator(`divideUpstreams[${key}].protocol`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].protocol
: "",
rules: [
{
required: true,
message: "protocol is required"
}
]
})(<Input />)}
</Item>
</Col>
<Col span={14} style={{marginLeft:"-20px"}}>
<Item label="upstreamUrl" {...{labelCol: { span: 9 }, wrapperCol: { span: 15 }}}>
{getFieldDecorator(`divideUpstreams[${key}].upstreamUrl`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].upstreamUrl
: "",
rules: [
{
required: true,
message: "upstreamUrl is required"
}
]
})(<Input />)}
</Item>
</Col>
</Row>
<Row gutter={30}>
<Col span={10}>
<Item label="weight" {...{labelCol: { span: 8 }, wrapperCol: { span: 10 }}}>
{getFieldDecorator(`divideUpstreams[${key}].weight`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].weight
: "",
rules: [
{
required: true,
message: "weight is required"
}
]
})(
<InputNumber
min={0}
max={100}
style={{ width: "100%" }}
/>
)}
</Item>
</Col>
<Col span={14} style={{marginLeft:"-20px"}}>
<Item label="timestamp" {...{labelCol: { span: 9 }, wrapperCol: { span: 15 }}}>
{getFieldDecorator(`divideUpstreams[${key}].timestamp`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].timestamp
: "",
rules: [
{
required: true,
message: "timestamp is required"
}
]
})(<InputNumber style={{ width: "100%" }} />)}
</Item>
</Col>
</Row>
<Row gutter={30}>
<Col span={10}>
<Item label="status" {...{labelCol: { span: 8 }, wrapperCol: { span: 4 }}}>
{getFieldDecorator(`divideUpstreams[${key}].status`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].status
: false,
valuePropName: "checked",
rules: [
{
required: true,
message: "status is required"
}
]
})(<Switch />)}
</Item>
</Col>
<Col span={14} style={{marginLeft:"-20px"}}>
<Item label="warmup" {...{labelCol: { span: 9 }, wrapperCol: { span: 15 }}}>
{getFieldDecorator(`divideUpstreams[${key}].warmup`, {
initialValue: divideUpstreams[key]
? divideUpstreams[key].warmup
: "",
rules: [
{
required: true,
message: "warmup is required"
}
]
})(<InputNumber style={{ width: "100%" }} />)}
</Item>
</Col>
</Row>
</div>
<div style={{ width: 64, textAlign: "right" }}>
<Icon
onClick={() => {
Expand All @@ -478,22 +481,23 @@ class AddModal extends Component {
));

return (
<Row gutter={16} key="8">
<Col span={10}>
<Item label="serviceId" wrapperCol={{ span: 16 }}>
{getFieldDecorator("serviceId", {
<div style={{padding:"10px"}}>
<Row gutter={16} key="8">
<Col span={10}>
<Item label="serviceId" {...{labelCol: { span: 6 }, wrapperCol: { span: 18 }}}>
{getFieldDecorator("serviceId", {
initialValue: serviceId,
rules: [
{
required: true
}
]
})(<Input placeholder="serviceId" />)}
</Item>
</Col>
<Col span={8}>
<Item label="gray" wrapperCol={{ span: 16 }}>
{getFieldDecorator("gray", {
})(<Input placeholder="serviceId" /> )}
</Item>
</Col>
<Col span={3}>
<Item label="gray" {...formCheckLayout}>
{getFieldDecorator("gray", {
valuePropName: "checked",
initialValue: gray,
rules: [
Expand All @@ -502,27 +506,30 @@ class AddModal extends Component {
}
]
})(<Switch />)}
</Item>
</Col>
<Col span={24}>
{Rule}
<Item wrapperCol={{ span: 16, offset: 3 }}>
<Button
type="dashed"
onClick={() => {
</Item>
</Col>
</Row>
<Row gutter={24} key="9">
<Col span={24}>
{Rule}
<Item>
<Button
type="dashed"
onClick={() => {
const keysData = getFieldValue("keys");
// eslint-disable-next-line no-plusplus
const nextKeys = keysData.concat(id++);
setFieldsValue({
keys: nextKeys
});
}}
>
<Icon type="plus" /> Add divide upstream
</Button>
</Item>
</Col>
</Row>
>
<Icon type="plus" /> Add divide upstream
</Button>
</Item>
</Col>
</Row>
</div>
);
}

Expand Down