vxe-table 4.2.4 → 4.2.6-beta.0

package/es/edit/src/hook.js

@@ -21,7 +21,7 @@ import { isEnableConf } from '../../tools/utils';
 import { getCellValue, setCellValue, getRowid } from '../../table/src/util';
 import { browse, removeClass, addClass } from '../../tools/dom';
 import { warnLog, errLog, getLog } from '../../tools/log';
-var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
+var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
 var editHook = {
     setupTable: function ($xetable) {
         var props = $xetable.props, reactData = $xetable.reactData, internalData = $xetable.internalData;
@@ -553,7 +553,7 @@ var editHook = {
              */
             setEditRow: function (row) {
                 var visibleColumn = internalData.visibleColumn;
-                return $xetable.setActiveCell(row, XEUtils.find(visibleColumn, function (column) { return isEnableConf(column.editRender); }));
+                return $xetable.setEditCell(row, XEUtils.find(visibleColumn, function (column) { return isEnableConf(column.editRender); }));
             },
             setActiveCell: function (row, fieldOrColumn) {
                 // if (process.env.NODE_ENV === 'development') {

package/es/form/src/form-config-item.js

@@ -39,10 +39,10 @@ var VxeFormConfigItem = defineComponent({
             var titleSlot = slots ? slots.title : null;
             var span = item.span || allSpan;
             var align = item.align || allAlign;
-            var titleAlign = item.titleAlign || allTitleAlign;
-            var titleWidth = item.titleWidth || allTitleWidth;
-            var titleColon = item.titleColon === null ? allTitleColon : item.titleColon;
-            var titleAsterisk = item.titleAsterisk === null ? allTitleAsterisk : item.titleAsterisk;
+            var titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+            var titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+            var titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+            var titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
             var itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow;
             var showEllipsis = itemOverflow === 'ellipsis';
             var showTitle = itemOverflow === 'title';
@@ -84,7 +84,7 @@ var VxeFormConfigItem = defineComponent({
                 contentVNs = compConf.renderItemContent(itemRender, params);
             }
             else if (field) {
-                contentVNs = ["" + XEUtils.get(data, field)];
+                contentVNs = [XEUtils.toValueString(XEUtils.get(data, field))];
             }
             if (collapseNode) {
                 contentVNs.push(h('div', {

package/es/modal/src/modal.js

@@ -487,6 +487,7 @@ export default defineComponent({
                     }
                     boxElem.style.left = left + "px";
                     boxElem.style.top = top + "px";
+                    boxElem.className = boxElem.className.replace(/\s?is--drag/, '') + ' is--drag';
                 };
                 document.onmouseup = function () {
                     document.onmousemove = domMousemove_1;
@@ -496,6 +497,9 @@ export default defineComponent({
                             savePosStorage();
                         });
                     }
+                    setTimeout(function () {
+                        boxElem.className = boxElem.className.replace(/\s?is--drag/, '');
+                    }, 50);
                 };
             }
         };
@@ -688,7 +692,7 @@ export default defineComponent({
                     headerOns.onDblclick = toggleZoomEvent;
                 }
                 headVNs.push(h('div', __assign({ class: ['vxe-modal--header', {
-                            'is--drag': draggable,
+                            'is--draggable': draggable,
                             'is--ellipsis': !isMsg && props.showTitleOverflow
                         }] }, headerOns), headerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : headerSlot({ $modal: $xemodal })) : renderTitles()));
             }

package/es/modal/style.css

@@ -185,7 +185,7 @@
        -moz-user-select: none;
         -ms-user-select: none;
             user-select: none; }
-    .vxe-modal--wrapper .vxe-modal--header.is--drag {
+    .vxe-modal--wrapper .vxe-modal--header.is--draggable {
       cursor: move; }
     .vxe-modal--wrapper .vxe-modal--header.is--ellipsis {
       overflow: hidden;