vxe-table 3.11.27-beta.0 → 3.11.27

package/packages/table/src/body.ts

@@ -462,7 +462,7 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
             rowid
           },
           style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-          key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+          key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
           on: trOn
         }, tdVNs)
     )

package/packages/table/src/methods.ts

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import { browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../ui/src/dom'
+import { tpImg, browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import Cell from './cell'
@@ -16,8 +16,6 @@ const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeU
 
 const customStorageKey = 'VXE_CUSTOM_STORE'
 
-const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='
-
 // 获取所有的列，排除分组
 const getColumnList = (columns: any[]) => {
   const result: any[] = []
@@ -5315,7 +5313,6 @@ const Methods = {
     const props = $xeTable
     const reactData = $xeTable
 
-    evnt.stopPropagation()
     const { dragConfig } = props
     const rowDragOpts = $xeTable.computeRowDragOpts
     const { dragStartMethod } = rowDragOpts
@@ -5573,7 +5570,6 @@ const Methods = {
     const $xeTable = this
     const reactData = $xeTable
 
-    evnt.stopPropagation()
     const columnDragOpts = $xeTable.computeColumnDragOpts
     const { dragStartMethod } = columnDragOpts
     const { column } = params

package/packages/table/src/table.ts

@@ -790,7 +790,7 @@ export default {
       })
     },
     staticColumns (value: any) {
-      this.handleColumn(value)
+      this.handleColumn(XEUtils.clone(value))
     },
     tableColumn () {
       this.analyColumnWidth()
@@ -1249,6 +1249,9 @@ export default {
         'is--virtual-x': scrollXLoad,
         'is--virtual-y': scrollYLoad
       }],
+      style: {
+        '--vxe-ui-table-drag-column-move-delay': `${Math.max(0.05, Math.min(0.3, tableData.length / 800))}s`
+      },
       attrs: {
         spellcheck: false
       },

package/packages/ui/src/dom.ts

@@ -4,6 +4,8 @@ const reClsMap: { [key: string]: any } = {}
 
 export const browse = XEUtils.browse()
 
+export const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='
+
 export function getPropClass (property: any, params: any) {
   return property ? XEUtils.isFunction(property) ? property(params) : property : ''
 }

package/styles/components/table-module/custom.scss

@@ -41,7 +41,7 @@
     position: absolute;
     left: -1px;
     width: calc(100% + 1px);
-    height: 3px;
+    height: 2px;
     background-color: var(--vxe-ui-font-primary-color);
     z-index: 12;
   }
@@ -95,6 +95,7 @@
 }
 
 .vxe-table-custom--body {
+  position: relative;
   display: block;
   flex-grow: 1;
   overflow-x: hidden;
@@ -107,15 +108,12 @@
   padding: 0;
   & > li {
     max-width: 26em;
-    min-width: 17em;
+    min-width: 18em;
     padding: 0.2em 1em 0.2em 1em;
     @for $i from 2 through 8 {
-      $interval: $i - 1 + 0.2;
+      $interval: $i - 1 + 0.5;
       &.level--#{$i}{
-        padding-left: #{$interval + 2.3}em;
-        .vxe-checkbox--icon {
-          left: #{$interval + 0.6}em;
-        }
+        padding-left: #{$interval + 1.2}em;
       }
     }
   }
@@ -130,7 +128,6 @@
 }
 
 .vxe-table-custom--panel-list {
-  padding: 0.2em 0;
   .vxe-table-custom--checkbox-option {
     &:hover {
       background-color: var(--vxe-ui-table-row-hover-background-color);
@@ -182,6 +179,12 @@
     cursor: not-allowed;
   }
 }
+.vxe-table-custom--name-option {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: row;
+  overflow: hidden;
+}
 .vxe-table-custom--checkbox-label  {
   flex-grow: 1;
   overflow: hidden;
@@ -199,6 +202,7 @@
 }
 
 .vxe-table-custom-popup--body {
+  position: relative;
   overflow: auto;
   height: 100%;
   outline: 0;
@@ -248,13 +252,43 @@
   }
 }
 
