vxe-table 4.7.73 → 4.7.75

package/packages/table/module/custom/panel.ts

@@ -60,7 +60,10 @@ export default defineComponent({
       const customOpts = computeCustomOpts.value
       const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
       XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (!parent) {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed
+        } else {
           if (allowSort) {
             const sortIndex = index + 1
             column.renderSortNumber = sortIndex
@@ -181,22 +184,30 @@ export default defineComponent({
       const customOpts = computeCustomOpts.value
       if (customOpts.immediate) {
         if (column.renderFixed === colFixed) {
-          column.fixed = ''
-          column.renderFixed = ''
+          XEUtils.eachTree([column], col => {
+            col.fixed = ''
+            col.renderFixed = ''
+          })
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.fixed = colFixed
-            column.renderFixed = colFixed
+            XEUtils.eachTree([column], col => {
+              col.fixed = colFixed
+              col.renderFixed = colFixed
+            })
           }
         }
         $xeTable.handleCustom()
         $xeTable.saveCustomStore('update:fixed')
       } else {
         if (column.renderFixed === colFixed) {
-          column.renderFixed = ''
+          XEUtils.eachTree([column], col => {
+            col.renderFixed = ''
+          })
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.renderFixed = colFixed
+            XEUtils.eachTree([column], col => {
+              col.renderFixed = colFixed
+            })
           }
         }
       }

package/packages/table/module/edit/hook.ts

@@ -613,7 +613,7 @@ hooks.add('tableEditModule', {
           return $xeTable.scrollToRow(row, column).then(() => {
             const cell = $xeTable.getCellElement(row, column)
             if (cell) {
-              editPrivateMethods.handleActived({
+              editPrivateMethods.handleEdit({
                 row,
                 rowIndex: $xeTable.getRowIndex(row),
                 column,
@@ -657,7 +657,7 @@ hooks.add('tableEditModule', {
       /**
        * 处理激活编辑
        */
-      handleActived (params, evnt) {
+      handleEdit (params, evnt) {
         const { editConfig, mouseConfig } = props
         const { editStore, tableColumn } = reactData
         const editOpts = computeEditOpts.value
@@ -756,6 +756,12 @@ hooks.add('tableEditModule', {
         }
         return nextTick()
       },
+      /**
+       * @deprecated
+       */
+      handleActived (params, evnt) {
+        return editPrivateMethods.handleEdit(params, evnt)
+      },
       /**
        * 处理聚焦
        */

package/packages/table/module/keyboard/hook.ts

@@ -280,7 +280,7 @@ hooks.add('tableKeyboardModule', {
           if (editConfig) {
             if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
               if (editOpts.mode === 'row') {
-                $xeTable.handleActived(params, evnt)
+                $xeTable.handleEdit(params, evnt)
               } else {
                 $xeTable.scrollToRow(params.row, params.column)
                   .then(() => $xeTable.handleSelected(params, evnt))

package/packages/table/module/validator/hook.ts

@@ -66,7 +66,7 @@ hooks.add('tableValidatorModule', {
           $xeTable.dispatchEvent('valid-error', params, null)
           resolve()
         } else {
-          $xeTable.handleActived(params, { type: 'valid-error', trigger: 'call' }).then(() => {
+          $xeTable.handleEdit(params, { type: 'valid-error', trigger: 'call' }).then(() => {
             resolve(validatorPrivateMethods.showValidTooltip(params))
           })
         }

package/packages/table/src/body.ts

@@ -162,7 +162,7 @@ export default defineComponent({
       const errorValidItem = validErrorMaps[`${rowid}:${colid}`]
       const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline')
       const attrs: any = { colid }
-      const params: VxeTableDefines.CellRenderBodyParams = { $table: $xeTable, $grid: $xeTable.xegrid, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
+      const params: VxeTableDefines.CellRenderBodyParams = { $table: $xeTable, $grid: $xeTable.xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
       // 虚拟滚动不支持动态高度
       if (scrollYLoad && !hasEllipsis) {
         showEllipsis = hasEllipsis = true

package/packages/table/src/cell.ts

@@ -893,26 +893,28 @@ export const Cell = {
     const editSlot = slots ? slots.edit : null
     const compConf = renderer.get(editRender.name)
     const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
+    const cellParams = Object.assign({ $type: '', isEdit }, params)
     if (isEdit) {
+      cellParams.$type = 'edit'
       if (editSlot) {
-        return $table.callSlot(editSlot, params)
+        return $table.callSlot(editSlot, cellParams)
       }
       if (rtEdit) {
-        return getSlotVNs(rtEdit(editRender, Object.assign({ $type: 'edit' }, params)))
+        return getSlotVNs(rtEdit(editRender, cellParams))
       }
       return []
     }
     if (defaultSlot) {
-      return $table.callSlot(defaultSlot, params)
+      return $table.callSlot(defaultSlot, cellParams)
     }
     if (formatter) {
       return [
         h('span', {
           class: 'vxe-cell--label'
-        }, getDefaultCellLabel(params))
+        }, getDefaultCellLabel(cellParams))
       ]
     }
-    return Cell.renderDefaultCell(params)
+    return Cell.renderDefaultCell(cellParams)
   }
 }
 

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) {
@@ -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;
-              }
-            }
           }
         }
       }