vue_crud 0.2.0.5 → 0.2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c844059d406166143174ba9db8cfd5042e83867e
-  data.tar.gz: 42b56026739e215d96c9c61aa44a7b913e42d963
+  metadata.gz: ac9cf45c4cff01f7e7f0fc6b5dd93cd4a0c9bd62
+  data.tar.gz: dc3be839adc92a391946644bed4618b3617df7f9
 SHA512:
-  metadata.gz: 6c8c6bb9f756e52f13a29d2896dc6628d063c8bc985a89d6dbf582f9caf937fe64a100c52108f8fefee2acf4ad9e291bb64c234fcd199590195133aa20fa3ca1
-  data.tar.gz: 7559938ad28712c5563888224ae0a98ca9f09b69b4bce2d834db45785b7784f17df2768f48196c1d181f29aadd4d57d7ebb8ef7c263e851686dca4e4541624be
+  metadata.gz: 43ec4022c830adffefa688f1b89dbb5c1f746e20320dc0928bb1579e06c6373c60d2c7e88bf1dde225b5ca790a443b7ee6a667810e445d5d855982228b1f635a
+  data.tar.gz: 7507e02e039f5bfb694b7da6a1b3c8265f2c99c28f4d278ef33f8cafd6c88b7af617bd375b7492cbfb809adba99d00c805c5d8baa78f45999a091305f6e4059c

data/lib/generators/vue_crud/templates/vue_crud.html

@@ -38,10 +38,13 @@ $(document).ready(function() {
         info_url: info_url
     });
     $('.filter .ui.dropdown').dropdown();
-    $('.ui.checkbox').checkbox();
+    // $('.ui.checkbox').checkbox();
 });
 </script>
 <div id="vue_crud">
+    <div class="ui inverted dimmer" :class="{'active': !is_loaded}">
+        <div class="ui indeterminate text loader">處理中...</div>
+    </div>
     <input type="text" name="progress" id="form-progress">
     <h1 class="ui center aligned icon header">
         <i class="icon" :class="info.titles.icon"></i> {{ info.titles.title }}