-.vxe-table-custom-popup--drag-hint {
+/*拖拽列*/
+.vxe-table-custom-popup--drag-line {
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 11;
+  pointer-events: none;
+}
+.vxe-table-custom-popup--drag-line {
+  width: 100%;
+  height: 1px;
+  border: 2px solid transparent;
+  &[drag-pos="top"] {
+    border-top-color: var(--vxe-ui-font-primary-color);
+  }
+  &[drag-pos="bottom"] {
+    border-bottom-color: var(--vxe-ui-font-primary-color);
+  }
+  &[drag-to-child="y"] {
+    border-top-color: transparent;
+    border-bottom-color: transparent;
+    border-left-color: var(--vxe-ui-status-success-color);
+  }
+  &.is--guides {
+    background-color: var( --vxe-ui-table-drag-over-background-color);
+  }
+}
+
+.vxe-table-custom-popup--drag-tip {
   display: none;
   position: absolute;
   top: 0;
   left: 0;
-  padding: 0.6em 1em 0.6em 1.6em;
-  max-width: 300px;
+  padding: 0.6em 1.4em;
+  max-width: 50%;
+  min-width: 100px;
   border-radius: var(--vxe-ui-border-radius);
   overflow: hidden;
   text-overflow: ellipsis;
@@ -264,9 +298,53 @@
   background-color: var(--vxe-ui-layout-background-color);
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
   z-index: 33;
+  &[drag-status="normal"] {
+    .vxe-table-custom-popup--drag-tip-normal-status {
+      display: block;
+    }
+  }
+  &[drag-status="sub"] {
+    .vxe-table-custom-popup--drag-tip-sub-status {
+      display: block;
+    }
+  }
+  &[drag-status="disabled"] {
+    .vxe-table-custom-popup--drag-tip-disabled-status {
+      display: block;
+    }
+  }
+}
+.vxe-table-custom-popup--drag-tip-wrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.vxe-table-custom-popup--drag-tip-status {
+  padding-right: 0.4em;
+}
+.vxe-table-custom-popup--drag-tip-disabled-status {
+  display: none;
+  flex-shrink: 0;
+  color: var(--vxe-ui-status-error-color)
+}
+.vxe-table-custom-popup--drag-tip-normal-status,
+.vxe-table-custom-popup--drag-tip-sub-status {
+  display: none;
+}
+.vxe-table-custom-popup--drag-tip-content {
+  flex-grow: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .vxe-table-custom-popup--name {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.vxe-table-custom-popup--title {
+  flex-grow: 1;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -285,7 +363,6 @@
 
 .vxe-table-custom-popup--column-item {
   position: relative;
-  &.col--sort,
   &.col--visible,
   &.col--resizable,
   &.col--fixed {
@@ -362,9 +439,14 @@
 }
 
 .vxe-table-custom--list-move {
-  transition: transform 0.35s;
+  transition-property: transform;
+  transition-duration: 0.35s;
+  transition-delay: 0.05s;
 }
 
+.vxe-table-custom-popup--column-sort-placeholder {
+  padding: 0.2em 0.5em;
+}
 .vxe-table-custom-popup--column-sort-btn {
   font-size: 1.2em;
   padding: 0.2em 0.5em;

package/styles/components/table.scss

@@ -1305,7 +1305,9 @@
     }
   }
   .vxe-header--col-list-move {
-    transition: transform 0.35s;
+    transition-property: transform;
+    transition-duration: 0.35s;
+    transition-delay: var(--vxe-ui-table-drag-column-move-delay, 0.3s);
   }
 
   .vxe-table--drag-col-line,
@@ -1367,7 +1369,9 @@
     }
   }
   .vxe-body--row-list-move {
-    transition: transform 0.35s;
+    transition-property: transform;
+    transition-duration: 0.35s;
+    transition-delay: 0.05s;
   }
   .vxe-table--drag-sort-tip {
     display: none;