fix: table column auto/fix width problem

ggbond2077 · ggbond2077 · commit 3cdc31f59e0b · 2023-03-08T14:56:06.000+08:00
fix: compile error
diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx
@@ -379,21 +379,22 @@ function ResizeableTable<RecordType extends object>(props: CustomTableProps<Reco
     index: -1,
     width: -1,
   });
+  let allColumnFixed = true;
   const columns = props.columns.map((col, index) => {
     const { width, ...restCol } = col;
     const resizeWidth = (resizeData.index === index ? resizeData.width : col.width) ?? 0;
     let colWidth: number | string = "auto";
     let minWidth: number | string = COL_MIN_WIDTH;
     if (resizeWidth > 0) {
-      // fixed width
-      if (index === props.columns.length - 1) {
-        // the last column auto width
-        colWidth = "100%";
-        minWidth = resizeWidth;
-      } else {
-        minWidth = "unset";
-        colWidth = resizeWidth;
-      }
+      minWidth = "unset";
+      colWidth = resizeWidth;
+    } else {
+      allColumnFixed = false;
+    }
+    if (allColumnFixed && index === props.columns.length - 1) {
+      // all column fixed, the last column fill extra space
+      colWidth = "auto";
+      minWidth = resizeWidth;
     }
     return {
       ...restCol,
diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx
@@ -19,7 +19,6 @@ import { TableNameComp } from "./tableNameComp";
 import { ChangeSetComp } from "./changeSetComp";
 import { FilterComp } from "./FilterComp";
 import { trans } from "i18n";
-import { ResourceType } from "@openblocks-ee/constants/queryConstants";
 import { ColumnNameDropdown } from "./columnNameDropdown";
 import React, { useContext } from "react";
 import { QueryContext } from "util/context/QueryContext";
@@ -247,13 +246,13 @@ export const SQLQuery = class extends SQLTmpQuery {
   }
 };
 
-export const NOT_SUPPORT_GUI_SQL_QUERY: ResourceType[] = [
+export const NOT_SUPPORT_GUI_SQL_QUERY: string[] = [
   "clickHouse",
   "snowflake",
   "tdengine",
   "dameng",
 ];
-const SUPPORT_UPSERT_SQL_QUERY: ResourceType[] = [
+const SUPPORT_UPSERT_SQL_QUERY: string[] = [
   "mysql",
   "oceanBase",
   "tidb",
