vxe-pc-ui 3.15.19 → 3.15.21

package/packages/radio/src/button.ts

@@ -3,9 +3,12 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
 import { getConfig, createEvent, globalMixins, renderEmptyElement } from '../../ui'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeRadioButtonPropTypes, RadioButtonReactData, RadioGroupPrivateComputed, VxeRadioGroupConstructor, ValueOf, VxeRadioButtonEmits, VxeRadioGroupPrivateMethods, VxeFormConstructor, VxeComponentPermissionInfo, VxeComponentSizeType, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 
+const { warnLog } = createComponentLog('radio-button')
+
 export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeRadioButton',
   mixins: [
@@ -36,6 +39,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean] as PropType<VxeRadioButtonPropTypes.Label>,
@@ -70,6 +74,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
       formItemInfo(): VxeFormDefines.ProvideItemInfo | null
       $xeRadioGroup(): (VxeRadioGroupConstructor & RadioGroupPrivateComputed & VxeRadioGroupPrivateMethods) | null
     }),
+    computeCheckValue () {
+      const $xeRadioButton = this
+      const props = $xeRadioButton
+
+      const { checkedValue, label } = props
+      return XEUtils.isUndefined(checkedValue) ? label : checkedValue
+    },
     computeIsDisabled () {
       const $xeRadioButton = this
       const $xeRadioGroup = $xeRadioButton.$xeRadioGroup
@@ -96,14 +107,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       return $xeRadioGroup ? $xeRadioGroup.strict : props.strict
     },
-    computeChecked  () {
+    computeIsChecked  () {
       const $xeRadioButton = this
       const props = $xeRadioButton
       const $xeRadioGroup = $xeRadioButton.$xeRadioGroup
 
-      const { label, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-      return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue
+      const checkValue = $xeRadioButton.computeCheckValue
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.value === checkValue
+      }
+      return props.value === checkValue
     }
   },
   methods: {
@@ -146,26 +159,21 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     changeEvent (evnt: Event) {
       const $xeRadioButton = this
-      const props = $xeRadioButton
 
       const isDisabled = $xeRadioButton.computeIsDisabled
       if (!isDisabled) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        $xeRadioButton.handleValue(radioValue, evnt)
+        const checkValue = $xeRadioButton.computeCheckValue
+        $xeRadioButton.handleValue(checkValue, evnt)
       }
     },
     clickEvent  (evnt: Event) {
       const $xeRadioButton = this
-      const props = $xeRadioButton
-      const $xeRadioGroup = $xeRadioButton.$xeRadioGroup
 
       const isDisabled = $xeRadioButton.computeIsDisabled
       const isStrict = $xeRadioButton.computeStrict
       if (!isDisabled && !isStrict) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
+        const isChecked = $xeRadioButton.computeIsChecked
+        if (isChecked) {
           $xeRadioButton.handleValue(null, evnt)
         }
       }
@@ -180,12 +188,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const slots = $xeRadioButton.$scopedSlots
       const $xeRadioGroup = $xeRadioButton.$xeRadioGroup
 
-      const { label, icon, content, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
+      const { icon, content } = props
       const vSize = $xeRadioButton.computeSize
       const isDisabled = $xeRadioButton.computeIsDisabled
       const name = $xeRadioButton.computeName
-      const isChecked = $xeRadioButton.computeChecked
+      const isChecked = $xeRadioButton.computeIsChecked
+      const checkValue = $xeRadioButton.computeCheckValue
       const defaultSlot = slots.default
 
       if ($xeRadioGroup) {
@@ -222,7 +230,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }
       }
       return h('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--button', {
           [`size--${vSize}`]: vSize,
           'is--disabled': isDisabled
@@ -269,6 +277,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       ])
     }
   },
+  mounted () {
+    const $xeRadioButton = this
+    const props = $xeRadioButton
+
+    if (props.label !== null) {
+      warnLog('vxe.error.delProp', ['label', 'checked-value'])
+    }
+  },
   render (this: any, h) {
     return this.renderVN(h)
   }

package/packages/radio/src/radio.ts

