bkui-vue 2.0.1-beta.31 → 2.0.1-beta.32

package/lib/table/index.js

@@ -20173,13 +20173,14 @@ var useColumns = function useColumns(props) {
   var resolveDraggableColumn = function resolveDraggableColumn() {
     if (props.rowDraggable) {
       var _props$rowDraggable$w, _props$rowDraggable, _props$rowDraggable$l, _props$rowDraggable2;
-      tableColumnList.unshift({
+      return {
         minWidth: 50,
         width: (_props$rowDraggable$w = (_props$rowDraggable = props.rowDraggable) === null || _props$rowDraggable === void 0 ? void 0 : _props$rowDraggable.width) !== null && _props$rowDraggable$w !== void 0 ? _props$rowDraggable$w : 60,
         label: (_props$rowDraggable$l = (_props$rowDraggable2 = props.rowDraggable) === null || _props$rowDraggable2 === void 0 ? void 0 : _props$rowDraggable2.label) !== null && _props$rowDraggable$l !== void 0 ? _props$rowDraggable$l : t.value.sort,
         type: 'drag'
-      });
+      };
     }
+    return null;
   };
   /**
    * 判定是否需要合并行或者列配置
@@ -20278,6 +20279,10 @@ var useColumns = function useColumns(props) {
     columnGroup.length = 0;
     var maxDepth = 0;
     var targetColumns = [];
+    var dragColumn = resolveDraggableColumn();
+    if (dragColumn) {
+      cols.unshift(dragColumn);
+    }
     var getMaxDepth = function getMaxDepth(root) {
       var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       if (root.length && maxDepth < depth) {
@@ -20351,7 +20356,7 @@ var useColumns = function useColumns(props) {
    */
   var formatColumns = function formatColumns() {
     sortColumns.length = 0;
-    resolveDraggableColumn();
+    // resolveDraggableColumn();
     var skipColNum = 0;
     (tableColumnList || []).forEach(function (col, index) {
       var _ref = needColSpan.value ? getColumnSpanConfig(col, index, skipColNum) : {

package/lib/tag/index.js

@@ -150,7 +150,6 @@ var TagStrokeType;
     size: shared_namespaceObject.PropTypes.size()
   },
   emits: ['change', 'close'],
-  // slots: ['icon'],
   slots: Object,
   setup: function setup(props, _ref) {
     var emit = _ref.emit;

package/lib/tag/tag.css

@@ -232,7 +232,7 @@
   background: var(--primary-color);
   opacity: 1;
 }
-.bk-tag--defaul {
+.bk-tag--default {
   padding: 0 8px;
 }
 .bk-tag--small {

package/lib/tag/tag.less

@@ -117,7 +117,7 @@
   }
 }
 
-.@{bk-prefix}-tag--defaul {
+.@{bk-prefix}-tag--default {
   padding: 0 8px;
 }
 

package/lib/tag/tag.variable.css

@@ -492,7 +492,7 @@
   background: var(--primary-color);
   opacity: 1;
 }
-.bk-tag--defaul {
+.bk-tag--default {
   padding: 0 8px;
 }
 .bk-tag--small {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.31",
+  "version": "2.0.1-beta.32",
   "workspaces": [
     "packages/**",
     "scripts/cli",