vxe-table 4.7.55 → 4.7.57

package/packages/table/render/index.ts

@@ -728,8 +728,24 @@ renderer.mixin({
     renderDefault: defaultEditRender
   },
   VxeUpload: {
+    renderEdit: defaultEditRender,
+    renderCell: defaultEditRender,
     renderDefault: defaultEditRender
   },
+  VxeImage: {
+    renderDefault (renderOpts, params) {
+      const { row, column } = params
+      const { props } = renderOpts
+      const cellValue = getCellValue(row, column)
+      return [
+        h(getDefaultComponent(renderOpts), {
+          ...props,
+          src: cellValue,
+          ...getEditOns(renderOpts, params)
+        })
+      ]
+    }
+  },
 
   // 以下已废弃
   $input: {

package/packages/table/src/column.ts

@@ -1,5 +1,5 @@
 import { defineComponent, h, onUnmounted, inject, ref, Ref, PropType, provide, onMounted } from 'vue'
-import { XEColumnInstance, watchColumn, assemColumn, destroyColumn } from '../../table/src/util'
+import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util'
 import Cell from '../../table/src/cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, VxeColumnProps } from '../../../types'
@@ -116,7 +116,7 @@ export default defineComponent({
     watchColumn($xeTable, props, column)
 
     onMounted(() => {
-      assemColumn($xeTable, refElem.value, column, parentColgroup)
+      assembleColumn($xeTable, refElem.value, column, parentColgroup)
     })
 
     onUnmounted(() => {

package/packages/table/src/columnInfo.ts

@@ -156,7 +156,8 @@ export class ColumnInfo {
   }
 
   getKey () {
-    return this.field || (this.type ? `type=${this.type}` : null)
+    const { type } = this
+    return this.field || (type ? `type=${type}` : null)
   }
 
   update (name: string, value: any) {

package/packages/table/src/group.ts

@@ -1,6 +1,6 @@
 import { defineComponent, h, onUnmounted, provide, inject, ref, Ref, onMounted, Slot } from 'vue'
 import { columnProps } from './column'
-import { XEColumnInstance, watchColumn, assemColumn, destroyColumn } from '../../table/src/util'
+import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util'
 import Cell from '../../table/src/cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
@@ -27,7 +27,7 @@ export default defineComponent({
     watchColumn($xeTable, props, column)
 
     onMounted(() => {
-      assemColumn($xeTable, refElem.value, column, parentColgroup)
+      assembleColumn($xeTable, refElem.value, column, parentColgroup)
     })
 
     onUnmounted(() => {

package/packages/table/src/table.ts

@@ -2911,7 +2911,7 @@ export default defineComponent({
           }, { children: childrenField })
           row[childrenField] = rows
           if (transform) {
-            row[mapChildrenField] = rows
+            row[mapChildrenField] = XEUtils.clone(rows, false)
           }
           updateAfterDataIndex()
           return rows

package/packages/table/src/util.ts

@@ -290,7 +290,7 @@ export function watchColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
   })
 }
 
-export function assemColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, elem: HTMLElement, column: ColumnInfo, colgroup: XEColumnInstance | null) {
+export function assembleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, elem: HTMLElement, column: ColumnInfo, colgroup: XEColumnInstance | null) {
   const { reactData } = $xeTable
   const { staticColumns } = reactData
   const parentElem = elem.parentNode

package/packages/toolbar/src/toolbar.ts

@@ -264,6 +264,7 @@ export default defineComponent({
               disabled: child.disabled,
               loading: child.loading,
               type: child.type,
+              mode: child.mode,
               icon: child.icon,
               circle: child.circle,
               round: child.round,
@@ -308,6 +309,7 @@ export default defineComponent({
                     disabled: item.disabled,
                     loading: item.loading,
                     type: item.type,
+                    mode: item.mode,
                     icon: item.icon,
                     circle: item.circle,
                     round: item.round,
@@ -365,6 +367,7 @@ export default defineComponent({
                     disabled: item.disabled,
                     loading: item.loading,
                     type: item.type,
+                    mode: item.mode,
                     icon: item.icon,
                     circle: item.circle,
                     round: item.round,

package/styles/components/icon.scss

@@ -45,7 +45,7 @@ $btnThemeList: (
   font-style: normal;
   font-weight: 400;
   font-size: 1.1em;
-  line-height: 1;
+  line-height: 1em;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   &.animat,

package/styles/components/table.scss

@@ -47,13 +47,13 @@
 /*默认的渲染*/
 .vxe-cell,
 .vxe-table--filter-template {
-  & > .vxe-default-input,
-  & > .vxe-default-textarea {
+  .vxe-default-input,
+  .vxe-default-textarea {
     background-color: var(--vxe-ui-layout-background-color);
   }
-  & > .vxe-default-input,
-  & > .vxe-default-textarea,
-  & > .vxe-default-select {
+  .vxe-default-input,
+  .vxe-default-textarea,
+  .vxe-default-select {
     outline: 0;
     padding: 0 2px;
     width: 100%;
@@ -68,12 +68,12 @@
       background-color: var(--vxe-ui-input-disabled-background-color);
     }
   }
-  & > .vxe-default-input,
-  & > .vxe-default-textarea,
-  & > .vxe-default-select {
+  .vxe-default-input,
+  .vxe-default-textarea,
+  .vxe-default-select {
     height: var(--vxe-ui-input-height-default);
   }
-  & > .vxe-default-input {
+  .vxe-default-input {
     &[type="date"]::-webkit-inner-spin-button {
       margin-top: 4px;
     }
@@ -85,7 +85,7 @@
       color: var(--vxe-ui-input-placeholder-color);
     }
   }
-  & > .vxe-default-textarea {
+  .vxe-default-textarea {
     resize: none;
     vertical-align: middle;
   }
@@ -105,6 +105,24 @@
   & > .vxe-default-textarea {
     resize: none;
   }
+  & > .vxe-cell--tree-node {
+    .vxe-input,
+    .vxe-textarea,
+    .vxe-select,
+    .vxe-tree-select,
+    .vxe-date-picker,
+    .vxe-number-input {
+      width: 100%;
+    }
+    .vxe-input > .vxe-input--inner,
+    .vxe-textarea > .vxe-textarea--inner {
+      padding: 0 2px;
+    }
+    .vxe-textarea--inner,
+    .vxe-default-textarea {
+      resize: none;
+    }
+  }
 }
 
 .vxe-table--checkbox-range,