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

package/lib/shared/index.js

@@ -794,8 +794,7 @@ var BKZIndexManager = /*#__PURE__*/function () {
         this.storageLayerIndexValue[type] = this.storageLayerIndexValue[type] + 1;
         return this.storageLayerIndexValue[type];
       }
-      this.storageLayerIndexValue[BKLAYERTYPE.MODAL] = this.storageLayerIndexValue[BKLAYERTYPE.MODAL] + 1;
-      return this.storageLayerIndexValue[BKLAYERTYPE.MODAL];
+      this.getNextIndex(BKLAYERTYPE.MODAL);
     }
     /** 获取弹窗类型最新zIndex的值 */
   }, {

package/lib/table/components/table-column.d.ts

@@ -101,6 +101,8 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
 }, {
+    isIndexPropChanged: import("vue").Ref<boolean>;
+    setIsIndexChanged: (val: boolean) => void;
     initColumns: (_col: Column | Column[], _rm?: boolean) => void;
     bkTableCache: {
         queueStack: (_: any, fn: any) => any;

package/lib/table/index.d.ts

@@ -1325,6 +1325,8 @@ declare const BkTable: {
             default: number;
         };
     }, {
+        isIndexPropChanged: import("vue").Ref<boolean>;
+        setIsIndexChanged: (val: boolean) => void;
         initColumns: (_col: import("./props").Column | import("./props").Column[], _rm?: boolean) => void;
         bkTableCache: {
             queueStack: (_: any, fn: any) => any;

package/lib/table/index.js

@@ -112,7 +112,7 @@ function defineProperty_defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["toRefs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRefs, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 ;// CONCATENATED MODULE: ../../packages/table/src/const.ts
 
 /*
@@ -694,18 +694,38 @@ var TableColumnProp = {
     var column = (0,external_vue_namespaceObject.reactive)(Object.assign({}, props, {
       field: props.prop || props.field
     }));
+    var isIndexPropChanged = (0,external_vue_namespaceObject.ref)(false);
+    var setIsIndexChanged = function setIsIndexChanged(val) {
+      isIndexPropChanged.value = val;
+    };
     return {
+      isIndexPropChanged: isIndexPropChanged,
+      setIsIndexChanged: setIsIndexChanged,
       initColumns: initColumns,
       bkTableCache: bkTableCache,
       column: column
     };
   },
+  watch: {
+    index: {
+      handler: function handler() {
+        this.setIsIndexChanged(!this.isIndexPropChanged);
+      },
+      deep: true
+    }
+  },
   unmounted: function unmounted() {
     this.updateColumnDefine(true);
   },
   mounted: function mounted() {
     this.updateColumnDefine();
   },
+  updated: function updated() {
+    if (this.isIndexPropChanged) {
+      this.updateColumnDefineByParent();
+      this.setIsIndexChanged(!this.isIndexPropChanged);
+    }
+  },
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -728,7 +748,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) {
@@ -736,7 +768,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;
@@ -754,7 +786,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);
             }
           });
@@ -4392,14 +4424,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,15 +4456,17 @@ 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 _getEllipsisTarget$cl, _getEllipsisTarget, _getEllipsisTarget$cl2;
+      var _resolveSetting = resolveSetting(),
+        _resolveSetting$showO = _resolveSetting.showOverflowTooltip,
+        showOverflowTooltip = _resolveSetting$showO === void 0 ? false : _resolveSetting$showO;
       var disabled = true;
       var resizerWay = props.resizerWay;
+      var defaultContent = (_getEllipsisTarget$cl = (_getEllipsisTarget = getEllipsisTarget()) === null || _getEllipsisTarget === void 0 || (_getEllipsisTarget$cl2 = _getEllipsisTarget.cloneNode) === null || _getEllipsisTarget$cl2 === void 0 ? void 0 : _getEllipsisTarget$cl2.call(_getEllipsisTarget, true)) !== null && _getEllipsisTarget$cl !== void 0 ? _getEllipsisTarget$cl : '';
       var content = function content() {
-        return refRoot.value.innerText;
+        return defaultContent;
       };
       var popoverOption = {};
       var mode = 'auto';
@@ -4438,7 +4479,7 @@ const external_directives_namespaceObject = external_directives_x({ ["bkEllipsis
         popoverOption = showOverflowTooltip.popoverOption;
         resizerWay = showOverflowTooltip.resizerWay || 'debounce';
         content = function content() {
-          return showOverflowTooltip.content || refRoot.value.innerText;
+          return showOverflowTooltip.content || defaultContent;
         };
         if (typeof showOverflowTooltip.content === 'function') {
           content = function content() {
@@ -4464,12 +4505,12 @@ 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;
-          return (_getEllipsisTarget = getEllipsisTarget()) === null || _getEllipsisTarget === void 0 ? void 0 : _getEllipsisTarget.innerHTML;
+          var _getEllipsisTarget$cl3, _getEllipsisTarget2, _getEllipsisTarget2$c;
+          return (_getEllipsisTarget$cl3 = (_getEllipsisTarget2 = getEllipsisTarget()) === null || _getEllipsisTarget2 === void 0 || (_getEllipsisTarget2$c = _getEllipsisTarget2.cloneNode) === null || _getEllipsisTarget2$c === void 0 ? void 0 : _getEllipsisTarget2$c.call(_getEllipsisTarget2, true)) !== null && _getEllipsisTarget$cl3 !== void 0 ? _getEllipsisTarget$cl3 : '';
         };
         if (props.headExplain) {
           mode = 'static';
@@ -5017,13 +5058,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 +5121,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 +5144,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
@@ -5181,8 +5224,10 @@ function head_filter_isSlot(s) {
       resolveClassName = _usePrefix.resolveClassName;
     var t = (0,external_config_provider_namespaceObject.useLocale)('table');
     var column = props.column;
-    var _toRefs = (0,external_vue_namespaceObject.toRefs)(props.column),
-      filter = _toRefs.filter;
+    var filter = (0,external_vue_namespaceObject.computed)(function () {
+      var _props$column;
+      return (_props$column = props.column) === null || _props$column === void 0 ? void 0 : _props$column.filter;
+    });
     var checked = (0,external_vue_namespaceObject.computed)(function () {
       var _filter$value$checked, _filter$value;
       return (_filter$value$checked = (_filter$value = filter.value) === null || _filter$value === void 0 ? void 0 : _filter$value.checked) !== null && _filter$value$checked !== void 0 ? _filter$value$checked : [];

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/lib/table-column/index.d.ts

@@ -49,6 +49,8 @@ declare const BkTableColumn: {
             default: number;
         };
     }>>, {
+        isIndexPropChanged: import("vue").Ref<boolean>;
+        setIsIndexChanged: (val: boolean) => void;
         initColumns: (_col: import("../../bkui-vue").TableIColumn | import("../../bkui-vue").TableIColumn[], _rm?: boolean) => void;
         bkTableCache: {
             queueStack: (_: any, fn: any) => any;
@@ -293,6 +295,8 @@ declare const BkTableColumn: {
             default: number;
         };
     }>>, {
+        isIndexPropChanged: import("vue").Ref<boolean>;
+        setIsIndexChanged: (val: boolean) => void;
         initColumns: (_col: import("../../bkui-vue").TableIColumn | import("../../bkui-vue").TableIColumn[], _rm?: boolean) => void;
         bkTableCache: {
             queueStack: (_: any, fn: any) => any;
@@ -485,6 +489,8 @@ declare const BkTableColumn: {
         default: number;
     };
 }>>, {
+    isIndexPropChanged: import("vue").Ref<boolean>;
+    setIsIndexChanged: (val: boolean) => void;
     initColumns: (_col: import("../../bkui-vue").TableIColumn | import("../../bkui-vue").TableIColumn[], _rm?: boolean) => void;
     bkTableCache: {
         queueStack: (_: any, fn: any) => any;

package/lib/table-column/index.js

@@ -82,7 +82,7 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref });
 ;// CONCATENATED MODULE: ../../packages/table/src/const.ts
 
 /*
@@ -664,18 +664,38 @@ var TableColumnProp = {
     var column = (0,external_vue_namespaceObject.reactive)(Object.assign({}, props, {
       field: props.prop || props.field
     }));
+    var isIndexPropChanged = (0,external_vue_namespaceObject.ref)(false);
+    var setIsIndexChanged = function setIsIndexChanged(val) {
+      isIndexPropChanged.value = val;
+    };
     return {
+      isIndexPropChanged: isIndexPropChanged,
+      setIsIndexChanged: setIsIndexChanged,
       initColumns: initColumns,
       bkTableCache: bkTableCache,
       column: column
     };
   },
+  watch: {
+    index: {
+      handler: function handler() {
+        this.setIsIndexChanged(!this.isIndexPropChanged);
+      },
+      deep: true
+    }
+  },
   unmounted: function unmounted() {
     this.updateColumnDefine(true);
   },
   mounted: function mounted() {
     this.updateColumnDefine();
   },
+  updated: function updated() {
+    if (this.isIndexPropChanged) {
+      this.updateColumnDefineByParent();
+      this.setIsIndexChanged(!this.isIndexPropChanged);
+    }
+  },
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -698,7 +718,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) {
@@ -706,7 +738,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;
@@ -724,7 +756,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);
             }
           });

package/package.json

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