qwer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a049889a8c127dd590b21203a34431749253774
-  data.tar.gz: fc0d9ee35aeed5287c9d2224562d25c83fa02738
+  metadata.gz: 21f2eacd42e7dcaa4021a2b55f282743600b9bad
+  data.tar.gz: fe6c3eb79af6eee3263fbe01cd6db70cbf8c4a97
 SHA512:
-  metadata.gz: eab2bb0b69143658380a3ccf3863a49e3939826d0d42e0164667eaad9da8cf092c1fad10c0cc9c246784cb2bdf940b22011814ed8512ba81c861703e24342707
-  data.tar.gz: 2c905049ad978b2b8b32db7a691d1e1295a31a0e58ea209ca65b7ed384616e98d952ac1324e2d0a535da3aa4b18ba0ba2fee264a7367e5ecf583b2bf9808fa22
+  metadata.gz: be881f80e2e17ae3dcc89c4996be8e52bada80bc3e58810adbbc63429cd2f835a2fdc34d7ce9d1dc8dc2c567fcd24ecd544a37ed2958877e114bb353a4e969e8
+  data.tar.gz: e7c5a955a88fa1edadc12cd22aa26fcce930f3735c74a09500967aba0d9c03746d07acde924453d9fa9b36d2d63c5f013fd7e1ec4f6d93e06dc92bad147fc52b

data/lib/qwer.rb

@@ -7,7 +7,9 @@ module Qwer
     # 初始化
     # page_size:  单页记录数
     # page:       当前页数
-    def initialize(page_size, page)
+    # model:      当前业务model
+    def initialize(model, page_size, page)
+      @model = model
       @page_size = page_size
       @page = page
     end
@@ -21,7 +23,7 @@ module Qwer
     # data:     要查询的内容
     # args :    其他参数
     def table_seach(params, data,*args)
-      html_str = Translater.table_search(params, data)
+      html_str = Translater.new.table_search(params, data, @model)
       html_str.html_safe
     end
 
@@ -30,8 +32,8 @@ module Qwer
     # datas:        数据
     # dname:        数据名称
     # args:         其他参数
-    def table_data(table_head, dname, datas, *args)
-      html_str = Translater.table_data(table_head, dname, datas, *args)
+    def table_data(table_head, opt, datas, *args)
+      html_str = Translater.new.table_data(table_head, @model, opt, datas, *args)
       html_str.html_safe
     end
 

data/lib/qwer/layout_helper.rb

@@ -3,26 +3,168 @@
 module Qwer
   require "qwer/version"
 
-  module Qwer
-    # Your code goes here...
-    def self.sayhi
-      puts "hello world"
-    end
-    module Helpers
-      def table_seach
-        '<h5 class="page-header">查询条件</h5>'
-        '<div class="dataTables_wrapper form-inline">
-        <div>
-          <form class="pjax-form" id="user_search" action="/users" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="✓">
-            <label class="control-label" for="q_邮箱：">邮箱：</label>
-            <input class="form-control" type="search" name="q[email_cont]" id="q_email_cont">
-            <a class="btn btn-success green" href="/users/new">新增</a>
-            <button type="submit" class="btn btn-info" data-toggle="modal" data-target="#search_model">查询</button>
-          </form>
-        </div>
-      </div>'
+  module Helper
+    class HelperMethod
+      MAX_LOOP_NUM = 10
+      DEFAULT_COL_NUM = 3
+
+      # 查询项布局初始化
+      # col_num : table的列数
+      # data_size : 查询项数量
+      def initialize(col_num, data_size)
+        @col_num = col_num
+        @data_size = data_size
+      end
+
+      def form_render data_params, form_params
+        html_str = ""
+        # 适配单行是都能显示　先暂时定位３　以后做适配
+        if data_params.size > DEFAULT_COL_NUM
+          html_str << form_table_render(form_params, data_params)
+        else
+
+          data_params.reject { |key, value|
+            if value.class.to_s.eql?('String')
+              html_str << "<div><label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='q_#{key}'></div>"
+            else
+              html_str << "<div><label class='control-label'>#{value[:name]}：</label>"
+              if select? value
+                html_str << add_selector(key, value)
+              else
+                html_str << "<input class='#{value[:css] ||= 'form-control'}' type='search' name='#{key}' id='q_#{key}'>"
+              end
+              html_str << "</div>"
+            end
+
+          }
+          html_str << button_render(form_params)
+        end
+        html_str
+      end
+
+      private
+
+      def add_selector key, value
+        html_str = "<select class='form-control' name='#{key}' id='#{get_input_id key}'>"
+        if value[:data].present?
+          html_str << "<option value=''>全部</option>" if value[:data].include? 'all'
+          value[:data].each do |item|
+            html_str << "<option value='#{item[:k]}'>#{item[:v]}</option>" if item.class.to_s.eql? 'Hash'
+          end
+        end
+        html_str << "</select>"
       end
