- fix: error occurs while dragging combo with drag-node behavior; (#4073

)
antvis · Nov 18, 2022 · 9dfe146 · 9dfe146
1 parent 58ebfa9
commit 9dfe146
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+### 4.7.14
+
+- fix: error occurs while dragging combo with drag-node behavior;
+
 ### 4.7.13
 
 - fix: unexpected move with fitCenter with animation;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-core",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",

diff --git a/packages/core/src/global.ts b/packages/core/src/global.ts
@@ -64,7 +64,7 @@ const colorSet = {
 };
 
 export default {
-  version: '0.7.13',
+  version: '0.7.14',
   rootContainerClassName: 'root-container',
   nodeContainerClassName: 'node-container',
   edgeContainerClassName: 'edge-container',

diff --git a/packages/element/package.json b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-element",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "@antv/g-base": "^0.5.1",
-    "@antv/g6-core": "0.7.13",
+    "@antv/g6-core": "0.7.14",
     "@antv/util": "~2.0.5"
   },
   "devDependencies": {

diff --git a/packages/g6/package.json b/packages/g6/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6",
-  "version": "4.7.13",
+  "version": "4.7.14",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",
@@ -66,7 +66,7 @@
     ]
   },
   "dependencies": {
-    "@antv/g6-pc": "0.7.13"
+    "@antv/g6-pc": "0.7.14"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",

diff --git a/packages/g6/src/index.ts b/packages/g6/src/index.ts
@@ -1,7 +1,7 @@
 import G6 from '@antv/g6-pc';
 
-G6.version = '4.7.13';
+G6.version = '4.7.14';
 
 export * from '@antv/g6-pc';
 export default G6;
-export const version = '4.7.13';
+export const version = '4.7.14';
diff --git a/packages/pc/package.json b/packages/pc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-pc",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",
@@ -75,9 +75,9 @@
     "@antv/g-canvas": "^0.5.2",
     "@antv/g-math": "^0.1.1",
     "@antv/g-svg": "^0.5.1",
-    "@antv/g6-core": "0.7.13",
-    "@antv/g6-element": "0.7.13",
-    "@antv/g6-plugin": "0.7.13",
+    "@antv/g6-core": "0.7.14",
+    "@antv/g6-element": "0.7.14",
+    "@antv/g6-plugin": "0.7.14",
     "@antv/hierarchy": "^0.6.7",
     "@antv/layout": "^0.3.0",
     "@antv/matrix-util": "^3.1.0-beta.3",

diff --git a/packages/pc/src/behavior/drag-node.ts b/packages/pc/src/behavior/drag-node.ts
@@ -110,6 +110,10 @@ export default {
    * @param evt event param
    */
   onDragMove(evt: IG6GraphEvent) {
+    if (evt.item?.getType?.() !== 'node') {
+      this.onDragEnd();
+      return;
+    }
     if (!this.mousedown) return;
     if (!this.dragstart) {
       // dragstart

diff --git a/packages/pc/src/global.ts b/packages/pc/src/global.ts
@@ -7,7 +7,7 @@ const textColor = 'rgb(0, 0, 0)';
 const colorSet = getColorsWithSubjectColor(subjectColor, backColor);
 
 export default {
-  version: '0.7.13',
+  version: '0.7.14',
   rootContainerClassName: 'root-container',
   nodeContainerClassName: 'node-container',
   edgeContainerClassName: 'edge-container',

diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-plugin",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "G6 Plugin",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -22,8 +22,8 @@
     "@antv/g-base": "^0.5.1",
     "@antv/g-canvas": "^0.5.2",
     "@antv/g-svg": "^0.5.2",
-    "@antv/g6-core": "0.7.13",
-    "@antv/g6-element": "0.7.13",
+    "@antv/g6-core": "0.7.14",
+    "@antv/g6-element": "0.7.14",
     "@antv/matrix-util": "^3.1.0-beta.3",
     "@antv/scale": "^0.3.4",
     "@antv/util": "^2.0.9",

diff --git a/packages/site/.dumirc.ts b/packages/site/.dumirc.ts
@@ -53,8 +53,8 @@ export default defineConfig({
     showAPIDoc: true,                                                   // 是否在 demo 页展示API文档
     themeSwitcher: 'g2',
     versions: {                                                         // 历史版本以及切换下拉菜单
-        [version]: 'https://g6.antv.antgroup.com',
-        '3.2.x': 'https://g6-v3-2.antv.vision',
+      [version]: 'https://g6.antv.antgroup.com',
+      '3.2.x': 'https://g6-v3-2.antv.vision',
     },
     docsearchOptions: {                                                 // 头部搜索框配置
       apiKey: '9d1cd586972bb492b7b41b13a949ef30',
@@ -574,6 +574,13 @@ export default defineConfig({
       { name: 'yunos', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*_js7SaNosUwAAAAAAAAAAABkARQnAQ', },
       { name: '菜鸟', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*TgV-RZDODJIAAAAAAAAAAABkARQnAQ', },
     ],
+    internalSite: {
+      url: 'https://g6.antv.antgroup.com',
+      name: {
+        zh: '极速站点',
+        en: 'Fast Site',
+      },
+    },
   },
   mfsu: false,
   alias: {
@@ -583,4 +590,5 @@ export default defineConfig({
   ],
   scripts: [
   ],
+  jsMinifier: 'terser',
 });
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@antv/g6-site",
-  "version": "4.7.13",
+  "version": "4.7.14",
   "description": "G6 sites deployed on gh-pages",
   "keywords": [
     "antv",
@@ -51,4 +51,4 @@
   "resolutions": {
     "@types/react": "^16.9.35"
   }
-}
+}