Skip to content

Commit 0be3cac

Browse files
author
fanyang
committed
fix: 修复合并遗留的冲突
1 parent c05c7b9 commit 0be3cac

File tree

1 file changed

+0
-74
lines changed

1 file changed

+0
-74
lines changed

‎sites/docs/docs/api/index.en-US.md

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,6 @@ All node instance operations on the flowchart, as well as events, and behavioral
4848

4949
| Option | Description |
5050
|:-----------------------|-------------------------|
51-
<<<<<<< HEAD
52-
| [setDefaultEdgeType](detail#setdefaultedgetype) | Set the type of edge, i.e. set the type of linkage drawn directly by the user at the node.|
53-
| [addEdge](detail#addedge) | Create an edge connecting two nodes. |
54-
| [getEdgeDataById](detail#getedgedatabyid) | Get edge data by `id`. |
55-
| [getEdgeModelById](detail#getedgemodelbyid) | Get the model of the edge based on the its `id`. |
56-
| [getEdgeModels](detail#getedgemodels) | Get the model of the edge that satisfies the condition. |
57-
| [changeEdgeId](detail#changeedgeid) | Modify the edge id. If a new id is not passed, one will be created internally automatically. |
58-
| [changeEdgeType](detail#changeedgetype) | Switch type of the edge. |
59-
| [deleteEdge](detail#deleteedge) | Delete an edge based on its id. |
60-
| [deleteEdgeByNodeId](detail#deleteedgebynodeid) | Deletes an edge of the specified type, based on the start and end points of the edge, and can pass only one of them. |
61-
| [getNodeEdges](detail#getnodeedges) | Get the model of all edges connected by the node. |
62-
=======
6351
| [setDefaultEdgeType](./detail/index.en-US.md#setdefaultedgetype) | Set the type of edge, i.e. set the type of linkage drawn directly by the user at the node.|
6452
| [addEdge](./detail/index.en-US.md#addedge) | Create an edge connecting two nodes. |
6553
| [getEdgeDataById](./detail/index.en-US.md#getedgedatabyid) | Get edge data by `id`. |
@@ -70,27 +58,11 @@ All node instance operations on the flowchart, as well as events, and behavioral
7058
| [deleteEdge](./detail/index.en-US.md#deleteedge) | Delete an edge based on its id. |
7159
| [deleteEdgeByNodeId](./detail/index.en-US.md#deleteedgebynodeid) | Deletes an edge of the specified type, based on the start and end points of the edge, and can pass only one of them. |
7260
| [getNodeEdges](./detail/index.en-US.md#getnodeedges) | Get the model of all edges connected by the node. |
73-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
7461

7562
### Element Related
7663

7764
| Option | Description |
7865
|:-----------------------|-------------------------|
79-
<<<<<<< HEAD
80-
| [addElements](detail#addelements) | Batch add nodes and edges. |
81-
| [selectElementById](detail#selectelementbyid) | Select the graph. |
82-
| [getSelectElements](detail#getselectelements) | Get all elements selected. |
83-
| [clearSelectElements](detail#clearselectelements) | Uncheck all elements. |
84-
| [getModelById](detail#getmodelbyid) | Get the `model` of a node or edge based on its `id`. |
85-
| [getDataById](detail#getdatabyid) | Get the `data` of a node or edge based on its `id`. |
86-
| [deleteElement](detail#deleteelement) | Delete the element by id. |
87-
| [setElementZIndex](detail#setelementzindex) | Set the `zIndex` of the element.|
88-
| [getAreaElement](detail#getareaelement) | Gets all the elements in the specified region, which must be a DOM layer. |
89-
| [setProperties](detail#setproperties) | Set the custom properties of nodes or edges. |
90-
| [getProperties](detail#getproperties) | Get the custom properties of a node or an edge. |
91-
| [deleteProperty](detail#deleteproperty) | Delete node attributes. |
92-
| [updateAttributes](detail#updateattributes) | Modifies an attribute in the corresponding element model, which is called graphModel inside the method. |
93-
=======
9466
| [addElements](./detail/index.en-US.md#addelements) | Batch add nodes and edges. |
9567
| [selectElementById](./detail/index.en-US.md#selectelementbyid) | Select the graph. |
9668
| [getSelectElements](./detail/index.en-US.md#getselectelements) | Get all elements selected. |
@@ -103,40 +75,21 @@ All node instance operations on the flowchart, as well as events, and behavioral
10375
| [setProperties](./detail/index.en-US.md#setproperties) | Set the custom properties of nodes or edges. |
10476
| [getProperties](./detail/index.en-US.md#getproperties) | Get the custom properties of a node or an edge. |
10577
| [deleteProperty](./detail/index.en-US.md#deleteproperty) | Delete node attributes. |
106-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
10778

10879
### Text Related
10980

11081
| Option | Description |
11182
|:-----------------------|-------------------------|
112-
<<<<<<< HEAD
113-
| [editText](detail#edittext) | Show text editing box for nodes and edges, entering edit mode, equivalent to [graphModel.editText](api/graph-model-api#edittext). |
114-
| [updateText](detail#updatetext) | Update the node or edge text. |
115-
| [updateEditConfig](detail#updateeditconfig) | Update the basic configuration of the flow editor. |
116-
| [getEditConfig](detail#geteditconfig) | Get the basic configuration of the flow editor. |
117-
=======
11883
| [editText](./detail/index.en-US.md#edittext) | Show text editing box for nodes and edges, entering edit mode, equivalent to [graphModel.editText](api/graph-model-api#edittext). |
11984
| [updateText](./detail/index.en-US.md#updatetext) | Update the node or edge text. |
12085
| [updateEditConfig](./detail/index.en-US.md#updateeditconfig) | Update the basic configuration of the flow editor. |
12186
| [getEditConfig](./detail/index.en-US.md#geteditconfig) | Get the basic configuration of the flow editor. |
122-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
12387

12488
### Graph Related
12589

12690
| Option | Description |
12791
|:-----------------------|-------------------------|
12892
| [setTheme](api/theme-api) | Set the theme. |
129-
<<<<<<< HEAD
130-
| [focusOn](detail#focuson) | Position to the center of the canvas viewport. |
131-
| [resize](detail#resize) | Adjusts the width and height of the canvas, if the width or height is not passed, the width and height of the canvas will be calculated automatically. |
132-
| [toFront](detail#tofront) | Places an element to the top. |
133-
| [getPointByClient](detail#getpointbyclient) | Get the coordinates of the event location relative to the top left corner of the canvas. |
134-
| [getGraphData](detail#getgraphdata) | Get flow graphing data. |
135-
| [getGraphRawData](detail#getgraphrawdata) | Get the raw data of the flow graph. The difference with getGraphData is that the data obtained by this method is not affected by the `adapter`. |
136-
| [clearData](detail#cleardata) | Clear the canvas. |
137-
| [renderRawData](detail#renderrawdata) | Rendering of the raw graph data. The difference with render is that after using `adapter`, you can use this method if you still want to render the data in logicflow format. |
138-
| [render](detail#render) | Render graph data. |
139-
=======
14093
| [focusOn](./detail/index.en-US.md#focuson) | Position to the center of the canvas viewport. |
14194
| [resize](./detail/index.en-US.md#resize) | Adjusts the width and height of the canvas, if the width or height is not passed, the width and height of the canvas will be calculated automatically. |
14295
| [toFront](./detail/index.en-US.md#tofront) | Places an element to the top. |
@@ -146,37 +99,18 @@ All node instance operations on the flowchart, as well as events, and behavioral
14699
| [clearData](./detail/index.en-US.md#cleardata) | Clear the canvas. |
147100
| [renderRawData](./detail/index.en-US.md#renderrawdata) | Rendering of the raw graph data. The difference with render is that after using `adapter`, you can use this method if you still want to render the data in logicflow format. |
148101
| [render](./detail/index.en-US.md#render) | Render graph data. |
149-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
150102

151103
### History Related
152104

153105
| Option | Description |
154106
|:-----------------------|-------------------------|
155-
<<<<<<< HEAD
156-
| [undo](detail#undo) | History operation - Back to previous step.|
157-
| [redo](detail#redo) | History operation - Resume next.|
158-
=======
159107
| [undo](./detail/index.en-US.md#undo) | History operation - Back to previous step.|
160108
| [redo](./detail/index.en-US.md#redo) | History operation - Resume next.|
161-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
162109

163110
### Resize Related
164111

165112
| Option | Description |
166113
|:-----------------------|-------------------------|
167-
<<<<<<< HEAD
168-
| [zoom](detail#zoom) | Zoom in or out on the canvas. |
169-
| [resetZoom](detail#resetzoom) | Reset the zoom ratio of the drawing to the default, which is 1. |
170-
| [setZoomMiniSize](detail#setzoomminisize) | Sets the minimum number of times the graph can be scaled when it is reduced. The parameter takes values from 0 to 1. Default 0. |
171-
| [setZoomMaxSize](detail#setzoommaxsize) | Set the maximum zoom scale when zooming in; default is 16. |
172-
| [getTransform](detail#gettransform) | Get the zoom in/out value of the current canvas.|
173-
| [translate](detail#translate) | Panning graph. |
174-
| [resetTranslate](detail#resettranslate) | Restore the graph to its original position. |
175-
| [translateCenter](detail#translatecenter) | Graphics canvas centering. |
176-
| [fitView](detail#fitview) | Reduce the entire flowchart to a size where the entire canvas can be displayed. |
177-
| [openEdgeAnimation](detail#openedgeanimation) | Enable edge animations. |
178-
| [closeEdgeAnimation](detail#closeedgeanimation) | Disable edge animations. |
179-
=======
180114
| [zoom](./detail/index.en-US.md#zoom) | Zoom in or out on the canvas. |
181115
| [resetZoom](./detail/index.en-US.md#resetzoom) | Reset the zoom ratio of the drawing to the default, which is 1. |
182116
| [setZoomMiniSize](./detail/index.en-US.md#setzoomminisize) | Sets the minimum number of times the graph can be scaled when it is reduced. The parameter takes values from 0 to 1. Default 0. |
@@ -188,20 +122,12 @@ All node instance operations on the flowchart, as well as events, and behavioral
188122
| [fitView](./detail/index.en-US.md#fitview) | Reduce the entire flowchart to a size where the entire canvas can be displayed. |
189123
| [openEdgeAnimation](./detail/index.en-US.md#openedgeanimation) | Enable edge animations. |
190124
| [closeEdgeAnimation](./detail/index.en-US.md#closeedgeanimation) | Disable edge animations. |
191-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)
192125

193126
### Event System Related
194127

195128
| Option | Description |
196129
|:-----------------------|-------------------------|
197-
<<<<<<< HEAD
198-
| [on](detail#on) | Event listener for the graph; see [Events](api/event-center-api) for more events. |
199-
| [off](detail#off) | Remove event listener. |
200-
| [once](detail#once) | Event listener that triggers only once. |
201-
| [emit](detail#emit) | Trigger an event. |
202-
=======
203130
| [on](./detail/index.en-US.md#on) | Event listener for the graph; see [Events](api/event-center-api) for more events. |
204131
| [off](./detail/index.en-US.md#off) | Remove event listener. |
205132
| [once](./detail/index.en-US.md#once) | Event listener that triggers only once. |
206133
| [emit](./detail/index.en-US.md#emit) | Trigger an event. |
207-
>>>>>>> df47bfe0 (docs: 官网基础模块 - 实例&节点页优化)

0 commit comments

Comments
 (0)