birt 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7b2e02b34b0e0a11a383755b89d6949439b5ef
-  data.tar.gz: 63c116c33dc69424de1d89a063310384afd7ebd2
+  metadata.gz: d17fdc7fb01954788c080eeb639a7b7445c2c030
+  data.tar.gz: 2dbf5737474092bf6d09bdfc6f9994938d934bb3
 SHA512:
-  metadata.gz: ea1bd93581c306b71c195aec4fcc318d20cbab24b74f3d3a8924a0f5f500b46a1867ad7b9e638380d1d16f0c0752bcc52b2fb7ec7208741c1a1b1c33edbad723
-  data.tar.gz: 1ccabe819bb5d15b48bad7454eed264e50ab567877f297799505abff74670540ff2bbdd37562c2b8eebfc86395d2f1b754ec5885736931b5c6b3c0f37797b87b
+  metadata.gz: db5677cbc475cca359859fb168ed9bc9d7b227521ddb89807252fdfbbbdd7086c0dbd1d68241092bd01f009cbbb2b27a23f80bbf14603824a124c8765caf8d87
+  data.tar.gz: dd24ead72fc2c37d57f3dede77823894ce827f02e8864ce443a605882e27a6ac7ad29410affa701659fbfc3913d7841432e8cb08eb8e3e37cbe710e93d0444de

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

@@ -1,16 +1,39 @@
 var Birt = (function () {
     var _this;
 
-    var rptDesignJsonData;
+    var rptDesignJsonData;  //报表的json数据
 
-    var $birt;
+    var $birt;              //birt报表整个区域
+    var $reports;           //报表区域
+    var $menus;             //文件列表，菜单区域
 
     function Birt(designJsonData) {
         _this = this;
         rptDesignJsonData = designJsonData;
-        $birt = $('.birt');
     }
 
+    /**
+     * 开始加载
+     */
+    Birt.prototype.run = function () {
+        _this.onCreate();
+        _this.getMenus();
+        _this.getRetDesign();
+    };
+
+    /**
+     * 被创建时
+     */
+    Birt.prototype.onCreate = function () {
+        $birt = $('.birt');
+
+        $birt.append("<ul class='birt-menus'></ul>");
+        $menus = $birt.find(".birt-menus");
+
+        $birt.append("<div class='birt-reports'></div>");
+        $reports = $birt.find(".birt-reports");
+    };
+
     /**
      * 获取报表数据
      * @param rptDesignName
@@ -45,8 +68,43 @@ var Birt = (function () {
         );
     };
 
+    /**
+     * 获取报表的目录结构
+     */
+    Birt.prototype.getMenus = function () {
+        $.birtLoading();
+        $.ajax(
+            {
+                url: '/birt/api/menus.json',
+                type: 'GET',
+                success: function (data) {
+                    $.birtLoading('hide');
+                    console.log(data);
+                    _this.showMenus(data.menus);
+                },
+                error: function (data) {
+                    $.birtLoading('hide');
+                }
+            }
+        );
+    };
+
+    /**
+     * 显示报表的名称
+     */
     Birt.prototype.showDisplayName = function () {
-        $birt.append('<h2>{0}</h2>'.format(rptDesignJsonData.display_name));
+        $reports.append("<h2 class='display-name'>{0}</h2>".format(rptDesignJsonData.display_name));
+    };
+
+    /**
+     * 显示报表菜单
+     * @param menus
+     */
+    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));
+        }
     };
 
 
