fix date picker

api/lib/cmdb/const.py

@@ -47,8 +47,8 @@ type_map = {
         Attribute.FLOAT: float,
         Attribute.TEXT: str,
         Attribute.TIME: str,
-        Attribute.DATE: lambda x: x.strftime("%Y%m%d"),
-        Attribute.DATETIME: lambda x: x.strftime("%Y%m%d %H:%M:%S"),
+        Attribute.DATE: lambda x: x.strftime("%Y-%m-%d"),
+        Attribute.DATETIME: lambda x: x.strftime("%Y-%m-%d %H:%M:%S"),
     },
     'serialize2': {
         Attribute.INT: int,

api/lib/database.py

@@ -10,7 +10,9 @@ from api.lib.exception import CommitException
 
 class FormatMixin(object):
     def to_dict(self):
-        return dict([(k.name, getattr(self, k.name)) for k in getattr(self, "__table__").columns])
+        return dict([(k.name,
+                      getattr(self, k.name) if not isinstance(getattr(self, k.name), datetime.datetime) else getattr(
+                          self, k.name).strftime('%Y-%m-%d %H:%M:%S')) for k in getattr(self, "__table__").columns])
 
     @classmethod
     def get_columns(cls):
@@ -18,7 +20,6 @@ class FormatMixin(object):
 
 
 class CRUDMixin(FormatMixin):
-
     @classmethod
     def create(cls, flush=False, **kwargs):
         return cls(**kwargs).save(flush=flush)

ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue

@@ -128,6 +128,11 @@ export default {
     createInstance (e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {
+        Object.keys(values).forEach(k => {
+          if (typeof values[k] === 'object') {
+            values[k] = values[k].format("YYYY-MM-DD HH:mm:ss")
+          }
+        })
         if (!err) {
           if (this.action === 'update') {
             this.$emit('submit', values)

ui/src/views/cmdb/ci_type/attributesTable.vue

@@ -393,7 +393,7 @@ export default {
     },
 
     getAttributes () {
-      searchAttributes().then(res => {
+      searchAttributes({ page_size: 10000 }).then(res => {
         this.allAttributes = res.attributes
       })
     },