feat:primaryKeyOrder

shanhexi · shanhexi · commit f8e02555b257 · 2023-11-06T00:22:09.000+08:00
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.less b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.less
@@ -92,9 +92,17 @@
   justify-content: center;
   align-items: center;
   cursor: pointer;
+  position: relative;
   i{
     color: var(--color-warning);
   }
+  span{
+    position: absolute;
+    font-weight: bold;
+    right: 4px;
+    bottom: -2px;
+    transform: scale(0.8);
+  }
 }
 
 .operationBar {
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -71,6 +71,7 @@ const createInitialData = () => {
     autoIncrement: null,
     comment: null,
     primaryKey: null,
+    primaryKeyOrder: null,
     schemaName: null,
     databaseName: null,
     typeName: null,
@@ -243,6 +244,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
               }}
             >
               {primaryKey && <Iconfont code="&#xe775;" />}
+              {primaryKey && <span>{record.primaryKeyOrder}</span>}
             </div>
           </div>
         );
@@ -287,22 +289,46 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
 
   const handelPrimaryKey = (_data: IColumnItemNew) => {
     const newData = dataSource.map((item) => {
+      let primaryKeyOrder:null | number = item.primaryKeyOrder;
+
+      if(_data.primaryKey) {
+        // 如果当前字段是主键，且当前字段的主键顺序大于当前编辑的字段的主键顺序，那么当前字段的主键顺序减1
+        if(_data.primaryKeyOrder &&  item.primaryKeyOrder && item.primaryKeyOrder >= _data.primaryKeyOrder){
+          primaryKeyOrder  = item.primaryKeyOrder - 1;
+        }
+      }
+
+      // 增加主键的时候，主键顺序为当前表的最大主键顺序+1
+      if(_data.key === item.key && !_data.primaryKey){
+        primaryKeyOrder = Math.max(...dataSource.map(i => {
+          return i.primaryKeyOrder || 0
+        })) + 1;
+      }
+
+
       if (item.key === _data?.key) {
         // 判断当前数据是新增的数据还是编辑后的数据
         let editStatus = item.editStatus;
         if (editStatus !== EditColumnOperationType.Add) {
           editStatus = EditColumnOperationType.Modify;
         }
+
         const editingDataItem = {
           ...item,
           primaryKey: !item.primaryKey,
+          primaryKeyOrder,
           nullable: !item.primaryKey ? NullableType.NotNull : item.nullable,
           editStatus,
         };
         return editingDataItem;
       }
-      return item;
+
+      return {
+        ...item,
+        primaryKeyOrder,
+      };
     });
+    console.log(newData)
     setDataSource(newData);
   };
 
diff --git a/chat2db-client/src/typings/editTable.ts b/chat2db-client/src/typings/editTable.ts
@@ -1,4 +1,4 @@
-import { IndexesType, EditColumnOperationType, NullableType } from '@/constants';
+import { EditColumnOperationType, NullableType } from '@/constants';
 
 // 编辑表时表的基础数据
 export interface IBaseInfo {
@@ -26,6 +26,7 @@ export interface IColumnItemNew {
   autoIncrement: string | null; // 是否自增
   comment: string | null; // 注释
   primaryKey: boolean | null; // 是否主键
+  primaryKeyOrder: number | null; // 主键顺序
   typeName: string | null; // 类型名
   columnSize: number | null; // 列的长度
   bufferLength: number | null; // 缓冲区长度
@@ -69,7 +70,7 @@ export interface IIndexItem {
   key?: string;
   name: string | null;
   comment?: string | null;
-  type: IndexesType | null;
+  type: any | null;
   columnList: IIndexIncludeColumnItem[];
   editStatus: EditColumnOperationType | null; // 操作类型
 
