修复设计器国际化以及滚动问题

youseries · Jan 25, 2018 · 75cd67b · 75cd67b
1 parent 5f0ff06
commit 75cd67b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js b/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
diff --git a/ureport2-js/src/designer.js b/ureport2-js/src/designer.js
@@ -116,7 +116,7 @@ export default class UReportDesigner{
     }
 
     buildTools(context){
-        const toolbar=$(`<div class="btn-group ud-toolbar"></div>`);
+        const toolbar=$(`<div class="btn-group ud-toolbar top-toolbar"></div>`);
         this.container.prepend(toolbar);
         this.tools=[];
         this.tools.push(new PreviewTool(context));

diff --git a/ureport2-js/src/i18n/designer.json b/ureport2-js/src/i18n/designer.json
@@ -98,7 +98,7 @@
     },
     "undo":{
       "noUndo":"当前没有内容可以撤消！",
-      "redo":"撤消"
+      "undo":"撤消"
     },
     "save":{
       "save":"保存",

diff --git a/ureport2-js/src/index.js b/ureport2-js/src/index.js
@@ -24,7 +24,7 @@ $(document).ready(function(){
     let prevTop=0;
     $(window).scroll(function(){
         const top=$(window).scrollTop();
-        const toolbar=$('.ud-toolbar');
+        const toolbar=$('.top-toolbar');
         if(top>0){
             toolbar.css({
                 "position":"absolute",