vxe-table 3.11.27-beta.0 → 3.11.27

package/es/table/src/body.js

@@ -384,7 +384,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
                     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/es/table/src/methods.js

@@ -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';
@@ -10,7 +10,6 @@ const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeU
 // const isWebkit = browse['-webkit'] && !browse.edge
 // const debounceScrollYDuration = browse.msie ? 80 : 20
 const customStorageKey = 'VXE_CUSTOM_STORE';
-const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 // 获取所有的列，排除分组
 const getColumnList = (columns) => {
     const result = [];
@@ -5311,7 +5310,6 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
-        evnt.stopPropagation();
         const { dragConfig } = props;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const { dragStartMethod } = rowDragOpts;
@@ -5554,7 +5552,6 @@ const Methods = {
         var _a;
         const $xeTable = this;
         const reactData = $xeTable;
-        evnt.stopPropagation();
         const columnDragOpts = $xeTable.computeColumnDragOpts;
         const { dragStartMethod } = columnDragOpts;
         const { column } = params;

package/es/table/src/table.js

@@ -764,7 +764,7 @@ export default {
             });
         },
         staticColumns(value) {
-            this.handleColumn(value);
+            this.handleColumn(XEUtils.clone(value));
         },
         tableColumn() {
             this.analyColumnWidth();
@@ -1168,6 +1168,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/es/table/style.css

@@ -751,7 +751,7 @@
   position: absolute;
   left: -1px;
   width: calc(100% + 1px);
-  height: 3px;
+  height: 2px;
   background-color: var(--vxe-ui-font-primary-color);
   z-index: 12;
 }
@@ -801,6 +801,7 @@
 }
 
 .vxe-table-custom--body {
+  position: relative;
   display: block;
   flex-grow: 1;
   overflow-x: hidden;
@@ -814,50 +815,29 @@
 }
 .vxe-table-custom--panel-list > li {
   max-width: 26em;
-  min-width: 17em;
+  min-width: 18em;
   padding: 0.2em 1em 0.2em 1em;
 }
 .vxe-table-custom--panel-list > li.level--2 {
-  padding-left: 3.5em;
-}
-.vxe-table-custom--panel-list > li.level--2 .vxe-checkbox--icon {
-  left: 1.8em;
+  padding-left: 2.7em;
 }
 .vxe-table-custom--panel-list > li.level--3 {
-  padding-left: 4.5em;
-}
-.vxe-table-custom--panel-list > li.level--3 .vxe-checkbox--icon {
-  left: 2.8em;
+  padding-left: 3.7em;
 }
 .vxe-table-custom--panel-list > li.level--4 {
-  padding-left: 5.5em;
-}
-.vxe-table-custom--panel-list > li.level--4 .vxe-checkbox--icon {
-  left: 3.8em;
+  padding-left: 4.7em;
 }
 .vxe-table-custom--panel-list > li.level--5 {
-  padding-left: 6.5em;
-}
-.vxe-table-custom--panel-list > li.level--5 .vxe-checkbox--icon {
-  left: 4.8em;
+  padding-left: 5.7em;
 }
 .vxe-table-custom--panel-list > li.level--6 {
-  padding-left: 7.5em;
-}
-.vxe-table-custom--panel-list > li.level--6 .vxe-checkbox--icon {
-  left: 5.8em;
+  padding-left: 6.7em;
 }
 .vxe-table-custom--panel-list > li.level--7 {
-  padding-left: 8.5em;
-}
-.vxe-table-custom--panel-list > li.level--7 .vxe-checkbox--icon {
-  left: 6.8em;
+  padding-left: 7.7em;
 }
 .vxe-table-custom--panel-list > li.level--8 {
-  padding-left: 9.5em;
-}
-.vxe-table-custom--panel-list > li.level--8 .vxe-checkbox--icon {
-  left: 7.8em;
+  padding-left: 8.7em;
 }
 
 .vxe-table-custom--header {
@@ -870,9 +850,6 @@
           user-select: none;
 }
 
-.vxe-table-custom--panel-list {
-  padding: 0.2em 0;
-}
 .vxe-table-custom--panel-list .vxe-table-custom--checkbox-option:hover {
   background-color: var(--vxe-ui-table-row-hover-background-color);
 }
@@ -961,6 +938,13 @@
   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;
@@ -980,6 +964,7 @@
 }
 
 .vxe-table-custom-popup--body {
+  position: relative;
   overflow: auto;
   height: 100%;
   outline: 0;
@@ -1026,13 +1011,44 @@
   border-right: 1px solid var(--vxe-ui-table-border-color);
 }
 
-.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;
+}
+.vxe-table-custom-popup--drag-line[drag-pos=top] {
+  border-top-color: var(--vxe-ui-font-primary-color);
+}
+.vxe-table-custom-popup--drag-line[drag-pos=bottom] {
+  border-bottom-color: var(--vxe-ui-font-primary-color);
+}
+.vxe-table-custom-popup--drag-line[drag-to-child=y] {
+  border-top-color: transparent;
+  border-bottom-color: transparent;
+  border-left-color: var(--vxe-ui-status-success-color);
+}
+.vxe-table-custom-popup--drag-line.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;
@@ -1045,8 +1061,52 @@
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
   z-index: 33;
 }
+.vxe-table-custom-popup--drag-tip[drag-status=normal] .vxe-table-custom-popup--drag-tip-normal-status {
+  display: block;
+}
+.vxe-table-custom-popup--drag-tip[drag-status=sub] .vxe-table-custom-popup--drag-tip-sub-status {
+  display: block;
+}
+.vxe-table-custom-popup--drag-tip[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;
@@ -1087,7 +1147,7 @@
 .vxe-table-custom-popup--column-item {
   position: relative;
 }
-.vxe-table-custom-popup--column-item.col--sort, .vxe-table-custom-popup--column-item.col--visible, .vxe-table-custom-popup--column-item.col--resizable, .vxe-table-custom-popup--column-item.col--fixed {
+.vxe-table-custom-popup--column-item.col--visible, .vxe-table-custom-popup--column-item.col--resizable, .vxe-table-custom-popup--column-item.col--fixed {
   text-align: center;
 }
 .vxe-table-custom-popup--column-item.col--resizable > .vxe-input, .vxe-table-custom-popup--column-item.col--resizable > .vxe-number-input {
@@ -1127,7 +1187,13 @@
 }
 
 .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 {
@@ -2689,7 +2755,9 @@
   opacity: 0.5;
 }
 .vxe-table--render-default .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--render-default .vxe-table--drag-col-line,
 .vxe-table--render-default .vxe-table--drag-row-line {
@@ -2744,7 +2812,9 @@
   opacity: 0.5;
 }
 .vxe-table--render-default .vxe-body--row-list-move {
-  transition: transform 0.35s;
+  transition-property: transform;
+  transition-duration: 0.35s;
+  transition-delay: 0.05s;
 }
 .vxe-table--render-default .vxe-table--drag-sort-tip {
   display: none;