+
+      # 得到查询项，table
+      def form_table_render form_param, data_params
+        conter = 1
+        total = 1
+        html_str = "<table class='table text-left'>"
+        data_params.reject { |key, value|
+          html_str << "<tr>" if tr_start? conter
+          html_str << "<td style='border: none'>"
+          html_str << "<div class='form-group'>"
+          if value.class.to_s.eql? 'String'
+            html_str << "<label class='control-label'>#{value}：</label><input class='#{'form-control'}' type='search' name='#{key}' id='#{get_input_id key}'></div>"
+          else
+            html_str << "<label class='control-label'>#{value[:name]}：</label>"
+            if select? value
+              html_str << add_selector(key, value)
+            else
+              html_str << "<input class='#{value[:css] ||= 'form-control'}' type='search' name='#{key}' id='#{get_input_id key}'>"
+            end
+          end
+          html_str << "</div>"
+
+          html_str << "</td>"
+
+          if !tr_end? conter
+            # 一行tr 还没有结束 需要填补td
+            html_str << add_td_or_blank_td(form_param, conter, total)
+          end
+          html_str << "</tr>" if tr_end? conter
+          conter = 0 if tr_end? conter
+          conter += 1
+          total += 1
+        }
+        # 查询项 正好占满整行，需要另起一个tr，添加 button
+        html_str << add_new_btn_tr(form_param)
+        html_str << "</table>"
+      end
+
+      # 添加空td,或button td
+      def add_td_or_blank_td form_params, counter, total
+        html_str = ""
+        return html_str if has_any_td? total
+        # 循环添加td，直至填满tr,在最后添加button
+        while true
+          break if tr_end?(counter + 1) || counter > MAX_LOOP_NUM
+          html_str << "<td style='border: none;'></td>"
+          counter += 1
+        end
+        html_str << "<td style='border:none;text-align:center;'>"
+        html_str << button_render(form_params)
+        html_str << "</td>"
+      end
+
+      def button_render form_params
+        html_str = "<a class='btn btn-success green' href='#{form_params[:new]}'>新增</a>" if form_params[:new]
+        html_str << "<button type='submit' class='btn btn-info' data-toggle='modal' data-target='#search_model'>查询</button>"
+      end
+
+      # 单行tr 开始
+      def tr_start? counter
+        counter == 1
+      end
+
+      # 单行tr 结束
+      def tr_end? counter
+        counter == @col_num
+      end
+
+      # 有剩余td 没有添加
+      def has_any_td? total
+        total < @data_size
+      end
+
+      # 是否是下拉栏
+      def select? value
+        value[:type] == 'select'
+      end
+
+      def data? value
+        value[:type] == 'date'
+      end
+
+      def data_time? value
+        value[:type] == 'data_time'
+      end
+
+      def get_input_id key
+        k = key.to_s
+        k['['] = "_"
+        k[']'] = ""
+        k
+      end
+
+      # 添加一行新的tr(有必要的话)
+      def add_new_btn_tr params
+        html_str = ""
+        result = @data_size % @col_num
+        if result.zero?
+          html_str << "<tr>"
+          (@col_num-1).times{
+            html_str << "<td style='border:none;'>"
+            html_str << "</td>"
+          }
+          html_str << "<td style='border:none;text-align: center;'>"
+          html_str << button_render(params)
+          html_str << "</td>"
+          html_str << "</tr>"
+        end
+        html_str
+      end
+
     end
   end
-
 end

data/lib/qwer/translater.rb

@@ -1,15 +1,20 @@
+require 'qwer/layout_helper'
+
 module Qwer
   class Translater
-    def self.table_search(form_params, data_params, model)
+    DEFAULT_COL_NUM = 3
+    INIT_CONTER = 1
+
+    def table_search(form_params, data_params, model)
+      col_num = form_params[:col_num] ||= DEFAULT_COL_NUM
+      conter ||= INIT_CONTER
       html_str = "<form class='#{form_params[:form_class] ||= 'pjax-form'}' id='' action='#{form_params[:action] ||= model}' accept-charset='#{form_params[:charset] ||= 'UTF-8' }' method='#{form_params[:method] ||= 'get'}'>"
       html_str << "<input name='utf8' type='hidden' value='✓'>"
-      data_params.reject { |key, value| html_str << "<div class='form-group'><label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='q_#{key}'></div>" }
-      html_str << "<a class='btn btn-success green' href='#{form_params[:new]}'>新增</a>" if form_params[:new]
-      html_str << "<button type='submit' class='btn btn-info' data-toggle='modal' data-target='#search_model'>查询</button>"
+      html_str << Qwer::Helper::HelperMethod.new(col_num, data_params.size).form_render(data_params, form_params).to_s
       html_str << "</form>"
     end
 
-    def self.table_data(table_head, dname, opt, datas, *args)
+    def table_data(table_head, dname, opt, datas, *args)
       html_str = "<table class='table table-striped table-hover' id='editable-sample'><thead><tr><th>#</th>"
       table_head.reject { |key, value| html_str << "<th>#{value}</th>" }
       html_str << "<th>操作</th></tr></thead><tbody>"
@@ -30,28 +35,30 @@ module Qwer
 
     private
 
-    def self.sequence(index)
+    # 设置数据表格序号
+    def sequence(index)
       (@page.to_i - 1) * @page_size.to_i + index + 1
     end
 
-    def self.edit?(opt)
+    # 判断是否是编辑方法
+    def edit?(opt)
       opt == "edit"
 
     end
 
-    def self.delete?(opt)
+    # 判断是否是删除方法
+    def delete?(opt)
       opt == "del"
     end
 
-    def self.send_keys data, key
+    # 获取给定的params的key的值
+    def send_keys data, key
       keys = key.to_s.split '.'
-      keys.each do |item|
-        data = data.send item if data.present?
-      end
-      data
+      keys.inject(data){|result, item| result.send item if result.present? }
     end
 
-    def self.opt_btns key, value, dname, data
+    # 操作列
+    def opt_btns key, value, dname, data
       if edit? key.to_s
         return "<a class='#{value[:css] ||= 'label label-success'}' href='/#{dname}/#{data.id.to_s}/edit'>#{value[:name] ||= '编辑'}</a>"
       elsif delete? key.to_s

data/lib/qwer/version.rb

@@ -1,3 +1,3 @@
 module Qwer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - lidejian@skio.cn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,6 @@ files:
 - lib/qwer/layout_helper.rb
 - lib/qwer/translater.rb
 - lib/qwer/version.rb
-- lib/temp/test.png
 - qwer-0.1.1.gem
 - qwer.gemspec
 homepage: https://www.baidu.com