Merge remote-tracking branch 'origin/dev' into dev

Chat2DB-Pro · Chat2DB-Pro · commit 5bfa34c8b795 · 2023-11-06T15:52:24.000+08:00
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -291,19 +291,26 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     const newData = dataSource.map((item) => {
       let primaryKeyOrder:null | number = item.primaryKeyOrder;
 
-      // 如果当前字段是主键，取消主键的时候，比当前字段顺序大的字段顺序-1
+      // 取消主键if
       if(_data.primaryKey) {
-        if(_data.primaryKeyOrder &&  item.primaryKeyOrder && item.primaryKeyOrder >= _data.primaryKeyOrder){
-          primaryKeyOrder  = item.primaryKeyOrder - 1;
+        // 如果取消的时当前的字段，主键顺序为null
+        if(_data.key === item.key){
+          primaryKeyOrder = null;
+        }else{
+          // 如果当前字段是主键，取消主键的时候，比当前字段顺序大的字段顺序-1
+          if(_data.primaryKeyOrder &&  item.primaryKeyOrder && item.primaryKeyOrder >= _data.primaryKeyOrder){
+            primaryKeyOrder  = item.primaryKeyOrder - 1;
+          }
         }
       }else{
+        // 增加主键if
         // 增加主键的时候，主键顺序为当前表的最大主键顺序+1
-        // 因为在map里所以只对当前字段进行处理
         if( _data.key === item.key){
           primaryKeyOrder = Math.max(...dataSource.map(i => {
             return i.primaryKeyOrder || 0
           })) + 1;
         }
+        // 对于当前字段之前的字段，主键顺序不变
       }
 
       if (item.key === _data?.key) {
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceHeader/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceHeader/index.tsx
@@ -503,7 +503,7 @@ function SearchHeader(props: {handleSearch: (value:string) => void}) {
         className={styles.searchHeaderInput}
         placeholder={i18n('common.text.search')}
         bordered={false}
-        onPressEnter={(e) => {
+        onPressEnter={() => {
           props.handleSearch(value);
         }}
       />
