doway-coms 3.2.2 → 3.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -25,7 +25,7 @@
     "vue-router": "3.6.5",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.2",
-    "doway-vxe-table": "3.9.21-beta1",
+    "vxe-table": "3.9.21",
     "vxe-pc-ui":"3.3.83",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"

package/packages/index.js

@@ -68,7 +68,6 @@ const components = [
 import 'vxe-table/lib/style.css'
 import VXETable from 'vxe-table'
 
-
 import VxeUI from 'vxe-pc-ui'
 import 'vxe-pc-ui/lib/style.css'
 

package/packages/utils/cell.ts

@@ -0,0 +1,873 @@
+import { CreateElement } from 'vue'
+import XEUtils from 'xe-utils'
+import { VxeUI } from '../../ui'
+import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
+import { updateCellTitle } from '../../ui/src/dom'
+import { createColumn, getRowid } from './util'
+import { getSlotVNs } from '../../ui/src/vn'
+
+const { getI18n, getIcon, renderer, formats } = VxeUI
+
+function renderTitlePrefixIcon (h: CreateElement, params: any) {
+  const { $table, column } = params
+  const titlePrefix = column.titlePrefix || column.titleHelp
+  return titlePrefix
+    ? [
+        h('i', {
+          class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
+          on: {
+            mouseenter (evnt: any) {
+              $table.triggerHeaderTitleEvent(evnt, titlePrefix, params)
+            },
+            mouseleave (evnt: any) {
+              $table.handleTargetLeaveEvent(evnt)
+            }
+          }
+        })
+      ]
+    : []
+}
+
+function renderTitleSuffixIcon (h: CreateElement, params: any) {
+  const { $table, column } = params
+  const titleSuffix = column.titleSuffix
+  return titleSuffix
+    ? [
+        h('i', {
+          class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
+          on: {
+            mouseenter (evnt: any) {
+              $table.triggerHeaderTitleEvent(evnt, titleSuffix, params)
+            },
+            mouseleave (evnt: any) {
+              $table.handleTargetLeaveEvent(evnt)
+            }
+          }
+        })
+      ]
+    : []
+}
+
+function renderTitleContent (h: CreateElement, params: any, content: any) {
+  const { $table, column } = params
+  const { type, showHeaderOverflow } = column
+  const { showHeaderOverflow: allColumnHeaderOverflow, tooltipOpts } = $table
+  const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
+  const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
+  const showTitle = headOverflow === 'title'
+  const showTooltip = headOverflow === true || headOverflow === 'tooltip'
+  const ons: any = {}
+  if (showTitle || showTooltip || showAllTip) {
+    ons.mouseenter = (evnt: any) => {
+      if ($table._isResize) {
+        return
+      }
+      if (showTitle) {
+        updateCellTitle(evnt.currentTarget, column)
+      } else if (showTooltip || showAllTip) {
+        $table.triggerHeaderTooltipEvent(evnt, params)
+      }
+    }
+  }
+  if (showTooltip || showAllTip) {
+    ons.mouseleave = (evnt: any) => {
+      if ($table._isResize) {
+        return
+      }
+      if (showTooltip || showAllTip) {
+        $table.handleTargetLeaveEvent(evnt)
+      }
+    }
+  }
+  return [
+    type === 'html' && XEUtils.isString(content)
+      ? h('span', {
+        class: 'vxe-cell--title',
+        domProps: {
+          innerHTML: content
+        },
+        on: ons
+      })
+      : h('span', {
+        class: 'vxe-cell--title',
+        on: ons
+      }, getSlotVNs(content))
+  ]
+}
+
+function formatFooterLabel (footerFormatter: any, params: any) {
+  if (XEUtils.isFunction(footerFormatter)) {
+    return footerFormatter(params)
+  }
+  const isArr = XEUtils.isArray(footerFormatter)
+  const gFormatOpts = isArr ? formats.get(footerFormatter[0]) : formats.get(footerFormatter)
+  const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null
+  if (footerFormatMethod) {
+    return isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params)
+  }
+  return ''
+}
+
+function getFooterContent (h: CreateElement, params: any) {
+  const { $table, column, _columnIndex, row, items } = params
+  const { slots, editRender, cellRender, footerFormatter } = column
+  const renderOpts = editRender || cellRender
+  if (slots && slots.footer) {
+    return $table.callSlot(slots.footer, params, h)
+  }
+  if (renderOpts) {
+    const compConf = renderer.get(renderOpts.name)
+    const rtFooter = compConf ? (compConf.renderTableFooter || compConf.renderFooter) : null
+    if (rtFooter) {
+      return getSlotVNs(rtFooter.call($table, h, renderOpts, params))
+    }
+  }
+  let itemValue = ''
+  // 兼容老模式
+  if (XEUtils.isArray(items)) {
+    itemValue = items[_columnIndex]
+    return [
+      footerFormatter
+        ? formatFooterLabel(footerFormatter, {
+          itemValue,
+          column,
+          row,
+          items,
+          _columnIndex
+        })
+        : formatText(itemValue, 1)
+    ]
+  }
+  itemValue = XEUtils.get(row, column.field)
+  return [
+    footerFormatter
+      ? formatFooterLabel(footerFormatter, {
+        itemValue,
+        column,
+        row,
+        items,
+        _columnIndex
+      })
+      : formatText(itemValue, 1)
+  ]
+}
+
+function getDefaultCellLabel (params: any) {
+  const { $table, row, column } = params
+  return formatText($table.getCellLabel(row, column), 1)
+}
+
+export const Cell = {
+  createColumn ($xetable: any, _vm: any) {
+    const { type, sortable, remoteSort, filters, editRender, treeNode } = _vm
+    const { editConfig, editOpts, checkboxOpts } = $xetable
+    const renMaps: any = {
+      renderHeader: this.renderDefaultHeader,
+      renderCell: treeNode ? this.renderTreeCell : this.renderDefaultCell,
+      renderFooter: this.renderDefaultFooter
+    }
+    switch (type) {
+      case 'seq':
+        renMaps.renderHeader = this.renderSeqHeader
+        renMaps.renderCell = treeNode ? this.renderTreeIndexCell : this.renderSeqCell
+        break
+      case 'radio':
+        renMaps.renderHeader = this.renderRadioHeader
+        renMaps.renderCell = treeNode ? this.renderTreeRadioCell : this.renderRadioCell
+        break
+      case 'checkbox':
+        renMaps.renderHeader = this.renderCheckboxHeader
+        renMaps.renderCell = checkboxOpts.checkField ? (treeNode ? this.renderTreeSelectionCellByProp : this.renderCheckboxCellByProp) : (treeNode ? this.renderTreeSelectionCell : this.renderCheckboxCell)
+        break
+      case 'expand':
+        renMaps.renderCell = this.renderExpandCell
+        renMaps.renderData = this.renderExpandData
+        break
+      case 'html':
+        renMaps.renderCell = treeNode ? this.renderTreeHTMLCell : this.renderHTMLCell
+        if (filters && (sortable || remoteSort)) {
+          renMaps.renderHeader = this.renderSortAndFilterHeader
+        } else if (sortable || remoteSort) {
+          renMaps.renderHeader = this.renderSortHeader
+        } else if (filters) {
+          renMaps.renderHeader = this.renderFilterHeader
+        }
+        break
+      default:
+        if (editConfig && editRender) {
+          renMaps.renderHeader = this.renderEditHeader
+          renMaps.renderCell = editOpts.mode === 'cell' ? (treeNode ? this.renderTreeCellEdit : this.renderCellEdit) : (treeNode ? this.renderTreeRowEdit : this.renderRowEdit)
+        } else if (filters && (sortable || remoteSort)) {
+          renMaps.renderHeader = this.renderSortAndFilterHeader
+        } else if (sortable || remoteSort) {
+          renMaps.renderHeader = this.renderSortHeader
+        } else if (filters) {
+          renMaps.renderHeader = this.renderFilterHeader
+        }
+    }
+    return createColumn($xetable, _vm, renMaps)
+  },
+  /**
+   * 单元格
+   */
+  renderHeaderTitle (h: any, params: any) {
+    const { $table, column } = params
+    const { slots, editRender, cellRender } = column
+    const renderOpts = editRender || cellRender
+    if (slots && slots.header) {
+      return renderTitleContent(h, params, $table.callSlot(slots.header, params, h))
+    }
+    if (renderOpts) {
+      const compConf = renderer.get(renderOpts.name)
+      const rtHeader = compConf ? (compConf.renderTableHeader || compConf.renderHeader) : null
+      if (rtHeader) {
+        return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)))
+      }
+    }
+    return renderTitleContent(h, params, formatText(column.getTitle(), 1))
+  },
+  renderDefaultHeader (h: CreateElement, params: any) {
+    return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params)).concat(renderTitleSuffixIcon(h, params))
+  },
+  renderDefaultCell (h: CreateElement, params: any) {
+    const { $table, row, column } = params
+    const { slots, editRender, cellRender } = column
+    const renderOpts = editRender || cellRender
+    if (slots && slots.default) {
+      return $table.callSlot(slots.default, params, h)
+    }
+    if (renderOpts) {
+      const compConf = renderer.get(renderOpts.name)
+      const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null
+      const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null
+      const renderFn = editRender ? rtCell : rtDefault
+      if (renderFn) {
+        return getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
+      }
+    }
+    const cellValue = $table.getCellLabel(row, column)
+    const cellPlaceholder = editRender ? editRender.placeholder : ''
+    return [
+      h('span', {
+        class: 'vxe-cell--label'
+      }, [
+        // 如果设置占位符
+        editRender && eqEmptyValue(cellValue)
+          ? h('span', {
+            class: 'vxe-cell--placeholder'
+          }, formatText(getFuncText(cellPlaceholder), 1))
+          : h('span', formatText(cellValue, 1))
+      ])
+    ]
+  },
+  renderTreeCell (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderDefaultCell.call(this, h, params))
+  },
+  renderDefaultFooter (h: CreateElement, params: any) {
+    return [
+      h('span', {
+        class: 'vxe-cell--item'
+      }, getFooterContent(h, params))
+    ]
+  },
+
+  /**
+   * 树节点
+   */
+  renderTreeIcon (h: CreateElement, params: any, cellVNodes: any) {
+    const { $table, isHidden } = params
+    const { treeOpts, treeExpandedMaps, treeExpandLazyLoadedMaps, fullAllDataRowIdData } = $table
+    const { row, column, level } = params
+    const { slots } = column
+    const { indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
+    const rowChilds = row[childrenField]
+    const hasChild = rowChilds && rowChilds.length
+    let hasLazyChilds = false
+    let isAceived = false
+    let isLazyLoading = false
+    let isLazyLoaded = false
+    const on: any = {}
+    if (slots && slots.icon) {
+      return $table.callSlot(slots.icon, params, h, cellVNodes)
+    }
+    if (!isHidden) {
+      const rowid = getRowid($table, row)
+      isAceived = !!treeExpandedMaps[rowid]
+      if (lazy) {
+        const rest = fullAllDataRowIdData[rowid]
+        isLazyLoading = !!treeExpandLazyLoadedMaps[rowid]
+        hasLazyChilds = row[hasChildField]
+        isLazyLoaded = !!rest.treeLoaded
+      }
+    }
+    if (!trigger || trigger === 'default') {
+      on.click = (evnt: any) => {
+        $table.triggerTreeExpandEvent(evnt, params)
+      }
+    }
+    return [
+      h('div', {
+        class: ['vxe-cell--tree-node', {
+          'is--active': isAceived
+        }],
+        style: {
+          paddingLeft: `${level * indent}px`
+        }
+      }, [
+        showIcon && (lazy ? (isLazyLoaded ? hasChild : hasLazyChilds) : hasChild)
+          ? [
+              h('div', {
+                class: 'vxe-tree--btn-wrapper',
+                on
+              }, [
+                h('i', {
+                  class: ['vxe-tree--node-btn', isLazyLoading ? (iconLoaded || getIcon().TABLE_TREE_LOADED) : (isAceived ? (iconOpen || getIcon().TABLE_TREE_OPEN) : (iconClose || getIcon().TABLE_TREE_CLOSE))]
+                })
+              ])
+            ]
+          : null,
+        h('div', {
+          class: 'vxe-tree-cell'
+        }, cellVNodes)
+      ])
+    ]
+  },
+
+  /**
+   * 索引
+   */
+  renderSeqHeader (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { slots } = column
+    return renderTitleContent(h, params, slots && slots.header ? $table.callSlot(slots.header, params, h) : formatText(column.getTitle(), 1))
+  },
+  renderSeqCell (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { treeConfig, seqOpts } = $table
+    const { slots } = column
+    if (slots && slots.default) {
+      return $table.callSlot(slots.default, params, h)
+    }
+    const { seq } = params
+    const seqMethod = seqOpts.seqMethod
+    return [formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)]
+  },
+  renderTreeIndexCell (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderSeqCell(h, params))
+  },
+
+  /**
+   * 单选
+   */
+  renderRadioHeader (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { slots } = column
+    const headerSlot = slots ? slots.header : null
+    const titleSlot = slots ? slots.title : null
+    return renderTitleContent(h, params, headerSlot
+      ? $table.callSlot(headerSlot, params, h)
+      : [
+          h('span', {
+            class: 'vxe-radio--label'
+          }, titleSlot ? $table.callSlot(titleSlot, params, h) : formatText(column.getTitle(), 1))
+        ])
+  },
+  renderRadioCell (h: CreateElement, params: any) {
+    const { $table, column, isHidden } = params
+    const { radioOpts, selectRadioRow } = $table
+    const { slots } = column
+    const { labelField, checkMethod, visibleMethod } = radioOpts
+    const { row } = params
+    const defaultSlot = slots ? slots.default : null
+    const radioSlot = slots ? slots.radio : null
+    const isChecked = row === selectRadioRow
+    const isVisible = !visibleMethod || visibleMethod({ row })
+    let isDisabled = !!checkMethod
+    let on: any
+    if (!isHidden) {
+      on = {
+        click (evnt: any) {
+          if (!isDisabled && isVisible) {
+            $table.triggerRadioRowEvent(evnt, params)
+          }
+        }
+      }
+      if (checkMethod) {
+        isDisabled = !checkMethod({ row })
+      }
+    }
+    const radioParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible }
+    if (radioSlot) {
+      return $table.callSlot(radioSlot, radioParams, h)
+    }
+    const radioVNs = []
+    if (isVisible) {
+      radioVNs.push(
+        h('span', {
+          class: ['vxe-radio--icon', isChecked ? getIcon().TABLE_RADIO_CHECKED : getIcon().TABLE_RADIO_UNCHECKED]
+        })
+      )
+    }
+    if (defaultSlot || labelField) {
+      radioVNs.push(
+        h('span', {
+          class: 'vxe-radio--label'
+        }, defaultSlot ? $table.callSlot(defaultSlot, radioParams, h) : XEUtils.get(row, labelField))
+      )
+    }
+    return [
+      h('span', {
+        class: ['vxe-cell--radio', {
+          'is--checked': isChecked,
+          'is--disabled': isDisabled
+        }],
+        on
+      }, radioVNs)
+    ]
+  },
+  renderTreeRadioCell (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderRadioCell(h, params))
+  },
+
+  /**
+   * 多选
+   */
+  renderCheckboxHeader (h: CreateElement, params: any) {
+    const { $table, column, isHidden } = params
+    const { isAllSelected: isAllCheckboxSelected, isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
+    const { slots } = column
+    const headerSlot = slots ? slots.header : null
+    const titleSlot = slots ? slots.title : null
+    const checkboxOpts = $table.checkboxOpts
+    const headerTitle = column.getTitle()
+    let on
+    if (!isHidden) {
+      on = {
+        click (evnt: any) {
+          if (!isAllCheckboxDisabled) {
+            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected)
+          }
+        }
+      }
+    }
+    const checkboxParams = { ...params, checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
+    if (headerSlot) {
+      return renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h))
+    }
+    if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+      return renderTitleContent(h, checkboxParams, [
+        h('span', {
+          class: 'vxe-checkbox--label'
+        }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+      ])
+    }
+    return renderTitleContent(h, checkboxParams, [
+      h('span', {
+        class: ['vxe-cell--checkbox', {
+          'is--checked': isAllCheckboxSelected,
+          'is--disabled': isAllCheckboxDisabled,
+          'is--indeterminate': isAllCheckboxIndeterminate
+        }],
+        attrs: {
+          title: getI18n('vxe.table.allTitle')
+        },
+        on
+      }, [
+        h('span', {
+          class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+        })
+      ].concat(titleSlot || headerTitle
+        ? [
+            h('span', {
+              class: 'vxe-checkbox--label'
+            }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+          ]
+        : []))
+    ])
+  },
+  renderCheckboxCell (h: CreateElement, params: any) {
+    const { $table, row, column, isHidden } = params
+    const { treeConfig, treeIndeterminateMaps, selectCheckboxMaps } = $table
+    const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
+    const { slots } = column
+    const defaultSlot = slots ? slots.default : null
+    const checkboxSlot = slots ? slots.checkbox : null
+    let indeterminate = false
+    let isChecked = false
+    const isVisible = !visibleMethod || visibleMethod({ row })
+    let isDisabled = !!checkMethod
+    let on
+    if (!isHidden) {
+      const rowid = getRowid($table, row)
+      isChecked = !!selectCheckboxMaps[rowid]
+      on = {
+        click (evnt: any) {
+          if (!isDisabled && isVisible) {
+            $table.triggerCheckRowEvent(evnt, params, !isChecked)
+          }
+        }
+      }
+      if (checkMethod) {
+        isDisabled = !checkMethod({ row })
+      }
+      if (treeConfig) {
+        indeterminate = !!treeIndeterminateMaps[rowid]
+      }
+    }
+    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
+    if (checkboxSlot) {
+      return $table.callSlot(checkboxSlot, checkboxParams, h)
+    }
+    const checkVNs = []
+    if (isVisible) {
+      checkVNs.push(
+        h('span', {
+          class: ['vxe-checkbox--icon', indeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+        })
+      )
+    }
+    if (defaultSlot || labelField) {
+      checkVNs.push(
+        h('span', {
+          class: 'vxe-checkbox--label'
+        }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams, h) : XEUtils.get(row, labelField))
+      )
+    }
+    return [
+      h('span', {
+        class: ['vxe-cell--checkbox', {
+          'is--checked': isChecked,
+          'is--disabled': isDisabled,
+          'is--indeterminate': indeterminate,
+          'is--hidden': !isVisible
+        }],
+        on
+      }, checkVNs)
+    ]
+  },
+  renderTreeSelectionCell (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCell(h, params))
+  },
+  renderCheckboxCellByProp (h: CreateElement, params: any) {
+    const { $table, row, column, isHidden } = params
+    const { treeConfig, treeIndeterminateMaps, checkboxOpts } = $table
+    const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
+    const { slots } = column
+    const defaultSlot = slots ? slots.default : null
+    const checkboxSlot = slots ? slots.checkbox : null
+    let isIndeterminate = false
+    let isChecked = false
+    const isVisible = !visibleMethod || visibleMethod({ row })
+    let isDisabled = !!checkMethod
+    let on
+    if (!isHidden) {
+      const rowid = getRowid($table, row)
+      isChecked = XEUtils.get(row, checkField)
+      on = {
+        click (evnt: any) {
+          if (!isDisabled && isVisible) {
+            $table.triggerCheckRowEvent(evnt, params, !isChecked)
+          }
+        }
+      }
+      if (checkMethod) {
+        isDisabled = !checkMethod({ row })
+      }
+      if (treeConfig) {
+        isIndeterminate = !!treeIndeterminateMaps[rowid]
+      }
+    }
+    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate }
+    if (checkboxSlot) {
+      return $table.callSlot(checkboxSlot, checkboxParams, h)
+    }
+    const checkVNs = []
+    if (isVisible) {
+      checkVNs.push(
+        h('span', {
+          class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+        })
+      )
+    }
+    if (defaultSlot || labelField) {
+      checkVNs.push(
+        h('span', {
+          class: 'vxe-checkbox--label'
+        }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams, h) : XEUtils.get(row, labelField))
+      )
+    }
+    return [
+      h('span', {
+        class: ['vxe-cell--checkbox', {
+          'is--checked': isChecked,
+          'is--disabled': isDisabled,
+          'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate,
+          'is--hidden': !isVisible
+        }],
+        on
+      }, checkVNs)
+    ]
+  },
+  renderTreeSelectionCellByProp (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCellByProp(h, params))
+  },
+
+  /**
+   * 展开行
+   */
+  renderExpandCell (h: CreateElement, params: any) {
+    const { $table, isHidden, row, column } = params
+    const { expandOpts, rowExpandedMaps, rowExpandLazyLoadedMaps } = $table
+    const { lazy, labelField, iconLoaded, showIcon, iconOpen, iconClose, visibleMethod } = expandOpts
+    const { slots } = column
+    const defaultSlot = slots ? slots.default : null
+    let isAceived = false
+    let isLazyLoading = false
+    if (slots && slots.icon) {
+      return $table.callSlot(slots.icon, params, h)
+    }
+    if (!isHidden) {
+      const rowid = getRowid($table, row)
+      isAceived = !!rowExpandedMaps[rowid]
+      if (lazy) {
+        isLazyLoading = !!rowExpandLazyLoadedMaps[rowid]
+      }
+    }
+    return [
+      showIcon && (!visibleMethod || visibleMethod(params))
+        ? h('span', {
+          class: ['vxe-table--expanded', {
+            'is--active': isAceived
+          }],
+          on: {
+            click (evnt: any) {
+              $table.triggerRowExpandEvent(evnt, params)
+            }
+          }
+        }, [
+          h('i', {
+            class: ['vxe-table--expand-btn', isLazyLoading ? (iconLoaded || getIcon().TABLE_EXPAND_LOADED) : (isAceived ? (iconOpen || getIcon().TABLE_EXPAND_OPEN) : (iconClose || getIcon().TABLE_EXPAND_CLOSE))]
+          })
+        ])
+        : null,
+      defaultSlot || labelField
+        ? h('span', {
+          class: 'vxe-table--expand-label'
+        }, defaultSlot ? $table.callSlot(defaultSlot, params, h) : XEUtils.get(row, labelField))
+        : null
+    ]
+  },
+  renderExpandData (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { slots, contentRender } = column
+    if (slots && slots.content) {
+      return $table.callSlot(slots.content, params, h)
+    }
+    if (contentRender) {
+      const compConf = renderer.get(contentRender.name)
+      const rtExpand = compConf ? (compConf.renderTableExpand || compConf.renderExpand) : null
+      if (rtExpand) {
+        return getSlotVNs(rtExpand.call($table, h, contentRender, params))
+      }
+    }
+    return []
+  },
+
+  /**
+   * HTML 标签
+   */
+  renderHTMLCell (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { slots } = column
+    if (slots && slots.default) {
+      return $table.callSlot(slots.default, params, h)
+    }
+    return [
+      h('span', {
+        class: 'vxe-cell--html',
+        domProps: {
+          innerHTML: getDefaultCellLabel(params)
+        }
+      })
+    ]
+  },
+  renderTreeHTMLCell (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderHTMLCell(h, params))
+  },
+
+  /**
+   * 排序和筛选
+   */
+  renderSortAndFilterHeader (h: CreateElement, params: any) {
+    return Cell.renderDefaultHeader(h, params)
+      .concat(Cell.renderSortIcon(h, params))
+      .concat(Cell.renderFilterIcon(h, params))
+  },
+
+  /**
+   * 排序
+   */
+  renderSortHeader (h: CreateElement, params: any) {
+    return Cell.renderDefaultHeader(h, params).concat(Cell.renderSortIcon(h, params))
+  },
+  renderSortIcon (h: CreateElement, params: any) {
+    console.log('renderSortIcon',params)
+    const { $table, column } = params
+    const { showIcon, iconLayout, iconAsc, iconDesc } = $table.sortOpts
+    return showIcon
+      ? [
+          h('span', {
+            class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
+          }, [
+            h('i', {
+              class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
+                'sort--active': column.order === 'asc'
+              }],
+              attrs: {
+                title: getI18n('vxe.table.sortAsc')
+              },
+              on: {
+                click (evnt: any) {
+                  evnt.stopPropagation()
+                  $table.triggerSortEvent(evnt, column, 'asc')
+                }
+              }
+            }),
+            h('i', {
+              class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
+                'sort--active': column.order === 'desc'
+              }],
+              attrs: {
+                title: getI18n('vxe.table.sortDesc')
+              },
+              on: {
+                click (evnt: any) {
+                  evnt.stopPropagation()
+                  $table.triggerSortEvent(evnt, column, 'desc')
+                }
+              }
+            })
+          ])
+        ]
+      : []
+  },
+
+  /**
+   * 筛选
+   */
+  renderFilterHeader (h: CreateElement, params: any) {
+    return Cell.renderDefaultHeader(h, params).concat(Cell.renderFilterIcon(h, params))
+  },
+  renderFilterIcon (h: CreateElement, params: any) {
+    const { $table, column, hasFilter } = params
+    const { filterStore, filterOpts } = $table
+    const { showIcon, iconNone, iconMatch } = filterOpts
+    return showIcon
+      ? [
+          h('span', {
+            class: ['vxe-cell--filter', {
+              'is--active': filterStore.visible && filterStore.column === column
+            }]
+          }, [
+            h('i', {
+              class: ['vxe-filter--btn', hasFilter ? (iconMatch || getIcon().TABLE_FILTER_MATCH) : (iconNone || getIcon().TABLE_FILTER_NONE)],
+              attrs: {
+                title: getI18n('vxe.table.filter')
+              },
+              on: {
+                click (evnt: any) {
+                  if ($table.triggerFilterEvent) {
+                    $table.triggerFilterEvent(evnt, params.column, params)
+                  }
+                }
+              }
+            })
+          ])
+        ]
+      : []
+  },
+
+  /**
+   * 可编辑
+   */
+  renderEditHeader (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { editConfig, editRules, editOpts } = $table
+    const { sortable, remoteSort, filters, editRender } = column
+    let isRequired = false
+    if (editRules) {
+      const columnRules = XEUtils.get(editRules, column.field)
+      if (columnRules) {
+        isRequired = columnRules.some((rule: any) => rule.required)
+      }
+    }
+    return (isEnableConf(editConfig)
+      ? [
+          isRequired && editOpts.showAsterisk
+            ? h('i', {
+              class: 'vxe-cell--required-icon'
+            })
+            : null,
+          isEnableConf(editRender) && editOpts.showIcon
+            ? h('i', {
+              class: ['vxe-cell--edit-icon', editOpts.icon || getIcon().TABLE_EDIT]
+            })
+            : null
+        ]
+      : []).concat(Cell.renderDefaultHeader(h, params))
+      .concat(sortable || remoteSort ? Cell.renderSortIcon(h, params) : [])
+      .concat(filters ? Cell.renderFilterIcon(h, params) : [])
+  },
+  // 行格编辑模式
+  renderRowEdit (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { editRender } = column
+    const { actived } = $table.editStore
+    return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row)
+  },
+  renderTreeRowEdit (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderRowEdit(h, params))
+  },
+  // 单元格编辑模式
+  renderCellEdit (h: CreateElement, params: any) {
+    const { $table, column } = params
+    const { editRender } = column
+    const { actived } = $table.editStore
+    return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row && actived.column === params.column)
+  },
+  renderTreeCellEdit (h: CreateElement, params: any) {
+    return Cell.renderTreeIcon(h, params, Cell.renderCellEdit(h, params))
+  },
+  runRenderer (h: CreateElement, params: any, _vm: any, isEdit: any) {
+    const { $table, column } = params
+    const { slots, editRender, formatter } = column
+    const compConf = renderer.get(editRender.name)
+    const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
+    const cellParams = Object.assign({ $type: '', isEdit }, params)
+    if (isEdit) {
+      if (slots && slots.edit) {
+        return $table.callSlot(slots.edit, cellParams, h)
+      }
+      if (rtEdit) {
+        return getSlotVNs(rtEdit.call($table, h, editRender, cellParams))
+      }
+      return []
+    }
+    if (slots && slots.default) {
+      return $table.callSlot(slots.default, cellParams, h)
+    }
+    if (formatter) {
+      return [
+        h('span', {
+          class: 'vxe-cell--label'
+        }, [getDefaultCellLabel(cellParams)])
+      ]
+    }
+    return Cell.renderDefaultCell.call(_vm, h, cellParams)
+  }
+} as any
+
+export default Cell

package/vue.config.js

@@ -50,9 +50,14 @@ module.exports = {
           // 修改它的选项...
           return options
         })
-
-        
-  }
+  },
+  // configureWebpack: {
+  //   resolve: {
+  //     alias: {
+  //       'node-modules/vxe-table/packages/table/src/cell.ts': path.resolve(__dirname, 'packages/utils/cell.ts') // 新的别名
+  //     }
+  //   }
+  // }
   }