vxe-table 3.4.15 → 3.5.0-beta.2

package/packages/tooltip/src/tooltip.js

@@ -1,7 +1,8 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
 
 function updateTipStyle (_vm) {
   const { $el: wrapperElem, tipTarget, tipStore } = _vm
@@ -40,6 +41,29 @@ function showTip (_vm) {
   return _vm.updatePlacement()
 }
 
+function renderContent (h, _vm) {
+  const { $scopedSlots, useHTML, tipContent } = _vm
+  if ($scopedSlots.content) {
+    return h('div', {
+      key: 1,
+      class: 'vxe-table--tooltip-content'
+    }, $scopedSlots.content.call(this, {}))
+  }
+  if (useHTML) {
+    return h('div', {
+      key: 2,
+      class: 'vxe-table--tooltip-content',
+      domProps: {
+        innerHTML: tipContent
+      }
+    })
+  }
+  return h('div', {
+    key: 3,
+    class: 'vxe-table--tooltip-content'
+  }, UtilTools.formatText(tipContent))
+}
+
 export default {
   name: 'VxeTooltip',
   mixins: [vSize],
@@ -48,19 +72,19 @@ export default {
     size: { type: String, default: () => GlobalConfig.tooltip.size || GlobalConfig.size },
     trigger: { type: String, default: () => GlobalConfig.tooltip.trigger },
     theme: { type: String, default: () => GlobalConfig.tooltip.theme },
-    content: [String, Number],
+    content: { type: [String, Number], default: null },
+    useHTML: Boolean,
     zIndex: [String, Number],
     isArrow: { type: Boolean, default: true },
     enterable: Boolean,
     enterDelay: { type: Number, default: () => GlobalConfig.tooltip.enterDelay },
-    leaveDelay: { type: Number, default: () => GlobalConfig.tooltip.leaveDelay },
-    leaveMethod: Function
+    leaveDelay: { type: Number, default: () => GlobalConfig.tooltip.leaveDelay }
   },
   data () {
     return {
       isUpdate: false,
       visible: false,
-      message: '',
+      tipContent: '',
       tipActive: false,
       tipTarget: null,
       tipZindex: 0,
@@ -73,7 +97,7 @@ export default {
   },
   watch: {
     content (value) {
-      this.message = value
+      this.tipContent = value
     },
     value (value) {
       if (!this.isUpdate) {
@@ -93,7 +117,7 @@ export default {
     const { $el, trigger, content, value } = this
     const parentNode = $el.parentNode
     let target
-    this.message = content
+    this.tipContent = content
     this.tipZindex = UtilTools.nextZIndex()
     XEUtils.arrayEach($el.children, (elem, index) => {
       if (index > 1) {
@@ -133,7 +157,7 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, vSize, theme, message, tipActive, isArrow, visible, tipStore, enterable } = this
+    const { $scopedSlots, vSize, theme, tipActive, isArrow, visible, tipStore, enterable } = this
     let on
     if (enterable) {
       on = {
@@ -154,9 +178,7 @@ export default {
       ref: 'tipWrapper',
       on
     }, [
-      h('div', {
-        class: 'vxe-table--tooltip-content'
-      }, $scopedSlots.content ? $scopedSlots.content.call(this, {}) : message),
+      renderContent(h, this),
       h('div', {
         class: 'vxe-table--tooltip-arrow',
         style: tipStore.arrowStyle
@@ -164,8 +186,8 @@ export default {
     ].concat($scopedSlots.default ? $scopedSlots.default.call(this, {}) : []))
   },
   methods: {
-    open (target, message) {
-      return this.toVisible(target || this.target, message)
+    open (target, content) {
+      return this.toVisible(target || this.target, content)
     },
     close () {
       this.tipTarget = null
@@ -192,13 +214,13 @@ export default {
         this.tipZindex = UtilTools.nextZIndex()
       }
     },
-    toVisible (target, message) {
+    toVisible (target, content) {
       if (target) {
         const { trigger, enterDelay } = this
         this.tipActive = true
         this.tipTarget = target
-        if (message) {
-          this.message = message
+        if (content) {
+          this.tipContent = content
         }
         if (enterDelay && trigger === 'hover') {
           this.showDelayTip()
@@ -245,17 +267,15 @@ export default {
     wrapperMouseenterEvent () {
       this.tipActive = true
     },
-    wrapperMouseleaveEvent (evnt) {
-      const { leaveMethod, trigger, enterable, leaveDelay } = this
+    wrapperMouseleaveEvent () {
+      const { trigger, enterable, leaveDelay } = this
       this.tipActive = false
-      if (!leaveMethod || leaveMethod({ $event: evnt }) !== false) {
-        if (enterable && trigger === 'hover') {
-          setTimeout(() => {
-            if (!this.tipActive) {
-              this.close()
-            }
-          }, leaveDelay)
-        }
+      if (enterable && trigger === 'hover') {
+        setTimeout(() => {
+          if (!this.tipActive) {
+            this.close()
+          }
+        }, leaveDelay)
       }
     }
   }

package/packages/v-x-e-table/index.js

@@ -6,7 +6,8 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { setup } from './src/setup'
-import { UtilTools } from '../tools'
+import { UtilTools } from '../tools/utils'
+import { errLog } from '../tools/log'
 
 const installedPlugins = []
 
@@ -29,7 +30,7 @@ function reg (key) {
   // 检测安装顺序是否正确
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
     if (VXETable.Table) {
-      UtilTools.error('vxe.error.useErr', [key])
+      errLog('vxe.error.useErr', [key])
     }
   }
   VXETable[`_${key}`] = 1
@@ -88,6 +89,7 @@ export const v = 'v3'
 
 export const VXETable = {
   v,
+  version: process.env.VUE_APP_VXE_TABLE_VERSION,
   reg,
   use,
   setup,

package/packages/v-x-e-table/src/conf.js

@@ -26,6 +26,9 @@ export default {
     // emptyRender: {
     //   name: ''
     // },
+    // rowConfig: {
+    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
+    // },
     radioConfig: {
       // trigger: 'default'
       strict: true
@@ -34,10 +37,9 @@ export default {
       // trigger: 'default',
       strict: true
     },
-    // tooltipConfig: {
-    //   theme: 'dark',
-    //   enterable: false
-    // },
+    tooltipConfig: {
+      enterable: true
+    },
     validConfig: {
       showMessage: true,
       message: 'default'
@@ -49,7 +51,6 @@ export default {
     //  storage: false,
     //  checkMethod () {}
     // },
-    // rowId: '_X_ID', // 行数据的唯一主键字段名
     sortConfig: {
       // remote: false,
       // trigger: 'default',
@@ -242,12 +243,15 @@ export default {
   },
   form: {
     // preventSubmit: false,
+    // size: null,
+    // colon: false,
     validConfig: {
       showMessage: true,
       autoPos: true
     },
-    // size: null,
-    // colon: false,
+    tooltipConfig: {
+      enterable: true
+    },
     titleAsterisk: true
   },
   input: {
@@ -273,6 +277,9 @@ export default {
   select: {
     // size: null,
     // transfer: false,
+    // optionConfig: {
+    //   keyField: '_X_OPTION_KEY'
+    // },
     multiCharOverflow: 8
   },
   toolbar: {

package/packages/v-x-e-table/src/interceptor.js

@@ -1,5 +1,5 @@
-import { UtilTools } from '../../tools'
 import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
 function toType (type) {
   return XEUtils.toValueString(type).replace('_', '').toLowerCase()
@@ -22,7 +22,7 @@ export const interceptor = {
     // 检测类型
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (eventTypes.indexOf(type) === -1) {
-        UtilTools.warn('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')])
+        warnLog('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')])
       }
     }
 
@@ -35,7 +35,7 @@ export const interceptor = {
       // 检测重复
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (eList.indexOf(callback) > -1) {
-          UtilTools.warn('vxe.error.coverProp', ['Interceptor', type])
+          warnLog('vxe.error.coverProp', ['Interceptor', type])
         }
       }
 

package/packages/v-x-e-table/src/renderer.js

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
-import { UtilTools } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import { warnLog } from '../../tools/log'
 
 const defaultCompProps = { transfer: true }
 
@@ -92,7 +93,7 @@ function getCellLabelVNs (h, renderOpts, params, cellLabel) {
     }, placeholder && isEmptyValue(cellLabel) ? [
       h('span', {
         class: 'vxe-cell--placeholder'
-      }, UtilTools.formatText(UtilTools.getFuncText(placeholder), 1))
+      }, UtilTools.formatText(getFuncText(placeholder), 1))
     ] : UtilTools.formatText(cellLabel, 1))
   ]
 }
@@ -672,7 +673,7 @@ export const renderer = {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           XEUtils.each(options, (val, key) => {
             if (!XEUtils.eqNull(renders[key]) && renders[key] !== val) {
-              UtilTools.warn('vxe.error.coverProp', [`Renderer.${name}`, key])
+              warnLog('vxe.error.coverProp', [`Renderer.${name}`, key])
             }
           })
         }

package/packages/v-x-e-table/src/store.js

@@ -1,5 +1,5 @@
-import { UtilTools } from '../../tools'
 import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
 /**
  * 创建数据仓库
@@ -22,7 +22,7 @@ class Store {
     // 检测是否覆盖
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (!XEUtils.eqNull(this.store[name]) && this.store[name] !== render) {
-        UtilTools.warn('vxe.error.coverProp', [this._name, name])
+        warnLog('vxe.error.coverProp', [this._name, name])
       }
     }
     this.store[name] = render

package/packages/validator/src/mixin.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
-import { UtilTools, DomTools } from '../../tools'
-import { eqEmptyValue } from '../../tools/src/utils'
+import { eqEmptyValue, getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
 
 /**
  * 校验规则
@@ -26,7 +26,7 @@ class Rule {
    * 支持国际化翻译
    */
   get content () {
-    return UtilTools.getFuncText(this.$options.content || this.$options.message)
+    return getFuncText(this.$options.content || this.$options.message)
   }
 
   get message () {

package/styles/select.scss

@@ -104,7 +104,7 @@
 
 .vxe-select-option {
   padding: 0 10px;
-  max-width: 400px;
+  max-width: 600px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

package/styles/tooltip.scss

@@ -7,7 +7,7 @@
   top: -100%;
   left: -100%;
   font-size: 12px;
-  max-width: 500px;
+  max-width: 600px;
   border-radius: $vxe-border-radius;
   padding: 8px 12px;
   white-space: normal;

package/types/v-x-e-table/index.d.ts

@@ -38,7 +38,15 @@ export type VXETableVersion = 'v1' | 'v2' | 'v3' | 'v4'
 export const v: VXETableVersion
 
 export interface VXETableCore {
+  /**
+   * 已被 version 替换
+   * @deprecated
+   */
   v: VXETableVersion;
+  /**
+   * 版本号
+   */
+  version: string;
   /**
    * 设置全局参数/获取所有参数
    */

package/lib/tools/index.js

@@ -1,76 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-exports.default = void 0;
-
-var _utils = _interopRequireWildcard(require("./src/utils"));
-
-Object.keys(_utils).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _utils[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _utils[key];
-    }
-  });
-});
-
-var _dom = _interopRequireWildcard(require("./src/dom"));
-
-Object.keys(_dom).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _dom[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _dom[key];
-    }
-  });
-});
-
-var _event = _interopRequireWildcard(require("./src/event"));
-
-Object.keys(_event).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _event[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _event[key];
-    }
-  });
-});
-
-var _resize = require("./src/resize");
-
-Object.keys(_resize).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _resize[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _resize[key];
-    }
-  });
-});
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var _default = {
-  UtilTools: _utils.default,
-  DomTools: _dom.default,
-  GlobalEvent: _event.default
-};
-exports.default = _default;

package/lib/tools/index.min.js

@@ -1 +0,0 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={};exports.default=void 0;var _utils=_interopRequireWildcard(require("./src/utils"));Object.keys(_utils).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_utils[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _utils[e]}}))});var _dom=_interopRequireWildcard(require("./src/dom"));Object.keys(_dom).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_dom[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _dom[e]}}))});var _event=_interopRequireWildcard(require("./src/event"));Object.keys(_event).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_event[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _event[e]}}))});var _resize=require("./src/resize");function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,r=new WeakMap;return(_getRequireWildcardCache=function(e){return e?r:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,o,n={},u=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((o=u?Object.getOwnPropertyDescriptor(e,r):null)&&(o.get||o.set)?Object.defineProperty(n,r,o):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}Object.keys(_resize).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_resize[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _resize[e]}}))});var _default={UtilTools:_utils.default,DomTools:_dom.default,GlobalEvent:_event.default};exports.default=_default;

