vxe-table 4.7.0-alpha.14 → 4.7.0-alpha.16

package/es/table/src/table.js

@@ -3355,7 +3355,7 @@ export default defineComponent({
             },
             openTooltip(target, content) {
                 const $commTip = refCommTooltip.value;
-                if ($commTip) {
+                if ($commTip && $commTip.open) {
                     return $commTip.open(target, content);
                 }
                 return nextTick();
@@ -3374,11 +3374,11 @@ export default defineComponent({
                         content: null,
                         visible: false
                     });
-                    if ($tooltip) {
+                    if ($tooltip && $tooltip.close) {
                         $tooltip.close();
                     }
                 }
-                if ($commTip) {
+                if ($commTip && $commTip.close) {
                     $commTip.close();
                 }
                 return nextTick();
@@ -4986,7 +4986,7 @@ export default defineComponent({
                 tableMethods.closeTooltip();
             }
             else {
-                if ($tooltip) {
+                if ($tooltip && $tooltip.setActived) {
                     $tooltip.setActived(true);
                 }
             }
@@ -5015,7 +5015,7 @@ export default defineComponent({
                 });
                 nextTick(() => {
                     const $tooltip = refTooltip.value;
-                    if ($tooltip) {
+                    if ($tooltip && $tooltip.open) {
                         $tooltip.open(isCellOverflow ? overflowElem : (tipElem || overflowElem), formatText(content));
                     }
                 });
@@ -5685,7 +5685,7 @@ export default defineComponent({
                     // tooltipStore.currOpts = { content: null }
                     nextTick(() => {
                         const $tooltip = refTooltip.value;
-                        if ($tooltip) {
+                        if ($tooltip && $tooltip.open) {
                             $tooltip.open(evnt.currentTarget, content);
                         }
                     });
@@ -5756,13 +5756,13 @@ export default defineComponent({
             handleTargetLeaveEvent() {
                 const tooltipOpts = computeTooltipOpts.value;
                 let $tooltip = refTooltip.value;
-                if ($tooltip) {
+                if ($tooltip && $tooltip.setActived) {
                     $tooltip.setActived(false);
                 }
                 if (tooltipOpts.enterable) {
                     internalData.tooltipTimeout = setTimeout(() => {
                         $tooltip = refTooltip.value;
-                        if ($tooltip && !$tooltip.isActived()) {
+                        if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
                             tableMethods.closeTooltip();
                         }
                     }, tooltipOpts.leaveDelay);

package/es/ui/index.js

@@ -1,5 +1,6 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
-VxeUI.tableVersion = process.env.VUE_APP_VXE_TABLE_VERSION;
+VxeUI.version = "4.7.0-alpha.16";
+VxeUI.tableVersion = "4.7.0-alpha.16";
 setConfig({
     emptyCell: '　',
     table: {
@@ -202,10 +203,10 @@ setIcon({
     TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
-    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
     TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
-    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
-    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
     TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
     // toolbar
     TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
@@ -221,7 +222,16 @@ setIcon({
     TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
     TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
 });
-// 兼容老版本
+/**
+ * 已废弃，兼容老版本
+ * @deprecated
+ */
 export const VXETable = VxeUI;
+/**
+ * 已废弃
+ * @deprecated
+ */
+export const globalStore = VxeUI.globalStore || {};
+VxeUI.globalStore = globalStore;
 export * from '@vxe-ui/core';
 export default VxeUI;

package/lib/index.umd.js

@@ -8831,7 +8831,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       },
       openTooltip(target, content) {
         const $commTip = refCommTooltip.value;
-        if ($commTip) {
+        if ($commTip && $commTip.open) {
           return $commTip.open(target, content);
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -8852,11 +8852,11 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
             content: null,
             visible: false
           });
-          if ($tooltip) {
+          if ($tooltip && $tooltip.close) {
             $tooltip.close();
           }
         }
-        if ($commTip) {
+        if ($commTip && $commTip.close) {
           $commTip.close();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -10688,7 +10688,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       if (isClear) {
         tableMethods.closeTooltip();
       } else {
-        if ($tooltip) {
+        if ($tooltip && $tooltip.setActived) {
           $tooltip.setActived(true);
         }
       }
@@ -10725,7 +10725,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         });
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
           const $tooltip = refTooltip.value;
-          if ($tooltip) {
+          if ($tooltip && $tooltip.open) {
             $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, (0,utils/* formatText */.vX)(content));
           }
         });
@@ -11514,7 +11514,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           // tooltipStore.currOpts = { content: null }
           (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
             const $tooltip = refTooltip.value;
-            if ($tooltip) {
+            if ($tooltip && $tooltip.open) {
               $tooltip.open(evnt.currentTarget, content);
             }
           });
@@ -11603,13 +11603,13 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       handleTargetLeaveEvent() {
         const tooltipOpts = computeTooltipOpts.value;
         let $tooltip = refTooltip.value;
-        if ($tooltip) {
+        if ($tooltip && $tooltip.setActived) {
           $tooltip.setActived(false);
         }
         if (tooltipOpts.enterable) {
           internalData.tooltipTimeout = setTimeout(() => {
             $tooltip = refTooltip.value;
-            if ($tooltip && !$tooltip.isActived()) {
+            if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
               tableMethods.closeTooltip();
             }
           }, tooltipOpts.leaveDelay);
@@ -21084,15 +21084,17 @@ const Toolbar = VxeToolbar;
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   VXETable: function() { return /* binding */ VXETable; }
+/* harmony export */   VXETable: function() { return /* binding */ VXETable; },
+/* harmony export */   globalStore: function() { return /* binding */ globalStore; }
 /* harmony export */ });
 /* harmony import */ var _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8514);
 /* harmony import */ var _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__) if(["default","VXETable"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__) if(["default","VXETable","globalStore"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
 /* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 
-_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.tableVersion = ({"NODE_ENV":"production","VUE_APP_VXE_ENV":"development","VUE_APP_VXE_VERSION":"4.7.0-alpha.14","BASE_URL":"/"}).VUE_APP_VXE_TABLE_VERSION;
+_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.version = "4.7.0-alpha.16";
+_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.tableVersion = "4.7.0-alpha.16";
 (0,_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.setConfig)({
   emptyCell: '　',
   table: {
@@ -21295,10 +21297,10 @@ const iconPrefix = 'vxe-icon-';
   TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
   TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
   TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
-  TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+  TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
   TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
-  TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
-  TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+  TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
+  TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
   TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
@@ -21314,8 +21316,17 @@ const iconPrefix = 'vxe-icon-';
   TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
   TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
 });
-// 兼容老版本
+/**
+ * 已废弃，兼容老版本
+ * @deprecated
+ */
 const VXETable = _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI;
+/**
+ * 已废弃
+ * @deprecated
+ */
+const globalStore = _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.globalStore || {};
+_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.globalStore = globalStore;
 
 /* harmony default export */ __webpack_exports__["default"] = (_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI);