vxe-pc-ui 4.15.2 → 4.15.4

package/packages/tree-select/src/tree-select.ts

@@ -4,7 +4,7 @@ import { getConfig, getI18n, getIcon, globalEvents, createEvent, useSize, render
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils'
 import { deNodeValue } from '../../tree/src/util'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
 import VxeInputComponent from '../../input'
 import VxeButtonComponent from '../../button'
@@ -14,6 +14,8 @@ import { getSlotVNs } from '../../ui/src/vn'
 import type { TreeSelectReactData, VxeTreeSelectEmits, TreeSelectInternalData, VxeButtonEvents, VxeInputEvents, ValueOf, VxeComponentStyleType, TreeSelectPrivateRef, TreeSelectPrivateMethods, TreeSelectMethods, VxeTreeSelectPrivateComputed, VxeTreeSelectPropTypes, VxeTreeSelectConstructor, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeTreeSelectPrivateMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeInputConstructor, VxeModalConstructor, VxeModalMethods, VxeTreeConstructor, VxeTreeEvents, VxeTreeSelectDefines } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
+const { warnLog, errLog } = createComponentLog('tree-select')
+
 function getOptUniqueId () {
   return XEUtils.uniqueId('node_')
 }
@@ -902,7 +904,7 @@ export default defineVxeComponent({
                           h('div', {
                             class: 'vxe-tree-select--header-button'
                           }, [
-                            showCheckedButton && showClearButton
+                            (showCheckedButton && multiple) || showClearButton
                               ? h('div', {
                                 class: 'vxe-tree-select--selected-btns'
                               }, [
@@ -922,24 +924,20 @@ export default defineVxeComponent({
                                   : renderEmptyElement($xeTreeSelect)
                               ])
                               : renderEmptyElement($xeTreeSelect),
-                            showExpandButton && showExpandButton
+                            showExpandButton
                               ? h('div', {
                                 class: 'vxe-tree-select--expand-btns'
                               }, [
-                                showExpandButton
-                                  ? h(VxeButtonComponent, {
-                                    content: getI18n('vxe.treeSelect.allExpand'),
-                                    mode: 'text',
-                                    onClick: allExpandPanelEvent
-                                  })
-                                  : renderEmptyElement($xeTreeSelect),
-                                showExpandButton
-                                  ? h(VxeButtonComponent, {
-                                    content: getI18n('vxe.treeSelect.clearExpand'),
-                                    mode: 'text',
-                                    onClick: clearExpandPanelEvent
-                                  })
-                                  : renderEmptyElement($xeTreeSelect)
+                                h(VxeButtonComponent, {
+                                  content: getI18n('vxe.treeSelect.allExpand'),
+                                  mode: 'text',
+                                  onClick: allExpandPanelEvent
+                                }),
+                                h(VxeButtonComponent, {
+                                  content: getI18n('vxe.treeSelect.clearExpand'),
+                                  mode: 'text',
+                                  onClick: clearExpandPanelEvent
+                                })
                               ])
                               : renderEmptyElement($xeTreeSelect)
                           ])
@@ -1002,7 +1000,7 @@ export default defineVxeComponent({
                       }, treeScopedSlots)
                     ])
                   ]),
-                  footerSlot || showTotalButton || (showCloseButton && multiple)
+                  footerSlot || showTotalButton || showCloseButton
                     ? h('div', {
                       class: 'vxe-tree-select--panel-footer'
                     }, footerSlot
@@ -1016,7 +1014,7 @@ export default defineVxeComponent({
                                 class: 'vxe-tree-select--total-btns'
                               }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                               : renderEmptyElement($xeTreeSelect),
-                            showCloseButton && multiple
+                            showCloseButton
                               ? h('div', {
                                 class: 'vxe-tree-select--oper-btns'
                               }, [

package/packages/ui/index.ts

@@ -73,6 +73,9 @@ setConfig({
     showFullLabel: true,
     treeConfig: {
       showIcon: true
+    },
+    filterConfig: {
+      autoExpandMode: 'first'
     }
   },
   checkbox: {},

package/packages/ui/src/log.ts

@@ -1,6 +1,18 @@
-import { log } from '@vxe-ui/core'
+import { VxeUI } from '@vxe-ui/core'
 
-const version = `ui v${process.env.VUE_APP_VXE_VERSION}`
+const { log } = VxeUI
 
-export const warnLog = log.create('warn', version)
-export const errLog = log.create('error', version)
+const uiVersion = `ui v${process.env.VUE_APP_VXE_VERSION}`
+
+export function createComponentLog (name: string) {
+  const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : ''
+  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : ''
+  const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : ''
+  return {
+    warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
+    errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
+  }
+}
+
+export const warnLog = log.create('warn', uiVersion)
+export const errLog = log.create('error', uiVersion)

package/packages/upload/src/upload.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, useSize, createEvent, globalEvents, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
-import { errLog, warnLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 import { initTpImg, getTpImg, getEventTargetNode, toCssUnit } from '../../ui/src/dom'
 import { readLocalFile } from './util'
 import VxeButtonComponent from '../../button/src/button'
@@ -11,6 +11,8 @@ import VxeButtonComponent from '../../button/src/button'
 import type { VxeUploadDefines, VxeUploadPropTypes, UploadReactData, UploadInternalData, UploadPrivateMethods, UploadMethods, VxeUploadEmits, UploadPrivateRef, VxeUploadPrivateComputed, VxeUploadConstructor, VxeUploadPrivateMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, ValueOf, VxeComponentEventParams } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
+const { warnLog, errLog } = createComponentLog('upload')
+
 function createReactData (): UploadReactData {
   return {
     isDragUploadStatus: false,
@@ -220,8 +222,12 @@ export default defineVxeComponent({
     'remove-fail',
     'download',
     'download-fail',
+    'upload-start',
     'upload-success',
     'upload-error',
+    'upload-end',
+    'upload-queue-start',
+    'upload-queue-end',
     'sort-dragend',
     'more-visible'
   ] as VxeUploadEmits,
@@ -605,6 +611,7 @@ export default defineVxeComponent({
       const fileKey = getFieldKey(item)
       const uploadFn = props.uploadMethod || getConfig().upload.uploadMethod
       if (uploadFn) {
+        dispatchEvent('upload-start', { option: item }, null)
         return Promise.resolve(
           uploadFn({
             $upload: $xeUpload,
@@ -646,6 +653,7 @@ export default defineVxeComponent({
           if (cacheItem) {
             cacheItem.loading = false
           }
+          dispatchEvent('upload-end', { option: item }, null)
         })
       } else {
         const { fileCacheMaps } = reactData
@@ -756,6 +764,8 @@ export default defineVxeComponent({
         }
       }
 
+      dispatchEvent('upload-queue-start', { files: selectFiles }, evnt)
+
       const cacheMaps = Object.assign({}, reactData.fileCacheMaps)
       const newFileList = multiple ? fileList : []
       const uploadPromiseRests: any[] = []
@@ -794,6 +804,7 @@ export default defineVxeComponent({
       })
       Promise.all(urlMode ? uploadPromiseRests : []).then(() => {
         const restFileList = reactData.fileList
+        dispatchEvent('upload-queue-end', { options: restFileList, files: selectFiles }, evnt)
         handleChange(restFileList)
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
@@ -1944,10 +1955,10 @@ export default defineVxeComponent({
 
     onMounted(() => {
       if (props.multiple && props.singleMode) {
-        errLog('vxe.error.errConflicts', ['[upload] multiple', 'single-mode'])
+        errLog('vxe.error.errConflicts', ['multiple', 'single-mode'])
       }
       if (props.imageStyle) {
-        warnLog('vxe.error.delProp', ['[upload] image-style', 'image-config'])
+        warnLog('vxe.error.delProp', ['image-style', 'image-config'])
       }
 
       if (props.dragSort) {

package/types/components/cascader.d.ts

@@ -46,6 +46,10 @@ export namespace VxeCascaderPropTypes {
    */
   type FilterValue = string | number | null | undefined
   export interface FilterConfig<D = any> {
+    /**
+     * 过滤后是否自动展开第一个节点
+     */
+    autoExpandMode?: 'first' | 'last' | ''
     /**
      * 过滤之前的方法
      */

package/types/components/date-picker.d.ts

@@ -57,14 +57,13 @@ export namespace VxeDatePickerPropTypes {
   export type LabelFormat = string
   export type ValueFormat = string
   export type TimeFormat = string
-  export type InputFormat = string
   export type Editable = boolean
   export type FestivalMethod = VxeDatePanelPropTypes.FestivalMethod
   export type DisabledMethod = VxeDatePanelPropTypes.DisabledMethod
   export type AutoClose = boolean
   export type PrefixIcon = string
   export type SuffixIcon = string
-  export interface ControlConfig {
+  export interface MaskedConfig {
     /**
      * 是否启用，支持局部/全局启用
      */
@@ -73,6 +72,14 @@ export namespace VxeDatePickerPropTypes {
      * 只对 enabled 启用后有效，是否启用方向键操作
      */
     isArrow?: boolean
+    /**
+     * 只对 enabled 启用后有效，是否启用输入掩码
+     */
+    isMasked?: boolean
+    /**
+     * 掩码占位符
+     */
+    maskPlaceholder?: string
   }
   /**
    * 已废弃，请使用 PopupConfig.placement
@@ -157,7 +164,6 @@ export interface VxeDatePickerProps {
   labelFormat?: VxeDatePickerPropTypes.LabelFormat
   valueFormat?: VxeDatePickerPropTypes.ValueFormat
   timeFormat?: VxeDatePickerPropTypes.TimeFormat
-  inputFormat?: VxeDatePickerPropTypes.InputFormat
   editable?: VxeDatePickerPropTypes.Editable
   festivalMethod?: VxeDatePickerPropTypes.FestivalMethod
   disabledMethod?: VxeDatePickerPropTypes.DisabledMethod
@@ -170,7 +176,7 @@ export interface VxeDatePickerProps {
    * 只对 type=date,week,month,quarter,year 有效，选择完日期后自动关闭
    */
   autoClose?: VxeDatePickerPropTypes.AutoClose
-  controlConfig?: VxeDatePickerPropTypes.ControlConfig
+  maskedConfig?: VxeDatePickerPropTypes.MaskedConfig
 
   /**
    * 只对 type=week 有效，选中日期后指定为一周的哪一天
@@ -207,12 +213,14 @@ export interface DatePickerReactData {
   panelPlacement: VxeDatePickerPropTypes.Placement
   isActivated: boolean
   inputValue: any
-  inputLabel: string
+  labelFlag: number
 }
 
 export interface DatePickerInternalData {
   hpTimeout?: undefined | number
-  parseInputKayMaps: Record<string, (evnt: KeyboardEvent, targetElem: HTMLInputElement, isUpArrow: boolean) => void>
+  inputLabel: string
+  isTriggerMasked?: boolean
+  laseFocusMasked: number
 }
 
 export interface DatePickerMethods {

package/types/components/drawer.d.ts

@@ -56,6 +56,7 @@ export namespace VxeDrawerPropTypes {
   export type ShowHeader = boolean
   export type ShowFooter = boolean
   export type ShowClose = boolean
+  export type Preload = boolean
   export type Width = number | string
   export type Height = number | string
   export type Resize = boolean
@@ -92,6 +93,7 @@ export interface VxeDrawerProps {
   showHeader?: VxeDrawerPropTypes.ShowHeader
   showFooter?: VxeDrawerPropTypes.ShowFooter
   showClose?: VxeDrawerPropTypes.ShowClose
+  preload?: VxeDrawerPropTypes.Preload
   width?: VxeDrawerPropTypes.Width
   height?: VxeDrawerPropTypes.Height
   resize?: VxeDrawerPropTypes.Resize

package/types/components/modal.d.ts

@@ -77,6 +77,7 @@ export namespace VxeModalPropTypes {
   export type ShowHeader = boolean
   export type ShowFooter = boolean
   export type ShowZoom = boolean
+  export type Preload = boolean
   export interface ZoomConfig {
     minimizeLayout?: null | '' | 'vertical' | 'horizontal'
     minimizeMaxSize?: number
@@ -153,6 +154,7 @@ export interface VxeModalProps {
   showHeader?: VxeModalPropTypes.ShowHeader
   showFooter?: VxeModalPropTypes.ShowFooter
   showZoom?: VxeModalPropTypes.ShowZoom
+  preload?: VxeModalPropTypes.Preload
   zoomConfig?: VxeModalPropTypes.ZoomConfig
   showMaximize?: VxeModalPropTypes.ShowMaximize
   showMinimize?: VxeModalPropTypes.ShowMinimize

package/types/components/upload.d.ts

@@ -322,8 +322,12 @@ export type VxeUploadEmits = [
   'remove-fail',
   'download',
   'download-fail',
+  'upload-start',
   'upload-success',
   'upload-error',
+  'upload-end',
+  'upload-queue-start',
+  'upload-queue-end',
   'sort-dragend',
   'more-visible'
 ]
@@ -387,9 +391,20 @@ export namespace VxeUploadDefines {
     option: VxeUploadDefines.FileObjItem
     data: any
   }
-
   export interface UploadErrorEventParams extends UploadSuccessEventParams {}
 
+  export interface UploadStartEventParams extends UploadSuccessEventParams {
+    option: VxeUploadDefines.FileObjItem
+  }
+  export interface UploadEndEventParams extends UploadStartEventParams {}
+
+  export interface UploadQueueStartEventParams extends UploadSuccessEventParams {
+    files: File[]
+  }
+  export interface UploadQueueEndEventParams extends UploadQueueStartEventParams {
+    options: VxeUploadDefines.FileObjItem[]
+  }
+
   export interface MoreVisibleEventParams {
     visible: boolean
   }
@@ -404,6 +419,10 @@ export type VxeUploadEventProps = {
   onDownloadFail?: VxeUploadEvents.DownloadFail
   onUploadSuccess?: VxeUploadEvents.UploadSuccess
   onUploadError?: VxeUploadEvents.UploadError
+  onUploadStart?: VxeUploadEvents.UploadStart
+  onUploadEnd?: VxeUploadEvents.UploadEnd
+  onUploadQueueStart?: VxeUploadEvents.UploadQueueStart
+  onUploadQueueEnd?: VxeUploadEvents.UploadQueueEnd
   onMoreVisible?: VxeUploadEvents.MoreVisible
 }
 
@@ -416,6 +435,10 @@ export interface VxeUploadListeners {
   downloadFail?: VxeUploadEvents.DownloadFail
   uploadSuccess?: VxeUploadEvents.UploadSuccess
   uploadError?: VxeUploadEvents.UploadError
+  uploadStart?: VxeUploadEvents.UploadStart
+  uploadEnd?: VxeUploadEvents.UploadEnd
+  uploadQueueStart?: VxeUploadEvents.UploadQueueStart
+  uploadQueueEnd?: VxeUploadEvents.UploadQueueEnd
   moreVisible?: VxeUploadEvents.MoreVisible
 }
 
@@ -428,6 +451,10 @@ export namespace VxeUploadEvents {
   export type DownloadFail = (params: VxeUploadDefines.DownloadFailEventParams) => void
   export type UploadSuccess = (params: VxeUploadDefines.UploadSuccessEventParams) => void
   export type UploadError = (params: VxeUploadDefines.UploadErrorEventParams) => void
+  export type UploadStart = (params: VxeUploadDefines.UploadStartEventParams) => void
+  export type UploadEnd = (params: VxeUploadDefines.UploadEndEventParams) => void
+  export type UploadQueueStart = (params: VxeUploadDefines.UploadQueueStartEventParams) => void
+  export type UploadQueueEnd = (params: VxeUploadDefines.UploadQueueEndEventParams) => void
   export type MoreVisible = (params: VxeUploadDefines.MoreVisibleEventParams) => void
 }