datetime filter future date, form datetime rule

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-django",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "个人实验项目, 本框架的目标是借鉴并超越django admin的自动化思想, 实现UI前端的极简快速定制开发",
   "main": "index.js",
   "files": [

src/components/form/Form.js

@@ -23,7 +23,7 @@ export function defaultRuleType(f){
     if (f.choices && f.choices.length > 0) {
         return typeof f.choices[0][0]
     }
-    return f.model ? 'number' : (['field', 'time'].includes(f.type) ? 'string' : (['integer', 'decimal'].includes(f.type) ? 'number' : f.type))
+    return f.model ? 'number' : (['field', 'time', 'datetime'].includes(f.type) ? 'string' : (['integer', 'decimal'].includes(f.type) ? 'number' : f.type))
 }
 
 export function defaultSpan(f){

src/utils/filters.js

@@ -1,15 +1,15 @@
 /**
  * Created by denishuang on 2017/11/16.
  */
-import { formatRelative, subDays, distance_in_words_to_now } from 'date-fns'
+import {formatRelative, subDays, distance_in_words_to_now} from 'date-fns'
 import zh_cn from 'date-fns/locale/zh_cn'
 export function date2now(d) {
     "use strict";
     return d
 }
 
 export function date(d) {
-    return distance_in_words_to_now(d, { locale: zh_cn})
+    return distance_in_words_to_now(d, {locale: zh_cn})
 }
 
 function pluralize(time, label) {
@@ -74,20 +74,21 @@ export function formatTime(time, option) {
     const now = new Date()
 
     const diff = (now - d) / 1000
-
-    if (diff < 30) {
-        return '刚刚'
-    } else if (diff < 3600) { // less 1 hour
-        return Math.ceil(diff / 60) + '分钟前'
-    } else if (diff < 3600 * 24) {
-        return Math.ceil(diff / 3600) + '小时前'
-    } else if (diff < 3600 * 24 * 2) {
-        return '1天前'
+    if (diff >= 0) {
+        if (diff < 30) {
+            return '刚刚'
+        } else if (diff < 3600) { // less 1 hour
+            return Math.ceil(diff / 60) + '分钟前'
+        } else if (diff < 3600 * 24) {
+            return Math.ceil(diff / 3600) + '小时前'
+        } else if (diff < 3600 * 24 * 2) {
+            return '1天前'
+        }
     }
     if (option) {
         return parseTime(time, option)
     } else {
-        if(d.getYear()!=now.getYear()){
+        if (d.getYear() != now.getYear()) {
             return parseTime(d, '{y}-{m}-{d} {h}:{i}')
         }
         return (d.getMonth() + 1) + '月' + d.getDate() + '日' + d.getHours() + '时' + d.getMinutes() + '分'
@@ -122,7 +123,7 @@ export function toThousandslsFilter(num) {
     return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
 }
 
-export function percent(value){
+export function percent(value) {
     let a = value && (value * 100).toFixed(2)
     return `${a}%`
 }