vxe-pc-ui 4.6.8 → 4.6.10

package/packages/ui/index.ts

@@ -11,16 +11,12 @@ VxeUI.uiVersion = version
 VxeUI.dynamicApp = dynamicApp
 
 export function config (options?: VxeGlobalConfig) {
-  if (process.env.VUE_APP_VXE_ENV === 'development') {
-    warnLog('vxe.error.delFunc', ['config', 'setConfig'])
-  }
+  warnLog('vxe.error.delFunc', ['config', 'setConfig'])
   return setConfig(options)
 }
 
 export function setup (options?: VxeGlobalConfig) {
-  if (process.env.VUE_APP_VXE_ENV === 'development') {
-    warnLog('vxe.error.delFunc', ['setup', 'setConfig'])
-  }
+  warnLog('vxe.error.delFunc', ['setup', 'setConfig'])
   return setConfig(options)
 }
 

package/packages/upload/src/upload.ts

@@ -1,4 +1,4 @@
-import { defineComponent, ref, h, reactive, watch, computed, TransitionGroup, PropType, inject, createCommentVNode, onUnmounted, onMounted } from 'vue'
+import { defineComponent, ref, h, reactive, watch, computed, TransitionGroup, PropType, inject, onUnmounted, onMounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, useSize, createEvent, globalEvents, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -1245,12 +1245,12 @@ export default defineComponent({
                 class: getIcon().UPLOAD_LOADING
               })
             ])
-            : createCommentVNode(),
+            : renderEmptyElement($xeUpload),
           showProgress && isLoading && cacheItem
             ? h('div', {
               class: 'vxe-upload--file-item-loading-text'
             }, progressText ? XEUtils.toFormatString(`${XEUtils.isFunction(progressText) ? progressText({}) : progressText}`, { percent: cacheItem.percent }) : getI18n('vxe.upload.uploadProgress', [cacheItem.percent]))
-            : createCommentVNode(),
+            : renderEmptyElement($xeUpload),
           showErrorStatus && isError
             ? h('div', {
               class: 'vxe-upload--image-item-error'
@@ -1265,7 +1265,7 @@ export default defineComponent({
                 }
               })
             ])
-            : createCommentVNode(),
+            : renderEmptyElement($xeUpload),
           h('div', {
             class: 'vxe-upload--file-item-btn-wrapper'
           }, [
@@ -1273,7 +1273,7 @@ export default defineComponent({
               ? h('div', {
                 class: 'vxe-upload--file-item-corner'
               }, getSlotVNs(cornerSlot({ option: item, isMoreView, readonly: formReadonly })))
-              : createCommentVNode(),
+              : renderEmptyElement($xeUpload),
             showDownloadButton && !isLoading
               ? h('div', {
                 class: 'vxe-upload--file-item-download-btn',
@@ -1285,7 +1285,7 @@ export default defineComponent({
                   class: getIcon().UPLOAD_FILE_DOWNLOAD
                 })
               ])
-              : createCommentVNode(),
+              : renderEmptyElement($xeUpload),
             showRemoveButton && !formReadonly && !isDisabled && !isLoading
               ? h('div', {
                 class: 'vxe-upload--file-item-remove-btn',
@@ -1297,7 +1297,7 @@ export default defineComponent({
                   class: getIcon().UPLOAD_FILE_REMOVE
                 })
               ])
-              : createCommentVNode()
+              : renderEmptyElement($xeUpload)
           ])
         ])
       })
