vxe-table 4.1.15 → 4.1.17-beta.2

package/es/input/src/input.js

@@ -283,12 +283,15 @@ export default defineComponent({
             }
             return '';
         });
+        var computeFirstDayOfWeek = computed(function () {
+            var startDay = props.startDay, startWeek = props.startWeek;
+            return XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+        });
         var computeWeekDatas = computed(function () {
             var weeks = [];
             var isDatePickerType = computeIsDatePickerType.value;
             if (isDatePickerType) {
-                var startDay = props.startDay, startWeek = props.startWeek;
-                var sWeek = XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+                var sWeek = computeFirstDayOfWeek.value;
                 weeks.push(sWeek);
                 for (var index = 0; index < 6; index++) {
                     if (sWeek >= 6) {
@@ -435,6 +438,7 @@ export default defineComponent({
         });
         var computeWeekDates = computed(function () {
             var dayDatas = computeDayDatas.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             return dayDatas.map(function (list) {
                 var firstItem = list[0];
                 var item = {
@@ -444,7 +448,7 @@ export default defineComponent({
                     isCurrent: false,
                     isNow: false,
                     isNext: false,
-                    label: XEUtils.getYearWeek(firstItem.date)
+                    label: XEUtils.getYearWeek(firstItem.date, firstDayOfWeek)
                 };
                 return [item].concat(list);
             });
@@ -610,6 +614,7 @@ export default defineComponent({
             var type = props.type;
             var valueFormat = props.valueFormat;
             var dateLabelFormat = computeDateLabelFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             var dValue = null;
             var dLabel = '';
             if (value) {
@@ -621,7 +626,20 @@ export default defineComponent({
                 }
             }
             if (XEUtils.isValidDate(dValue)) {
-                dLabel = XEUtils.toDateString(dValue, dateLabelFormat);
+                dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek });
+                // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+                if (dateLabelFormat && type === 'week') {
+                    var firstWeekDate = XEUtils.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
+                    if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+                        var yyIndex = dateLabelFormat.indexOf('yyyy');
+                        if (yyIndex > -1) {
+                            var yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
+                            if (yyNum && !isNaN(yyNum)) {
+                                dLabel = dLabel.replace("" + yyNum, "" + (yyNum - 1));
+                            }
+                        }
+                    }
+                }
             }
             else {
                 dValue = null;
@@ -680,16 +698,17 @@ export default defineComponent({
             var datetimePanelValue = reactData.datetimePanelValue;
             var isDateTimeType = computeIsDateTimeType.value;
             var dateValueFormat = computeDateValueFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             if (props.type === 'week') {
                 var sWeek = XEUtils.toNumber(props.selectDay);
-                date = XEUtils.getWhatWeek(date, 0, sWeek);
+                date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
             }
             else if (isDateTimeType) {
                 date.setHours(datetimePanelValue.getHours());
                 date.setMinutes(datetimePanelValue.getMinutes());
                 date.setSeconds(datetimePanelValue.getSeconds());
             }
-            var inpVal = XEUtils.toDateString(date, dateValueFormat);
+            var inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek });
             dateCheckMonth(date);
             if (!XEUtils.isEqual(modelValue, inpVal)) {
                 emitModel(inpVal, { type: 'update' });
@@ -740,6 +759,7 @@ export default defineComponent({
                             }
                             else {
                                 var isChange = false;
+                                var firstDayOfWeek = computeFirstDayOfWeek.value;
                                 if (type === 'datetime') {
                                     var dateValue = computeDateValue.value;
                                     if (inputValue !== XEUtils.toDateString(dateValue, dateLabelFormat) || inputValue !== XEUtils.toDateString(inpDateVal, dateLabelFormat)) {
@@ -752,7 +772,7 @@ export default defineComponent({
                                 else {
                                     isChange = true;
                                 }
-                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat);
+                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat, { firstDay: firstDayOfWeek });
                                 if (isChange) {
                                     dateChange(inpDateVal);
                                 }
@@ -1192,17 +1212,18 @@ export default defineComponent({
                 }
                 else {
                     var offsetDay = datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first');
+                    var firstDayOfWeek = computeFirstDayOfWeek.value;
                     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);
                     }
                     dateMoveDay(offsetDay);
                 }
@@ -2037,8 +2058,11 @@ export default defineComponent({
             initValue();
         });
         watch(computeDateLabelFormat, function () {
-            dateParseValue(reactData.datePanelValue);
-            reactData.inputValue = reactData.datePanelLabel;
+            var isDatePickerType = computeIsDatePickerType.value;
+            if (isDatePickerType) {
+                dateParseValue(reactData.datePanelValue);
+                reactData.inputValue = reactData.datePanelLabel;
+            }
         });
         nextTick(function () {
             GlobalEvent.on($xeinput, 'mousewheel', handleGlobalMousewheelEvent);

package/es/radio/src/button.js

@@ -11,7 +11,8 @@ export default defineComponent({
         title: [String, Number],
         content: [String, Number],
         disabled: Boolean,
-        size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
+        strict: { type: Boolean, default: function () { return GlobalConfig.radioButton.strict; } },
+        size: { type: String, default: function () { return GlobalConfig.radioButton.size || GlobalConfig.size; } }
     },
     emits: [
         'update:modelValue',
@@ -34,6 +35,9 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : null;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
@@ -44,16 +48,27 @@ export default defineComponent({
             }
         };
         Object.assign($xeradiobutton, radioButtonMethods);
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -76,7 +91,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--label'

package/es/radio/src/group.js

@@ -7,6 +7,7 @@ export default defineComponent({
     props: {
         modelValue: [String, Number, Boolean],
         disabled: Boolean,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [

package/es/radio/src/radio.js

@@ -12,6 +12,7 @@ export default defineComponent({
         content: [String, Number],
         disabled: Boolean,
         name: String,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [
@@ -35,20 +36,34 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : props.name;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
         });
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -77,7 +92,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--icon'

package/es/table/src/table.js

@@ -1107,7 +1107,7 @@ export default defineComponent({
                         fullAllDataRowIdData[rowid] = rest;
                         fullDataRowIdData[rowid] = rest;
                     }
-                }, { children: treeOpts.mapChildren });
+                }, { children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children });
             }
             else {
                 afterFullData.forEach(function (row, index) {
@@ -2433,7 +2433,7 @@ export default defineComponent({
                     }
                     XEUtils.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
                         var rowid = getRowid($xetable, childRow);
-                        var rest = { row: childRow, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: items, parent: parent, level: parentLevel + nodes.length };
+                        var rest = { row: childRow, rowid: rowid, seq: -1, index: index, _index: -1, $index: -1, items: items, parent: parent, level: parentLevel + nodes.length };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     }, treeOpts);
@@ -2441,6 +2441,7 @@ export default defineComponent({
                     if (transform) {
                         row[mapChildren] = rows;
                     }
+                    updateAfterDataIndex();
                     return rows;
                 });
             },
@@ -2765,6 +2766,26 @@ export default defineComponent({
                 }
                 return rowList;
             },
+            /**
+             * 只对 tree-config 有效，获取行的父级
+             */
+            getParentRow: function (rowOrRowid) {
+                var treeConfig = props.treeConfig;
+                var fullDataRowIdData = internalData.fullDataRowIdData;
+                if (rowOrRowid && treeConfig) {
+                    var rowid = void 0;
+                    if (XEUtils.isString(rowOrRowid)) {
+                        rowid = rowOrRowid;
+                    }
+                    else {
+                        rowid = getRowid($xetable, rowOrRowid);
+                    }
+                    if (rowid) {
+                        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null;
+                    }
+                }
+                return null;
+            },
             /**
              * 根据行的唯一主键获取行
              * @param {String/Number} rowid 行主键

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

@@ -284,7 +284,16 @@ var GlobalConfig = {
     // transfer: false
     },
     radio: {
-    // size: null
+        // size: null,
+        strict: true
+    },
+    radioButton: {
+        // size: null,
+        strict: true
+    },
+    radioGroup: {
+        // size: null,
+        strict: true
     },
     checkbox: {
     // size: null