birt 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d17fdc7fb01954788c080eeb639a7b7445c2c030
-  data.tar.gz: 2dbf5737474092bf6d09bdfc6f9994938d934bb3
+  metadata.gz: 591788cc9db63198f8416d70130bd5e8212f3004
+  data.tar.gz: de1e8914cf9809c29106bc7b72f2871a9af447a2
 SHA512:
-  metadata.gz: db5677cbc475cca359859fb168ed9bc9d7b227521ddb89807252fdfbbbdd7086c0dbd1d68241092bd01f009cbbb2b27a23f80bbf14603824a124c8765caf8d87
-  data.tar.gz: dd24ead72fc2c37d57f3dede77823894ce827f02e8864ce443a605882e27a6ac7ad29410affa701659fbfc3913d7841432e8cb08eb8e3e37cbe710e93d0444de
+  metadata.gz: 38d9145876ab625890ccf0bbd2835ba8322bcb2806eaa8eb7aad3fa4133c8da02e6d0a89bcfafc7450428cecd464957c6b07e00938626b720706a506f6c810dc
+  data.tar.gz: b3ea9af809f34db440b429162c713ae16659196d15505af262609ba91369211b67181d844856ff6e4cf6a7c998d476a3166c51d2a82a2bd33a2251819c2adc33

data/app/assets/javascripts/birt/birt.js