@@ -3,9 +3,12 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
 import { getConfig, createEvent, globalMixins, getIcon, renderEmptyElement } from '../../ui'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeRadioPropTypes, RadioReactData, VxeRadioEmits, RadioGroupPrivateComputed, VxeRadioGroupConstructor, VxeRadioGroupPrivateMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeComponentPermissionInfo, VxeComponentSizeType, VxeFormDefines, ValueOf } from '../../../types'
 
+const { warnLog } = createComponentLog('radio')
+
 export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeRadio',
   mixins: [
@@ -36,6 +39,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean] as PropType<VxeRadioPropTypes.Label>,
@@ -70,6 +74,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
       formItemInfo(): VxeFormDefines.ProvideItemInfo | null
       $xeRadioGroup(): (VxeRadioGroupConstructor & RadioGroupPrivateComputed & VxeRadioGroupPrivateMethods) | null
     }),
+    computeCheckValue () {
+      const $xeRadio = this
+      const props = $xeRadio
+
+      const { checkedValue, label } = props
+      return XEUtils.isUndefined(checkedValue) ? label : checkedValue
+    },
     computeIsDisabled () {
       const $xeRadio = this
       const $xeRadioGroup = $xeRadio.$xeRadioGroup
@@ -97,14 +108,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeRadioGroup = $xeRadio.$xeRadioGroup
       return $xeRadioGroup ? $xeRadioGroup.strict : props.strict
     },
-    computeChecked () {
+    computeIsChecked () {
       const $xeRadio = this
       const props = $xeRadio
-
       const $xeRadioGroup = $xeRadio.$xeRadioGroup
-      const { label, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-      return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue
+
+      const checkValue = $xeRadio.computeCheckValue
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.value === checkValue
+      }
+      return props.value === checkValue
     }
   },
   methods: {
@@ -147,26 +160,21 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     changeEvent  (evnt: Event) {
       const $xeRadio = this
-      const props = $xeRadio
 
       const isDisabled = $xeRadio.computeIsDisabled
       if (!isDisabled) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        $xeRadio.handleValue(radioValue, evnt)
+        const checkValue = $xeRadio.computeCheckValue
+        $xeRadio.handleValue(checkValue, evnt)
       }
     },
     clickEvent  (evnt: Event) {
       const $xeRadio = this
-      const props = $xeRadio
-      const $xeRadioGroup = $xeRadio.$xeRadioGroup
 
       const isDisabled = $xeRadio.computeIsDisabled
       const isStrict = $xeRadio.computeStrict
       if (!isDisabled && !isStrict) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
+        const isChecked = $xeRadio.computeIsChecked
+        if (isChecked) {
           $xeRadio.handleValue(null, evnt)
         }
       }
@@ -181,13 +189,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeRadio
       const $xeRadioGroup = $xeRadio.$xeRadioGroup
 
-      const { label, content, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
+      const { content } = props
       const slots = $xeRadio.$scopedSlots
       const vSize = $xeRadio.computeSize
       const isDisabled = $xeRadio.computeIsDisabled
       const name = $xeRadio.computeName
-      const isChecked = $xeRadio.computeChecked
+      const isChecked = $xeRadio.computeIsChecked
+      const checkValue = $xeRadio.computeCheckValue
       const defaultSlot = slots.default
 
       if ($xeRadioGroup) {
@@ -209,7 +217,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }
       }
       return h('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--default', {
           [`size--${vSize}`]: vSize,
           'is--checked': isChecked,
@@ -243,6 +251,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       ])
     }
   },
+  mounted () {
+    const $xeRadio = this
+    const props = $xeRadio
+
+    if (props.label !== null) {
+      warnLog('vxe.error.delProp', ['label', 'checked-value'])
+    }
+  },
   render (this: any, h) {
     return this.renderVN(h)
   }

package/packages/upload/src/upload.ts

@@ -732,14 +732,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return ''
     },