@@ -1314,13 +1314,13 @@ export default defineComponent({
       const tipSlot = slots.tip || slots.hint
 
       if (formReadonly || !showUploadButton) {
-        return createCommentVNode()
+        return renderEmptyElement($xeUpload)
       }
       return h('div', {
         class: 'vxe-upload--file-action'
       }, [
         autoHiddenButton && overCount
-          ? createCommentVNode()
+          ? renderEmptyElement($xeUpload)
           : h('div', {
             class: 'vxe-upload--file-action-btn',
             onClick: clickEvent
@@ -1338,7 +1338,7 @@ export default defineComponent({
           ? h('div', {
             class: 'vxe-upload--file-action-tip'
           }, tipSlot ? getSlotVNs(tipSlot({ $upload: $xeUpload })) : `${defTipText}`)
-          : createCommentVNode()
+          : renderEmptyElement($xeUpload)
       ])
     }
 
@@ -1363,7 +1363,7 @@ export default defineComponent({
       }, showList
         ? [
             showMoreButton && moreConfig && isHorizontal
-              ? createCommentVNode()
+              ? renderEmptyElement($xeUpload)
               : renderFileAction(true),
             (currList.length || (showMoreButton && isHorizontal))
               ? h('div', {
@@ -1385,7 +1385,7 @@ export default defineComponent({
                           class: 'vxe-upload--file-list'
                         }, renderFileItemList(currList, false))
                     )
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeUpload),
                 showMoreButton && overMaxNum
                   ? h('div', {
                     class: 'vxe-upload--file-over-more'
@@ -1397,12 +1397,12 @@ export default defineComponent({
                       onClick: handleMoreEvent
                     })
                   ])
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeUpload),
                 showMoreButton && moreConfig && isHorizontal
                   ? renderFileAction(false)
-                  : createCommentVNode()
+                  : renderEmptyElement($xeUpload)
               ])
-              : createCommentVNode()
+              : renderEmptyElement($xeUpload)
           ]
         : [
             renderFileAction(false)
@@ -1469,9 +1469,9 @@ export default defineComponent({
                   ? h('div', {
                     class: 'vxe-upload--image-item-loading-text'
                   }, progressText ? XEUtils.toFormatString(`${XEUtils.isFunction(progressText) ? progressText({}) : progressText}`, { percent: cacheItem.percent }) : getI18n('vxe.upload.uploadProgress', [cacheItem.percent]))
-                  : createCommentVNode()
+                  : renderEmptyElement($xeUpload)
               ])
-              : createCommentVNode(),
+              : renderEmptyElement($xeUpload),
             !isLoading
               ? (
                   isError && showErrorStatus
@@ -1497,7 +1497,7 @@ export default defineComponent({
                       })
                     ])
                 )
-              : createCommentVNode(),
+              : renderEmptyElement($xeUpload),
             h('div', {
               class: 'vxe-upload--image-item-btn-wrapper',
               onClick (evnt) {
@@ -1508,7 +1508,7 @@ export default defineComponent({
                 ? h('div', {
                   class: 'vxe-upload--file-item-corner'
                 }, getSlotVNs(cornerSlot({ option: item, isMoreView, readonly: formReadonly })))
-                : createCommentVNode(),
+                : renderEmptyElement($xeUpload),
               showRemoveButton && !formReadonly && !isDisabled && !isLoading
                 ? h('div', {
                   class: 'vxe-upload--image-item-remove-btn',
@@ -1521,7 +1521,7 @@ export default defineComponent({
                     class: getIcon().UPLOAD_IMAGE_REMOVE
                   })
                 ])
-                : createCommentVNode()
+                : renderEmptyElement($xeUpload)
             ])
           ])
         ])
@@ -1539,7 +1539,7 @@ export default defineComponent({
       const tipSlot = slots.tip || slots.hint
 
       if (formReadonly || !showUploadButton || (autoHiddenButton && overCount)) {
-        return createCommentVNode()
+        return renderEmptyElement($xeUpload)
       }
       return h('div', {
         key: 'action',
@@ -1563,17 +1563,17 @@ export default defineComponent({
                       class: buttonIcon || getIcon().UPLOAD_IMAGE_ADD
                     })
                   ])
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeUpload),
                 isMoreView || showButtonText
                   ? h('div', {
                     class: 'vxe-upload--image-action-content'
                   }, buttonText ? `${XEUtils.isFunction(buttonText) ? buttonText({}) : buttonText}` : getI18n('vxe.upload.imgBtnText'))
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeUpload),
                 showTipText && (defTipText || tipSlot)
                   ? h('div', {
                     class: 'vxe-upload--image-action-hint'
                   }, tipSlot ? getSlotVNs(tipSlot({ $upload: $xeUpload })) : `${defTipText}`)
-                  : createCommentVNode()
+                  : renderEmptyElement($xeUpload)
               ])
             ])
       ])
@@ -1616,7 +1616,7 @@ export default defineComponent({
                         onClick: handleMoreEvent
                       })
                     ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeUpload),
                   renderImageAction(false)
                 ])
               })
@@ -1634,7 +1634,7 @@ export default defineComponent({
                       onClick: handleMoreEvent
                     })
                   ])
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeUpload),
                 renderImageAction(false)
               ]))
           ]
