vxe-pc-ui 4.15.19 → 4.15.21

package/packages/radio/src/button.ts

@@ -1,11 +1,14 @@
-import { h, computed, reactive, inject, PropType } from 'vue'
+import { h, computed, reactive, inject, PropType, onMounted } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
 import { getConfig, createEvent, useSize, renderEmptyElement } from '../../ui'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeRadioButtonPropTypes, VxeRadioGroupConstructor, RadioButtonReactData, RadioButtonPrivateMethods, VxeRadioButtonConstructor, VxeRadioButtonEmits, VxeRadioGroupPrivateMethods, RadioButtonMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf } from '../../../types'
 
+const { warnLog } = createComponentLog('radio-button')
+
 export default defineVxeComponent({
   name: 'VxeRadioButton',
   props: {
@@ -32,6 +35,7 @@ export default defineVxeComponent({
 
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean] as PropType<VxeRadioButtonPropTypes.Label>,
@@ -63,6 +67,11 @@ export default defineVxeComponent({
       reactData
     } as unknown as VxeRadioButtonConstructor
 
+    const computeCheckValue = computed(() => {
+      const { checkedValue, label } = props
+      return XEUtils.isUndefined(checkedValue) ? label : checkedValue
+    })
+
     const computeIsDisabled = computed(() => {
       const { disabled } = props
       if (disabled === null) {
@@ -84,10 +93,12 @@ export default defineVxeComponent({
       return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict
     })
 
-    const computeChecked = computed(() => {
-      const { label, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-      return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue
+    const computeIsChecked = computed(() => {
+      const checkValue = computeCheckValue.value
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.props.modelValue === checkValue
+      }
+      return props.modelValue === checkValue
     })
 
     const dispatchEvent = (type: ValueOf<VxeRadioButtonEmits>, params: Record<string, any>, evnt: Event | null) => {
@@ -120,9 +131,8 @@ export default defineVxeComponent({
     const changeEvent = (evnt: Event) => {
       const isDisabled = computeIsDisabled.value
       if (!isDisabled) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        handleValue(radioValue, evnt)
+        const checkValue = computeCheckValue.value
+        handleValue(checkValue, evnt)
       }
     }
 
@@ -130,21 +140,20 @@ export default defineVxeComponent({
       const isDisabled = computeIsDisabled.value
       const isStrict = computeStrict.value
       if (!isDisabled && !isStrict) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.props.modelValue : props.modelValue)) {
+        const isChecked = computeIsChecked.value
+        if (isChecked) {
           handleValue(null, evnt)
         }
       }
     }
 
     const renderVN = () => {
-      const { label, icon, content, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
+      const { icon, content } = props
       const vSize = computeSize.value
       const isDisabled = computeIsDisabled.value
       const name = computeName.value
-      const isChecked = computeChecked.value
+      const isChecked = computeIsChecked.value
+      const checkValue = computeCheckValue.value
       const defaultSlot = slots.default
 
       if ($xeRadioGroup) {
@@ -182,7 +191,7 @@ export default defineVxeComponent({
         }
       }
       return h('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--button', {
           [`size--${vSize}`]: vSize,
           'is--disabled': isDisabled
@@ -221,6 +230,12 @@ export default defineVxeComponent({
       ])
     }
 
+    onMounted(() => {
+      if (props.label !== null) {
+        warnLog('vxe.error.delProp', ['label', 'checked-value'])
+      }
+    })
+
     $xeRadioButton.renderVN = renderVN
 
     return renderVN

package/packages/radio/src/radio.ts

@@ -1,11 +1,14 @@
-import { h, computed, inject, PropType, reactive } from 'vue'
+import { h, computed, inject, PropType, reactive, onMounted } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
 import { getConfig, createEvent, useSize, getIcon, renderEmptyElement } from '../../ui'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeRadioPropTypes, VxeRadioConstructor, VxeRadioEmits, RadioReactData, RadioPrivateMethods, VxeRadioGroupConstructor, VxeRadioGroupPrivateMethods, RadioMethods, VxeFormConstructor, ValueOf, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 
+const { warnLog } = createComponentLog('radio')
+
 export default defineVxeComponent({
   name: 'VxeRadio',
   props: {
@@ -32,6 +35,7 @@ export default defineVxeComponent({
 
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean] as PropType<VxeRadioPropTypes.Label>,
@@ -63,6 +67,11 @@ export default defineVxeComponent({
 
     const { computeSize } = useSize(props)
 
+    const computeCheckValue = computed(() => {
+      const { checkedValue, label } = props
+      return XEUtils.isUndefined(checkedValue) ? label : checkedValue
+    })
+
     const computeIsDisabled = computed(() => {
       const { disabled } = props
       if (disabled === null) {
@@ -84,10 +93,12 @@ export default defineVxeComponent({
       return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict
     })
 
-    const computeChecked = computed(() => {
-      const { label, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-      return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue
+    const computeIsChecked = computed(() => {
+      const checkValue = computeCheckValue.value
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.props.modelValue === checkValue
+      }
+      return props.modelValue === checkValue
     })
 
     const handleValue = (checkedValue: VxeRadioPropTypes.CheckedValue, evnt: Event) => {
@@ -107,9 +118,8 @@ export default defineVxeComponent({
     const changeEvent = (evnt: Event) => {
       const isDisabled = computeIsDisabled.value
       if (!isDisabled) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        handleValue(radioValue, evnt)
+        const checkValue = computeCheckValue.value
+        handleValue(checkValue, evnt)
       }
     }
 
@@ -117,9 +127,8 @@ export default defineVxeComponent({
       const isDisabled = computeIsDisabled.value
       const isStrict = computeStrict.value
       if (!isDisabled && !isStrict) {
-        const { label, checkedValue } = props
-        const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.props.modelValue : props.modelValue)) {
+        const isChecked = computeIsChecked.value
+        if (isChecked) {
           handleValue(null, evnt)
         }
       }
@@ -139,12 +148,12 @@ export default defineVxeComponent({
     Object.assign($xeRadio, radioMethods, radioPrivateMethods)
 
     const renderVN = () => {
-      const { label, content, checkedValue } = props
-      const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
+      const { content } = props
       const vSize = computeSize.value
       const isDisabled = computeIsDisabled.value
       const name = computeName.value
-      const isChecked = computeChecked.value
+      const isChecked = computeIsChecked.value
+      const checkValue = computeCheckValue.value
       const defaultSlot = slots.default
 
       if ($xeRadioGroup) {
@@ -167,7 +176,7 @@ export default defineVxeComponent({
         }
       }
       return h('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--default', {
           [`size--${vSize}`]: vSize,
           'is--checked': isChecked,
@@ -193,6 +202,12 @@ export default defineVxeComponent({
       ])
     }
 
+    onMounted(() => {
+      if (props.label !== null) {
+        warnLog('vxe.error.delProp', ['label', 'checked-value'])
+      }
+    })
+
     $xeRadio.renderVN = renderVN
 
     return $xeRadio

package/packages/upload/src/upload.ts

@@ -217,6 +217,7 @@ export default defineVxeComponent({
   },
   emits: [
     'update:modelValue',
+    'change',
     'add',
     'remove',
     'remove-fail',
@@ -491,11 +492,11 @@ export default defineVxeComponent({
       emit('update:modelValue', value)
     }
 
-    const handleChange = (value: VxeUploadDefines.FileObjItem[]) => {
+    const handleChangeEvent = (evnt: Event | null, vals: VxeUploadDefines.FileObjItem[]) => {
       const { singleMode, urlMode, urlArgs } = props
       const urlProp = computeUrlProp.value
       const nameProp = computeNameProp.value
-      let restList = value ? value.slice(0) : []
+      let restList = vals ? vals.slice(0) : []
       if (urlMode) {
         restList = restList.map(item => {
           const url = item[urlProp]
@@ -510,7 +511,10 @@ export default defineVxeComponent({
           return url
         })
       }
-      emitModel(singleMode ? (restList[0] || null) : restList)
+      const value = singleMode ? (restList[0] || null) : restList
+      emitModel(value)
+      dispatchEvent('change', { value }, evnt)
+      return value
     }
 
     const getThumbnailFileUrl = (item: VxeUploadDefines.FileObjItem) => {
@@ -631,6 +635,7 @@ export default defineVxeComponent({
           if (cacheItem) {
             cacheItem.percent = 100
             cacheItem.status = 'success'
+            cacheItem.response = res
           }
           Object.assign(item, res)
           dispatchEvent('upload-success', { option: item, data: res }, null)
@@ -639,6 +644,7 @@ export default defineVxeComponent({
           const cacheItem = fileCacheMaps[fileKey]
           if (cacheItem) {
             cacheItem.status = 'error'
+            cacheItem.response = res
           }
           if (showErrorStatus) {
             Object.assign(item, res)
@@ -665,7 +671,7 @@ export default defineVxeComponent({
       return Promise.resolve()
     }
 
-    const handleReUpload = (item: VxeUploadDefines.FileObjItem) => {
+    const handleReUploadEvent = (evnt: MouseEvent, item: VxeUploadDefines.FileObjItem) => {
       const { uploadMethod, urlMode } = props
       const { fileCacheMaps } = reactData
       const fileKey = getFieldKey(item)
@@ -678,7 +684,7 @@ export default defineVxeComponent({
         cacheItem.percent = 0
         handleUploadResult(item, file).then(() => {
           if (urlMode) {
-            handleChange(reactData.fileList)
+            handleChangeEvent(evnt, reactData.fileList)
           }
         })
       }
@@ -784,7 +790,8 @@ export default defineVxeComponent({
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           }
         }
         const item = reactive(fileObj)
@@ -803,9 +810,19 @@ export default defineVxeComponent({
         dispatchEvent('add', { option: item }, evnt)
       })
       Promise.all(uploadPromiseRests).then(() => {
+        const { fileCacheMaps } = reactData
         const restFileList = reactData.fileList
-        dispatchEvent('upload-queue-end', { options: restFileList, files: selectFiles }, evnt)
-        handleChange(restFileList)
+        const uploadResults: VxeUploadDefines.UploadResultObj[] = restFileList.map(option => {
+          const fileKey = getFieldKey(option)
+          const cacheItem = fileCacheMaps[fileKey]
+          return {
+            option,
+            status: cacheItem ? cacheItem.status : null,
+            response: cacheItem ? cacheItem.response : null
+          }
+        })
+        const value = handleChangeEvent(evnt, restFileList)
+        dispatchEvent('upload-queue-end', { value, options: restFileList, results: uploadResults, files: selectFiles }, evnt)
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt as any, formItemInfo.itemConfig.field, restFileList)
@@ -842,7 +859,7 @@ export default defineVxeComponent({
     const handleRemoveEvent = (evnt: Event | null, item: VxeUploadDefines.FileObjItem, index: number) => {
       const { fileList } = reactData
       fileList.splice(index, 1)
-      handleChange(fileList)
+      handleChangeEvent(evnt, fileList)
       // 自动更新校验状态
       if ($xeForm && formItemInfo) {
         $xeForm.triggerItemEvent(evnt || { type: 'remove' }, formItemInfo.itemConfig.field, fileList)
@@ -1483,8 +1500,8 @@ export default defineVxeComponent({
                     mode: 'text',
                     status: 'primary',
                     content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
-                    onClick () {
-                      handleReUpload(item)
+                    onClick (evnt) {
+                      handleReUploadEvent(evnt, item)
                     }
                   })
                 ])
@@ -1730,8 +1747,8 @@ export default defineVxeComponent({
                       mode: 'text',
                       status: 'primary',
                       content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
-                      onClick () {
-                        handleReUpload(item)
+                      onClick (evnt) {
+                        handleReUploadEvent(evnt, item)
                       }
                     })
                   ])

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

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

package/types/components/checkbox.d.ts

@@ -25,6 +25,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
@@ -41,7 +45,8 @@ export type VxeCheckboxProps = {
    */
   modelValue?: VxeCheckboxPropTypes.ModelValue
   /**
-   * 只对 checkbox-group 有效，值
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeCheckboxPropTypes.Label
   /**

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

@@ -35,6 +35,7 @@ export namespace VxeRadioButtonPropTypes {
 
   /**
    * 已废弃，被 CheckedValue 替换
+   * @deprecated
    */
   export type Label = VxeRadioPropTypes.Label
 }
@@ -53,7 +54,8 @@ export interface VxeRadioButtonProps {
   disabled?: VxeRadioButtonPropTypes.Disabled
 
   /**
-   * 已废弃，被 checkedValue 替换
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeRadioButtonPropTypes.Label
 }

package/types/components/radio.d.ts

@@ -26,6 +26,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
@@ -66,7 +70,8 @@ export interface VxeRadioProps {
   name?: VxeRadioPropTypes.Name
 
   /**
-   * 已废弃，被 checkedValue 替换
+   * 已废弃，被 checked-value 替换
+   * @deprecated
    */
   label?: VxeRadioPropTypes.Label
 }

package/types/components/table.d.ts

@@ -1016,6 +1016,7 @@ export namespace VxeTablePropTypes {
       resize?: VxeModalPropTypes.Resize
       escClosable?: VxeModalPropTypes.EscClosable
       maskClosable?: VxeModalPropTypes.MaskClosable
+      transfer?: VxeModalPropTypes.Transfer
     }
     /**
      * 抽屉模式配置项，用于 mode='drawer'
@@ -1030,6 +1031,7 @@ export namespace VxeTablePropTypes {
       resize?: VxeDrawerPropTypes.Resize
       escClosable?: VxeDrawerPropTypes.EscClosable
       maskClosable?: VxeDrawerPropTypes.MaskClosable
+      transfer?: VxeDrawerPropTypes.Transfer
     }
     /**
      * 默认模式配置项
@@ -1037,6 +1039,8 @@ export namespace VxeTablePropTypes {
     popupOptions?: {
       mode?: 'inside' | 'outside' | 'auto' | '' | null
       width?: number | string
+      minWidth?: number | string
+      maxWidth?: number | string
       maxHeight?: number | string
       transfer?: boolean
     }
@@ -6994,7 +6998,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

@@ -317,6 +317,7 @@ export interface VxeUploadPrivateMethods extends UploadPrivateMethods { }
 
 export type VxeUploadEmits = [
   'update:modelValue',
+  'change',
   'add',
   'remove',
   'remove-fail',
@@ -357,17 +358,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
@@ -402,7 +414,9 @@ export namespace VxeUploadDefines {
     files: File[]
   }
   export interface UploadQueueEndEventParams extends UploadQueueStartEventParams {
+    value: VxeUploadPropTypes.ModelValue
     options: VxeUploadDefines.FileObjItem[]
+    results: VxeUploadDefines.UploadResultObj[]
   }
 
   export interface MoreVisibleEventParams {
@@ -412,6 +426,7 @@ export namespace VxeUploadDefines {
 
 export type VxeUploadEventProps = {
   'onUpdate:modelValue'?: VxeUploadEvents.UpdateModelValue
+  onChange?: VxeUploadEvents.Change
   onAdd?: VxeUploadEvents.Add
   onRemove?: VxeUploadEvents.Remove
   onRemoveFail?: VxeUploadEvents.RemoveFail
@@ -428,6 +443,7 @@ export type VxeUploadEventProps = {
 
 export interface VxeUploadListeners {
   'update:modelValue'?: VxeUploadEvents.UpdateModelValue
+  change?: VxeUploadEvents.Change
   add?: VxeUploadEvents.Add
   remove?: VxeUploadEvents.Remove
   removeFail?: VxeUploadEvents.RemoveFail
@@ -444,6 +460,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