Merge branch 'master' into 003-toggle-columns-table-names

Author: alswl

.umirc.ts

@@ -6,6 +6,8 @@ export default defineConfig({
   model: {},
   initialState: {},
   request: {},
+  // CI/E2E 时关闭 mock，避免 path-to-regexp 版本冲突导致 dev 服务器报错
+  mock: process.env.CI ? false : undefined,
   layout: {
     title: 'dbml-editor - free online DBML editor',
     locale: false,

package.json

@@ -40,6 +40,7 @@
     "@ant-design/pro-components": "^2.4.4",
     "@antv/layout": "^0.3.25",
     "@antv/x6": "^2.18.1",
+    "@antv/x6-common": "^2.0.17",
     "@antv/x6-plugin-snapline": "^2.1.7",
     "@antv/x6-react-shape": "^2.2.3",
     "@dbml/core": "^3.4.3",

pnpm-lock.yaml

@@ -3,7 +3,8 @@ import { expect, test } from '@playwright/test';
 test.describe('DBML Editor - Basic Features', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should load homepage', async ({ page }) => {
@@ -42,7 +43,8 @@ test.describe('DBML Editor - Basic Features', () => {
 test.describe('DBML Editor - Editing Features', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should edit DBML code', async ({ page }) => {
@@ -97,7 +99,8 @@ Table orders {
 test.describe('DBML Editor - Import Features', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should open import dialog', async ({ page }) => {
@@ -154,7 +157,8 @@ test.describe('DBML Editor - Import Features', () => {
 test.describe('DBML Editor - Export Features', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should open export dialog', async ({ page }) => {
@@ -208,7 +212,8 @@ test.describe('DBML Editor - Export Features', () => {
 test.describe('DBML Editor - Error Handling', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should display syntax error message', async ({ page }) => {

tests/e2e/editor.spec.ts

@@ -3,7 +3,8 @@ import { expect, test } from '@playwright/test';
 test.describe('ER Diagram - Interaction', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
     await page.waitForSelector('svg', { timeout: 10000 });
   });
 
@@ -21,7 +22,12 @@ test.describe('ER Diagram - Interaction', () => {
   });
 
   test('should display table names', async ({ page }) => {
-    // Wait for diagram to render table names (CI is slower)
+    // 等待 ER 图节点和文字渲染完成（layout 与 X6 渲染为异步）
+    await expect(page.locator('svg g[data-cell-id]').first()).toBeVisible({
+      timeout: 15000,
+    });
+    await expect(page.locator('svg text').first()).toBeVisible({ timeout: 15000 });
+
     const tableNames = page.locator('svg text');
     await expect(tableNames.first()).toBeVisible({ timeout: 15000 });
 
@@ -109,7 +115,8 @@ Ref: posts.user_id > users.id
 test.describe('ER Diagram - Layout', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
     await page.waitForSelector('svg', { timeout: 10000 });
   });
 
@@ -181,7 +188,8 @@ Table products {
 test.describe('ER Diagram - Visual', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
     await page.waitForSelector('svg', { timeout: 10000 });
     await page.waitForTimeout(1000);
   });
@@ -197,6 +205,7 @@ test.describe('ER Diagram - Visual', () => {
     const rectCount = await rects.count();
     expect(rectCount).toBeGreaterThan(0);
 
+    await expect(page.locator('svg text').first()).toBeVisible({ timeout: 15000 });
     const texts = page.locator('svg text');
     const textCount = await texts.count();
     expect(textCount).toBeGreaterThan(0);

tests/e2e/er-diagram.spec.ts

@@ -3,7 +3,8 @@ import { expect, test } from '@playwright/test';
 test.describe('Export - SQL Export Functionality', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
   });
 
   test('should open export modal', async ({ page }) => {

tests/e2e/export.spec.ts

@@ -3,7 +3,8 @@ import { expect, test } from '@playwright/test';
 test.describe('Toolbar - Zoom Controls', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/');
-    await page.waitForLoadState('networkidle');
+    await page.waitForLoadState('load');
+    await expect(page.locator('.react-shape-app')).toBeVisible({ timeout: 15000 });
     await page.waitForSelector('.zoom-toolbar', { timeout: 10000 });
     await page.waitForTimeout(2000); // Wait for initial render
   });