vxe-table 3.4.14-beta.2 → 3.5.0-beta.0

package/packages/form/src/form.js

@@ -2,11 +2,11 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools, isEnableConf } from '../../tools'
-import { createItem } from './util'
+import { isEnableConf, eqEmptyValue, getFuncText } from '../../tools/utils'
+import DomTools, { browse } from '../../tools/dom'
+import { createItem, handleFieldOrItem } from './util'
 import { renderTitle } from './render'
-import { eqEmptyValue } from '../../tools/src/utils'
-import { browse } from '../../tools/src/dom'
+import { errLog } from '../../tools/log'
 
 class Rule {
   constructor (rule) {
@@ -24,7 +24,7 @@ class Rule {
   }
 
   get content () {
-    return UtilTools.getFuncText(this.$options.content || this.$options.message)
+    return getFuncText(this.$options.content || this.$options.message)
   }
 
   get message () {
@@ -136,7 +136,7 @@ function renderItems (h, _vm, itemList) {
             width: isNaN(titleWidth) ? titleWidth : `${titleWidth}px`
           } : null,
           attrs: {
-            title: showTitle ? UtilTools.getFuncText(title) : null
+            title: showTitle ? getFuncText(title) : null
           },
           on: ons
         }, renderTitle(h, _vm, item)) : null,
@@ -239,7 +239,7 @@ export default {
       const { items } = this
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (this.customLayout && this.items) {
-          UtilTools.error('vxe.error.errConflicts', ['custom-layout', 'items'])
+          errLog('vxe.error.errConflicts', ['custom-layout', 'items'])
         }
       }
       if (items) {
@@ -308,7 +308,7 @@ export default {
             XEUtils.each(item.slots, (func) => {
               if (!XEUtils.isFunction(func)) {
                 if (!$scopedSlots[func]) {
-                  UtilTools.error('vxe.error.notSlot', [func])
+                  errLog('vxe.error.notSlot', [func])
                 }
               }
             })
@@ -325,6 +325,10 @@ export default {
       }, { children: 'children' })
       return itemList
     },
+    getItemByField (field) {
+      const rest = XEUtils.findTree(this.formItems, item => item.field === field, { children: 'children' })
+      return rest ? rest.item : null
+    },
     toggleCollapse () {
       const status = !this.collapseAll
       this.collapseAll = status
@@ -416,11 +420,15 @@ export default {
     },
     handleTargetLeaveEvent () {
       const { tooltipOpts } = this
+      let $tooltip = this.$refs.tooltip
       this.tooltipActive = false
+      if ($tooltip) {
+        $tooltip.setActived(false)
+      }
       if (tooltipOpts.enterable) {
         this.tooltipTimeout = setTimeout(() => {
-          const $tooltip = this.$refs.tooltip
-          if ($tooltip && !$tooltip.isHover) {
+          $tooltip = this.$refs.tooltip
+          if ($tooltip && !$tooltip.isActived()) {
             this.closeTooltip()
           }
         }, tooltipOpts.leaveDelay)
@@ -428,15 +436,14 @@ export default {
         this.closeTooltip()
       }
     },
-    clearValidate (field) {
-      const itemList = this.getItems()
-      if (field) {
-        const item = itemList.find(item => item.field === field)
+    clearValidate (fieldOrItem) {
+      if (fieldOrItem) {
+        const item = handleFieldOrItem(this, fieldOrItem)
         if (item) {
           item.showError = false
         }
       } else {
-        itemList.forEach(item => {
+        this.getItems().forEach(item => {
           item.showError = false
         })
       }
@@ -446,8 +453,9 @@ export default {
       this.clearValidate()
       return this.beginValidate(this.getItems(), '', callback)
     },
-    validateField (field, callback) {
-      return this.beginValidate(this.getItems().filter(item => item.field === field), '', callback)
+    validateField (fieldOrItem, callback) {
+      const item = handleFieldOrItem(this, fieldOrItem)
+      return this.beginValidate(item ? [item] : [], '', callback)
     },
     beginValidate (itemList, type, callback) {
       const { data, rules: formRules, validOpts } = this
@@ -480,7 +488,7 @@ export default {
             callback()
           }
         }).catch(() => {
-          return new Promise((resolve, reject) => {
+          return new Promise((resolve) => {
             this.showErrTime = setTimeout(() => {
               itemList.forEach(item => {
                 if (item.errRule) {
@@ -497,7 +505,7 @@ export default {
               callback(validRest)
               resolve()
             } else {
-              reject(validRest)
+              resolve(validRest)
             }
           })
         })
@@ -574,9 +582,8 @@ export default {
     },
     handleFocus (fields) {
       const { $el } = this
-      const itemList = this.getItems()
       fields.some((property, index) => {
-        const item = itemList.find(item => item.field === property)
+        const item = this.getItemByField(property)
         if (item && isEnableConf(item.itemRender)) {
           const { itemRender } = item
           const compConf = VXETable.renderer.get(itemRender.name)
@@ -619,8 +626,7 @@ export default {
             this.clearValidate(property)
           })
           .catch(({ rule }) => {
-            const itemList = this.getItems()
-            const item = itemList.find(item => item.field === property)
+            const item = this.getItemByField(property)
             if (item) {
               item.showError = true
               item.errRule = rule

package/packages/form/src/render.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, isEnableConf } from '../../tools'
+import { isEnableConf, getFuncText } from '../../tools/utils'
 
 function renderPrefixIcon (h, titlePrefix) {
   return h('span', {
@@ -34,7 +34,7 @@ export function renderTitle (h, _vm, item) {
       (titlePrefix.content || titlePrefix.message)
         ? h('vxe-tooltip', {
           props: {
-            content: UtilTools.getFuncText(titlePrefix.content || titlePrefix.message),
+            content: getFuncText(titlePrefix.content || titlePrefix.message),
             enterable: titlePrefix.enterable,
             theme: titlePrefix.theme
           }
@@ -47,7 +47,7 @@ export function renderTitle (h, _vm, item) {
   titVNs.push(
     h('span', {
       class: 'vxe-form--item-title-label'
-    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : UtilTools.getFuncText(item.title)))
+    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)))
   )
   contVNs.push(
     h('div', {
@@ -60,7 +60,7 @@ export function renderTitle (h, _vm, item) {
       (titleSuffix.content || titleSuffix.message)
         ? h('vxe-tooltip', {
           props: {
-            content: UtilTools.getFuncText(titleSuffix.content || titleSuffix.message),
+            content: getFuncText(titleSuffix.content || titleSuffix.message),
             enterable: titleSuffix.enterable,
             theme: titleSuffix.theme
           }

package/packages/form/src/util.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import VXETable from '../../v-x-e-table'
-import { UtilTools } from '../../tools'
+import { warnLog } from '../../tools/log'
 
 class ItemConfig {
   constructor ($xeform, item) {
@@ -31,7 +31,7 @@ class ItemConfig {
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       const compConf = item.itemRender ? VXETable.renderer.get(item.itemRender.name) : null
       if (compConf && !compConf.renderItemContent && compConf.renderItem) {
-        UtilTools.warn('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent'])
+        warnLog('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent'])
       }
     }
   }
@@ -49,6 +49,13 @@ export function getItemConfig ($xeform, _vm, options) {
   return isItem(_vm) ? _vm : new ItemConfig($xeform, _vm, options)
 }
 
+export const handleFieldOrItem = ($xeform, fieldOrItem) => {
+  if (fieldOrItem) {
+    return XEUtils.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem
+  }
+  return null
+}
+
 export function createItem ($xeform, _vm) {
   return getItemConfig($xeform, _vm)
 }

package/packages/grid/src/grid.js

@@ -3,8 +3,10 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools, GlobalEvent, isEnableConf } from '../../tools'
-import { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/src/dom'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import DomTools, { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
+import { warnLog, errLog } from '../../tools/log'
 
 const methods = {}
 const propKeys = Object.keys(Table.props)
@@ -59,7 +61,7 @@ function getFuncSlot (_vm, optSlots, slotKey) {
         return $scopedSlots[funcSlot]
       } else {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-          UtilTools.error('vxe.error.notSlot', [funcSlot])
+          errLog('vxe.error.notSlot', [funcSlot])
         }
       }
     } else {
@@ -77,10 +79,10 @@ function getToolbarSlots (_vm) {
   const slots = {}
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
     if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
-      UtilTools.warn('vxe.error.reqProp', ['toolbar-config.slots.buttons'])
+      warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons'])
     }
     if ($scopedSlots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
-      UtilTools.warn('vxe.error.reqProp', ['toolbar-config.slots.tools'])
+      warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools'])
     }
   }
   if (toolbarOptSlots) {
@@ -253,15 +255,15 @@ export default {
   created () {
     const { data, formOpts, proxyOpts, proxyConfig } = this
     if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+      errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (this.toolbar) {
-        UtilTools.warn('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
+        warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
       }
       if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
+        warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
       }
     }
 
@@ -588,7 +590,7 @@ export default {
               })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.query'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
             }
           }
           break
@@ -614,7 +616,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
@@ -631,7 +633,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
@@ -643,7 +645,7 @@ export default {
                 // 检测弹窗模块
                 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                   if (!VXETable.modal) {
-                    UtilTools.error('vxe.error.reqModule', ['Modal'])
+                    errLog('vxe.error.reqModule', ['Modal'])
                   }
                 }
                 VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -651,7 +653,7 @@ export default {
             }
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.delete'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
             }
           }
           break
@@ -690,7 +692,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
@@ -707,7 +709,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
@@ -718,7 +720,7 @@ export default {
                   // 检测弹窗模块
                   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                     if (!VXETable.modal) {
-                      UtilTools.error('vxe.error.reqModule', ['Modal'])
+                      errLog('vxe.error.reqModule', ['Modal'])
                     }
                   }
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
@@ -727,7 +729,7 @@ export default {
             })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.save'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
             }
           }
           break
@@ -762,7 +764,7 @@ export default {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ id: `msg_${code}`, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -817,7 +819,7 @@ export default {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -931,7 +933,7 @@ export default {
             XEUtils.each(column.slots, (func) => {
               if (!XEUtils.isFunction(func)) {
                 if (!$scopedSlots[func]) {
-                  UtilTools.error('vxe.error.notSlot', [func])
+                  errLog('vxe.error.notSlot', [func])
                 }
               }
             })

package/packages/header/src/header.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
 import { convertToRows } from './util'
 import { getColMinWidth } from '../../table/src/util'
 
@@ -163,7 +164,7 @@ export default {
               },
               style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null,
               on: thOns,
-              key: columnKey || isColGroup ? column.id : $columnIndex
+              key: columnKey || columnOpts.useKey || isColGroup ? column.id : $columnIndex
             }, [
               h('div', {
                 class: ['vxe-cell', {

package/packages/input/src/input.js

@@ -1,9 +1,12 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 import { toStringTimeDate, getDateQuarter } from './date'
 import { handleNumber, toFloatValueFixed } from './number'
+import { warnLog } from '../../tools/log'
 
 const yearSize = 20
 const monthSize = 20
@@ -962,7 +965,7 @@ export default {
     inpPlaceholder () {
       const { placeholder } = this
       if (placeholder) {
-        return UtilTools.getFuncText(placeholder)
+        return getFuncText(placeholder)
       }
       return ''
     },
@@ -1017,7 +1020,7 @@ export default {
   },
   mounted () {
     if (this.dateConfig) {
-      UtilTools.warn('vxe.error.removeProp', ['date-config'])
+      warnLog('vxe.error.removeProp', ['date-config'])
     }
     if (this.isDatePickerType) {
       if (this.transfer) {

package/packages/keyboard/src/mixin.js

@@ -1,6 +1,5 @@
 import XEUtils from 'xe-utils'
-import { DomTools } from '../../tools'
-import { browse } from '../../tools/src/dom'
+import DomTools, { browse } from '../../tools/dom'
 
 function getTargetOffset (target, container) {
   let offsetTop = 0

package/packages/list/src/list.js

@@ -1,8 +1,9 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { GlobalEvent, createResizeEvent } from '../../tools'
-import { browse } from '../../tools/src/dom'
+import { createResizeEvent } from '../../tools/resize'
+import { GlobalEvent } from '../../tools/event'
+import { browse } from '../../tools/dom'
 
 export default {
   name: 'VxeList',

package/packages/menu/src/mixin.js

@@ -1,6 +1,8 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools, isEnableConf } from '../../tools'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import DomTools from '../../tools/dom'
 import VXETable from '../../v-x-e-table'
+import { warnLog } from '../../tools/log'
 
 export default {
   methods: {
@@ -104,7 +106,7 @@ export default {
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-                UtilTools.warn('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
+                warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
               }
               this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt)
             } else {
@@ -255,7 +257,7 @@ export default {
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-            UtilTools.warn('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
+            warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
           }
           this.emitEvent('context-menu-click', params, evnt)
         } else {

package/packages/menu/src/panel.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 
 export default {
   name: 'VxeTableContextMenu',
@@ -53,7 +53,7 @@ export default {
             }),
             h('span', {
               class: 'vxe-context-menu--link-content'
-            }, UtilTools.getFuncText(item.name)),
+            }, getFuncText(item.name)),
             h('i', {
               class: ['vxe-context-menu--link-suffix', hasChildMenus ? item.suffixIcon || 'suffix--haschild' : item.suffixIcon]
             })
@@ -89,7 +89,7 @@ export default {
                 }),
                 h('span', {
                   class: 'vxe-context-menu--link-content'
-                }, UtilTools.getFuncText(child.name))
+                }, getFuncText(child.name))
               ])
             ])
           })) : null

package/packages/modal/src/modal.js

@@ -1,7 +1,10 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
+import { errLog } from '../../tools/log'
 
 export const allActivedModals = []
 export const msgQueue = []
@@ -86,7 +89,7 @@ export default {
   },
   created () {
     if (this.storage && !this.id) {
-      UtilTools.error('vxe.error.reqProp', ['modal.id'])
+      errLog('vxe.error.reqProp', ['modal.id'])
     }
   },
   mounted () {
@@ -167,7 +170,7 @@ export default {
         }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : headerSlot.call(this, { $modal: this }, h)) : [
           titleSlot ? titleSlot.call(this, { $modal: this }, h) : h('span', {
             class: 'vxe-modal--title'
-          }, title ? UtilTools.getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
+          }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
           showZoom ? h('i', {
             class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
             attrs: {
@@ -199,7 +202,7 @@ export default {
           ]) : null,
           h('div', {
             class: 'vxe-modal--content'
-          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : UtilTools.getFuncText(content)),
+          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : getFuncText(content)),
           !isMsg ? h('div', {
             class: ['vxe-loading', {
               'is--visible': loading

package/packages/pulldown/src/pulldown.js

@@ -1,6 +1,8 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 
 export default {
   name: 'VxePulldown',

package/packages/radio/src/button.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 
 export default {
@@ -60,7 +60,7 @@ export default {
       }),
       h('span', {
         class: 'vxe-radio--label'
-      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])
+      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])
     ])
   },
   methods: {

package/packages/radio/src/radio.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 
@@ -63,7 +63,7 @@ export default {
       }),
       h('span', {
         class: 'vxe-radio--label'
-      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])
+      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])
     ])
   },
   methods: {

package/packages/select/src/select.js

@@ -2,7 +2,9 @@ import XEUtils from 'xe-utils'
 import VxeInput from '../../input/src/input'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 
 function isOptionVisible (option) {
   return option.visible !== false
@@ -146,7 +148,7 @@ export function renderOption (h, _vm, list, group) {
           }
         }
       }
-    }, defaultSlot ? _vm.callSlot(defaultSlot, { option, $select: _vm }, h) : UtilTools.formatText(UtilTools.getFuncText(option[labelField]))) : null
+    }, defaultSlot ? _vm.callSlot(defaultSlot, { option, $select: _vm }, h) : UtilTools.formatText(getFuncText(option[labelField]))) : null
   })
 }
 
@@ -168,7 +170,7 @@ export function renderOptgroup (h, _vm) {
     }, [
       h('div', {
         class: 'vxe-optgroup--title'
-      }, defaultSlot ? _vm.callSlot(defaultSlot, { option: group, $select: _vm }, h) : UtilTools.getFuncText(group[groupLabelField])),
+      }, defaultSlot ? _vm.callSlot(defaultSlot, { option: group, $select: _vm }, h) : getFuncText(group[groupLabelField])),
       h('div', {
         class: 'vxe-optgroup--wrapper'
       }, renderOption(h, _vm, group[groupOptionsField], group))

package/packages/switch/src/switch.js

@@ -1,7 +1,7 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { browse } from '../../tools/src/dom'
+import { browse } from '../../tools/dom'
 
 export default {
   name: 'VxeSwitch',
@@ -30,10 +30,10 @@ export default {
       return this.value === this.openValue
     },
     onShowLabel () {
-      return UtilTools.getFuncText(this.openLabel)
+      return getFuncText(this.openLabel)
     },
     offShowLabel () {
-      return UtilTools.getFuncText(this.closeLabel)
+      return getFuncText(this.closeLabel)
     },
     styles () {
       return browse.msie && this.isChecked ? {