@@ -89,7 +147,7 @@ var Birt = (function () {
 
         table_html += "</table>";
 
-        $(".birt").append(table_html);
+        $reports.append(table_html);
         console.log(table);
         return table_html;
     };

data/app/assets/javascripts/birt.js

@@ -5,4 +5,4 @@
 
 var birt = new Birt();
 
-birt.getRetDesign();
+birt.run();

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

@@ -0,0 +1,9 @@
+.birt-reports {
+  display: table-cell;
+  vertical-align: top;
+  padding-left: 8px;
+  text-align: left;
+  > .display-name {
+    margin: 0 0 12px 0;
+  }
+}

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

@@ -0,0 +1,27 @@
+.birt-menus {
+  display: table-cell;
+  width: 200px;
+  list-style: none;
+  border: 1px solid #ddd;
+  padding: 8px;
+  vertical-align: top;
+  > .item {
+    > .icon {
+      width: 20px;
+      height: 20px;
+      background-image: url(asset_path('tree.png'));
+      display: inline-block;
+      background-position: -100px -20px;
+      line-height: 20px;
+      vertical-align: top;
+      cursor: pointer;
+    }
+    > a {
+      font: 14px/1.7 "微软雅黑";
+      height: 20px;
+      line-height: 20px;
+      vertical-align: top;
+      cursor: pointer;
+    }
+  }
+}

data/app/assets/stylesheets/birt.scss

@@ -1,9 +1,10 @@
 @import "birt/base/*";
-@import "birt/components/table";
-@import "birt/components/loading";
+@import "birt/components/*";
 
 .birt {
   @include birt_base;
   width: 100%;
   padding: 12px;
-}
+  position: relative;
+  display: table;
+}

data/app/views/birt/api/menus.json.jbuilder

@@ -0,0 +1 @@
+json.menus @menus

data/config/routes.rb

@@ -3,4 +3,5 @@
 # end
 Rails.application.routes.draw do
   get 'birt/api', :to => 'birt/api#index'
+  get 'birt/api/menus', :to => 'birt/api#menus'
 end

data/lib/app/controllers/birt/api_controller.rb

@@ -12,5 +12,11 @@ module Birt
       @rpt_design.parse_rpt
       @rpt_design.data_sets.values.each { |data_set| data_set.data_set_result }
     end
+
+    #获取文件目录列表
+    def menus
+      @menus = Birt.menus
+    end
+
   end
 end

data/lib/birt/routing.rb

@@ -3,6 +3,7 @@ module Birt #:nodoc:
     module MapperExtensions
       def self.birts
         @set.add_route("/birt/api", {:controller => "birt/api_controller", :action => "index"})
+        @set.add_route("/birt/api/menus", {:controller => "birt/api_controller", :action => "menus"})
       end
     end
   end

data/lib/birt/version.rb

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

data/lib/birt.rb

@@ -26,17 +26,16 @@ module Birt
     "<div class=\"birt\" data-rptdesign=\"#{rptdesign_name}.rptdesign\"></div>"
   end
 
-  #获取目录结构
+  #获取报表的目录结构
   def menus
-
     Dir.glob("./reports/*.rptdesign").inject([]) { |acc, f|
       names = REXML::Document.new(File.read(f)).root.get_elements("/report/text-property[@name='displayName']")
       display_name = names[0].text if names && names[0]
+      file_name = f.split('/').last.split(".").first
       acc << {
-          file: f,
-          display_name: display_name
+          file_name: file_name,
+          display_name: display_name || file_name
       }; acc
     }
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - saxer
@@ -132,6 +132,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/images/tree.png
 - app/assets/javascripts/birt.js
 - app/assets/javascripts/birt/birt.js
 - app/assets/javascripts/birt/components/loading.js
@@ -139,11 +140,13 @@ 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/table.scss
 - app/views/birt/api/index.json.jbuilder
+- app/views/birt/api/menus.json.jbuilder
 - config/birt.yml
-- config/database.yml
 - config/routes.rb
 - lib/app/controllers/birt/api_controller.rb
 - lib/app/helpers/application_helper.rb
@@ -195,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: birt report

data/config/database.yml

@@ -1,13 +0,0 @@
-default: &default
-  adapter: mysql2
-  encoding: utf8
-  pool: 5
-  username: root
-  password: sun
-  host: localhost
-development:
-  <<: *default
-  database: spider
-production:
-  <<: *default
-  database: spider