Browse Source

fix: 修改数据模型引入问题

liaojiaxing 2 weeks ago
parent
commit
794dd7b6fc

+ 2 - 2
apps/er-designer/.umirc.ts

@@ -17,8 +17,8 @@ export default defineConfig({
   ],
   proxy: {
     '/api': {
-      'target': 'http://ab.dev.jbpm.shalu.com/',
-      // 'target': 'https://edesign.shalu.com/',
+      // 'target': 'http://ab.dev.jbpm.shalu.com/',
+      'target': 'https://edesign.shalu.com/',
       'changeOrigin': true,
       'pathRewrite': { '^/api' : '' },
     },

+ 1 - 1
apps/er-designer/src/components/AddModel.tsx

@@ -76,7 +76,7 @@ export default React.forwardRef(function AddModel(
           // 主表
           if (tableMap[item.id]) {
             tableMap[item.id] = {
-              ...tableMap[item.parentBusinessTableId],
+              ...tableMap[item.id],
               ...option,
             };
           } else {

+ 1 - 1
apps/er-designer/src/components/AddTable.tsx

@@ -116,7 +116,7 @@ export default forwardRef(function AddTable(
           // 主表
           if (tableMap[item.id]) {
             tableMap[item.id] = {
-              ...tableMap[item.parentBusinessTableId],
+              ...tableMap[item.id],
               ...option,
             };
           } else {

+ 4 - 4
apps/er-designer/src/components/SyncModal.tsx

@@ -133,7 +133,7 @@ export default forwardRef(function SyncModal(
           // 主表
           if (tableMap[item.id]) {
             tableMap[item.id] = {
-              ...tableMap[item.parentBusinessTableId],
+              ...tableMap[item.id],
               ...option,
             };
           } else {
@@ -314,13 +314,13 @@ export default forwardRef(function SyncModal(
             {resultStatus === "success" ? (
               <Result
                 status="success"
-                title="数据同步完成!"
+                title={`数据${tabActiveKey === '1' ? '拉取' : '推送'}完成!`}
                 subTitle="请查看数据表的数据信息"
               />
             ) : (
               <Result
                 status="error"
-                title="数据同步失败!"
+                title={`数据${tabActiveKey === '1' ? '拉取' : '推送'}失败!`}
                 subTitle="请检查数据表的数据信息"
               />
             )}
@@ -356,7 +356,7 @@ export default forwardRef(function SyncModal(
           tables: project.tables.map((item) => {
             if (tableIds.includes(item.table.id)) {
               return (
-                selectedRows.find((item) => item.table.id === item.table.id) ||
+                selectedRows.find((t) => t.table.id === item.table.id) ||
                 item
               );
             }