Merge pull request #25 from jkazama/1.1.x

v1.1.1

gulpfile.babel.js

@@ -34,6 +34,7 @@ const resource = {
   },
   vendor: {
     js: ['jquery', 'lodash', 'moment', 'vue', 'vue-router', 'bootstrap-sass'],
+    css: [`${paths.node.modules}/flatpickr/dist/flatpickr.min.css`],
     fontawesome: `${paths.node.modules}/font-awesome/fonts/**/*`
   }
 }
@@ -141,6 +142,10 @@ gulp.task('build:sass', () => {
 
 // copy Static Resource
 gulp.task('build:static', () => {
+  gulp.src(resource.vendor.css)
+    .pipe($.concat('vendor.css'))
+    .pipe($.pleeease())
+    .pipe(gulp.dest(paths.dist.css))
   gulp.src(resource.vendor.fontawesome)
     .pipe(gulp.dest(paths.dist.font))
   return gulp.src(resource.src.static)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-ui-vue",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Vue.js / VueRouter Boilerplate",
   "main": "src/js/app.js",
   "scripts": {
@@ -14,52 +14,53 @@
     "url": "https://github.com/jkazama/sample-ui-vue.git"
   },
   "dependencies": {
-    "bootstrap-sass": "^3.3.0",
-    "co": "^4.6.0",
-    "flatpickr": "^2.0.0",
-    "font-awesome": "^4.6.0",
-    "jquery": "^3.1.0",
-    "lodash": "^4.15.0",
-    "moment": "^2.14.0",
-    "superagent": "^2.2.0",
-    "vue": "^2.0.0",
-    "vue-router": "^2.0.0"
+    "bootstrap-sass": "~3.3.0",
+    "co": "~4.6.0",
+    "flatpickr": "~2.1.0",
+    "font-awesome": "~4.6.0",
+    "jquery": "~3.1.0",
+    "lodash": "~4.17.0",
+    "moment": "~2.16.0",
+    "superagent": "~2.3.0",
+    "vue": "~2.0.0",
+    "vue-router": "~2.0.0",
+    "he": "~1.1.0"
   },
   "devDependencies": {
-    "babel-core": "^6.13.0",
-    "babel-loader": "^6.2.0",
-    "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-preset-es2015": "^6.14.0",
-    "babel-runtime": "^6.9.0",
-    "browser-sync": "^2.14.0",
-    "css-loader": "^0.23.0",
-    "del": "^2.2.0",
-    "gulp": "^3.9.0",
-    "gulp-changed": "^1.3.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-cssmin": "^0.1.0",
-    "gulp-htmlhint": "^0.3.0",
-    "gulp-if": "^2.0.0",
-    "gulp-load-plugins": "^1.2.0",
-    "gulp-order": "^1.1.0",
-    "gulp-pleeease": "^2.0.0",
-    "gulp-plumber": "^1.1.0",
-    "gulp-pug": "^3.0.0",
-    "gulp-rev-all": "^0.8.0",
-    "gulp-sass": "^2.3.0",
-    "gulp-slash": "^1.1.0",
-    "gulp-uglify": "^1.5.0",
-    "html-loader": "^0.4.0",
-    "node-sass": "^3.4.0",
-    "pug": "^2.0.0-beta5",
-    "pug-loader": "^2.3.0",
-    "run-sequence": "^1.2.0",
-    "sass-loader": "^4.0.0",
-    "style-loader": "^0.13.0",
-    "template-html-loader": "^0.0.3",
-    "vue-hot-reload-api": "^2.0.0",
-    "vue-loader": "^9.5.0",
-    "webpack": "^1.13.0",
-    "webpack-stream": "^3.2.0"
+    "babel-core": "~6.18.0",
+    "babel-loader": "~6.2.0",
+    "babel-plugin-transform-runtime": "~6.15.0",
+    "babel-preset-es2015": "~6.14.0",
+    "babel-runtime": "~6.18.0",
+    "browser-sync": "~2.17.0",
+    "css-loader": "~0.25.0",
+    "del": "~2.2.0",
+    "gulp": "~3.9.0",
+    "gulp-changed": "~1.3.0",
+    "gulp-concat": "~2.6.0",
+    "gulp-cssmin": "~0.1.0",
+    "gulp-htmlhint": "~0.3.0",
+    "gulp-if": "~2.0.0",
+    "gulp-load-plugins": "~1.2.0",
+    "gulp-order": "~1.1.0",
+    "gulp-pleeease": "~2.0.0",
+    "gulp-plumber": "~1.1.0",
+    "gulp-pug": "~3.0.0",
+    "gulp-rev-all": "~0.8.0",
+    "gulp-sass": "~2.3.0",
+    "gulp-slash": "~1.1.0",
+    "gulp-uglify": "~1.5.0",
+    "html-loader": "~0.4.0",
+    "node-sass": "~3.13.0",
+    "pug": "~2.0.0-beta6",
+    "pug-loader": "~2.3.0",
+    "run-sequence": "~1.2.0",
+    "sass-loader": "~4.0.0",
+    "style-loader": "~0.13.0",
+    "template-html-loader": "~0.0.3",
+    "vue-hot-reload-api": "~2.0.0",
+    "vue-loader": "~9.7.0",
+    "webpack": "~1.13.0",
+    "webpack-stream": "~3.2.0"
   }
 }

src/html/index.pug

@@ -4,6 +4,7 @@ html(lang="ja")
     meta(charset="utf-8")
     meta(content="IE=edge,chrome=1" http-equiv="X-UA-Compatible")
     title アプリケーション
+    link(rel="stylesheet" href="/css/vendor.css")
     link(rel="stylesheet" href="/css/style.css")
     script(src="/js/vendor.bundle.js")
   body

src/js/components/DatePicker.vue

@@ -37,11 +37,11 @@ import Vue from 'vue'
 import Message from 'components/Message.vue'
 import Flatpickr from 'flatpickr'
 // for localize
-Flatpickr.l10n.weekdays = {
+Flatpickr.l10ns.default.weekdays = {
   shorthand: ['日', '月', '火', '水', '木', '金', '土'],
   longhand: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日']
 }
-Flatpickr.l10n.months = {
+Flatpickr.l10ns.default.months = {
   shorthand: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
   longhand: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 }
@@ -97,16 +97,9 @@ export default {
     updateValue(v){
       this.$emit('input', v)
     },
-    onEnter(event) {
-      if (this.enter) {
-        this.enter(event)
-      } else {
-        Lib.Log.debug('enter empty executed. please set v-bind:enter="yourParentMethodName"')
-      }
-    },
     clearDate() {
       this.updateValue(null)
     }
   }
 }
-</script>
+</script>

src/js/components/Message.vue

@@ -63,7 +63,6 @@ export default {
     },
     handleGlobalMessage(messages) {
       let message = messages.global
-      console.log(messages)
       let valid = this.globalKey ? this.globalKey === messages.globalKey : true
       if (message && valid) {
         this.message = Array.isArray(message) ? message[0] : message

src/js/views/mixins/view-basic.js

@@ -37,9 +37,10 @@ export default {
     this.clear()
   },
   methods: {
+    // コンポーネントタグ(テンプレートで定義された文字列)を返します。文字列はアッパーキャメルケースで統一して返されます。
     componentTag() {
       let tag = this.$options._componentTag
-      return tag ? tag : ""
+      return tag ? _.upperFirst(_.camelCase(tag)) : ""
     },
     // メッセージを通知します。
     message(globalMessage = null, columnMessages = [], level = Level.INFO) {

src/js/views/mixins/view-crud.js

@@ -8,7 +8,7 @@ import ViewBasic from 'views/mixins/view-basic'
 /**
  * 特定情報の登録/変更/削除を前提とした Vue Mixin。
  * 情報に対するCRUD目的のパネルで利用してください。
-  * 本クラスを利用する際は初期化時に以下の設定が必要です。
+ * 本クラスを利用する際は初期化時に以下の設定が必要です。
  * ・actionの実装
  * ---
  * - Props -