@@ -157,8 +160,11 @@ $(document).ready(function() {
             </div>
         </div>
         <div class="actions">
-            <button class="ui basic gray cancel button">取消</button>
-            <button @click="modalSubmit" class="ui button blue">{{ action_name }}</button>
+            <div class="ui buttons">
+                <button class="ui cancel button">取消</button>
+                <div class="or"></div>
+                <button @click="modalSubmit" class="ui button blue">{{ action_name }}</button>
+            </div>
             <!-- NOTE: Custom modal action -->
             <div class="inline-block custom_modal_action"></div>
         </div>
@@ -187,20 +193,13 @@ $(document).ready(function() {
                 <span v-html="model[attribute.name]"></span>
             </div>
 
+            <div v-else-if="attribute.display_type == 'datetime'">
+                {{ model[attribute.name] | datetime }}
+            </div>
+
             <div v-else>
                 {{ model[attribute.name] }}
             </div>
-<!--
-            <span v-if="attribute.display_type != 'img'">
-                <span v-if="attribute.input_type == 'textarea'" v-html="model[attribute.name]">
-                </span>
-                <span v-else>
-                    {{ model[attribute.name] }}
-                </span>
-            </span>
-            <span v-else>
-                <img :src="model[attribute.name]" />
-            </span> -->
         </td>
         <td style="position: relative;">
             <a @click="restoreModel" onclick="return false" class="ui red right corner label" v-show="is_deleted" title="您已刪除，點擊復原">
@@ -230,6 +229,11 @@ $(document).ready(function() {
                     <i class="right trash icon"></i>
                 </div>
             </div>
+            <div class="ui buttons" v-for="quick_toggle_attribute in info.quick_toggle_attributes">
+                <button class="ui button" @click="toggleTrue(quick_toggle_attribute.name)" :class="{'green': model[quick_toggle_attribute.name]}">{{ quick_toggle_attribute.labels[0] }}</button>
+                <div class="or"></div>
+                <button class="ui button" @click="toggleFalse(quick_toggle_attribute.name)" :class="{'green': !model[quick_toggle_attribute.name]}">{{ quick_toggle_attribute.labels[1] }}</button>
+            </div>
         </td>
         <td :colspan="info.model_attributes.length + 1">
             <!-- NOTE: Custom model -->
@@ -267,6 +271,10 @@ $(document).ready(function() {
                             <span class="display_name">{{ attribute.display_name }}：</span>
                             <span v-html="model[attribute.name]"></span>
                         </div>
+                        <div v-else-if="attribute.display_type == 'datetime'">
+                            <span class="display_name">{{ attribute.display_name }}：</span>
+                            {{ model[attribute.name] | datetime }}
+                        </div>
                         <div v-else>
                             <span class="display_name">{{ attribute.display_name }}：</span>
                             {{ model[attribute.name] }}
@@ -310,8 +318,8 @@ $(document).ready(function() {
         <div v-for="attribute in model_attributes" v-if="attribute.editable">
             <!-- select -->
             <div class="field" v-if="attribute.input_type == 'select'">
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
-                <select :id="'model_' + attribute.display_name" v-model="model[attribute.name]" class="ui fluid dropdown" :class="attribute.input_class">
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
+                <select :id="'model_' + attribute.name" v-model="model[attribute.name]" class="ui fluid dropdown" :class="attribute.input_class">
                     <option v-for="option in attribute.options" :value="option.value" v-text="option.text"></option>
                 </select>
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
@@ -322,8 +330,8 @@ $(document).ready(function() {
             </div>
             <!-- multiSelect -->
             <div class="field" v-else-if="attribute.input_type == 'multiSelect'">
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
-                <select :id="'model_' + attribute.display_name" multiple v-model="model[attribute.name]" class="ui fluid dropdown" :class="attribute.input_class">
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
+                <select :id="'model_' + attribute.name" multiple v-model="model[attribute.name]" class="ui fluid dropdown" :class="attribute.input_class">
                     <option v-for="option in attribute.options" :value="option.value" v-text="option.text"></option>
                 </select>
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
@@ -334,10 +342,10 @@ $(document).ready(function() {
             </div>
             <!-- selectInput -->
             <div class="field" v-else-if="attribute.input_type == 'selectInput'">
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
                 <div class="ui grid">
                     <div class="ten wide column">
-                        <input type="text" :id="'model_' + attribute.display_name" v-model="model[attribute.name]" :class="attribute.input_class">
+                        <input @keyup.enter="modalSubmit" type="text" :id="'model_' + attribute.name" v-model="model[attribute.name]" :class="attribute.input_class">
                     </div>
                     <div class="six wide column">
                         <select v-model="model[attribute.name]" class="ui dropdown" :class="attribute.input_class" onchange="$(this).parent().prev().find('input').val(this.value)">
@@ -353,8 +361,8 @@ $(document).ready(function() {
             </div>
             <!-- textarea -->
             <div class="field" v-else-if="attribute.input_type == 'textarea'">
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
-                <textarea v-froala :attribute="attribute.name" :id="'model_' + attribute.display_name" v-model="model[attribute.name]" :class="attribute.input_class"></textarea>
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
+                <textarea v-froala :attribute="attribute.name" :id="'model_' + attribute.name" v-model="model[attribute.name]" :class="attribute.input_class"></textarea>
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
                     <span style="color: red" v-for="(error, index) in errors[attribute.name]">
                         <span v-if="index > 0">,</span> {{ error }}
@@ -364,7 +372,7 @@ $(document).ready(function() {
             <!-- checkbox -->
             <div class="field" v-else-if="attribute.input_type == 'checkbox'">
                 <div class="ui checkbox">
-                    <input type="checkbox" tabindex="0" :id="'model_' + attribute.display_name" v-model="model[attribute.name]" :class="attribute.input_class">
+                    <input type="checkbox" tabindex="0" :id="'model_' + attribute.name" v-model="model[attribute.name]" :class="attribute.input_class">
                     <label>{{ attribute.display_name }}</label>
                 </div>
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
@@ -375,8 +383,8 @@ $(document).ready(function() {
             </div>
             <!-- number -->
             <div class="field" v-else-if="attribute.input_type == 'number'">
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
-                <input type="number" :id="'model_' + attribute.display_name" v-model="model[attribute.name]" :class="attribute.input_class" number>
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
+                <input  @keyup.enter="modalSubmit" type="number" :id="'model_' + attribute.name" v-model="model[attribute.name]" :class="attribute.input_class" number>
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
                     <span style="color: red" v-for="(error, index) in errors[attribute.name]">
                         <span v-if="index > 0">,</span> {{ error }}
@@ -385,8 +393,8 @@ $(document).ready(function() {
             </div>
             <!-- else -->
             <div class="field" v-else>
-                <label :for="'model_' + attribute.display_name">{{ attribute.display_name }}</label>
-                <input type="text" :id="'model_' + attribute.display_name" v-model="model[attribute.name]" :class="attribute.input_class">
+                <label :for="'model_' + attribute.name">{{ attribute.display_name }}</label>
+                <input  @keyup.enter="modalSubmit" type="text" :id="'model_' + attribute.name" v-model="model[attribute.name]" :class="attribute.input_class">
                 <div class="ui pointing red basic label" v-show="errors[attribute.name]">
                     <span style="color: red" v-for="(error, index) in errors[attribute.name]">
                         <span v-if="index > 0">,</span> {{ error }}

data/lib/vue_crud/version.rb

@@ -1,3 +1,3 @@
 module VueCrud
-  VERSION = "0.2.0.5"
+  VERSION = "0.2.0.6"
 end

data/vendor/assets/javascripts/vue_crud.js

@@ -423,7 +423,8 @@ function vueCRUD_init(params = {}) {
                 filteredModelCount: null,
                 is_calculating: false,
                 selected_attribute: getParameterByName("sa"),
-                selected_text: getParameterByName("st")
+                selected_text: getParameterByName("st"),
+                is_loaded: false
             }
         },
         mounted: function() {
@@ -476,6 +477,7 @@ function vueCRUD_init(params = {}) {
                             url: urlParser(that.info.actions.index.url, that.model, that.info.actions.index.suffix),
                             success: function(res) {
                                 that.models = res;
+                                that.is_loaded = true;
                             }
                         });
                     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vue_crud
 version: !ruby/object:Gem::Version
-  version: 0.2.0.5
+  version: 0.2.0.6
 platform: ruby
 authors:
 - Donald Chiang