package/lib/tools/src/event.min.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.hasEventKey=exports.default=exports.GlobalEvent=exports.EVENT_KEYS=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var EVENT_KEYS={F2:"F2",ESCAPE:"Escape",ENTER:"Enter",TAB:"Tab",DELETE:"Delete",BACKSPACE:"Backspace",SPACEBAR:" ",CONTEXT_MENU:"ContextMenu",ARROW_UP:"ArrowUp",ARROW_DOWN:"ArrowDown",ARROW_LEFT:"ArrowLeft",ARROW_RIGHT:"ArrowRight",PAGE_UP:"PageUp",PAGE_DOWN:"PageDown"},convertEventKeys={" ":"Spacebar",Apps:(exports.EVENT_KEYS=EVENT_KEYS).CONTEXT_MENU,Del:EVENT_KEYS.DELETE,Up:EVENT_KEYS.ARROW_UP,Down:EVENT_KEYS.ARROW_DOWN,Left:EVENT_KEYS.ARROW_LEFT,Right:EVENT_KEYS.ARROW_RIGHT},wheelName=_dom.browse.firefox?"DOMMouseScroll":"mousewheel",eventStore=[],hasEventKey=function(e,t){e=e.key;return t=t.toLowerCase(),!!e&&(t===e.toLowerCase()||!(!convertEventKeys[e]||convertEventKeys[e].toLowerCase()!==t))};exports.hasEventKey=hasEventKey;var GlobalEvent={on:function(e,t,o){o&&eventStore.push({comp:e,type:t,cb:o})},off:function(t,o){_xeUtils.default.remove(eventStore,function(e){return e.comp===t&&e.type===o})},trigger:function(r){var n=r.type===wheelName;eventStore.forEach(function(e){var t=e.comp,o=e.type,e=e.cb;r.cancelBubble||(o===r.type||n&&"mousewheel"===o)&&e.call(t,r)})},eqKeypad:function(e,t){e=e.key;return t.toLowerCase()===e.toLowerCase()}};exports.GlobalEvent=GlobalEvent,_dom.browse.isDoc&&(_dom.browse.msie||(document.addEventListener("copy",GlobalEvent.trigger,!1),document.addEventListener("cut",GlobalEvent.trigger,!1),document.addEventListener("paste",GlobalEvent.trigger,!1)),document.addEventListener("keydown",GlobalEvent.trigger,!1),document.addEventListener("contextmenu",GlobalEvent.trigger,!1),window.addEventListener("mousedown",GlobalEvent.trigger,!1),window.addEventListener("blur",GlobalEvent.trigger,!1),window.addEventListener("resize",GlobalEvent.trigger,!1),window.addEventListener(wheelName,_xeUtils.default.throttle(GlobalEvent.trigger,100,{leading:!0,trailing:!1}),!1));var _default=GlobalEvent;exports.default=_default;