-    handleChange (value: VxeUploadDefines.FileObjItem[]) {
+    handleChangeEvent (evnt: Event | null, vals: VxeUploadDefines.FileObjItem[]) {
       const $xeUpload = this
       const props = $xeUpload
 
       const { singleMode, urlMode, urlArgs } = props
       const urlProp = $xeUpload.computeUrlProp
       const nameProp = $xeUpload.computeNameProp
-      let restList = value ? value.slice(0) : []
+      let restList = vals ? vals.slice(0) : []
       if (urlMode) {
         restList = restList.map(item => {
           const url = item[urlProp]
@@ -754,7 +754,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
           return url
         })
       }
-      $xeUpload.emitModel(singleMode ? (restList[0] || null) : restList)
+      const value = singleMode ? (restList[0] || null) : restList
+      $xeUpload.emitModel(value)
+      $xeUpload.dispatchEvent('change', { value }, evnt)
+      return value
     },
     getThumbnailFileUrl (item: VxeUploadDefines.FileObjItem) {
       const $xeUpload = this
@@ -887,6 +890,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           if (cacheItem) {
             cacheItem.percent = 100
             cacheItem.status = 'success'
+            cacheItem.response = res
           }
           // 处理动态字段双向绑定问题
           // Object.assign(item, res)
@@ -899,6 +903,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           const cacheItem = fileCacheMaps[fileKey]
           if (cacheItem) {
             cacheItem.status = 'error'
+            cacheItem.response = res
           }
           if (showErrorStatus) {
             // 处理动态字段双向绑定问题
@@ -928,7 +933,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return Promise.resolve()
     },
-    handleReUpload (item: VxeUploadDefines.FileObjItem) {
+    handleReUploadEvent (evnt: MouseEvent, item: VxeUploadDefines.FileObjItem) {
       const $xeUpload = this
       const props = $xeUpload
       const reactData = $xeUpload.reactData
@@ -945,7 +950,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         cacheItem.percent = 0
         $xeUpload.handleUploadResult(item, file).then(() => {
           if (urlMode) {
-            $xeUpload.handleChange(reactData.fileList)
+            $xeUpload.handleChangeEvent(evnt, reactData.fileList)
           }
         })
       }
@@ -1056,7 +1061,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           }
         }
         const item = fileObj
@@ -1075,9 +1081,19 @@ export default /* define-vxe-component start */ defineVxeComponent({
         $xeUpload.dispatchEvent('add', { option: item }, evnt)
       })
       Promise.all(uploadPromiseRests).then(() => {
+        const { fileCacheMaps } = reactData
         const restFileList = reactData.fileList
-        $xeUpload.dispatchEvent('upload-queue-end', { options: restFileList, files: selectFiles }, evnt)
-        $xeUpload.handleChange(restFileList)
+        const uploadResults: VxeUploadDefines.UploadResultObj[] = restFileList.map(option => {
+          const fileKey = $xeUpload.getFieldKey(option)
+          const cacheItem = fileCacheMaps[fileKey]
+          return {
+            option,
+            status: cacheItem ? cacheItem.status : null,
+            response: cacheItem ? cacheItem.response : null
+          }
+        })
+        const value = $xeUpload.handleChangeEvent(evnt, restFileList)
+        $xeUpload.dispatchEvent('upload-queue-end', { value, options: restFileList, results: uploadResults, files: selectFiles }, evnt)
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt as any, formItemInfo.itemConfig.field, restFileList)
@@ -1121,7 +1137,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const { fileList } = reactData
       fileList.splice(index, 1)
-      $xeUpload.handleChange(fileList)
+      $xeUpload.handleChangeEvent(evnt, fileList)
       // 自动更新校验状态
       if ($xeForm && formItemInfo) {
         $xeForm.triggerItemEvent(evnt || { type: 'remove' }, formItemInfo.itemConfig.field, fileList)
@@ -1647,8 +1663,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
                       content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload')
                     },
                     on: {
-                      click () {
-                        $xeUpload.handleReUpload(item)
+                      click (evnt: MouseEvent) {
+                        $xeUpload.handleReUploadEvent(evnt, item)
                       }
                     }
                   })
@@ -1928,8 +1944,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload')
                       },
                       on: {
-                        click () {
-                          $xeUpload.handleReUpload(item)
+                        click (evnt: MouseEvent) {
+                          $xeUpload.handleReUploadEvent(evnt, item)
                         }
                       }
                     })

