vxe-table 4.7.74 → 4.7.76

package/packages/table/src/table.ts

@@ -1773,7 +1773,7 @@ export default defineComponent({
       checkValidate('blur')
         .catch((e: any) => e)
         .then(() => {
-          $xeTable.handleActived(params, evnt)
+          $xeTable.handleEdit(params, evnt)
             .then(() => checkValidate('change'))
             .catch((e: any) => e)
         })
@@ -3514,8 +3514,8 @@ export default defineComponent({
        * 将固定的列左边、右边分别靠边
        * 如果传 true 则会检查列顺序并排序
        */
-      refreshColumn (resiveOrder) {
-        if (resiveOrder) {
+      refreshColumn (initOrder) {
+        if (initOrder) {
           const columnList = XEUtils.orderBy(internalData.collectColumn, 'renderSortNumber')
           internalData.collectColumn = columnList
           const tableFullColumn = getColumnList(columnList)
@@ -5027,7 +5027,7 @@ export default defineComponent({
               // 如果按下了 F2 键
               if (selected.row && selected.column) {
                 evnt.preventDefault()
-                $xeTable.handleActived(selected.args, evnt)
+                $xeTable.handleEdit(selected.args, evnt)
               }
             }
           } else if (isContextMenu) {
@@ -5144,7 +5144,7 @@ export default defineComponent({
                     backMethod(params)
                   } else {
                     setCellValue(selected.row, selected.column, null)
-                    $xeTable.handleActived(selected.args, evnt)
+                    $xeTable.handleEdit(selected.args, evnt)
                   }
                   $xeTable.dispatchEvent('cell-backspace-value', params, evnt)
                 }
@@ -5188,7 +5188,7 @@ export default defineComponent({
                   editMethod(params)
                 } else {
                   setCellValue(selected.row, selected.column, null)
-                  $xeTable.handleActived(selected.args, evnt)
+                  $xeTable.handleEdit(selected.args, evnt)
                 }
                 const afterEditMethod = editOpts.afterEditMethod
                 if (afterEditMethod) {
@@ -5349,7 +5349,7 @@ export default defineComponent({
         const el = refElem.value
         if (el) {
           const parentElem = el.parentNode as HTMLElement
-          const parentPaddingSize = height === 'fill' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
+          const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
           return Math.floor($xeGrid ? $xeGrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize)
         }
         return 0
@@ -6071,12 +6071,12 @@ export default defineComponent({
               checkValidate('blur')
                 .catch((e) => e)
                 .then(() => {
-                  $xeTable.handleActived(params, evnt)
+                  $xeTable.handleEdit(params, evnt)
                     .then(() => checkValidate('change'))
                     .catch((e) => e)
                 })
             } else if (editOpts.mode === 'cell') {
-              $xeTable.handleActived(params, evnt)
+              $xeTable.handleEdit(params, evnt)
                 .then(() => checkValidate('change'))
                 .catch((e) => e)
             }

package/packages/table/src/use/cell-view.ts

@@ -0,0 +1,44 @@
+import { computed } from 'vue'
+import XEUtils from 'xe-utils'
+
+import type { VxeTableDefines, VxeGlobalRendererHandles } from '../../../../types'
+
+export function useCellView <D = any, P = Record<string, any>> (props: {
+  renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions | VxeGlobalRendererHandles.RenderTableEditOptions
+  renderParams: VxeGlobalRendererHandles.RenderTableCellParams | VxeGlobalRendererHandles.RenderTableEditParams
+}) {
+  const currColumn = computed<VxeTableDefines.ColumnInfo<D>>(() => {
+    const { renderParams } = props
+    return renderParams.column
+  })
+
+  const currRow = computed<D>(() => {
+    const { renderParams } = props
+    return renderParams.row
+  })
+
+  const cellOptions = computed<P>(() => {
+    const { renderOpts } = props
+    return renderOpts.props as any || {}
+  })
+
+  const cellModel = computed({
+    get () {
+      const { renderParams } = props
+      const { row, column } = renderParams
+      return XEUtils.get(row, column.field)
+    },
+    set (value) {
+      const { renderParams } = props
+      const { row, column } = renderParams
+      return XEUtils.set(row, column.field, value)
+    }
+  })
+
+  return {
+    currColumn,
+    currRow,
+    cellModel,
+    cellOptions
+  }
+}

package/packages/table/src/use/index.ts

@@ -0,0 +1 @@
+export * from './cell-view'

package/styles/components/table.scss

@@ -89,6 +89,9 @@
   .vxe-default-textarea {
     resize: none;
     vertical-align: middle;
+    &:not([rows]) {
+      height: var(--vxe-ui-input-height-default);
+    }
   }
   & > .vxe-input,
   & > .vxe-textarea,
@@ -1219,6 +1222,7 @@
   /*暂无数据*/
   .vxe-table--empty-placeholder,
   .vxe-table--empty-block {
+    color: var(--vxe-ui-input-placeholder-color);
     min-height: var(--vxe-ui-table-row-height-default);
     justify-content: center;
     align-items: center;
@@ -1430,21 +1434,12 @@
               border: 0;
               padding: 0;
             }
-            .vxe-default-input {
-              height: var(--vxe-ui-table-row-line-height);
-            }
             .vxe-input {
               .vxe-input--inner {
                 border: 0;
                 padding-left: 0;
               }
             }
-            .vxe-textarea {
-              height: calc(var(--vxe-ui-table-row-line-height) - 1px);
-              .vxe-textarea--inner {
-                border: 0;
-              }
-            }
           }
         }
       }