tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix rebase error

Browse Source
This commit is contained in:
pengfei.zhou 2019-10-25 14:30:51 +08:00
parent c4864699b2
commit eaaf7b7b57
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/src/Counter.ts
View File

@ -96,7 +96,6 @@ class CounterVM extends ViewModel<CountModel, CounterView> {
@Entry @Entry
class MyPage extends VMPanel<CountModel, CounterView>{ class MyPage extends VMPanel<CountModel, CounterView>{
<<<<<<< HEAD
getViewHolderClass() { getViewHolderClass() {
@ -104,9 +103,6 @@ class MyPage extends VMPanel<CountModel, CounterView>{
} }
getViewModelClass() { getViewModelClass() {
=======
getVMClass() {
>>>>>>> debug ts code
return CounterVM return CounterVM
} }

10
demo/src/Snake.ts
View File

@ -346,17 +346,7 @@ class SnakeVM extends ViewModel<SnakeModel, SnakeView>{
} }
@Entry @Entry
class SnakePanel extends VMPanel<SnakeModel, SnakeView>{ class SnakePanel extends VMPanel<SnakeModel, SnakeView>{
<<<<<<< HEAD
getViewModelClass() { getViewModelClass() {
=======
constructor() {
super()
console.log("SnakePanel")
}
getVMClass() {
>>>>>>> fix debug
return SnakeVM return SnakeVM
} }
getState(): SnakeModel { getState(): SnakeModel {