@@ -12,13 +12,15 @@ var Birt = (function () {
         rptDesignJsonData = designJsonData;
     }
 
+    Birt.prototype.file_name = "";      //birt报表文件名称
+
     /**
      * 开始加载
      */
     Birt.prototype.run = function () {
         _this.onCreate();
-        _this.getMenus();
         _this.getRetDesign();
+        _this.getMenus();
     };
 
     /**
@@ -39,10 +41,12 @@ var Birt = (function () {
      * @param rptDesignName
      */
     Birt.prototype.getRetDesign = function (rptDesignName) {
+        _this.file_name = rptDesignName || $birt.data('rptdesign');
+
         $.birtLoading();
         $.ajax(
             {
-                url: '/birt/api.json?_report={0}'.format(rptDesignName || $birt.data('rptdesign')),
+                url: '/birt/api.json?_report={0}'.format(_this.file_name),
                 type: 'GET',
                 success: function (data) {
                     $.birtLoading('hide');
@@ -72,23 +76,43 @@ var Birt = (function () {
      * 获取报表的目录结构
      */
     Birt.prototype.getMenus = function () {
-        $.birtLoading();
+        var menus = _this.getMenusFromCache();
+        if (menus) {
+            _this.showMenus(menus);
+            return;
+        }
         $.ajax(
             {
                 url: '/birt/api/menus.json',
                 type: 'GET',
                 success: function (data) {
-                    $.birtLoading('hide');
                     console.log(data);
                     _this.showMenus(data.menus);
+                    _this.putMenusToCache(data.menus);
                 },
                 error: function (data) {
-                    $.birtLoading('hide');
                 }
             }
         );
     };
 
+    /**
+     * 从缓存中获取菜单列表
+     */
+    Birt.prototype.getMenusFromCache = function () {
+        var menus = localStorage.getItem("birt_menus");
+        console.log(menus);
+        return menus ? JSON.parse(menus) : null;
+    };
+
+    /**
+     * 将菜单数据写入缓存
+     * @param menus
+     */
+    Birt.prototype.putMenusToCache = function (menus) {
+        localStorage.setItem("birt_menus", JSON.stringify(menus));
+    };
+
     /**
      * 显示报表的名称
      */
@@ -103,7 +127,8 @@ var Birt = (function () {
     Birt.prototype.showMenus = function (menus) {
         for (var i = 0; i < menus.length; i++) {
             var menu = menus[i];
-            $menus.append("<li class='item'><i class='icon'></i><a>{0}</a></li>".format(menu.display_name));
+            var active = menu.file_name == _this.file_name.replace(".rptdesign", "") ? 'active' : '';
+            $menus.append("<li class='item {1}'><i class='icon'></i><a href='/?_report={2}'>{0}</a></li>".format(menu.display_name, active, menu.file_name));
         }
     };
 
@@ -154,7 +179,7 @@ var Birt = (function () {
 
 
     Birt.prototype.showLineChart = function (lineChart) {
-        $(".birt").append("<div id='report_{0}'></div>".format(lineChart.id));
+        $reports.append("<div id='report_{0}'></div>".format(lineChart.id));
         new Highcharts.Chart({
             chart: {
                 renderTo: "report_{0}".format(lineChart.id),

data/app/assets/stylesheets/birt/base/constant.scss

@@ -32,6 +32,10 @@ $color-loading-point-grayer: #8C8990;
 $color-switch-off: #ddd;
 $color-switch-on: #4cd964;
 
+$color-birt-menu-bg: #293038;               //menu列表背景颜色
+$color-birt-menu-item-hover-bg: #37424F;    //menu列表背景颜色
+
+
 /*num*/
 $num-header-height: 45px;
 $num-footer-tabs-height: 50px;
@@ -43,7 +47,6 @@ $num-button-small-height: 28px;
 $border-color: #ddd;
 $border-blue-color: #145fd7;
 
-
 $blue: #4a87ee;
 $hover: #f5f5f5;
 

data/app/assets/stylesheets/birt/components/menus.scss

@@ -1,11 +1,20 @@
 .birt-menus {
-  display: table-cell;
+  position: fixed;
+  z-index: 100;
+  top: 0;
+  left: 0;
+  height: 100%;
   width: 200px;
   list-style: none;
-  border: 1px solid #ddd;
-  padding: 8px;
+  border: none;
+  margin: 0;
   vertical-align: top;
+  background: $color-birt-menu-bg;
+  color: white;
+  padding: 0;
+  //菜单列表项
   > .item {
+    padding: 5px 8px;
     > .icon {
       width: 20px;
       height: 20px;
@@ -20,8 +29,19 @@
       font: 14px/1.7 "微软雅黑";
       height: 20px;
       line-height: 20px;
+      color: white;
+      text-decoration: none;
       vertical-align: top;
       cursor: pointer;
     }
   }
+  //列表项被选中
+  > .item.active {
+    background: rgba(0, 0, 0, 0.6);
+    color: white;
+  }
+
+  > .item:hover {
+    background: $color-birt-menu-item-hover-bg;
+  }
 }

data/app/assets/stylesheets/birt/components/{birt_reports.scss → reports.scss}

@@ -1,8 +1,12 @@
 .birt-reports {
-  display: table-cell;
   vertical-align: top;
-  padding-left: 8px;
   text-align: left;
+  position: absolute;
+  left: 208px;
+  top: 0;
+  right: 0;
+  width: auto;
+  padding: 0 8px 5px 3px;
   > .display-name {
     margin: 0 0 12px 0;
   }

data/app/assets/stylesheets/birt.scss

@@ -2,9 +2,16 @@
 @import "birt/components/*";
 
 .birt {
-  @include birt_base;
   width: 100%;
-  padding: 12px;
+  padding: 0;
   position: relative;
-  display: table;
+}
+
+body {
+  padding: 0;
+  margin: 0;
+}
+
+* {
+  @include birt_base;
 }

data/lib/birt/version.rb

@@ -1,5 +1,5 @@
 module Birt
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
   module Core
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - saxer
@@ -140,9 +140,9 @@ files:
 - app/assets/stylesheets/birt.scss
 - app/assets/stylesheets/birt/base/constant.scss
 - app/assets/stylesheets/birt/base/mixins.scss
-- app/assets/stylesheets/birt/components/birt_reports.scss
 - app/assets/stylesheets/birt/components/loading.scss
 - app/assets/stylesheets/birt/components/menus.scss
+- app/assets/stylesheets/birt/components/reports.scss
 - app/assets/stylesheets/birt/components/table.scss
 - app/views/birt/api/index.json.jbuilder
 - app/views/birt/api/menus.json.jbuilder