bkui-vue 0.0.3-beta.2-9 → 0.0.3-beta.2-10

package/lib/table/index.js

@@ -4392,14 +4392,21 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
     });
     var resolveSetting = function resolveSetting() {
       if (/boolean|object/.test(typeof_typeof(props.column.showOverflowTooltip)) && props.column.showOverflowTooltip !== null) {
+        var _props$column$showOve = props.column.showOverflowTooltip,
+          _props$column$showOve2 = _props$column$showOve.content,
+          content = _props$column$showOve2 === void 0 ? '' : _props$column$showOve2,
+          _props$column$showOve3 = _props$column$showOve.mode,
+          mode = _props$column$showOve3 === void 0 ? undefined : _props$column$showOve3,
+          _props$column$showOve4 = _props$column$showOve.popoverOption,
+          popoverOption = _props$column$showOve4 === void 0 ? {} : _props$column$showOve4;
         var result = {
           showOverflowTooltip: {
-            content: '',
+            content: content,
             disabled: !props.column.showOverflowTooltip,
-            mode: undefined,
+            mode: mode,
             resizerWay: undefined,
             watchCellResize: undefined,
-            popoverOption: {}
+            popoverOption: popoverOption
           }
         };
         if (props.parentSetting !== null && typeof_typeof(props.parentSetting) === 'object') {
@@ -4417,11 +4424,11 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         showOverflowTooltip: props.parentSetting
       };
     };
-    var _resolveSetting = resolveSetting(),
-      _resolveSetting$showO = _resolveSetting.showOverflowTooltip,
-      showOverflowTooltip = _resolveSetting$showO === void 0 ? false : _resolveSetting$showO;
     var bkEllipsisIns = null;
     var resolveTooltipOption = function resolveTooltipOption() {
+      var _resolveSetting = resolveSetting(),
+        _resolveSetting$showO = _resolveSetting.showOverflowTooltip,
+        showOverflowTooltip = _resolveSetting$showO === void 0 ? false : _resolveSetting$showO;
       var disabled = true;
       var resizerWay = props.resizerWay;
       var content = function content() {
@@ -4464,8 +4471,8 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         }
       }
       if (props.isHead) {
-        var _props$column$showOve, _props$column;
-        disabled = !((_props$column$showOve = (_props$column = props.column) === null || _props$column === void 0 || (_props$column = _props$column.showOverflowTooltip) === null || _props$column === void 0 ? void 0 : _props$column.showHead) !== null && _props$column$showOve !== void 0 ? _props$column$showOve : true);
+        var _props$column$showOve5, _props$column;
+        disabled = !((_props$column$showOve5 = (_props$column = props.column) === null || _props$column === void 0 || (_props$column = _props$column.showOverflowTooltip) === null || _props$column === void 0 ? void 0 : _props$column.showHead) !== null && _props$column$showOve5 !== void 0 ? _props$column$showOve5 : true);
         mode = 'auto';
         content = function content() {
           var _getEllipsisTarget;
@@ -5017,13 +5024,14 @@ function _isSlot(s) {
     });
   });
   var lastDragRow = null;
+  var lastDragRowClass = '';
   var insertPlaceDiv = function insertPlaceDiv(target, placement) {
     if (placement === '--top') {
       target.parentNode.insertBefore(placeDiv, target);
       return;
     }
     if (target.nextElementSibling === null) {
-      target.parentNode.appendChild(placeDiv);
+      target.parentNode.append(placeDiv);
       return;
     }
     target.parentNode.insertBefore(placeDiv, target.nextElementSibling);
@@ -5079,6 +5087,7 @@ function _isSlot(s) {
   var onDragleave = function onDragleave(event) {
     beforeEventFire(function () {
       var target = getTargetRow(event);
+      lastDragRowClass = target.classList.contains('--bottom') ? '--bottom' : '--top';
       removeDragClass(target, ['--drag-enter', '--bottom', '--top']);
     });
   };
@@ -5101,12 +5110,12 @@ function _isSlot(s) {
     var rowIndex = target.dataset.rowIndex;
     var targetIndex = Number(rowIndex);
     var sourceIndex = (_event$target$dataset = event.target.dataset) === null || _event$target$dataset === void 0 ? void 0 : _event$target$dataset.rowIndex;
-    if (target.classList.contains('--bottom')) {
+    if (lastDragRowClass === '--bottom') {
       targetIndex = targetIndex + 1;
     }
     resp.changePageRowIndex(Number(sourceIndex), targetIndex);
-    removeDragClass(target, ['--drag-enter', '--bottom', '--top']);
     lastDragRow = null;
+    lastDragRowClass = '';
     ctx.emit(EMIT_EVENTS.DRAG_END, {
       sourceEvent: event,
       data: resp.pageData

package/lib/table/props.d.ts

@@ -43,7 +43,7 @@ export declare enum FixedEnum {
     RIGHT = "right"
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"right" | "left">;
-export type IOverflowTooltipProp = {
+export type IOverflowTooltipOption = {
     content: string | Function;
     disabled?: (col: Column, row: any) => boolean | boolean;
     watchCellResize?: boolean;
@@ -51,7 +51,8 @@ export type IOverflowTooltipProp = {
     popoverOption?: any;
     resizerWay?: ResizerWay;
     showHead?: boolean;
-} | boolean;
+};
+export type IOverflowTooltipProp = IOverflowTooltipOption | boolean;
 export type IOverflowTooltip = IOverflowTooltipProp;
 export declare const IOverflowTooltipPropType: import("vue-types").VueTypeDef<IOverflowTooltipProp>;
 export type ISortOption = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.3-beta.2-9",
+  "version": "0.0.3-beta.2-10",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",