vxe-table 3.4.10-beta.0 → 3.4.12-beta.0

package/packages/radio/src/button.js

@@ -9,7 +9,8 @@ export default {
     title: [String, Number],
     content: [String, Number],
     disabled: Boolean,
-    size: { type: String, default: () => GlobalConfig.radio.size || GlobalConfig.size }
+    strict: { type: Boolean, default: () => GlobalConfig.radioButton.strict },
+    size: { type: String, default: () => GlobalConfig.radioButton.size || GlobalConfig.size }
   },
   inject: {
     $xeradiogroup: {
@@ -23,6 +24,10 @@ export default {
     isDisabled () {
       const { $xeradiogroup } = this
       return this.disabled || ($xeradiogroup && $xeradiogroup.disabled)
+    },
+    isStrict () {
+      const { $xeradiogroup } = this
+      return $xeradiogroup ? $xeradiogroup.strict : this.strict
     }
   },
   render (h) {
@@ -49,7 +54,8 @@ export default {
           checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
         },
         on: {
-          change: this.changeEvent
+          change: this.changeEvent,
+          click: this.clickEvent
         }
       }),
       h('span', {
@@ -58,15 +64,27 @@ export default {
     ])
   },
   methods: {
+    handleValue (label, evnt) {
+      const { $xeradiogroup } = this
+      const params = { label, $event: evnt }
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked(params)
+      } else {
+        this.$emit('input', label)
+        this.$emit('change', params)
+      }
+    },
     changeEvent (evnt) {
-      const { $xeradiogroup, isDisabled, label } = this
+      const { isDisabled } = this
       if (!isDisabled) {
-        const params = { label, $event: evnt }
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked(params)
-        } else {
-          this.$emit('input', label)
-          this.$emit('change', params)
+        this.handleValue(this.label, evnt)
+      }
+    },
+    clickEvent (evnt) {
+      const { $xeradiogroup, isDisabled, isStrict } = this
+      if (!isDisabled && !isStrict) {
+        if (this.label === ($xeradiogroup ? $xeradiogroup.value : this.value)) {
+          this.handleValue(null, evnt)
         }
       }
     }

package/packages/radio/src/group.js

@@ -6,7 +6,8 @@ export default {
   props: {
     value: [String, Number, Boolean],
     disabled: Boolean,
-    size: { type: String, default: () => GlobalConfig.radio.size || GlobalConfig.size }
+    strict: { type: Boolean, default: () => GlobalConfig.radioGroup.strict },
+    size: { type: String, default: () => GlobalConfig.radioGroup.size || GlobalConfig.size }
   },
   provide () {
     return {

package/packages/radio/src/radio.js

@@ -12,6 +12,7 @@ export default {
     content: [String, Number],
     disabled: Boolean,
     name: String,
+    strict: { type: Boolean, default: () => GlobalConfig.radio.strict },
     size: { type: String, default: () => GlobalConfig.radio.size || GlobalConfig.size }
   },
   inject: {
@@ -23,6 +24,10 @@ export default {
     isDisabled () {
       const { $xeradiogroup } = this
       return this.disabled || ($xeradiogroup && $xeradiogroup.disabled)
+    },
+    isStrict () {
+      const { $xeradiogroup } = this
+      return $xeradiogroup ? $xeradiogroup.strict : this.strict
     }
   },
   render (h) {
@@ -49,17 +54,8 @@ export default {
           checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
         },
         on: {
-          change: evnt => {
-            if (!isDisabled) {
-              const params = { label, $event: evnt }
-              if ($xeradiogroup) {
-                $xeradiogroup.handleChecked(params)
-              } else {
-                this.$emit('input', label)
-                this.$emit('change', params)
-              }
-            }
-          }
+          change: this.changeEvent,
+          click: this.clickEvent
         }
       }),
       h('span', {
@@ -71,15 +67,27 @@ export default {
     ])
   },
   methods: {
+    handleValue (label, evnt) {
+      const { $xeradiogroup } = this
+      const params = { label, $event: evnt }
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked(params)
+      } else {
+        this.$emit('input', label)
+        this.$emit('change', params)
+      }
+    },
     changeEvent (evnt) {
-      const { $xeradiogroup, isDisabled, label } = this
+      const { isDisabled } = this
       if (!isDisabled) {
-        const params = { label, $event: evnt }
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked(params)
-        } else {
-          this.$emit('input', label)
-          this.$emit('change', params)
+        this.handleValue(this.label, evnt)
+      }
+    },
+    clickEvent (evnt) {
+      const { $xeradiogroup, isDisabled, isStrict } = this
+      if (!isDisabled && !isStrict) {
+        if (this.label === ($xeradiogroup ? $xeradiogroup.value : this.value)) {
+          this.handleValue(null, evnt)
         }
       }
     }

package/packages/table/src/methods.js

@@ -606,7 +606,7 @@ const Methods = {
       }
       XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
         const rowid = getRowid(this, childRow)
-        const rest = { row: childRow, rowid, seq: -1, index: -1, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
+        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
         fullDataRowIdData[rowid] = rest
         fullDataRowMap.set(childRow, rest)
         fullAllDataRowIdData[rowid] = rest
@@ -616,6 +616,7 @@ const Methods = {
       if (transform) {
         row[mapChildren] = rows
       }
+      this.updateAfterDataIndex()
       return rows
     })
   },
@@ -1250,7 +1251,7 @@ const Methods = {
           fullAllDataRowIdData[rowid] = rest
           fullDataRowIdData[rowid] = rest
         }
-      }, { children: treeOpts.mapChildren })
+      }, { children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
@@ -4554,10 +4555,14 @@ const Methods = {
       }
     }
     return cellLabel
-  }
+  },
   /*************************
    * Publish methods
    *************************/
+
+  getSetupOptions () {
+    return GlobalConfig
+  }
 }
 
 // Module methods

package/packages/v-x-e-table/src/conf.js

@@ -292,7 +292,16 @@ export default {
     // transfer: false
   },
   radio: {
-    // size: null
+    // size: null,
+    strict: true
+  },
+  radioButton: {
+    // size: null,
+    strict: true
+  },
+  radioGroup: {
+    // size: null,
+    strict: true
   },
   checkbox: {
     // size: null

package/packages/validator/src/mixin.js

@@ -166,7 +166,7 @@ export default {
                   cb(validRest)
                   resolve()
                 } else {
-                  if (GlobalConfig.validToReject) {
+                  if (GlobalConfig.validToReject === 'obsolete') {
                     // 已废弃，校验失败将不会执行catch
                     reject(validRest)
                   } else {