vxe-table 4.5.8 → 4.5.10

package/packages/table/src/table.ts

@@ -2048,16 +2048,16 @@ export default defineComponent({
     }
 
     const handleAsyncTreeExpandChilds = (row: any): Promise<void> => {
-      const { treeExpandedMaps, treeExpandLazyLoadedMaps } = reactData
-      const { fullAllDataRowIdData } = internalData
       const treeOpts = computeTreeOpts.value
       const checkboxOpts = computeCheckboxOpts.value
       const { transform, loadMethod } = treeOpts
       const { checkStrictly } = checkboxOpts
-      const rowid = getRowid($xetable, row)
-      const rest = fullAllDataRowIdData[rowid]
       return new Promise(resolve => {
         if (loadMethod) {
+          const { treeExpandLazyLoadedMaps } = reactData
+          const { fullAllDataRowIdData } = internalData
+          const rowid = getRowid($xetable, row)
+          const rest = fullAllDataRowIdData[rowid]
           treeExpandLazyLoadedMaps[rowid] = row
           loadMethod({ $table: $xetable, row }).then((childRecords: any) => {
             rest.treeLoaded = true
@@ -2069,6 +2069,7 @@ export default defineComponent({
             }
             if (childRecords) {
               return tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
+                const { treeExpandedMaps } = reactData
                 if (childRows.length && !treeExpandedMaps[rowid]) {
                   treeExpandedMaps[rowid] = row
                 }
@@ -2084,6 +2085,7 @@ export default defineComponent({
               })
             }
           }).catch(() => {
+            const { treeExpandLazyLoadedMaps } = reactData
             rest.treeLoaded = false
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid]
@@ -2111,21 +2113,23 @@ export default defineComponent({
     }
 
     const handleAsyncRowExpand = (row: any): Promise<void> => {
-      const { fullAllDataRowIdData } = internalData
-      const { rowExpandLazyLoadedMaps, rowExpandedMaps } = reactData
       return new Promise(resolve => {
         const expandOpts = computeExpandOpts.value
         const { loadMethod } = expandOpts
         if (loadMethod) {
+          const { fullAllDataRowIdData } = internalData
+          const { rowExpandLazyLoadedMaps } = reactData
           const rowid = getRowid($xetable, row)
           const rest = fullAllDataRowIdData[rowid]
           rowExpandLazyLoadedMaps[rowid] = row
           loadMethod({ $table: $xetable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
+            const { rowExpandedMaps } = reactData
             rest.expandLoaded = true
             rowExpandedMaps[rowid] = row
           }).catch(() => {
             rest.expandLoaded = false
           }).finally(() => {
+            const { rowExpandLazyLoadedMaps } = reactData
             if (rowExpandLazyLoadedMaps[rowid]) {
               delete rowExpandLazyLoadedMaps[rowid]
             }
@@ -2547,6 +2551,7 @@ export default defineComponent({
      */
     const handleBaseTreeExpand = (rows: any[], expanded: boolean) => {
       const { treeExpandedMaps, treeExpandLazyLoadedMaps, treeNodeColumn } = reactData
+      const treeTempExpandedMaps = { ...treeExpandedMaps }
       const { fullAllDataRowIdData, tableFullData } = internalData
       const treeOpts = computeTreeOpts.value
       const { reserve, lazy, accordion, toggleMethod } = treeOpts
@@ -2563,8 +2568,8 @@ export default defineComponent({
         if (matchObj) {
           matchObj.items.forEach(item => {
             const rowid = getRowid($xetable, item)
-            if (treeExpandedMaps[rowid]) {
-              delete treeExpandedMaps[rowid]
+            if (treeTempExpandedMaps[rowid]) {
+              delete treeTempExpandedMaps[rowid]
             }
           })
         }
@@ -2572,7 +2577,7 @@ export default defineComponent({
       if (expanded) {
         validRows.forEach((row: any) => {
           const rowid = getRowid($xetable, row)
-          if (!treeExpandedMaps[rowid]) {
+          if (!treeTempExpandedMaps[rowid]) {
             const rest = fullAllDataRowIdData[rowid]
             const isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
             // 是否使用懒加载
@@ -2580,7 +2585,7 @@ export default defineComponent({
               result.push(handleAsyncTreeExpandChilds(row))
             } else {
               if (row[childrenField] && row[childrenField].length) {
-                treeExpandedMaps[rowid] = row
+                treeTempExpandedMaps[rowid] = row
               }
             }
           }
@@ -2588,14 +2593,15 @@ export default defineComponent({
       } else {
         validRows.forEach(item => {
           const rowid = getRowid($xetable, item)
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid]
+          if (treeTempExpandedMaps[rowid]) {
+            delete treeTempExpandedMaps[rowid]
           }
         })
       }
       if (reserve) {
         validRows.forEach((row: any) => handleTreeExpandReserve(row, expanded))
       }
+      reactData.treeExpandedMaps = treeTempExpandedMaps
       return Promise.all(result).then(() => {
         return tableMethods.recalculate()
       })
@@ -2796,7 +2802,7 @@ export default defineComponent({
        */
       loadTreeChildren (row, childRecords) {
         const { keepSource } = props
-        const { tableSourceData, fullDataRowIdData, fullAllDataRowIdData } = internalData
+        const { tableSourceData, fullDataRowIdData, fullAllDataRowIdData, sourceDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform, mapChildrenField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
@@ -2809,6 +2815,10 @@ export default defineComponent({
             if (matchObj) {
               matchObj.item[childrenField] = XEUtils.clone(rows, true)
             }
+            rows.forEach(childRow => {
+              const rowid = getRowid($xetable, childRow)
+              sourceDataRowIdData[rowid] = XEUtils.clone(childRow, true)
+            })
           }
           XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
             const rowid = getRowid($xetable, childRow)
@@ -3436,7 +3446,7 @@ export default defineComponent({
       },
       isIndeterminateByCheckboxRow (row) {
         const { treeIndeterminateMaps } = reactData
-        return treeIndeterminateMaps[getRowid($xetable, row)] && !tableMethods.isCheckedByCheckboxRow(row)
+        return !!treeIndeterminateMaps[getRowid($xetable, row)] && !tableMethods.isCheckedByCheckboxRow(row)
       },
       /**
        * 多选，切换某一行的选中状态
@@ -3864,8 +3874,9 @@ export default defineComponent({
        * @param {Boolean} expanded 是否展开
        */
       setRowExpand (rows, expanded) {
-        let { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn: column } = reactData
+        const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn: column } = reactData
         const { fullAllDataRowIdData } = internalData
+        let rExpandedMaps = { ...rowExpandedMaps }
         const expandOpts = computeExpandOpts.value
         const { reserve, lazy, accordion, toggleMethod } = expandOpts
         const lazyRests: any[] = []
@@ -3877,28 +3888,28 @@ export default defineComponent({
           }
           if (accordion) {
             // 只能同时展开一个
-            rowExpandedMaps = {}
+            rExpandedMaps = {}
             rows = rows.slice(rows.length - 1, rows.length)
           }
           const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xetable, expanded, column, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows
           if (expanded) {
             validRows.forEach((row: any) => {
               const rowid = getRowid($xetable, row)
-              if (!rowExpandedMaps[rowid]) {
+              if (!rExpandedMaps[rowid]) {
                 const rest = fullAllDataRowIdData[rowid]
                 const isLoad = lazy && !rest.expandLoaded && !rowExpandLazyLoadedMaps[rowid]
                 if (isLoad) {
                   lazyRests.push(handleAsyncRowExpand(row))
                 } else {
-                  rowExpandedMaps[rowid] = row
+                  rExpandedMaps[rowid] = row
                 }
               }
             })
           } else {
             validRows.forEach(item => {
               const rowid = getRowid($xetable, item)
-              if (rowExpandedMaps[rowid]) {
-                delete rowExpandedMaps[rowid]
+              if (rExpandedMaps[rowid]) {
+                delete rExpandedMaps[rowid]
               }
             })
           }
@@ -3906,7 +3917,7 @@ export default defineComponent({
             validRows.forEach((row: any) => handleRowExpandReserve(row, expanded))
           }
         }
-        reactData.rowExpandedMaps = rowExpandedMaps
+        reactData.rowExpandedMaps = rExpandedMaps
         return Promise.all(lazyRests).then(() => tableMethods.recalculate())
       },
       /**
@@ -6342,11 +6353,11 @@ export default defineComponent({
           const { exportConfig, importConfig } = props
           const exportOpts = computeExportOpts.value
           const importOpts = computeImportOpts.value
-          if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.config.importTypes, importOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type: string) => XEUtils.includes(VXETable.config.importTypes, type)).join(',') || VXETable.config.importTypes.join(',')])
+          if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.globalConfs.importTypes, importOpts.types)) {
+            warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type: string) => XEUtils.includes(VXETable.globalConfs.importTypes, type)).join(',') || VXETable.globalConfs.importTypes.join(',')])
           }
-          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.config.exportTypes, exportOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type: string) => XEUtils.includes(VXETable.config.exportTypes, type)).join(',') || VXETable.config.exportTypes.join(',')])
+          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.globalConfs.exportTypes, exportOpts.types)) {
+            warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type: string) => XEUtils.includes(VXETable.globalConfs.exportTypes, type)).join(',') || VXETable.globalConfs.exportTypes.join(',')])
           }
         }
 

package/packages/v-x-e-table/index.ts

@@ -7,7 +7,7 @@ import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
 import { hooks } from './src/hooks'
-import { setup } from './src/setup'
+import { config } from './src/config'
 import { getLastZIndex, nextZIndex } from '../tools/utils'
 
 import { VXETableCore } from '../../types/all'
@@ -72,14 +72,19 @@ class VXETableConfig {
     return getExportOrImpotType(GlobalConfig.export.types, 2)
   }
 }
-export const config = new VXETableConfig()
+
+// 已废弃
+export const globalConfs = new VXETableConfig()
 
 export const v = 'v4'
 
+export const setup = config
+
 export const VXETable = {
   v,
   version: process.env.VUE_APP_VXE_TABLE_VERSION,
   setup,
+  config,
   interceptor,
   renderer,
   commands,
@@ -87,7 +92,6 @@ export const VXETable = {
   validators,
   menus,
   hooks,
-  config,
   use,
   t,
   _t
@@ -100,6 +104,6 @@ export * from './src/menus'
 export * from './src/formats'
 export * from './src/validators'
 export * from './src/hooks'
-export * from './src/setup'
+export * from './src/config'
 
 export default VXETable

package/packages/v-x-e-table/src/{setup.ts → config.ts}

@@ -6,6 +6,6 @@ import { VxeGlobalConfigMethod } from '../../../types/all'
 /**
  * 全局参数设置
  */
-export const setup: VxeGlobalConfigMethod = (options) => {
+export const config: VxeGlobalConfigMethod = (options) => {
   return XEUtils.merge(GlobalConfig, options)
 }

package/styles/button.scss

@@ -334,12 +334,14 @@ $btnThemeList: (
   border-radius: var(--vxe-border-radius);
   border: 1px solid var(--vxe-input-border-color);
   box-shadow: 0 1px 6px rgba(0,0,0,.2);
-  & > .vxe-button {
-    margin-left: 0;
-    margin-top: 0.4em;
+  & > .vxe-button.type--text,
+  & > .vxe-button.type--button {
     display: block;
     width: 100%;
     border: 0;
+    margin: 0.4em 0 0 0;
+  }
+  & > .vxe-button {
     &.type--text {
       padding: 2px 8px;
     }

package/styles/form.scss

@@ -138,6 +138,20 @@
       }
     }
   }
+  &.is--vertical {
+    .vxe-form--item-inner {
+      flex-direction: column;
+      align-items: initial;
+      .vxe-form--item-title {
+        height: 2em;
+        line-height: 2em;
+        padding-right: 0;
+      }
+      .vxe-form--item-title-content {
+        flex-grow: initial;
+      }
+    }
+  }
   &.is--span {
     .vxe-default-input:not([type="submit"]):not([type="reset"]),
     .vxe-default-textarea,

package/types/form-item.d.ts

@@ -54,6 +54,10 @@ export interface VxeFormItemProps {
    * 是否显示标题
    */
   showTitle?: VxeFormItemPropTypes.ShowTitle
+  /**
+   * 使用垂直布局
+   */
+  vertical?: VxeFormItemPropTypes.Vertical
   /**
    * 给表单项附加 className
    */
@@ -121,6 +125,7 @@ export namespace VxeFormItemPropTypes {
   export type TitleColon = VxeFormPropTypes.TitleColon
   export type TitleAsterisk = VxeFormPropTypes.TitleAsterisk
   export type ShowTitle = boolean
+  export type Vertical = boolean
 
   interface ClassNameParams {
     $form: VxeFormConstructor

package/types/form.d.ts

@@ -76,6 +76,7 @@ export namespace VxeFormPropTypes {
   export type TitleColon = boolean
   export type TitleAsterisk = boolean
   export type TitleOverflow = boolean | 'ellipsis' | 'title' | 'tooltip' | '' | null
+  export type Vertical = boolean
 
   interface ClassNameParams {
     $form: VxeFormConstructor
@@ -128,6 +129,7 @@ export type VxeFormProps<D = any> = {
   titleColon?: VxeFormPropTypes.TitleColon
   titleAsterisk?: VxeFormPropTypes.TitleAsterisk
   titleOverflow?: VxeFormPropTypes.TitleOverflow
+  vertical?: VxeFormPropTypes.Vertical
   className?: VxeFormPropTypes.ClassName
   readonly?: VxeFormPropTypes.Readonly
   items?: VxeFormPropTypes.Items
@@ -218,6 +220,7 @@ export namespace VxeFormDefines {
     titleSuffix: VxeFormItemPropTypes.TitleSuffix
     titleOverflow: VxeFormItemPropTypes.TitleOverflow
     showTitle: VxeFormItemPropTypes.ShowTitle
+    vertical: VxeFormItemPropTypes.Vertical
     resetValue: VxeFormItemPropTypes.ResetValue
     visibleMethod: VxeFormItemPropTypes.VisibleMethod
     visible: VxeFormItemPropTypes.Visible

package/types/table.d.ts

@@ -833,17 +833,17 @@ export interface TableReactData<D = VxeTableDataRow> {
   expandColumn: any
   hasFixedColumn: boolean
   // 已展开的行
-  rowExpandedMaps: Record<string, D>
+  rowExpandedMaps: Record<string, D | null>
   // 懒加载中的展开行
-  rowExpandLazyLoadedMaps: Record<string, D>
+  rowExpandLazyLoadedMaps: Record<string, D | null>
   // 树节点列信息
   treeNodeColumn: any
   // 已展开树节点
-  treeExpandedMaps: Record<string, D>
+  treeExpandedMaps: Record<string, D | null>
   // 懒加载中的树节点的集合
-  treeExpandLazyLoadedMaps: Record<string, D>
+  treeExpandLazyLoadedMaps: Record<string, D | null>
   // 树节点不确定状态的集合
-  treeIndeterminateMaps: Record<string, D>
+  treeIndeterminateMaps: Record<string, D | null>
   // 合并单元格的对象集
   mergeList: VxeTableDefines.MergeItem<D>[]
   // 合并表尾数据的对象集

package/types/v-x-e-table/index.d.ts

@@ -8,7 +8,7 @@ import { VxeGlobalFormats } from './formats'
 import { VxeGlobalMenus } from './menus'
 import { VxeGlobalValidators } from './validators'
 import { VxeGlobalHooks } from './hooks'
-import { VxeGlobalConfigMethod } from './setup'
+import { VxeGlobalConfigMethod } from './config'
 
 /* eslint-disable no-use-before-define */
 
@@ -34,7 +34,7 @@ export type VxeGlobalI18n = (key: string, args?: any) => string
 export type VxeGlobalTranslate = (key: string, args?: any) => string
 export type VxeGlobalUse = (plugin: VXETablePluginObject, ...options: any[]) => VXETableCore
 
-export const setup: VxeGlobalConfigMethod
+export const config: VxeGlobalConfigMethod
 export const interceptor: VxeGlobalInterceptor
 export const renderer: VxeGlobalRenderer
 export const commands: VxeGlobalCommands
@@ -46,11 +46,21 @@ export const modal: ModalController
 export const saveFile: SaveFileFunction
 export const readFile: ReadFileFunction
 export const print: PrintFunction
-export const config: VXETableConfig
 export const t: VxeGlobalI18n
 export const _t: VxeGlobalTranslate
 export const use: VxeGlobalUse
 
+/**
+ * 请使用 config
+ * @deprecated
+ */
+export const setup: VxeGlobalConfigMethod
+/**
+ * 已废弃
+ * @deprecated
+ */
+export const globalConfs: VXETableConfig
+
 export interface VXETablePluginObject {
   install(vxetable: VXETableCore, ...options: any[]): void
   [key: string]: any
@@ -62,11 +72,6 @@ export const v: VXETableVersion
 
 export interface VXETableCore {
   tooltip?: boolean
-  /**
-   * 已被 version 替换
-   * @deprecated
-   */
-  v: VXETableVersion
   /**
    * 版本号
    */
@@ -74,7 +79,7 @@ export interface VXETableCore {
   /**
    * 设置全局参数/获取所有参数
    */
-  setup: VxeGlobalConfigMethod
+  config: VxeGlobalConfigMethod
   /**
    * Table interceptor
    */
@@ -119,10 +124,6 @@ export interface VXETableCore {
    * 打印
    */
   print: PrintFunction
-  /**
-   * 读取内置配置
-   */
-  config: VXETableConfig
   /**
    * 安装插件
    * @param plugin
@@ -134,6 +135,22 @@ export interface VXETableCore {
    */
   t: VxeGlobalI18n
   _t: VxeGlobalTranslate
+
+  /**
+   * 读取内置配置
+   * @deprecated 已废弃
+   */
+  globalConfs: VXETableConfig
+  /**
+   * 已被 version 替换
+   * @deprecated
+   */
+  v: VXETableVersion
+  /**
+   * 请使用 config
+   * @deprecated
+   */
+  setup: VxeGlobalConfigMethod
 }
 
 /**
@@ -148,6 +165,6 @@ export * from './formats'
 export * from './menus'
 export * from './validators'
 export * from './hooks'
-export * from './setup'
+export * from './config'
 
 export default VXETable

package/lib/v-x-e-table/src/setup.min.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.setup=void 0;var _conf=_interopRequireDefault(require("./conf")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var setup=function(e){return _xeUtils.default.merge(_conf.default,e)};exports.setup=setup;