vxe-table 3.16.0-beta.0 → 3.16.0-beta.2

package/packages/table/src/props.ts

@@ -55,7 +55,7 @@ export default {
     default: () => getConfig().table.fit
   },
   // 表格是否加载中
-  loading: Boolean,
+  loading: Boolean as PropType<VxeTablePropTypes.Loading>,
   // 所有的列对其方式
   align: {
     type: String,
@@ -246,11 +246,11 @@ export default {
   // 查找/替换配置项
   fnrConfig: Object,
   // 编辑配置项
-  editConfig: [Boolean, Object],
+  editConfig: [Boolean, Object] as PropType<VxeTablePropTypes.EditConfig>,
   // 校验配置项
-  validConfig: Object,
+  validConfig: Object as PropType<VxeTablePropTypes.ValidConfig>,
   // 校验规则配置项
-  editRules: Object,
+  editRules: Object as PropType<VxeTablePropTypes.EditRules>,
   // 加载中配置项
   loadingConfig: Object,
   // 空内容渲染配置项

package/packages/table/src/table.ts

@@ -1193,10 +1193,10 @@ export default {
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
 
-      const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
+      const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
       const { visibleDataRowIdData, rowExpandedMaps } = internalData
       const expandList: any[] = []
-      if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+      if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
         XEUtils.each(rowExpandedMaps, (row, rowid) => {
           if (visibleDataRowIdData[rowid]) {
             expandList.push(row)
@@ -1670,7 +1670,7 @@ export default {
     if (rowOpts.height && !this.showOverflow) {
       warnLog('vxe.error.notProp', ['table.show-overflow'])
     }
-    if (!$xeTable.triggerCellAreaMousedownEvent) {
+    if (!$xeTable.triggerCellAreaMousednEvent) {
       if (props.areaConfig) {
         warnLog('vxe.error.notProp', ['area-config'])
       }
@@ -1867,6 +1867,7 @@ export default {
     $xeTable.$nextTick(() => {
       if (props.loading) {
         if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
+          errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>'])
           errLog('vxe.error.reqComp', ['vxe-loading'])
         }
       }
@@ -1875,6 +1876,24 @@ export default {
           (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
           props.tooltipConfig || props.editRules) {
         if (!VxeUITooltipComponent) {
+          if (props.showOverflow === true) {
+            errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title'])
+          }
+          if (props.showOverflow === 'tooltip') {
+            errLog('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title'])
+          }
+          if (props.showHeaderOverflow === true) {
+            errLog('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title'])
+          }
+          if (props.showHeaderOverflow === 'tooltip') {
+            errLog('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title'])
+          }
+          if (props.showFooterOverflow === true) {
+            errLog('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title'])
+          }
+          if (props.showFooterOverflow === 'tooltip') {
+            errLog('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title'])
+          }
           errLog('vxe.error.reqComp', ['vxe-tooltip'])
         }
       }

package/packages/ui/index.ts

@@ -258,9 +258,10 @@ VxeUI.setConfig({
     proxyConfig: {
       enabled: true,
       autoLoad: true,
+      showLoading: true,
       showResponseMsg: true,
       showActiveMsg: true,
-      props: {
+      response: {
         list: null,
         result: 'result',
         total: 'page.total',

package/styles/components/table.scss

@@ -1920,19 +1920,16 @@ $btnThemeList: (
       background-color: var( --vxe-ui-table-drag-over-background-color);
     }
   }
-  .vxe-header--column,
-  .vxe-body--column,
-  .vxe-footer--column {
+  .vxe-table--column {
+    &.col--drag-move {
+      transition: transform 0.5s ease;
+    }
     &.col--drag-origin {
       & > .vxe-cell {
-        opacity: 0.5;
+        opacity: 0.3;
       }
     }
   }
-  .vxe-header--col-list-move {
-    transition-property: transform;
-    transition-duration: 0.35s;
-  }
 
   .vxe-table--drag-col-line,
   .vxe-table--drag-row-line {
@@ -1984,10 +1981,13 @@ $btnThemeList: (
     }
   }
   .vxe-body--row {
+    &.row--drag-move {
+      transition: transform 0.5s ease;
+    }
     &.row--drag-origin {
       & > .vxe-body--column {
         & > .vxe-cell {
-          opacity: 0.5;
+          opacity: 0.3;
         }
       }
     }