Add type: object for schema.

laoxubuer · Feb 17, 2016 · a481d17 · a481d17
1 parent 7194b23
commit a481d17
Show file tree

Hide file tree

Showing 12 changed files with 190 additions and 175 deletions.
diff --git a/examples/form/field.vue b/examples/form/field.vue
@@ -37,9 +37,6 @@
   import { default as schema } from './schema';
 
   export default {
-    methods: {
-    },
-
     data() {
       return {
         model: schema.newModel(),

diff --git a/src/basic/dialog.vue b/src/basic/dialog.vue
@@ -31,10 +31,6 @@
       height: {}
     },
 
-    beforeCompile() {
-      console.log(this.$options);
-    },
-
     computed: {
       popupOptions() {
         return {

diff --git a/src/data/grid-body.vue b/src/data/grid-body.vue
@@ -6,22 +6,7 @@
 </style>
 
 <script type="text/ecmascript-6">
-  let getPath = function(object, sortKey) {
-    if (!object || !sortKey) return null;
-    var path = sortKey.split('.');
-    if (path.length === 1) return object[sortKey];
-
-    var target = object;
-    for (var i = 0, j = path.length; i < j; i++) {
-      var key = path[i];
-      var value = target[key];
-      if (i === j - 1) {
-        return value;
-      }
-      if (value === null || value === undefined) return null;
-      target = value;
-    }
-  };
+  import { getPath } from '../util';
 
   let isObject = function(obj) {
     return obj !== null && typeof obj === 'object';
@@ -106,12 +91,12 @@
         if (schema) {
           var mapping = schema.getPropertyMapping(property);
           if (mapping) {
-            return schema.translateProperty(property, row[property]);
+            return schema.translateProperty(property, getPath(row, property));
           }
           return schema.getPropertyText(row, property);
         }
 
-        return row[property];
+        return getPath(row, property);
       }
     }
   };

diff --git a/src/form/checkbox.vue b/src/form/checkbox.vue
@@ -11,7 +11,7 @@
   .d-checkbox-label {
     display: inline-block;
     height: 28px;
-    vertical-align: middle;
+    vertical-align: top;
     font-size: 14px;
   }
 </style>

diff --git a/src/form/fields/field-common.js b/src/form/fields/field-common.js
@@ -56,7 +56,6 @@ export default {
       if (schema) {
         schema.validateProperty(model, this.property);
 
-        this.hintType = model.$hintTypes[this.property];
         this.hintMessage = model.$hints[this.property];
       }
     }

diff --git a/src/form/fields/field.vue b/src/form/fields/field.vue
@@ -35,16 +35,22 @@
     overflow: hidden;
     text-overflow: ellipsis;
     width: 120px;
-    height: 30px;
+    height: 28px;
     padding-right: 10px;
     font-size: 14px;
-    line-height: 30px;
+    line-height: 28px;
     text-align: right;
     color: #666;
   }
 
   .d-field-content {
     vertical-align: top;
+    font-size: 14px;
+    padding-left: 4px;
+    padding-right: 24px;
+    box-sizing: border-box;
+    border-radius: 2px;
+    line-height: 28px;
   }
 
   .d-field.validate-error input {

diff --git a/src/form/fields/label.vue b/src/form/fields/label.vue
@@ -20,7 +20,6 @@
   .d-labelfield-content {
     font-size: 14px;
     padding-left: 4px;
-    width: 100%;
     padding-right: 24px;
     box-sizing: border-box;
     border-radius: 2px;
@@ -30,7 +29,7 @@
 </style>
 
 <script type="text/ecmascript-6">
-  import { merge } from '../../util';
+  import { merge, getPath } from '../../util';
   import { default as common } from './field-common';
 
   export default {
@@ -39,19 +38,23 @@
     computed: merge({
       textValue() {
         var mapping = this.mapping;
-        var reversedMap = {};
+        if (mapping) {
+          var reversedMap = {};
 
-        for (var label in mapping) {
-          if (mapping.hasOwnProperty(label)) {
-            var value = mapping[label];
-            reversedMap[value] = label;
+          for (var label in mapping) {
+            if (mapping.hasOwnProperty(label)) {
+              var value = mapping[label];
+              reversedMap[value] = label;
+            }
           }
-        }
 
-        var currentValue = this.model[this.property];
-        if (mapping && currentValue !== null && currentValue !== undefined) {
-          return reversedMap[currentValue];
+          var currentValue = getPath(this.model, this.property);
+          if (mapping && currentValue !== null && currentValue !== undefined) {
+            return reversedMap[currentValue];
+          }
         }
+
+        return getPath(this.model, this.property);
       }
     }, common.computed),
 

diff --git a/src/form/fields/radio.vue b/src/form/fields/radio.vue
@@ -25,7 +25,7 @@
 </style>
 
 <script type="text/ecmascript-6">
-  import { merge } from '../../util';
+  import { merge, getPath, setPath } from '../../util';
   import { default as common } from './field-common';
 
   export default {
@@ -41,12 +41,12 @@
       editorValue: {
         get() {
           if (this.model && this.property) {
-            return this.model[this.property];
+            return getPath(this.model, this.property);
           }
         },
         set(newValue) {
           if (this.model && this.property) {
-            this.model[this.property] = newValue;
+            setPath(this.model, this.property, newValue);
           }
         }
       }

diff --git a/src/form/fields/select.vue b/src/form/fields/select.vue
@@ -60,7 +60,7 @@
 </style>
 
 <script type="text/ecmascript-6">
-  import { merge } from '../../util';
+  import { merge, getPath, setPath } from '../../util';
   import { default as common } from './field-common';
   import { default as Dropdown } from '../../service/dropdown';
 
@@ -113,12 +113,12 @@
       selectValue: {
         get() {
           if (this.model && this.property) {
-            return this.model[this.property];
+            return getPath(this.model, this.property);
           }
         },
         set(newValue) {
           if (this.model && this.property) {
-            this.model[this.property] = newValue;
+            setPath(this.model, this.property, newValue);
           }
         }
       }