@@ -1704,13 +1704,11 @@ export default defineComponent({
     })
 
     onMounted(() => {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (props.multiple && props.singleMode) {
-          errLog('vxe.error.errConflicts', ['multiple', 'single-mode'])
-        }
-        if (props.imageStyle) {
-          warnLog('vxe.error.delProp', ['image-style', 'image-config'])
-        }
+      if (props.multiple && props.singleMode) {
+        errLog('vxe.error.errConflicts', ['multiple', 'single-mode'])
+      }
+      if (props.imageStyle) {
+        warnLog('vxe.error.delProp', ['image-style', 'image-config'])
       }
 
       if (props.dragSort) {

package/types/components/button.d.ts

@@ -174,7 +174,8 @@ export type VxeButtonEmits = [
   'click',
   'mouseenter',
   'mouseleave',
-  'dropdown-click'
+  'dropdown-click',
+  'dropdownClick'
 ]
 
 export namespace VxeButtonDefines {

package/types/components/image-group.d.ts

@@ -1,5 +1,6 @@
 import { RenderFunction, SetupContext, Ref } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, ValueOf, VxeComponentSizeType } from '@vxe-ui/core'
+import { VxeImagePreviewPropTypes } from './image-preview'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
@@ -33,6 +34,7 @@ export namespace VxeImageGroupPropTypes {
     width?: number | string
     height?: number | string
   }
+  export type ToolbarConfig = VxeImagePreviewPropTypes.ToolbarConfig
   export type ShowPrintButton = boolean
   export type ShowDownloadButton = boolean
 }
@@ -42,6 +44,7 @@ export type VxeImageGroupProps = {
   showPreview?: VxeImageGroupPropTypes.ShowPreview
   urlList?: VxeImageGroupPropTypes.UrlList
   imageStyle?: VxeImageGroupPropTypes.ImageStyle
+  toolbarConfig?: VxeImageGroupPropTypes.ToolbarConfig
   showPrintButton?: VxeImageGroupPropTypes.ShowPrintButton
   showDownloadButton?: VxeImageGroupPropTypes.ShowDownloadButton
 }

package/types/components/image-preview.d.ts

@@ -31,6 +31,35 @@ export namespace VxeImagePreviewPropTypes {
   export type MarginSize = string | number
   export type ShowPrintButton = boolean
   export type ShowDownloadButton = boolean
+  export interface ToolbarConfig {
+    layouts?: ('PageNumber' | 'ZoomOut' | 'ZoomIn' | 'PctFull' | 'Pct11' | 'RotateLeft' | 'RotateRight' | 'Print' | 'Download')[]
+    zoomOut?: boolean | {
+      icon?: string
+    }
+    zoomIn?: boolean | {
+      icon?: string
+    }
+    pctFull?: boolean | {
+      icon?: string
+    }
+    pct11?: boolean | {
+      icon?: string
+    }
+    rotateLeft?: boolean | {
+      icon?: string
+    }
+    rotateRight?: boolean | {
+      icon?: string
+    }
+    print?: boolean | {
+      icon?: string
+    }
+    download?: boolean | {
+      icon?: string
+      beforeDownloadMethod?: BeforeDownloadMethod
+      downloadMethod?: DownloadMethod
+    }
+  }
   export type BeforeDownloadMethod = undefined | ((params: {
     $imagePreview: VxeImagePreviewConstructor
     url: any
@@ -49,6 +78,7 @@ export type VxeImagePreviewProps = {
   urlField?: VxeImagePreviewPropTypes.UrlField
   maskClosable?: VxeImagePreviewPropTypes.MaskClosable
   marginSize?: VxeImagePreviewPropTypes.MarginSize
+  toolbarConfig?: VxeImagePreviewPropTypes.ToolbarConfig
   showPrintButton?: VxeImagePreviewPropTypes.ShowPrintButton
   showDownloadButton?: VxeImagePreviewPropTypes.ShowDownloadButton
   downloadMethod?: VxeImagePreviewPropTypes.DownloadMethod
@@ -91,6 +121,8 @@ export namespace VxeImagePreviewDefines {
     $imagePreview: VxeImagePreviewConstructor
   }
 
+  export type ToolbarCode = 'zoomOut' | 'zoomIn' | 'pctFull' | 'pct11' | 'rotateLeft' | 'rotateRight' | 'print' | 'download'
+
   export type ChangeParams = {
     checklist: any[]
   }

package/types/components/image.d.ts

@@ -35,6 +35,7 @@ export namespace VxeImagePropTypes {
   export type Height = number | string
   export type Circle = boolean
   export type MaskClosable = boolean
+  export type ToolbarConfig = VxeImagePreviewPropTypes.ToolbarConfig
   export type ShowPreview = boolean
   export type ShowPrintButton = boolean
   export type ShowDownloadButton = boolean
@@ -50,6 +51,7 @@ export interface VxeImageProps {
   height?: VxeImagePropTypes.Height
   circle?: VxeImagePropTypes.Circle
   maskClosable?: VxeImagePropTypes.MaskClosable
+  toolbarConfig?: VxeImagePropTypes.ToolbarConfig
   showPreview?: VxeImagePropTypes.ShowPreview
   showPrintButton?: VxeImagePropTypes.ShowPrintButton
   showDownloadButton?: VxeImagePropTypes.ShowDownloadButton

package/types/components/tree.d.ts

@@ -163,17 +163,19 @@ export interface VxeTreePrivateComputed extends TreePrivateComputed { }
 
 export interface TreeReactData {
   currentNode: any
-  nodeMaps: Record<string, VxeTreeDefines.NodeCacheItem>
   selectRadioKey: VxeTreePropTypes.CheckNodeKey | null
   treeList: any[]
-  treeExpandedMaps: Record<string, boolean>
-  treeExpandLazyLoadedMaps: Record<string, boolean>
-  selectCheckboxMaps: Record<string, boolean>
-  indeterminateCheckboxMaps: Record<string, boolean>
+  updateExpandedFlag: number
+  updateCheckboxFlag: number
 }
 
 export interface TreeInternalData {
   initialized?: boolean
+  nodeMaps: Record<string, VxeTreeDefines.NodeCacheItem>
+  indeterminateRowMaps: Record<string, any>
+  selectCheckboxMaps: Record<string, any>
+  treeExpandedMaps: Record<string, boolean>
+  treeExpandLazyLoadedMaps: Record<string, boolean>
 }
 
 export interface TreeMethods<D = any> {