qwer 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f2eacd42e7dcaa4021a2b55f282743600b9bad
-  data.tar.gz: fe6c3eb79af6eee3263fbe01cd6db70cbf8c4a97
+  metadata.gz: baa4e80611cb9340919386fa04b36c4c66a7476d
+  data.tar.gz: 87325871d0368346805a829be25a8d82cc0c13af
 SHA512:
-  metadata.gz: be881f80e2e17ae3dcc89c4996be8e52bada80bc3e58810adbbc63429cd2f835a2fdc34d7ce9d1dc8dc2c567fcd24ecd544a37ed2958877e114bb353a4e969e8
-  data.tar.gz: e7c5a955a88fa1edadc12cd22aa26fcce930f3735c74a09500967aba0d9c03746d07acde924453d9fa9b36d2d63c5f013fd7e1ec4f6d93e06dc92bad147fc52b
+  metadata.gz: 083522e497627eac3b7ebcf7180422428fcac98f0b050c4335d5aaba7407624ac7447f82d354e4a9b3461c25aa6e43294497e29ca056eb4a74a5bb63dff96c18
+  data.tar.gz: b3627402eea76db7e0801f23dee44c7e10bf19662206d741b1fe7a8af399ac60a5858c467aefb75942eb5e7fe0b8e51065cf6aff97b72e7b8c937b149ad571ae

data/README.md

@@ -33,7 +33,7 @@ Or install it yourself as:
 
 - 调用方法table_seach,创建查询项
 ```
-    model.table_seach({
+    model.table_seach({    col_num: 3,              ## 查讯项的列数
                           action: '/users',         ## 提交地址（默认为当前业务）
                           method: 'get',            ## 请求方式（默认为get）
                           form_class: 'form-inline text-right',     ## 表单样式：　默认（pjax-form）
@@ -41,6 +41,14 @@ Or install it yourself as:
                           new: '/companies/new'     ## 新建按钮指向地址（可选,不传则没有新建按钮）
                       }, {
                           'q[name_cont]': '名称',    ## 查询项name及其显示名称
+                          'q[status_eq]': { name: '状态', type: 'select', data: [ "all", { k: '1', v: '正常' }, { k: 0, v: '删除' } ] }
+                          # 如果key为一个Hash，则name为必选， 
+                          #     type: 
+                          #         不填写：          默认为input
+                          #         select :        下拉框
+                          #         css:            标明css样式
+                          #         data:           下拉option数据内容
+                          #             数据类型为数组，单个数据为一个Hash， 以k,和v 表示 ， all表示添加一个全部的option
                       })
 ```
 

data/lib/qwer.rb

@@ -1,5 +1,8 @@
 require "qwer/version"
 require 'qwer/translater'
+require 'kaminari/helpers/helper_methods'
+require 'kaminari/helpers/tags'
+require 'kaminari/helpers/paginator'
 
 module Qwer
   class Tmodel
@@ -8,8 +11,9 @@ module Qwer
     # page_size:  单页记录数
     # page:       当前页数
     # model:      当前业务model
-    def initialize(model, page_size, page)
+    def initialize(model, query, page_size, page)
       @model = model
+      @query = query
       @page_size = page_size
       @page = page
     end
@@ -23,7 +27,7 @@ module Qwer
     # data:     要查询的内容
     # args :    其他参数
     def table_seach(params, data,*args)
-      html_str = Translater.new.table_search(params, data, @model)
+      html_str = Translater.new.table_search(params, @query, data, @model)
       html_str.html_safe
     end
 
@@ -40,9 +44,20 @@ module Qwer
     # 分页
     # 使用kaminary分页
     # datas   查询的数据
-    def pager(datas)
-      html_str = "共#{datas.total_count}条 #{datas.total_pages}页#{paginate @companies}"
-      html_str.html_safe
-    end
+    # def pager datas, **options
+    # paginate_class = Kaminari::Helpers::Paginator
+    #
+    # options[:total_pages] = datas.total_pages
+    # options.reverse_merge! current_page: datas.current_page, per_page: datas.limit_value, remote: false
+    #
+    #
+    # paginator = paginate_class.new self, options
+    # p "=========================1=="
+    # p paginator.to_s
+    # p "=========================2=="
+    # html_str = "共#{datas.total_count}条 #{datas.total_pages}页#{paginate datas}"
+    # html_str = Translater.new.pager(datas)
+    # html_str.html_safe
+    # end
   end
 end

data/lib/qwer/layout_helper.rb

@@ -11,9 +11,11 @@ module Qwer
       # 查询项布局初始化
       # col_num : table的列数
       # data_size : 查询项数量
-      def initialize(col_num, data_size)
+      def initialize(col_num, query, data_size, model)
         @col_num = col_num
+        @query = query
         @data_size = data_size
+        @model = model
       end
 
       def form_render data_params, form_params
@@ -22,16 +24,15 @@ module Qwer
         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>"
+              html_str << "<label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='q_#{key}' value='#{@query.send(get_send_key key)}'>"
             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}'>"
+                html_str << "<input class='#{value[:css]} form-control' type='search' name='#{key}' id='q_#{key}' value='#{@query.send(get_send_key key)}'>"
               end
               html_str << "</div>"
             end
@@ -49,7 +50,11 @@ module Qwer
         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'
+            if @query.send(get_send_key key).present? && item.class.to_s.eql?('Hash') && (item[:k].to_s == @query.send(get_send_key key).to_s)
+              html_str << "<option value='#{item[:k]}' selected>#{item[:v]}</option>"
+            else
+              html_str << "<option value='#{item[:k]}'>#{item[:v]}</option>" if item.class.to_s.eql? 'Hash'
+            end
           end
         end
         html_str << "</select>"
@@ -65,19 +70,19 @@ module Qwer
           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>"
+            html_str << "<label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='#{get_input_id key}' value='#{@query.send(get_send_key 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}'>"
+              input_value = @query.send(get_send_key key)
+              input_value = input_value.nil? ? "" : DateTime.parse(input_value.to_s).strftime('%Y-%m-%d').to_s
+              html_str << "<input class='#{value[:css]} form-control' type='search' name='#{key}' id='#{get_input_id key}' value='#{input_value}'>"
             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)
@@ -108,7 +113,8 @@ module Qwer
       end
 
       def button_render form_params
-        html_str = "<a class='btn btn-success green' href='#{form_params[:new]}'>新增</a>" if form_params[:new]
+        new_url = "/#{@model}/new"
+        html_str = "<a class='btn btn-success green' href='#{form_params[:new] ||= new_url }'>新增</a>" if !(form_params[:new] == false)
         html_str << "<button type='submit' class='btn btn-info' data-toggle='modal' data-target='#search_model'>查询</button>"
       end
 
@@ -165,6 +171,10 @@ module Qwer
         html_str
       end
 
+      def get_send_key key
+        result = key.to_s.split('[').last
+        result = result.split(']').first
+      end
     end
   end
 end

data/lib/qwer/translater.rb

@@ -2,15 +2,15 @@ require 'qwer/layout_helper'
 
 module Qwer
   class Translater
-    DEFAULT_COL_NUM = 3
-    INIT_CONTER = 1
+    DEFAULT_COL_NUM = 3               #　查询 table 默认列数
+    INIT_CONTER = 1                   #  计数器从１开始
 
-    def table_search(form_params, data_params, model)
+    def table_search(form_params, query, 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 = "<form class='#{form_params[:form_class] ||= 'pjax-form'}' id='company_search' 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='✓'>"
-      html_str << Qwer::Helper::HelperMethod.new(col_num, data_params.size).form_render(data_params, form_params).to_s
+      html_str << Qwer::Helper::HelperMethod.new(col_num, query, data_params.size, model).form_render(data_params, form_params).to_s
       html_str << "</form>"
     end
 

data/lib/qwer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - lidejian@skio.cn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ 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