PullRequest: 829 修复最大值限制 key 读取

Merge branch 'fix/max-config of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.4

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/829


Reviewed-by: 晓康 <xxk268858@oceanbase.com>


* refactor: 调整最大值key 读取
* refactor: 优化代码样式
* refactor: 调整函数名称

Author: 之瑛

src/component/ODCSetting/config/group/sqlQuery.tsx

@@ -18,7 +18,7 @@ import { getCurrentOrganizationId } from '@/store/setting';
 import { IODCSetting, ODCSettingGroup } from '../../config';
 import InputIntergerItem from '../../Item/InputIntegerItem';
 import InputItem from '../../Item/InputItem';
-import { validForqueryLimit, validForqueryQueryNumber } from '../../validators';
+import { validForQueryLimit, validForQueryQueryNumber } from '../../validators';
 
 const databaseGroup: ODCSettingGroup = {
   label: formatMessage({
@@ -41,7 +41,7 @@ const sqlQuerySetting: IODCSetting[] = [
     rules: [
       {
         validator(rule, value, callback) {
-          return validForqueryLimit(value);
+          return validForQueryLimit(value);
         },
       },
     ],
@@ -72,7 +72,7 @@ const sqlQuerySetting: IODCSetting[] = [
     rules: [
       {
         validator(rule, value, callback) {
-          return validForqueryQueryNumber(value);
+          return validForQueryQueryNumber(value);
         },
       },
     ],

src/component/ODCSetting/config/personal/personalSqlQuery.tsx

@@ -18,7 +18,7 @@ import { getCurrentOrganizationId } from '@/store/setting';
 import { IODCSetting, ODCSettingGroup } from '../../config';
 import InputIntergerItem from '../../Item/InputIntegerItem';
 import InputItem from '../../Item/InputItem';
-import { validForqueryLimit, validForqueryQueryNumber } from '../../validators';
+import { validForQueryLimit, validForQueryQueryNumber } from '../../validators';
 
 const databaseGroup: ODCSettingGroup = {
   label: formatMessage({
@@ -42,7 +42,7 @@ const personalSqlQuerySetting: IODCSetting[] = [
     rules: [
       {
         validator(rule, value, callback) {
-          return validForqueryLimit(value);
+          return validForQueryLimit(value);
         },
       },
     ],
@@ -73,7 +73,7 @@ const personalSqlQuerySetting: IODCSetting[] = [
     rules: [
       {
         validator(rule, value, callback) {
-          return validForqueryQueryNumber(value);
+          return validForQueryQueryNumber(value);
         },
       },
     ],

src/component/ODCSetting/validators.ts

@@ -1,7 +1,8 @@
 import { formatMessage } from '@/util/intl';
 import setting, { getCurrentOrganizationId } from '@/store/setting';
+import { getSystemConfig } from '@/common/network/other';
 
-export const validForqueryQueryNumber = (value) => {
+export const validForQueryQueryNumber = (value) => {
   const sessionQueryLimit = sessionStorage.getItem(`maxQueryLimit-${getCurrentOrganizationId()}`);
   const queryLimit = setting.getSpaceConfigByKey('odc.sqlexecute.default.maxQueryLimit');
   if (!value) {
@@ -35,11 +36,13 @@ export const validForqueryQueryNumber = (value) => {
   return Promise.resolve();
 };
 
-export const validForqueryLimit = (value) => {
-  const limit =
-    Number(setting.configurations['odc.session.sql-execute.max-result-set-rows']) || 100000;
-  if (value > limit) {
-    return Promise.reject(`不超过${limit}`);
+export const validForQueryLimit = async (value) => {
+  const res = await getSystemConfig();
+  const maxResultsetRows =
+    parseInt(res?.['odc.session.sql-execute.max-result-set-rows']) || Number.MAX_SAFE_INTEGER;
+
+  if (value > maxResultsetRows) {
+    return Promise.reject(`不超过${maxResultsetRows}`);
   }
   if (!value) {
     return Promise.reject(