bkui-vue 1.0.3-beta.12 → 1.0.3-beta.13

package/lib/plugin-popover/index.d.ts

@@ -23,5 +23,5 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-import $bkPopover from '../../popover/src/plugin-popover';
+import $bkPopover from '../popover/plugin-popover';
 export default $bkPopover;

package/lib/table/index.js

@@ -741,7 +741,19 @@ var TableColumnProp = {
       var fn = function fn() {
         // @ts-ignore
         var selfVnode = _this._;
-        var colList = selfVnode.parent.vnode.children["default"]() || [];
+        var getTableNode = function getTableNode() {
+          var _parentVnode$type;
+          var parentVnode = selfVnode.parent;
+          if (((_parentVnode$type = parentVnode.type) === null || _parentVnode$type === void 0 ? void 0 : _parentVnode$type.name) === 'Table') {
+            return parentVnode.vnode;
+          }
+          return getTableNode();
+        };
+        var tableNode = getTableNode();
+        if (!tableNode) {
+          return;
+        }
+        var colList = tableNode.children["default"]() || [];
         var sortColumns = [];
         var index = 0;
         var reduceColumns = function reduceColumns(nodes) {
@@ -749,7 +761,7 @@ var TableColumnProp = {
             return;
           }
           nodes.forEach(function (node) {
-            var _node$type, _node$children2;
+            var _node$type, _node$children2, _node$type2;
             if (Array.isArray(node)) {
               reduceColumns(node);
               return;
@@ -767,7 +779,7 @@ var TableColumnProp = {
               sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
               index = index + 1;
             }
-            if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0) {
+            if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0 && ((_node$type2 = node.type) === null || _node$type2 === void 0 ? void 0 : _node$type2.name) !== 'Table') {
               reduceColumns(node.children);
             }
           });
@@ -4423,14 +4435,21 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
     });
     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') {
@@ -4448,11 +4467,11 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
         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() {
@@ -4495,8 +4514,8 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
         }
       }
       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;
@@ -5065,13 +5084,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);
@@ -5127,6 +5147,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']);
     });
   };
@@ -5149,12 +5170,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 = {