fix: fix alter property limit in edit page (#514)

* fix: fix alter property limit in edit page * mod: code review
vesoft-inc · Mar 29, 2023 · 2f41997 · 2f41997
1 parent 7fd290a
commit 2f41997
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/app/pages/Schema/SchemaConfig/Edit/CommonEdit/PropertiesRow.tsx b/app/pages/Schema/SchemaConfig/Edit/CommonEdit/PropertiesRow.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { AlterType, IProperty } from '@app/interfaces/schema';
 import { useI18n } from '@vesoft-inc/i18n';
 import { nameRulesFn, numberRulesFn, stringByteRulesFn } from '@app/config/rules';
-import { DATA_TYPE, EXPLAIN_DATA_TYPE } from '@app/utils/constant';
+import { DataTypeTransformMap, DATA_TYPE, EXPLAIN_DATA_TYPE } from '@app/utils/constant';
 
 import styles from './index.module.less';
 const Option = Select.Option;
@@ -102,8 +102,11 @@ export const EditRow = (props: IEditProps) => {
                     message: intl.get('formRules.dataTypeRequired'),
                   },
                 ]}>
-                <Select showSearch={true} onChange={onUpdateType} dropdownMatchSelectWidth={false}>
+                <Select disabled={!(type in DataTypeTransformMap)} showSearch={true} onChange={onUpdateType} dropdownMatchSelectWidth={false}>
                   {DATA_TYPE.map(item => {
+                    if(!DataTypeTransformMap[type]?.includes(item.value) || item.value !== type) {
+                      return null;
+                    }
                     return (
                       <Option value={item.value} key={item.value}>
                         {item.label}

diff --git a/app/utils/constant.ts b/app/utils/constant.ts
@@ -103,6 +103,14 @@ export const ENUM_OF_COMPARE = {
   ],
 };
 
+export const DataTypeTransformMap = {
+  int8: ['int16', 'int32', 'int'],
+  int16: ['int32', 'int'],
+  int32: ['int'],
+  fixed_string: ['string'],
+  float: ['double'],
+} as const;
+
 export const DATA_TYPE = [
   {
     value: 'int',

diff --git a/server/api/studio/pkg/client/pool.go b/server/api/studio/pkg/client/pool.go
@@ -479,6 +479,9 @@ func parseExecuteData(response SingleResponse) (ParsedResult, error) {
 		return result, nil
 	}
 
+	if !res.IsSucceed() {
+		return result, errors.New(res.GetErrorMsg())
+	}
 	if res.IsSetPlanDesc() {
 		resp := response.Result
 		if response.Result == nil {
@@ -510,9 +513,6 @@ func parseExecuteData(response SingleResponse) (ParsedResult, error) {
 			return result, nil
 		}
 	}
-	if !res.IsSucceed() {
-		return result, errors.New(res.GetErrorMsg())
-	}
 	if !res.IsEmpty() {
 		rows := res.GetRows()
 		rowSize := len(rows)