feat: update

src/app/ControlPage/control/control.component.css

-div, app-element-term, app-element-guacamole {
+div, app-element-term, app-element-iframe {
   height: 100%;
+  padding-bottom: 30px;
 }
 
 div {

src/app/ControlPage/control/control.component.html

@@ -11,6 +11,5 @@
                       [userid]="m.user.id"
                       [index]="i"
                       *ngIf="m.type=='rdp'">
-
   </app-element-iframe>
 </div>

src/app/elements/iframe/iframe.component.ts

@@ -17,7 +17,7 @@ export class ElementIframeComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.target = 'https://wx.qq.com/';
+    this.target = 'http://localhost:8080/#/client/MwBjAHBvc3RncmVzcWw=';
   }
 
   trust(url) {

src/app/elements/term/term.component.ts

@@ -44,7 +44,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
       }
     } else {
       term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
-      term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
+      term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 3;
       term.term = this.term;
     }
     this.term.open(this.el.nativeElement, true);

tools/publish.sh

@@ -7,12 +7,12 @@
 set -ex
 
 
-git checkout publish && \
+git checkout github_dev && \
   git pull github dev --rebase && \
-  git merge master -m "publish" && \
+  git merge dev -m "publish" && \
   git reset --soft HEAD^ && \
   git commit -m "publish" && \
-  git push github publish:dev && \
+  git push github github_dev:dev && \
   echo "success"
-git checkout master
-git pull github dev --commit && git push origin master
+git checkout dev
+git pull github dev --commit && git push origin dev