Skip to content

Commit 687b770

Browse files
committed
Merge branch 'dev-4.3.4' of https://code.alipay.com/oceanbase/oceanbase-developer-center into dev-4.3.4
2 parents 394a66b + ce220e6 commit 687b770

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

src/component/Task/AsyncTask/CreateModal/index.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,12 +929,20 @@ const CreateModal: React.FC<IProps> = (props) => {
929929

930930
//请输入查询结果限制
931931
},
932+
{
933+
validator: (_, value) => {
934+
const max = setting.getSpaceConfigByKey('odc.sqlexecute.default.maxQueryLimit');
935+
if (value !== undefined && value > max) {
936+
return Promise.reject(`不超过查询条数上限 ${max}`);
937+
}
938+
return Promise.resolve();
939+
},
940+
},
932941
]}
933942
>
934943
<InputNumber
935944
defaultValue={setting.getSpaceConfigByKey('odc.sqlexecute.default.queryLimit')}
936945
min={1}
937-
max={10000 * 100}
938946
/>
939947
</Form.Item>
940948
<FormItemPanel

src/component/Task/MutipleAsyncTask/CreateModal/MoreSetting.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,21 @@ const MoreSetting = () => {
6464
defaultMessage: '请输入查询结果限制',
6565
}),
6666
},
67+
{
68+
validator: (_, value) => {
69+
const max = setting.getSpaceConfigByKey('odc.sqlexecute.default.maxQueryLimit');
70+
if (value !== undefined && value > max) {
71+
return Promise.reject(`不超过查询条数上限 ${max}`);
72+
}
73+
return Promise.resolve();
74+
},
75+
},
6776
]}
6877
>
6978
<InputNumber
7079
defaultValue={setting.getSpaceConfigByKey('odc.sqlexecute.default.queryLimit')}
7180
style={{ width: 128 }}
7281
min={1}
73-
max={10000 * 100}
7482
/>
7583
</Form.Item>
7684
<Form.Item

src/component/Task/ResultSetExportTask/CreateModal/index.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,15 @@ const CreateModal: React.FC<IProps> = (props) => {
295295
defaultMessage: '请填写条数限制',
296296
}), //'请填写条数限制'
297297
},
298+
{
299+
validator: (_, value) => {
300+
const max = setting.getSpaceConfigByKey('odc.sqlexecute.default.maxQueryLimit');
301+
if (value !== undefined && Number(value) > max) {
302+
return Promise.reject(`不超过查询条数上限 ${max}`);
303+
}
304+
return Promise.resolve();
305+
},
306+
},
298307
]}
299308
>
300309
<InputBigNumber

src/component/Task/SQLPlanTask/CreateModal/index.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,12 +687,20 @@ const CreateModal: React.FC<IProps> = (props) => {
687687
}),
688688
//请输入查询结果限制
689689
},
690+
{
691+
validator: (_, value) => {
692+
const max = setting.getSpaceConfigByKey('odc.sqlexecute.default.maxQueryLimit');
693+
if (value !== undefined && value > max) {
694+
return Promise.reject(`不超过查询条数上限 ${max}`);
695+
}
696+
return Promise.resolve();
697+
},
698+
},
690699
]}
691700
>
692701
<InputNumber
693702
defaultValue={setting.getSpaceConfigByKey('odc.sqlexecute.default.queryLimit')}
694703
min={1}
695-
max={10000 * 100}
696704
/>
697705
</Form.Item>
698706
<Form.Item

0 commit comments

Comments
 (0)