package/types/components/checkbox-button.d.ts

@@ -21,6 +21,7 @@ export namespace VxeCheckboxButtonPropTypes {
   export type ModelValue = any
   /**
    * 已废弃，被 CheckedValue 替换
+   * @deprecated
    */
   export type Label = VxeCheckboxPropTypes.Label
   export type Title = VxeCheckboxPropTypes.Title
@@ -36,6 +37,7 @@ export interface VxeCheckboxButtonProps {
   modelValue?: VxeCheckboxButtonPropTypes.ModelValue
   /**
    * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeCheckboxButtonPropTypes.Label
   title?: VxeCheckboxButtonPropTypes.Title
@@ -72,6 +74,7 @@ export namespace VxeCheckboxButtonDefines {
   }
 
   export interface ChangeParams {
+    value: any
     label: any
   }
   export interface ChangeEventParams extends CheckboxButtonEventParams, ChangeParams { }

package/types/components/checkbox.d.ts

@@ -18,6 +18,10 @@ export interface VxeCheckboxPrivateRef extends CheckboxPrivateRef { }
 export namespace VxeCheckboxPropTypes {
   export type Size = VxeComponentSizeType
   export type ModelValue = string | number | boolean | null
+  /**
+   * 已废弃，被 CheckedValue 替换
+   * @deprecated
+   */
   export type Label = string | number
   export type Indeterminate = boolean
   export type Title = string | number
@@ -27,14 +31,15 @@ export namespace VxeCheckboxPropTypes {
   export type Disabled = boolean
 }
 
-export interface VxeCheckboxProps {
+export type VxeCheckboxProps = {
   size?: VxeCheckboxPropTypes.Size
   /**
    * 绑定值
    */
-  value?: VxeCheckboxPropTypes.ModelValue
+  modelValue?: VxeCheckboxPropTypes.ModelValue
   /**
-   * 只对 checkbox-group 有效，值
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeCheckboxPropTypes.Label
   /**

package/types/components/radio-button.d.ts

@@ -28,13 +28,14 @@ export namespace VxeRadioButtonPropTypes {
 
   /**
    * 已废弃，被 CheckedValue 替换
+   * @deprecated
    */
   export type Label = VxeRadioPropTypes.Label
 }
 
 export interface VxeRadioButtonProps {
   size?: VxeRadioButtonPropTypes.Size
-  value?: VxeRadioButtonPropTypes.ModelValue
+  modelValue?: VxeRadioButtonPropTypes.ModelValue
   /**
    * 严格模式，不允许取消
    */
@@ -46,7 +47,8 @@ export interface VxeRadioButtonProps {
   disabled?: VxeRadioButtonPropTypes.Disabled
 
   /**
-   * 已废弃，被 checkedValue 替换
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeRadioButtonPropTypes.Label
 }

package/types/components/radio.d.ts

@@ -19,6 +19,10 @@ export namespace VxeRadioPropTypes {
   export type Size = VxeComponentSizeType
   export type Strict = boolean
   export type ModelValue = any
+  /**
+   * 已废弃，被 CheckedValue 替换
+   * @deprecated
+   */
   export type Label = any
   export type CheckedValue = any
   export type Title = string | number
@@ -36,7 +40,7 @@ export interface VxeRadioProps {
   /**
    * 绑定值
    */
-  value?: VxeRadioPropTypes.ModelValue
+  modelValue?: VxeRadioPropTypes.ModelValue
   /**
    * 值
    */
@@ -59,7 +63,8 @@ export interface VxeRadioProps {
   name?: VxeRadioPropTypes.Name
 
   /**
-   * 已废弃，被 checkedValue 替换
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeRadioPropTypes.Label
 }

package/types/components/table.d.ts

@@ -994,6 +994,7 @@ export namespace VxeTablePropTypes {
       resize?: VxeModalPropTypes.Resize
       escClosable?: VxeModalPropTypes.EscClosable
       maskClosable?: VxeModalPropTypes.MaskClosable
+      transfer?: VxeDrawerPropTypes.Transfer
     }
     /**
      * 抽屉模式配置项，用于 mode='drawer'
@@ -1008,6 +1009,7 @@ export namespace VxeTablePropTypes {
       resize?: VxeDrawerPropTypes.Resize
       escClosable?: VxeDrawerPropTypes.EscClosable
       maskClosable?: VxeDrawerPropTypes.MaskClosable
+      transfer?: VxeDrawerPropTypes.Transfer
     }
     /**
      * 默认模式配置项
@@ -1015,6 +1017,8 @@ export namespace VxeTablePropTypes {
     popupOptions?: {
       mode?: 'inside' | 'outside' | 'auto' | '' | null
       width?: number | string
+      minWidth?: number | string
+      maxWidth?: number | string
       maxHeight?: number | string
       transfer?: boolean
     }
@@ -7026,7 +7030,8 @@ export namespace VxeTableDefines {
     activeWrapper: boolean
     visible: boolean
     maxHeight: number | string | null
-    popupStyle: VxeComponentStyleType
+    defPopupStyle: VxeComponentStyleType
+    panePopupStyle: VxeComponentStyleType
     oldSortMaps: Record<string, number>
     oldFixedMaps: Record<string, VxeColumnPropTypes.Fixed>
     oldVisibleMaps: Record<string, boolean>

package/types/components/upload.d.ts

@@ -312,6 +312,7 @@ export type VxeUploadEmits = [
   'model-value',
   'modelValue',
   'input',
+  'change',
   'add',
   'remove',
   'remove-fail',
@@ -352,17 +353,28 @@ export namespace VxeUploadDefines {
     file: File
   }>
 
+  export interface UploadResultObj {
+    option: VxeUploadDefines.FileObjItem
+    status: 'error' | 'success' | 'pending' | null
+    response: any
+  }
+
   export interface FileCacheItem {
     file: File
     loading: boolean
     status: 'error' | 'success' | 'pending'
     percent: number
+    response: any
   }
 
   export interface FileObjItem {
     [key: string]: any
   }
 
+  export interface ChangeEventParams {
+    value: VxeUploadPropTypes.ModelValue
+  }
+
   export interface AddParams {
     options: VxeUploadDefines.FileObjItem[]
     option: VxeUploadDefines.FileObjItem
@@ -397,7 +409,9 @@ export namespace VxeUploadDefines {
     files: File[]
   }
   export interface UploadQueueEndEventParams extends UploadQueueStartEventParams {
+    value: VxeUploadPropTypes.ModelValue
     options: VxeUploadDefines.FileObjItem[]
+    results: VxeUploadDefines.UploadResultObj[]
   }
 
   export interface MoreVisibleEventParams {
@@ -407,6 +421,7 @@ export namespace VxeUploadDefines {
 
 export type VxeUploadEventProps = {
   'onUpdate:modelValue'?: VxeUploadEvents.UpdateModelValue
+  onChange?: VxeUploadEvents.Change
   onAdd?: VxeUploadEvents.Add
   onRemove?: VxeUploadEvents.Remove
   onRemoveFail?: VxeUploadEvents.RemoveFail
@@ -423,6 +438,7 @@ export type VxeUploadEventProps = {
 
 export interface VxeUploadListeners {
   'update:modelValue'?: VxeUploadEvents.UpdateModelValue
+  change?: VxeUploadEvents.Change
   add?: VxeUploadEvents.Add
   remove?: VxeUploadEvents.Remove
   removeFail?: VxeUploadEvents.RemoveFail
@@ -439,6 +455,7 @@ export interface VxeUploadListeners {
 
 export namespace VxeUploadEvents {
   export type UpdateModelValue = (modelValue: VxeUploadPropTypes.ModelValue) => void
+  export type Change = (params: VxeUploadDefines.ChangeEventParams) => void
   export type Add = (params: VxeUploadDefines.AddEventParams) => void
   export type Remove = (params: VxeUploadDefines.RemoveEventParams) => void
   export type RemoveFail = (params: VxeUploadDefines.RemoveFailEventParams) => void