vxe-table 3.4.11 → 3.4.12

package/packages/edit/src/mixin.js

@@ -7,18 +7,19 @@ const { getRowid } = UtilTools
 
 function insertTreeRow (_vm, newRecords, isAppend) {
   const { tableFullTreeData, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
+  const { rowField, parentField, children, mapChildren } = treeOpts
   const funcName = isAppend ? 'push' : 'unshift'
   newRecords.forEach(item => {
-    const parentRowId = item[treeOpts.parentField]
+    const parentRowId = item[parentField]
     const rowid = getRowid(_vm, item)
-    const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, item => parentRowId === item[treeOpts.rowField], treeOpts) : null
+    const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, item => parentRowId === item[rowField], { children: mapChildren }) : null
     if (matchObj) {
       const { item: parentRow } = matchObj
       const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
       const parentLevel = parentRest ? parentRest.level : 0
-      let parentChilds = parentRow[treeOpts.children]
+      let parentChilds = parentRow[children]
       if (!XEUtils.isArray(parentChilds)) {
-        parentChilds = parentRow[treeOpts.children] = []
+        parentChilds = parentRow[children] = []
       }
       parentChilds[funcName](item)
       const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
@@ -59,7 +60,7 @@ export default {
      */
     _insertAt (records, row) {
       const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
-      const { transform } = treeOpts
+      const { transform, rowField, mapChildren } = treeOpts
       if (!XEUtils.isArray(records)) {
         records = [records]
       }
@@ -98,7 +99,7 @@ export default {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[treeOpts.rowField] === item[treeOpts.rowField], treeOpts)
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildren })
             if (matchObj) {
               const { parent: parentRow } = matchObj
               const parentChilds = matchObj.items
@@ -108,13 +109,13 @@ export default {
                 const rowid = getRowid(this, item)
                 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                   if (item[treeOpts.parentField]) {
-                    if (parentRow && item[treeOpts.parentField] !== parentRow[treeOpts.rowField]) {
-                      UtilTools.error('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[treeOpts.rowField]}`])
+                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                      UtilTools.error('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
                     }
                   }
                 }
                 if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[treeOpts.rowField]
+                  item[treeOpts.parentField] = parentRow[rowField]
                 }
                 parentChilds.splice(matchObj.index + i, 0, item)
                 const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1 }
@@ -131,7 +132,15 @@ export default {
             if (treeConfig) {
               throw new Error(UtilTools.getLog('vxe.error.noTree', ['insert']))
             }
-            const afIndex = afterFullData.indexOf(row)
+            let afIndex = -1
+            // 如果是可视索引
+            if (XEUtils.isNumber(row)) {
+              if (row < afterFullData.length) {
+                afIndex = row
+              }
+            } else {
+              afIndex = afterFullData.indexOf(row)
+            }
             if (afIndex === -1) {
               throw new Error(UtilTools.error('vxe.error.unableInsert'))
             }

package/packages/grid/src/grid.js

@@ -253,7 +253,7 @@ export default {
   created () {
     const { data, formOpts, proxyOpts, proxyConfig } = this
     if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-      console.error('[vxe-grid] There is a conflict between the props proxy-config and data.')
+      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {

package/packages/input/src/input.js

@@ -756,15 +756,10 @@ export default {
       return this.maxDate ? XEUtils.toStringDate(this.maxDate) : null
     },
     dateValue () {
-      const { value, isDatePickerType, type, dateValueFormat } = this
+      const { value, isDatePickerType, dateValueFormat } = this
       let val = null
       if (value && isDatePickerType) {
-        let date
-        if (type === 'time') {
-          date = toStringTimeDate(value)
-        } else {
-          date = XEUtils.toStringDate(value, dateValueFormat)
-        }
+        const date = this.parseDate(value, dateValueFormat)
         if (XEUtils.isValidDate(date)) {
           val = date
         }
@@ -812,11 +807,14 @@ export default {
       }
       return ''
     },
+    firstDayOfWeek () {
+      const { startDay, startWeek } = this
+      return XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek)
+    },
     weekDatas () {
       const weeks = []
       if (this.isDatePickerType) {
-        const { startDay, startWeek } = this
-        let sWeek = XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek)
+        let { firstDayOfWeek: sWeek } = this
         weeks.push(sWeek)
         for (let index = 0; index < 6; index++) {
           if (sWeek >= 6) {
@@ -957,7 +955,8 @@ export default {
       return XEUtils.chunk(this.dayList, 7)
     },
     weekDates () {
-      return this.dayDatas.map(list => {
+      const { dayDatas, firstDayOfWeek } = this
+      return dayDatas.map(list => {
         const firstItem = list[0]
         const item = {
           date: firstItem.date,
@@ -966,7 +965,7 @@ export default {
           isCurrent: false,
           isNow: false,
           isNext: false,
-          label: XEUtils.getYearWeek(firstItem.date)
+          label: XEUtils.getYearWeek(firstItem.date, firstDayOfWeek)
         }
         return [item].concat(list)
       })
@@ -1045,8 +1044,10 @@ export default {
       this.initValue()
     },
     dateLabelFormat () {
-      this.dateParseValue(this.datePanelValue)
-      this.inputValue = this.datePanelLabel
+      if (this.isDatePickerType) {
+        this.dateParseValue(this.datePanelValue)
+        this.inputValue = this.datePanelLabel
+      }
     }
   },
   created () {
@@ -1266,6 +1267,13 @@ export default {
       }
       this.$emit('clear', { $panel: $refs.panel, value, $event: evnt })
     },
+    parseDate (value, format) {
+      const { type } = this
+      if (type === 'time') {
+        return toStringTimeDate(value)
+      }
+      return XEUtils.toStringDate(value, format)
+    },
     /**
      * 检查初始值
      */
@@ -1292,7 +1300,7 @@ export default {
       }
     },
     afterCheckValue () {
-      const { type, exponential, inpReadonly, inputValue, isDatePickerType, isNumType, datetimePanelValue, dateLabelFormat, min, max } = this
+      const { type, exponential, inpReadonly, inputValue, isDatePickerType, isNumType, datetimePanelValue, dateLabelFormat, min, max, firstDayOfWeek } = this
       if (!inpReadonly) {
         if (isNumType) {
           if (inputValue) {
@@ -1315,12 +1323,7 @@ export default {
             if (type === 'week' || type === 'quarter') {
               // 周和季度选择器不支持解析，无需处理
             } else {
-              let inpDateVal
-              if (type === 'time') {
-                inpDateVal = toStringTimeDate(inputValue)
-              } else {
-                inpDateVal = XEUtils.toStringDate(inputValue, dateLabelFormat)
-              }
+              let inpDateVal = this.parseDate(inputValue, dateLabelFormat)
               if (XEUtils.isValidDate(inpDateVal)) {
                 if (type === 'time') {
                   inpDateVal = toStringTimeDate(inpDateVal)
@@ -1340,7 +1343,7 @@ export default {
                   } else {
                     isChange = true
                   }
-                  this.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat)
+                  this.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat, { firstDay: firstDayOfWeek })
                   if (isChange) {
                     this.dateChange(inpDateVal)
                   }
@@ -1650,18 +1653,27 @@ export default {
       }
     },
     dateParseValue (date) {
-      const { type, dateLabelFormat, valueFormat } = this
+      const { type, dateLabelFormat, valueFormat, firstDayOfWeek } = this
       let dValue = null
       let dLabel = ''
       if (date) {
-        if (type === 'time') {
-          dValue = toStringTimeDate(date)
-        } else {
-          dValue = XEUtils.toStringDate(date, valueFormat)
-        }
+        dValue = this.parseDate(date, valueFormat)
       }
       if (XEUtils.isValidDate(dValue)) {
-        dLabel = XEUtils.toDateString(dValue, dateLabelFormat)
+        dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek })
+        // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+        if (dateLabelFormat && type === 'week') {
+          const firstWeekDate = XEUtils.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek)
+          if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+            const yyIndex = dateLabelFormat.indexOf('yyyy')
+            if (yyIndex > -1) {
+              const yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4))
+              if (yyNum && !isNaN(yyNum)) {
+                dLabel = dLabel.replace(`${yyNum}`, `${yyNum - 1}`)
+              }
+            }
+          }
+        }
       } else {
         dValue = null
       }
@@ -1669,7 +1681,7 @@ export default {
       this.datePanelLabel = dLabel
     },
     dateOffsetEvent (evnt) {
-      const { isActivated, datePanelValue, datePanelType } = this
+      const { isActivated, datePanelValue, datePanelType, firstDayOfWeek } = this
       if (isActivated) {
         evnt.preventDefault()
         const keyCode = evnt.keyCode
@@ -1718,11 +1730,11 @@ export default {
           if (isLeftArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, -1)
           } else if (isUpArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, -1)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek)
           } else if (isRightArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, 1)
           } else if (isDwArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, 1)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek)
           }
           this.dateMoveDay(offsetDay)
         }
@@ -1741,16 +1753,16 @@ export default {
       }
     },
     dateChange (date) {
-      const { value, datetimePanelValue, dateValueFormat } = this
+      const { value, datetimePanelValue, dateValueFormat, firstDayOfWeek } = this
       if (this.type === 'week') {
         const sWeek = XEUtils.toNumber(this.selectDay)
-        date = XEUtils.getWhatWeek(date, 0, sWeek)
+        date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek)
       } else if (this.hasTime) {
         date.setHours(datetimePanelValue.getHours())
         date.setMinutes(datetimePanelValue.getMinutes())
         date.setSeconds(datetimePanelValue.getSeconds())
       }
-      const inpVal = XEUtils.toDateString(date, dateValueFormat)
+      const inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek })
       this.dateCheckMonth(date)
       if (!XEUtils.isEqual(value, inpVal)) {
         this.emitModel(inpVal, { type: 'update' })

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

@@ -1083,20 +1083,21 @@ const Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords (isFull) {
-    const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts } = this
+    const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData } = this
+    const { transform, children, mapChildren } = treeOpts
     const { checkField: property } = checkboxOpts
-    const currTableData = isFull ? tableFullData : afterFullData
+    const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
     let rowList = []
     if (property) {
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, property), treeOpts)
+        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, property), { children: transform ? mapChildren : children })
       } else {
         rowList = currTableData.filter(row => XEUtils.get(row, property))
       }
     } else {
       const { selection } = this
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => selection.indexOf(row) > -1, treeOpts)
+        rowList = XEUtils.filterTree(currTableData, row => selection.indexOf(row) > -1, { children: transform ? mapChildren : children })
       } else {
         rowList = currTableData.filter(row => selection.indexOf(row) > -1)
       }
@@ -1268,6 +1269,24 @@ const Methods = {
       })
     }
   },
+  /**
+   * 只对 tree-config 有效，获取行的父级
+   */
+  getParentRow (rowOrRowid) {
+    const { treeConfig, fullDataRowIdData } = this
+    if (rowOrRowid && treeConfig) {
+      let rowid
+      if (XEUtils.isString(rowOrRowid)) {
+        rowid = rowOrRowid
+      } else {
+        rowid = getRowid(this, rowOrRowid)
+      }
+      if (rowid) {
+        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null
+      }
+    }
+    return null
+  },
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键

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