style(graphin):fix eslint error

antvis · Jan 22, 2021 · 228241e · 228241e
1 parent e7a7649
commit 228241e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 11 deletions.
diff --git a/packages/graphin-components/src/ContextMenu/index.tsx b/packages/graphin-components/src/ContextMenu/index.tsx
@@ -1,7 +1,15 @@
 import React, { useEffect } from 'react';
-import { GraphinContext, IG6GraphEvent } from '@antv/graphin';
+import * as Graphin from '@antv/graphin';
 import Menu from './Menu';
 
+const { GraphinContext } = Graphin;
+
+interface IG6GraphEvent {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  item: any;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string]: any;
+}
 const defaultStyle: React.CSSProperties = {
   width: 200,
   background: '#fff',

diff --git a/packages/graphin-components/src/Hull/index.tsx b/packages/graphin-components/src/Hull/index.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
 // @ts-ignore
-import { GraphinContext, Utils } from '@antv/graphin';
+import { GraphinContext } from '@antv/graphin';
 
 const defaultHullCfg = {
-  id: Utils.uuid(),
+  id: `${Math.random()}`, // Utils.uuid(),
   members: [],
   type: 'round-convex',
   nonMembers: [],

diff --git a/packages/graphin/.npmignore b/packages/graphin/.npmignore
@@ -34,7 +34,6 @@ jspm_packages/
 .idea
 
 # build
-lib
 build
 
 # lock

diff --git a/packages/graphin/package.json b/packages/graphin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/graphin",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0",
   "description": "the react toolkit for graph analysis based on g6",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/graphin/src/Graphin.tsx b/packages/graphin/src/Graphin.tsx
@@ -377,7 +377,7 @@ class Graphin extends React.PureComponent<GraphinProps, GraphinState> {
   }
 
   clear = () => {
-    if (this.layout && this.layout.destroyed) {
+    if (this.layout && this.layout.destroy) {
       this.layout.destroy(); // tree graph
     }
     this.layout = {} as LayoutController;

diff --git a/packages/graphin/src/consts.ts b/packages/graphin/src/consts.ts
@@ -294,6 +294,6 @@ export const getDefaultStyleByTheme = (inputTheme: ThemeType | undefined) => {
     background: isLight ? '#fff' : '#000',
     ...genDefaultNodeStyle(theme),
     ...genDefaultEdgeStyle(theme),
-    ...genDefaultComboStyle(theme),
+    ...genDefaultComboStyle(),
   };
 };
diff --git a/packages/graphin/src/index.ts b/packages/graphin/src/index.ts
@@ -28,6 +28,7 @@ export default Graphin;
 export { Utils, Layout, GraphinContext, Behaviors, registerFontFamily };
 
 export { GraphinContextType, NodeStyle, EdgeStyle };
+
 export {
   /** export G6 */
   default as G6,

diff --git a/packages/graphin/src/layout/index.ts b/packages/graphin/src/layout/index.ts
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import G6, { Graph } from '@antv/g6';
 import defaultOptions from './utils/options';
 
@@ -26,8 +28,6 @@ class LayoutController {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   options: any;
 
-  type: string;
-
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   instance: any;
 

diff --git a/packages/graphin/src/typings/type.ts b/packages/graphin/src/typings/type.ts
@@ -361,8 +361,8 @@ export interface ComboStyle {
 
 export interface Layout {
   /** 布局名称，必选 */
-  type: string;
-  reset?: Layout;
+  type?: string;
+  preset?: Layout;
   /** 布局配置，可选 */
   [key: string]: any; // eslint-disable-line
 }