vxe-table 3.19.49 → 3.19.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.19.49",
+  "version": "3.19.52",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -67,7 +67,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vue-template-compiler": "2.6.14"
+    "vue-template-compiler": "2.6.14",
+    "vxe-pc-ui": "3.11.25"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -273,7 +273,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const filterOpts = $xeTable.computeFilterOpts
       const hasCheckOption = $xeFilterPanel.computeHasCheckOption
       const { filterRender, filterMultiple } = column
-      const { confirmButtonText, resetButtonText, showFooter } = filterOpts
+      const { confirmButtonText, resetButtonText, showFooter } = filterOpts as any
       const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
       let showFlFoot = !!filterMultiple

package/packages/table/module/menu/mixin.ts

@@ -312,8 +312,9 @@ export default {
       if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = menus.get(menu.code)
         const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt })
-        if (gMenuOpts && gMenuOpts.menuMethod) {
-          gMenuOpts.menuMethod(params, evnt)
+        const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null
+        if (tmMethod) {
+          tmMethod(params, evnt)
         }
         // 在 v4 中废弃事件 context-menu-click
         if ($xeTable.$listeners['context-menu-click']) {

package/packages/table/render/index.ts

@@ -985,7 +985,7 @@ renderer.mixin({
           const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1)
           let amountLabel = XEUtils.toFixed(XEUtils.floor(itemValue, digits), digits)
           if (!autoFill) {
-            amountLabel = XEUtils.toNumber(amountLabel)
+            amountLabel = XEUtils.toNumber(amountLabel) as any
           }
           return amountLabel
         } else if (type === 'amount') {

package/packages/table/src/cell.ts

@@ -391,7 +391,7 @@ export const Cell = {
     const tableInternalData = $table as unknown as TableInternalData
     const { isRowGroupStatus } = tableReactData
     const { editConfig } = tableProps
-    const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column
+    const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column
     const isEnableEdit = editConfig && isEnableConf(editConfig)
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null
     const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null
@@ -464,8 +464,9 @@ export const Cell = {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h))
       }
       const renderOpts = editRenderOpts || cellRenderOpts
-      // formatter > (renderTableCell | renderTableDefault)
-      if (renderOpts && !formatter) {
+      // 如果是编辑表格：renderTableCell > formatter
+      // 如果是查看表格：renderTableDefault > formatter
+      if (renderOpts) {
         const compConf = renderer.get(renderOpts.name)
         if (compConf) {
           const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault)

package/packages/table/src/methods.ts

@@ -4603,8 +4603,8 @@ const tableMethods: any = {
     })
     reactData.tableData = tableData
     internalData.visibleDataRowIdData = visibleDataRowIdMaps
-    if ($xeGanttView && $xeGanttView.updateViewData) {
-      $xeGanttView.updateViewData(force)
+    if ($xeGanttView && ($xeGanttView as any).updateViewData) {
+      ($xeGanttView as any).updateViewData(force)
     }
     return $xeTable.$nextTick()
   },

package/styles/components/table-module/menu.scss

@@ -16,7 +16,7 @@
   user-select: none;
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
-  background-color: var(--vxe-ui-table-menu-background-color);
+  background-color: var(--vxe-ui-layout-background-color);
 }
 .vxe-context-menu--link {
   display: flex;
@@ -46,7 +46,7 @@
   margin: 0;
   padding: 0;
   list-style-type: none;
-  border-bottom: 1px solid #E8EAED;
+  border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
   li {
     position: relative;
     margin: 1px 0;
@@ -55,11 +55,8 @@
       border: 0;
     }
     &.link--active {
-      background-color: #C5C5C5;
-      border-color:#C5C5C5;
-      & > .vxe-context-menu--link {
-        color: #2B2B2B;
-      }
+      background-color: var(--vxe-ui-base-hover-background-color);
+      border-color: var(--vxe-ui-base-hover-background-color);
     }
     &.link--loading,
     &.link--disabled {
@@ -68,8 +65,6 @@
         cursor: no-drop;
       }
       &.link--active {
-        border-color:#C0C1C2;
-        background-color: #EEEEEE;
         &:hover {
           background-color: inherit;
         }