Browse Source

fix: 修复bug

liaojiaxing 5 months ago
parent
commit
f1f09b3c0d

+ 35 - 31
apps/er-designer/src/components/TableEdit.tsx

@@ -126,6 +126,34 @@ export default function TableEdit(props: {
   };
 
   const columns: ProColumns[] = [
+    {
+      title: "操作",
+      valueType: "option",
+      width: 120,
+      render: (_text, record, _, action) =>
+        record.isPreDefined
+          ? []
+          : [
+              <a
+                key="editable"
+                onClick={() => {
+                  action?.startEditable?.(record.id);
+                }}
+              >
+                编辑
+              </a>,
+              <a
+                key="delete"
+                onClick={() => {
+                  setDataSource(
+                    dataSource.filter((item) => item.id !== record.id)
+                  );
+                }}
+              >
+                删除
+              </a>,
+            ],
+    },
     {
       title: "字段代码",
       dataIndex: "schemaName",
@@ -160,7 +188,6 @@ export default function TableEdit(props: {
       renderFormItem: (_schema, config, form) => {
         const model = config.record;
         const rowKey = config.recordKey;
-        console.log(model);
         return (
           <span>
             <LangInput
@@ -209,7 +236,7 @@ export default function TableEdit(props: {
       },
       render: (text, record) => {
         return record.type === DataType.Decimal
-          ? `${record.precision},${record.scale}`
+          ? `${record.precision}${record.scale ? `,${record.scale}` : ""}`
           : text;
       },
       renderFormItem: (_schema, config, form) => {
@@ -285,37 +312,14 @@ export default function TableEdit(props: {
     {
       title: "预定义字段",
       dataIndex: "isPreDefined",
-      renderText: (text, record) => {
+      valueType: "switch",
+      readonly: true,
+      render: (text, record) => {
         return record.isPreDefined ? "是" : "否";
       },
-    },
-    {
-      title: "操作",
-      valueType: "option",
-      width: 120,
-      render: (_text, record, _, action) =>
-        record.isPreDefined
-          ? []
-          : [
-              <a
-                key="editable"
-                onClick={() => {
-                  action?.startEditable?.(record.id);
-                }}
-              >
-                编辑
-              </a>,
-              <a
-                key="delete"
-                onClick={() => {
-                  setDataSource(
-                    dataSource.filter((item) => item.id !== record.id)
-                  );
-                }}
-              >
-                删除
-              </a>,
-            ],
+      renderFormItem: (schema, config) => {
+        return config.record.isPreDefined ? "是" : "否";
+      },
     },
   ];
 

+ 4 - 2
apps/er-designer/src/pages/er/components/Menu.tsx

@@ -80,9 +80,11 @@ export default function Menu() {
 
     graph.exportPNG("", {
       quality: 1,
-      copyStyles: false,
+      copyStyles: true,
       stylesheet: `
-      
+        .x6-port {
+          display: none;
+        }
       `
     });
   };

+ 3 - 0
apps/er-designer/src/pages/er/components/TablePanel.tsx

@@ -78,6 +78,9 @@ export default function TablePanel() {
         title="字段详情"
         width={"80%"}
         open={open}
+        footer={(_, { CancelBtn}) => {
+          return <CancelBtn/>
+        }}
         onCancel={() => {
           setOpen(false);
           setTableData(undefined);