vxe-table 4.7.1 → 4.7.3

package/packages/table/module/keyboard/hook.ts

@@ -1,9 +1,11 @@
 import XEUtils from 'xe-utils'
-import { hooks } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { browse, hasClass, getAbsolutePos, addClass, removeClass, getEventTargetNode } from '../../../ui/src/dom'
 
 import type { TableKeyboardPrivateMethods } from '../../../../types'
 
+const { hooks } = VxeUI
+
 function getTargetOffset (target: any, container: any) {
   let offsetTop = 0
   let offsetLeft = 0

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

@@ -1,11 +1,13 @@
 import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
-import { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/dom'
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
 
 import type { TableMenuMethods, TableMenuPrivateMethods } from '../../../../types'
 
+const { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
+
 const tableMenuMethodKeys: (keyof TableMenuMethods)[] = ['closeMenu']
 
 hooks.add('tableMenuModule', {

package/packages/table/module/validator/hook.ts

@@ -1,12 +1,14 @@
 import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
-import { getConfig, validators, hooks, log } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { getFuncText, eqEmptyValue } from '../../../ui/src/utils'
 import { scrollToView } from '../../../ui/src/dom'
 import { handleFieldOrColumn, getRowid } from '../../src/util'
 
 import type { TableValidatorMethods, TableValidatorPrivateMethods, VxeTableDefines } from '../../../../types'
 
+const { getConfig, validators, hooks, log } = VxeUI
+
 /**
  * 校验规则
  */

package/packages/table/render/index.ts

@@ -1,12 +1,13 @@
 import { h, resolveComponent, ComponentOptions } from 'vue'
 import XEUtils from 'xe-utils'
-import { getConfig, renderer, getI18n, log } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { getCellValue, setCellValue } from '../../table/src/util'
 import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
 import { getOnName } from '../../ui/src/vn'
 
-import type { VxeButtonComponent } from 'vxe-pc-ui'
-import type { VxeGlobalRendererHandles, VxeColumnPropTypes } from '../../../types'
+import type { VxeGlobalRendererHandles, VxeColumnPropTypes, VxeButtonComponent } from '../../../types'
+
+const { getConfig, renderer, getI18n, log } = VxeUI
 
 const componentDefaultModelProp = 'modelValue'
 

package/packages/table/src/body.ts

@@ -1,12 +1,14 @@
 import { createCommentVNode, defineComponent, h, ref, Ref, PropType, inject, nextTick, ComputedRef, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
-import { getI18n, renderer, VxeComponentSlotType } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { mergeBodyMethod, getRowid, removeScrollListener, restoreScrollListener, XEBodyScrollElement } from './util'
 import { updateCellTitle, getPropClass } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
 
-import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableDefines, VxeTableMethods, VxeColumnPropTypes, VxeComponentSizeType } from '../../../types'
+import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableDefines, VxeTableMethods, VxeColumnPropTypes, VxeComponentSlotType, VxeComponentSizeType } from '../../../types'
+
+const { getI18n, renderer } = VxeUI
 
 const renderType = 'body'
 

package/packages/table/src/cell.ts

@@ -1,12 +1,14 @@
 import { h, VNode } from 'vue'
 import XEUtils from 'xe-utils'
-import { getI18n, getIcon, renderer, VxeComponentSlotType } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { updateCellTitle } from '../../ui/src/dom'
 import { createColumn, getRowid } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 
-import type { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods } from '../../../types'
+import type { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods, VxeComponentSlotType } from '../../../types'
+
+const { getI18n, getIcon, renderer } = VxeUI
 
 function renderTitlePrefixIcon (params: VxeTableDefines.CellRenderHeaderParams) {
   const { $table, column } = params

package/packages/table/src/columnInfo.ts

@@ -1,10 +1,11 @@
 import XEUtils from 'xe-utils'
-import { getI18n, formats, log } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { toFilters } from './util'
 import { getFuncText } from '../../ui/src/utils'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
+const { getI18n, formats, log } = VxeUI
 export class ColumnInfo {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   constructor ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, _vm: any, { renderHeader, renderCell, renderFooter, renderData }: any = {}) {

package/packages/table/src/props.ts

@@ -1,8 +1,10 @@
 import { PropType } from 'vue'
-import { getConfig } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 
 import type { VxeTablePropTypes } from '../../../types'
 
+const { getConfig } = VxeUI
+
 export default {
   /** 基本属性 */
   id: String as PropType<VxeTablePropTypes.ID>,

package/packages/table/src/table.ts

@@ -2,7 +2,7 @@ import { defineComponent, h, createCommentVNode, ComponentPublicInstance, resolv
 import XEUtils from 'xe-utils'
 import { browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
-import { VxeUI, getConfig, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, log, useSize } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import Cell from './cell'
 import TableBodyComponent from './body'
 import TableHeaderComponent from './header'
@@ -17,8 +17,9 @@ import TableImportPanelComponent from '../module/export/import-panel'
 import TableExportPanelComponent from '../module/export/export-panel'
 import TableMenuPanelComponent from '../module/menu/panel'
 
-import type { VxeLoadingComponent, VxeTooltipInstance, VxeTooltipComponent } from 'vxe-pc-ui'
-import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableProps, VxeColumnPropTypes } from '../../../types'
+import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableProps, VxeColumnPropTypes, VxeLoadingComponent, VxeTooltipInstance, VxeTooltipComponent } from '../../../types'
+
+const { getConfig, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, log, useFns } = VxeUI
 
 const isWebkit = browse['-webkit'] && !browse.edge
 
@@ -36,7 +37,7 @@ export default defineComponent({
 
     const xID = XEUtils.uniqueId()
 
-    const { computeSize } = useSize(props)
+    const { computeSize } = useFns.useSize(props)
 
     const reactData = reactive<TableReactData>({
       // 低性能的静态列

package/packages/toolbar/src/toolbar.ts

@@ -1,10 +1,11 @@
 import { defineComponent, h, ref, Ref, computed, inject, createCommentVNode, VNode, reactive, nextTick, PropType, resolveComponent } from 'vue'
 import XEUtils from 'xe-utils'
-import { getConfig, getIcon, getI18n, renderer, commands, log, createEvent, useSize } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import { getSlotVNs } from '../../ui/src/vn'
 
-import type { VxeButtonComponent } from 'vxe-pc-ui'
-import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, VxeToolbarConstructor, VxeToolbarEmits, VxeToolbarPropTypes, VxeTableConstructor, ToolbarPrivateRef, VxeTableMethods, VxeTablePrivateMethods, ToolbarReactData } from '../../../types'
+import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, VxeToolbarConstructor, VxeToolbarEmits, VxeToolbarPropTypes, VxeTableConstructor, ToolbarPrivateRef, VxeTableMethods, VxeTablePrivateMethods, ToolbarReactData, VxeButtonComponent } from '../../../types'
+
+const { getConfig, getIcon, getI18n, renderer, commands, log, createEvent, useFns } = VxeUI
 
 export default defineComponent({
   name: 'VxeToolbar',
@@ -31,7 +32,7 @@ export default defineComponent({
 
     const xID = XEUtils.uniqueId()
 
-    const { computeSize } = useSize(props)
+    const { computeSize } = useFns.useSize(props)
 
     const reactData = reactive<ToolbarReactData>({
       isRefresh: false,

package/packages/ui/index.ts

@@ -1,4 +1,4 @@
-import { VxeUI, modal, drawer, saveFile, readFile } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 
 VxeUI.version = process.env.VUE_APP_VXE_VERSION as string
 VxeUI.tableVersion = process.env.VUE_APP_VXE_VERSION as string
@@ -285,12 +285,11 @@ export const _t = VxeUI._t
  */
 export const VXETable = VxeUI
 
+export const saveFile = VxeUI.readFile
+export const readFile = VxeUI.readFile
+
 export {
-  VxeUI,
-  modal,
-  drawer,
-  saveFile,
-  readFile
+  VxeUI
 }
 
 export default VxeUI

package/packages/ui/src/utils.ts

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import { getConfig } from 'vxe-pc-ui'
+import { VxeUI } from 'vxe-pc-ui'
 import DomZIndex from 'dom-zindex'
 
 export function isEnableConf (conf: any): boolean {
@@ -32,14 +32,14 @@ export function hasChildrenList (item: any) {
 
 export function getFuncText (content?: string | number | boolean | null) {
   if (content) {
-    const translate = getConfig().translate
+    const translate = VxeUI.getConfig().translate
     return XEUtils.toValueString(translate ? translate('' + content) : content)
   }
   return ''
 }
 
 export function formatText (value: any, placeholder?: any) {
-  return '' + (isEmptyValue(value) ? (placeholder ? getConfig().emptyCell : '') : value)
+  return '' + (isEmptyValue(value) ? (placeholder ? VxeUI.getConfig().emptyCell : '') : value)
 }
 
 /**

package/packages/ui/src/vn.ts

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
-import { VxeComponentSlotType } from 'vxe-pc-ui'
+
+import type { VxeComponentSlotType } from '../../../types'
 
 export function getOnName (type: string) {
   return 'on' + type.substring(0, 1).toLocaleUpperCase() + type.substring(1)

package/styles/components/table.scss

@@ -208,7 +208,10 @@
 }
 
 .vxe-table--cell-active-area {
-  border: var(--vxe-ui-table-cell-active-area-border-width) solid var(--vxe-ui-table-cell-active-area-border-color);
+  border-color: var(--vxe-ui-table-cell-active-area-border-color); 
+  border-style: solid;
+  border-width: var(--vxe-ui-table-cell-active-area-border-width);
+  background-color: var(--vxe-ui-table-cell-active-area-background-color);
 }
 
 .vxe-table--cell-multi-area {
@@ -990,7 +993,7 @@
     height: 1em;
     text-align: center;
     transform: translateY(-50%);
-    background-color: var(--vxe-ui-layout-background-color);
+    // background-color: var(--vxe-ui-layout-background-color);
     z-index: 1;
     user-select: none;
     cursor: pointer;

package/styles/theme/base.scss

@@ -69,6 +69,7 @@ $vxe-ui-status-error-color: #f56c6c;
   --vxe-ui-table-cell-extend-area-border-width: 2px;
   --vxe-ui-table-cell-copy-area-border-width: 3px;
   --vxe-ui-table-cell-active-area-border-width: 2px;
+  --vxe-ui-table-cell-active-area-background-color: transparent;
   --vxe-ui-table-cell-copy-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-extend-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-active-area-border-color: var(--vxe-ui-table-cell-area-border-color);