fix: 🧩 fix tableAttribute pagination checkbox

limuen · Jun 6, 2024 · eefd09c · eefd09c
1 parent 91a6298
commit eefd09c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/apps/react-low-code/src/views/lowCode/component/index.tsx b/apps/react-low-code/src/views/lowCode/component/index.tsx
@@ -6,7 +6,7 @@ import { useFormHook } from "@/views/lowCode/form/hook/form";
 import Operations from "@/components/Operations";
 import TemplateTagList from "@/components/TemplateTagList";
 import { StorageNameMap } from "@/constants/storageNames";
-import { AnyObject } from "src/types";
+import { AnyObject } from "@/types";
 import { downloadFile, uuid } from "@limuen/utils";
 import ComponentBody from "./component/ComponentBody";
 import { ComponentGlobalControl, ComponentAttribute, BodyType } from "./component/ComponentGlobalControl";

diff --git a/apps/react-low-code/src/views/lowCode/table/components/TableBody.tsx b/apps/react-low-code/src/views/lowCode/table/components/TableBody.tsx
@@ -2,7 +2,7 @@ import { DragDropContext, Droppable } from "react-beautiful-dnd";
 import { IColumnType } from "../";
 import { PlusOutlined } from "@ant-design/icons";
 import { Button, Table } from "antd";
-import { AnyObject } from "src/types";
+import { AnyObject } from "@/types";
 import { TableAttribute } from "./TableGlobalControl";
 
 export interface TableBodyProps {

diff --git a/apps/react-low-code/src/views/lowCode/table/components/TableGlobalControl.tsx b/apps/react-low-code/src/views/lowCode/table/components/TableGlobalControl.tsx
@@ -1,9 +1,9 @@
 import { useEffect } from "react";
+import { Button, Checkbox, Form, Input, TablePaginationConfig } from "antd";
 import { CloseOutlined } from "@ant-design/icons";
 import Selection from "@/components/Selection";
-import { Button, Checkbox, Form, Input, TablePaginationConfig } from "antd";
 import GlobalControl from "@/components/GlobalControl";
-import { AnyObject } from "src/types";
+import { AnyObject } from "@/types";
 import { shortUuid } from "@limuen/utils";
 
 export interface TableAttribute {
@@ -13,7 +13,7 @@ export interface TableAttribute {
   extension: ".tsx" | ".jsx";
   attribute: {
     rowKey?: string;
-    pagination?: TablePaginationConfig;
+    pagination?: false | TablePaginationConfig;
   };
 }
 
@@ -37,6 +37,10 @@ const TableGlobalControl: React.FC<TableGlobalControlProps> = ({
   useEffect(() => {
     form.setFieldsValue({
       ...tableAttribute,
+      attribute: {
+        ...tableAttribute.attribute,
+        pagination: tableAttribute.attribute.pagination !== undefined ? tableAttribute.attribute.pagination : {}
+      },
       dataSource: dataSource.map(item => {
         if (typeof item === "string") {
           return item;
@@ -125,7 +129,7 @@ const TableGlobalControl: React.FC<TableGlobalControlProps> = ({
           </Form.List>
         </Form.Item>
         <Form.Item label="分页" name={["attribute", "pagination"]} valuePropName="checked">
-          <Checkbox />
+          <Checkbox checked={!!tableAttribute.attribute.pagination} />
         </Form.Item>
       </Selection>