VARCHAR default value

shanhexi · shanhexi · commit c606653a42ec · 2023-09-28T18:47:38.000+08:00
diff --git a/chat2db-client/.vscode/settings.json b/chat2db-client/.vscode/settings.json
@@ -78,6 +78,7 @@
     "umijs",
     "USERANDPASSWORD",
     "uuidv",
+    "VARCHAR",
     "VIEWCOLUMN",
     "wireframe"
   ],
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -348,6 +348,12 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
         if (editStatus !== EditColumnOperationType.Add) {
           editStatus = EditColumnOperationType.Modify;
         }
+        const editingDataItem = {
+          ...item,
+          [name]: value,
+          editStatus,
+        };
+
         if (name === 'columnType') {
           // 根据当前字段类型，设置编辑配置
           databaseSupportField.columnTypes.forEach((i) => {
@@ -358,15 +364,19 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
               });
             }
           });
+          // 特殊处理VARCHAR的默认长度 为255
+          if (value === 'VARCHAR' && editingDataItem.columnSize === null) {
+            editingDataItem.columnSize = 255;
+            form.setFieldsValue({
+              columnSize: 255,
+            });
+          }
         }
-        return {
-          ...item,
-          [name]: value,
-          editStatus,
-        };
+        return editingDataItem;
       }
       return item;
     });
+    console.log(newData);
     setDataSource(newData);
   };
 
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/index.tsx
@@ -7,7 +7,7 @@ import ColumnList, { IColumnListRef } from './ColumnList';
 import BaseInfo, { IBaseInfoRef } from './BaseInfo';
 import sqlService, { IModifyTableSqlParams, IExecuteSqlParams } from '@/service/sql';
 import MonacoEditor, { IExportRefFunction } from '@/components/Console/MonacoEditor';
-import { IEditTableInfo, IWorkspaceTab, IManageResultData } from '@/typings';
+import { IEditTableInfo, IWorkspaceTab } from '@/typings';
 import { DatabaseTypeCode } from '@/constants';
 import i18n from '@/i18n';
 import lodash from 'lodash';
@@ -49,7 +49,7 @@ export default memo((props: IProps) => {
   const columnListRef = useRef<IColumnListRef>(null);
   const indexListRef = useRef<IIndexListRef>(null);
   const monacoEditorRef = useRef<IExportRefFunction>(null);
-  const [executeSqlResult, setExecuteSqlResult] = useState<IManageResultData[]>();
+  const [executeSqlResult, setExecuteSqlResult] = useState<string | null>(null);
   const [executeLoading, setExecuteLoading] = useState<boolean>(false);
   const [appendValue, setAppendValue] = useState<string>('');
   const tabList = useMemo(() => {
@@ -80,18 +80,24 @@ export default memo((props: IProps) => {
     setCurrentTab(item);
   }
 
+  useEffect(() => {
+    if (!viewSqlModal) {
+      setExecuteSqlResult(null);
+    }
+  }, [viewSqlModal]);
+
   useEffect(() => {
     if (tableName) {
-      getTableDetails();
+      getTableDetails({});
     }
   }, []);
 
-  const getTableDetails = () => {
+  const getTableDetails = ({ tableNameProps }: { tableNameProps?: string }) => {
     if (!tableName) return;
     const params = {
       databaseName,
       dataSourceId,
-      tableName,
+      tableName: tableNameProps || tableName,
       schemaName,
       refresh: true,
     };
@@ -139,25 +145,26 @@ export default memo((props: IProps) => {
     };
     setExecuteLoading(true);
     sqlService
-      .executeSql(executeSQLParams)
+      .executeDDL(executeSQLParams)
       .then((res) => {
-        if (!tableName) {
-          const newTableName = baseInfoRef.current?.getBaseInfo().name;
-          changeTabDetails({
-            ...tabDetails,
-            title: `edit-${newTableName}`,
-            uniqueData: {
-              ...(tabDetails.uniqueData || {}),
-              tableName: newTableName,
-            },
-          });
-        }
-        if (res.filter((t) => !t.success).length === 0) {
+        if (res.success) {
           setViewSqlModal(false);
           message.success(i18n('common.text.successfulExecution'));
+          const newTableName = baseInfoRef.current?.getBaseInfo().name;
+          getTableDetails({ tableNameProps: newTableName });
+          if (!tableName) {
+            changeTabDetails({
+              ...tabDetails,
+              title: `edit-${newTableName}`,
+              uniqueData: {
+                ...(tabDetails.uniqueData || {}),
+                tableName: newTableName,
+              },
+            });
+          }
+        } else {
+          setExecuteSqlResult(res.message);
         }
-        setExecuteSqlResult(res);
-        getTableDetails();
       })
       .finally(() => {
         setExecuteLoading(false);
@@ -255,19 +262,7 @@ export default memo((props: IProps) => {
             <div className={styles.result}>
               <div className={styles.resultHeader}>{i18n('common.text.errorMessage')}</div>
               <div className={styles.resultContent}>
-                {executeSqlResult
-                  ?.filter((t) => !t.success)
-                  .map((t, i) => {
-                    return (
-                      <div key={i}>
-                        <div className={styles.errorTitle}>
-                          <Iconfont code="&#xe87c;" />
-                          sql{i + 1}:{t.sql}
-                        </div>
-                        <div className={styles.errorMessage}>{t.message}</div>
-                      </div>
-                    );
-                  })}
+                <div className={styles.errorMessage}>{executeSqlResult}</div>
               </div>
             </div>
           )}
diff --git a/chat2db-client/src/service/sql.ts b/chat2db-client/src/service/sql.ts
@@ -205,9 +205,13 @@ export interface IModifyTableSqlParams {
 }
 
 /** 获取修改表的sql */ 
-const getModifyTableSql = createRequest<IModifyTableSqlParams, {sql:string}[]>('/api/rdb/table/modify/sql', { method: 'post' });
+const getModifyTableSql = createRequest<IModifyTableSqlParams, { sql: string }[]>('/api/rdb/table/modify/sql', { method: 'post' });
+
+/** 执行编辑表的sql, 专为编辑表而生 */ 
+const executeDDL = createRequest<IExecuteSqlParams, {success: boolean, message: string}>('/api/rdb/dml/execute_ddl', {method:'post'});
 
 export default {
+  executeDDL,
   getModifyTableSql,
   getTableDetails,
   getDatabaseFieldTypeList,