package/lib/tools/src/resize.min.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.createResizeEvent=createResizeEvent;var resizeTimeout,_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,n){return t&&_defineProperties(e.prototype,t),n&&_defineProperties(e,n),e}var eventStore=[],defaultInterval=500;function eventHandle(){eventStore.length&&(eventStore.forEach(function(o){o.tarList.forEach(function(e){var t=e.target,n=e.width,r=e.heighe,i=t.clientWidth,t=t.clientHeight;(i&&n!==i||t&&r!==t)&&(e.width=i,e.heighe=t,setTimeout(o.callback))})}),eventListener())}function eventListener(){clearTimeout(resizeTimeout),resizeTimeout=setTimeout(eventHandle,_conf.default.resizeInterval||defaultInterval)}var ResizeObserverPolyfill=function(){function t(e){_classCallCheck(this,t),this.tarList=[],this.callback=e}return _createClass(t,[{key:"observe",value:function(t){var n=this;t&&(this.tarList.some(function(e){return e.target===t})||this.tarList.push({target:t,width:t.clientWidth,heighe:t.clientHeight}),eventStore.length||eventListener(),eventStore.some(function(e){return e===n})||eventStore.push(this))}},{key:"unobserve",value:function(t){_xeUtils.default.remove(eventStore,function(e){return e.tarList.some(function(e){return e.target===t})})}},{key:"disconnect",value:function(){var t=this;_xeUtils.default.remove(eventStore,function(e){return e===t})}}]),t}();function createResizeEvent(e){return new(window.ResizeObserver||ResizeObserverPolyfill)(e)}