解决冲突

2022-04-07 18:27:27 +08:00
parent deec1b0bd6
commit 7b0f2d49b5
9 changed files with 209 additions and 33 deletions
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.html
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.html
@ -0,0 +1,2 @@
+<g2-custom delay="100" (render)="render($event)"></g2-custom>
+
				`@ -0,0 +1,2 @@`
				`<g2-custom delay="100" (render)="render($event)"></g2-custom>`