vxe-table 3.14.0-beta.13 → 3.14.0-beta.15

package/es/table/src/cell.js

@@ -551,7 +551,8 @@ export const Cell = {
         const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
         const checkboxOpts = $table.computeCheckboxOpts;
-        const headerTitle = column.getTitle();
+        const { checkStrictly, showHeader, headerTitle } = checkboxOpts;
+        const colTitle = column.getTitle();
         const ons = {};
         if (!isHidden) {
             ons.click = (evnt) => {
@@ -564,11 +565,11 @@ export const Cell = {
         if (headerSlot) {
             return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
         }
-        if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+        if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
                 h('span', {
                     class: 'vxe-checkbox--label'
-                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)
             ]));
         }
         return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
@@ -579,18 +580,18 @@ export const Cell = {
                         'is--indeterminate': isAllCheckboxIndeterminate
                     }],
                 attrs: {
-                    title: getI18n('vxe.table.allTitle')
+                    title: XEUtils.eqNull(headerTitle) ? getI18n('vxe.table.allTitle') : `${headerTitle || ''}`
                 },
                 on: ons
             }, [
                 h('span', {
                     class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
                 })
-            ].concat(titleSlot || headerTitle
+            ].concat(titleSlot || colTitle
                 ? [
                     h('span', {
                         class: 'vxe-checkbox--label'
-                    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+                    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)
                 ]
                 : []))
         ]));
@@ -820,7 +821,7 @@ export const Cell = {
     renderSortIcon(h, params) {
         const { $table, column } = params;
         const sortOpts = $table.computeSortOpts;
-        const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
+        const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
         if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
             return [
                 h('span', {
@@ -831,7 +832,7 @@ export const Cell = {
                                 'sort--active': column.order === 'asc'
                             }],
                         attrs: {
-                            title: getI18n('vxe.table.sortAsc')
+                            title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
                         },
                         on: allowBtn
                             ? {
@@ -847,7 +848,7 @@ export const Cell = {
                                 'sort--active': column.order === 'desc'
                             }],
                         attrs: {
-                            title: getI18n('vxe.table.sortDesc')
+                            title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
                         },
                         on: allowBtn
                             ? {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.0-beta.13";
+export const version = "3.14.0-beta.15";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.14.0-beta.13"}`;
+const version = `table v${"3.14.0-beta.15"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -4,9 +4,9 @@
 	else if(typeof define === 'function' && define.amd)
 		define([, "@vxe-ui/core", "xe-utils"], factory);
 	else if(typeof exports === 'object')
-		exports["VXETable"] = factory(require("vue"), require("@vxe-ui/core"), require("xe-utils"));
+		exports["VxeUITable"] = factory(require("vue"), require("@vxe-ui/core"), require("xe-utils"));
 	else
-		root["VXETable"] = factory(root["Vue"], root["VxeUI"], root["XEUtils"]);
+		root["VxeUITable"] = factory(root["Vue"], root["VxeUI"], root["XEUtils"]);
 })((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__9274__, __WEBPACK_EXTERNAL_MODULE__4345__, __WEBPACK_EXTERNAL_MODULE__8871__) {
 return /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.13";
+const version = "3.14.0-beta.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.13"}`;
+const log_version = `table v${"3.14.0-beta.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4302,7 +4302,12 @@ const Cell = {
     const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
     const checkboxOpts = $table.computeCheckboxOpts;
-    const headerTitle = column.getTitle();
+    const {
+      checkStrictly,
+      showHeader,
+      headerTitle
+    } = checkboxOpts;
+    const colTitle = column.getTitle();
     const ons = {};
     if (!isHidden) {
       ons.click = evnt => {
@@ -4320,10 +4325,10 @@ const Cell = {
     if (headerSlot) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
     }
-    if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+    if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
         class: 'vxe-checkbox--label'
-      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)]));
+      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)]));
     }
     return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
       class: ['vxe-cell--checkbox', {
@@ -4332,14 +4337,14 @@ const Cell = {
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
       attrs: {
-        title: cell_getI18n('vxe.table.allTitle')
+        title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(headerTitle) ? cell_getI18n('vxe.table.allTitle') : `${headerTitle || ''}`
       },
       on: ons
     }, [h('span', {
       class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
-    })].concat(titleSlot || headerTitle ? [h('span', {
+    })].concat(titleSlot || colTitle ? [h('span', {
       class: 'vxe-checkbox--label'
-    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)] : []))]));
+    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)] : []))]));
   },
   renderCheckboxCell(h, params) {
     const {
@@ -4638,6 +4643,8 @@ const Cell = {
     const {
       showIcon,
       allowBtn,
+      ascTitle,
+      descTitle,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -4651,7 +4658,7 @@ const Cell = {
           'sort--active': column.order === 'asc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortAsc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(ascTitle) ? cell_getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -4664,7 +4671,7 @@ const Cell = {
           'sort--active': column.order === 'desc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortDesc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(descTitle) ? cell_getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -31841,6 +31848,7 @@ const Toolbar = VxeToolbar;
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -32003,8 +32011,8 @@ core_.VxeUI.setTheme('light');
 
 if (typeof window !== 'undefined' && window.Vue) {
   if (window.VXETable) {
-    if (!window.VxeUITable) {
-      window.VxeUITable = components_namespaceObject;
+    if (!window.VXETable) {
+      window.VXETable = components_namespaceObject;
     }
   }
   window.Vue.use(components_namespaceObject);