vxe-table 4.2.4-beta.2 → 4.2.4

package/es/icon/style.css

@@ -241,10 +241,10 @@
 
 .vxe-icon--plus:before {
   content: "+";
-  left: -0.05em;
-  bottom: 0;
-  line-height: 0.9em;
-  font-size: 1.4em; }
+  left: -0.12em;
+  bottom: -0.1em;
+  line-height: 1em;
+  font-size: 1.6em; }
 
 .vxe-icon--check:before {
   left: 0.25em;
@@ -261,11 +261,12 @@
   transform: rotate(45deg); }
 
 .vxe-icon--close:before {
-  content: "\D7";
-  left: -0.05em;
-  bottom: 0;
-  line-height: 0.8em;
-  font-size: 1.4em; }
+  content: "+";
+  left: -0.1em;
+  bottom: -0.16em;
+  line-height: 1em;
+  font-size: 1.8em;
+  transform: rotate(45deg); }
 
 .vxe-icon--minus:before {
   content: "\2500";

package/es/input/src/input.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, Teleport, ref, computed, reactive, nextTick, watch, onUnmounted } from 'vue';
+import { defineComponent, h, Teleport, ref, computed, reactive, inject, nextTick, watch, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { useSize } from '../../hooks/size';
@@ -78,6 +78,8 @@ export default defineComponent({
     ],
     setup: function (props, context) {
         var slots = context.slots, emit = context.emit;
+        var $xeform = inject('$xeform', null);
+        var $xeformiteminfo = inject('$xeformiteminfo', null);
         var xID = XEUtils.uniqueId();
         var computeSize = useSize(props);
         var reactData = reactive({
@@ -510,6 +512,37 @@ export default defineComponent({
             var type = props.type, immediate = props.immediate;
             return immediate || !(type === 'text' || type === 'number' || type === 'integer' || type === 'float');
         });
+        var computeNumValue = computed(function () {
+            var type = props.type;
+            var inputValue = reactData.inputValue;
+            var isNumType = computeIsNumType.value;
+            if (isNumType) {
+                return type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
+            }
+            return 0;
+        });
+        var computeIsDisabledSubtractNumber = computed(function () {
+            var min = props.min;
+            var inputValue = reactData.inputValue;
+            var isNumType = computeIsNumType.value;
+            var numValue = computeNumValue.value;
+            // 当有值时再进行判断
+            if ((inputValue || inputValue === 0) && isNumType && min !== null) {
+                return numValue <= XEUtils.toNumber(min);
+            }
+            return false;
+        });
+        var computeIsDisabledAddNumber = computed(function () {
+            var max = props.max;
+            var inputValue = reactData.inputValue;
+            var isNumType = computeIsNumType.value;
+            var numValue = computeNumValue.value;
+            // 当有值时再进行判断
+            if ((inputValue || inputValue === 0) && isNumType && max !== null) {
+                return numValue >= XEUtils.toNumber(max);
+            }
+            return false;
+        });
         var getNumberValue = function (val) {
             var type = props.type, exponential = props.exponential;
             var inpMaxlength = computeInpMaxlength.value;
@@ -530,6 +563,10 @@ export default defineComponent({
             inputMethods.dispatchEvent('input', { value: value }, evnt);
             if (XEUtils.toValueString(props.modelValue) !== value) {
                 inputMethods.dispatchEvent('change', { value: value }, evnt);
+                // 自动更新校验状态
+                if ($xeform && $xeformiteminfo) {
+                    $xeform.triggerItemEvent(evnt, $xeformiteminfo.itemConfig.field, value);
+                }
             }
         };
         var emitInputEvent = function (value, evnt) {
@@ -849,8 +886,9 @@ export default defineComponent({
         var downbumTimeout;
         var numberNextEvent = function (evnt) {
             var readonly = props.readonly, disabled = props.disabled;
+            var isDisabledSubtractNumber = computeIsDisabledSubtractNumber.value;
             clearTimeout(downbumTimeout);
-            if (!disabled && !readonly) {
+            if (!disabled && !readonly && !isDisabledSubtractNumber) {
                 numberChange(false, evnt);
             }
             inputMethods.dispatchEvent('next-number', {}, evnt);
@@ -863,8 +901,9 @@ export default defineComponent({
         };
         var numberPrevEvent = function (evnt) {
             var readonly = props.readonly, disabled = props.disabled;
+            var isDisabledAddNumber = computeIsDisabledAddNumber.value;
             clearTimeout(downbumTimeout);
-            if (!disabled && !readonly) {
+            if (!disabled && !readonly && !isDisabledAddNumber) {
                 numberChange(true, evnt);
             }
             inputMethods.dispatchEvent('prev-number', {}, evnt);
@@ -1942,11 +1981,15 @@ export default defineComponent({
             return null;
         };
         var renderNumberIcon = function () {
+            var isDisabledAddNumber = computeIsDisabledAddNumber.value;
+            var isDisabledSubtractNumber = computeIsDisabledSubtractNumber.value;
             return h('span', {
                 class: 'vxe-input--number-suffix'
             }, [
                 h('span', {
-                    class: 'vxe-input--number-prev is--prev',
+                    class: ['vxe-input--number-prev is--prev', {
+                            'is--disabled': isDisabledAddNumber
+                        }],
                     onMousedown: numberMousedownEvent,
                     onMouseup: numberStopDown,
                     onMouseleave: numberStopDown
@@ -1956,7 +1999,9 @@ export default defineComponent({
                     })
                 ]),
                 h('span', {
-                    class: 'vxe-input--number-next is--next',
+                    class: ['vxe-input--number-next is--next', {
+                            'is--disabled': isDisabledSubtractNumber
+                        }],
                     onMousedown: numberMousedownEvent,
                     onMouseup: numberStopDown,
                     onMouseleave: numberStopDown

package/es/input/style.css

@@ -152,6 +152,11 @@
 .vxe-input:not(.is--disabled) .vxe-input--number-next:active {
   color: #409eff; }
 
+.vxe-input:not(.is--disabled) .vxe-input--number-prev.is--disabled,
+.vxe-input:not(.is--disabled) .vxe-input--number-next.is--disabled {
+  cursor: no-drop;
+  color: #e4e7ed; }
+
 .vxe-input .vxe-input--password-suffix,
 .vxe-input .vxe-input--number-suffix,
 .vxe-input .vxe-input--date-picker-suffix,

package/es/radio/src/button.js

@@ -20,6 +20,8 @@ export default defineComponent({
     ],
     setup: function (props, context) {
         var slots = context.slots, emit = context.emit;
+        var $xeform = inject('$xeform', null);
+        var $xeformiteminfo = inject('$xeformiteminfo', null);
         var xID = XEUtils.uniqueId();
         var computeSize = useSize(props);
         var $xeradiobutton = {
@@ -55,6 +57,10 @@ export default defineComponent({
             else {
                 emit('update:modelValue', label);
                 radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+                // 自动更新校验状态
+                if ($xeform && $xeformiteminfo) {
+                    $xeform.triggerItemEvent(evnt, $xeformiteminfo.itemConfig.field, label);
+                }
             }
         };
         var changeEvent = function (evnt) {

package/es/radio/src/group.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, provide } from 'vue';
+import { defineComponent, h, provide, inject } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { useSize } from '../../hooks/size';
@@ -16,6 +16,8 @@ export default defineComponent({
     ],
     setup: function (props, context) {
         var slots = context.slots, emit = context.emit;
+        var $xeform = inject('$xeform', null);
+        var $xeformiteminfo = inject('$xeformiteminfo', null);
         var xID = XEUtils.uniqueId();
         var $xeradiogroup = {
             xID: xID,
@@ -26,9 +28,13 @@ export default defineComponent({
         var radioGroupMethods = {};
         useSize(props);
         var radioGroupPrivateMethods = {
-            handleChecked: function (params) {
+            handleChecked: function (params, evnt) {
                 emit('update:modelValue', params.label);
                 radioGroupMethods.dispatchEvent('change', params);
+                // 自动更新校验状态
+                if ($xeform && $xeformiteminfo) {
+                    $xeform.triggerItemEvent(evnt, $xeformiteminfo.itemConfig.field, params.label);
+                }
             }
         };
         radioGroupMethods = {

package/es/radio/src/radio.js

@@ -21,6 +21,8 @@ export default defineComponent({
     ],
     setup: function (props, context) {
         var slots = context.slots, emit = context.emit;
+        var $xeform = inject('$xeform', null);
+        var $xeformiteminfo = inject('$xeformiteminfo', null);
         var xID = XEUtils.uniqueId();
         var $xeradio = {
             xID: xID,
@@ -50,6 +52,10 @@ export default defineComponent({
             else {
                 emit('update:modelValue', label);
                 radioMethods.dispatchEvent('change', { label: label }, evnt);
+                // 自动更新校验状态
+                if ($xeform && $xeformiteminfo) {
+                    $xeform.triggerItemEvent(evnt, $xeformiteminfo.itemConfig.field, label);
+                }
             }
         };
         var changeEvent = function (evnt) {

package/es/select/src/select.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, Teleport, ref, resolveComponent, computed, provide, onUnmounted, reactive, nextTick, watch, onMounted } from 'vue';
+import { defineComponent, h, Teleport, ref, inject, resolveComponent, computed, provide, onUnmounted, reactive, nextTick, watch, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { useSize } from '../../hooks/size';
@@ -44,6 +44,8 @@ export default defineComponent({
     ],
     setup: function (props, context) {
         var slots = context.slots, emit = context.emit;
+        var $xeform = inject('$xeform', null);
+        var $xeformiteminfo = inject('$xeformiteminfo', null);
         var xID = XEUtils.uniqueId();
         var computeSize = useSize(props);
         var reactData = reactive({
@@ -339,6 +341,10 @@ export default defineComponent({
             if (selectValue !== props.modelValue) {
                 emit('update:modelValue', selectValue);
                 selectMethods.dispatchEvent('change', { value: selectValue }, evnt);
+                // 自动更新校验状态
+                if ($xeform && $xeformiteminfo) {
+                    $xeform.triggerItemEvent(evnt, $xeformiteminfo.itemConfig.field, selectValue);
+                }
             }
         };
         var clearValueEvent = function (evnt, selectValue) {