vxe-pc-ui 4.6.7 → 4.6.9

package/es/image/src/preview.js

@@ -1,5 +1,5 @@
-import { defineComponent, h, provide, ref, reactive, computed, watch, onMounted, onUnmounted, createCommentVNode, onBeforeUnmount } from 'vue';
-import { VxeUI, getConfig, createEvent, getIcon, globalEvents, GLOBAL_EVENT_KEYS, getI18n } from '../../ui';
+import { defineComponent, h, provide, ref, reactive, computed, watch, onMounted, onUnmounted, onBeforeUnmount } from 'vue';
+import { VxeUI, getConfig, createEvent, getIcon, globalEvents, GLOBAL_EVENT_KEYS, getI18n, renderEmptyElement } from '../../ui';
 import XEUtils from 'xe-utils';
 import { getDomNode, addClass, removeClass, hasControlKey } from '../../ui/src/dom';
 export default defineComponent({
@@ -27,6 +27,7 @@ export default defineComponent({
             type: Boolean,
             default: () => getConfig().imagePreview.showDownloadButton
         },
+        toolbarConfig: Object,
         beforeDownloadMethod: Function,
         downloadMethod: Function
     },
@@ -58,6 +59,9 @@ export default defineComponent({
         const computeMarginSize = computed(() => {
             return XEUtils.toNumber(props.marginSize || 0) || 16;
         });
+        const computeToolbarOpts = computed(() => {
+            return Object.assign({}, getConfig().imagePreview.toolbarConfig, props.toolbarConfig);
+        });
         const computeRotateText = computed(() => {
             const { offsetRotate } = reactData;
             if (offsetRotate) {
@@ -287,10 +291,13 @@ export default defineComponent({
         };
         const handleDownloadImg = (evnt) => {
             const { activeIndex } = reactData;
+            const toolbarOpts = computeToolbarOpts.value;
+            const btnConf = toolbarOpts.download;
+            const btnOpts = XEUtils.isBoolean(btnConf) ? {} : (btnConf ? Object.assign({}, btnConf) : {});
             const imgList = computeImgList.value;
             const imgUrl = imgList[activeIndex || 0];
-            const beforeDownloadFn = props.beforeDownloadMethod || getConfig().imagePreview.beforeDownloadMethod;
-            const downloadFn = props.downloadMethod || getConfig().imagePreview.downloadMethod;
+            const beforeDownloadFn = props.beforeDownloadMethod || btnOpts.beforeDownloadMethod || getConfig().imagePreview.beforeDownloadMethod;
+            const downloadFn = props.downloadMethod || btnOpts.downloadMethod || getConfig().imagePreview.downloadMethod;
             Promise.resolve(beforeDownloadFn
                 ? beforeDownloadFn({
                     $imagePreview: $xeImagePreview,
@@ -475,17 +482,23 @@ export default defineComponent({
             }));
         };
         const renderOperationBtn = (code, icon) => {
-            return h('div', {
-                class: 'vxe-image-preview--operation-btn',
-                title: getI18n(`vxe.imagePreview.operBtn.${code}`),
-                onClick(evnt) {
-                    handleOperationBtn(evnt, code);
-                }
-            }, [
-                h('i', {
-                    class: getIcon()[icon]
-                })
-            ]);
+            const toolbarOpts = computeToolbarOpts.value;
+            const btnConf = toolbarOpts[code];
+            const btnOpts = XEUtils.isBoolean(btnConf) ? {} : (btnConf ? Object.assign({}, btnConf) : {});
+            const showBtn = btnConf !== false;
+            return showBtn
+                ? h('div', {
+                    class: 'vxe-image-preview--operation-btn',
+                    title: getI18n(`vxe.imagePreview.operBtn.${code}`),
+                    onClick(evnt) {
+                        handleOperationBtn(evnt, code);
+                    }
+                }, [
+                    h('i', {
+                        class: btnOpts.icon || getIcon()[icon]
+                    })
+                ])
+                : renderEmptyElement($xeImagePreview);
         };
         const renderBtnWrapper = () => {
             const { showPrintButton, showDownloadButton } = props;
@@ -493,6 +506,7 @@ export default defineComponent({
             const imgList = computeImgList.value;
             const rotateText = computeRotateText.value;
             const scaleText = computeScaleText.value;
+            const toolbarOpts = computeToolbarOpts.value;
             return h('div', {
                 class: 'vxe-image-preview--btn-wrapper'
             }, [
@@ -522,7 +536,7 @@ export default defineComponent({
                             class: getIcon().IMAGE_PREVIEW_PREVIOUS
                         })
                     ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeImagePreview),
                 imgList.length > 1
                     ? h('div', {
                         class: 'vxe-image-preview--next-btn',
@@ -534,7 +548,7 @@ export default defineComponent({
                             class: getIcon().IMAGE_PREVIEW_NEXT
                         })
                     ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeImagePreview),
                 h('div', {
                     class: 'vxe-image-preview--operation-info'
                 }, [
@@ -564,8 +578,8 @@ export default defineComponent({
                     renderOperationBtn('pct11', 'IMAGE_PREVIEW_PCT_1_1'),
                     renderOperationBtn('rotateLeft', 'IMAGE_PREVIEW_ROTATE_LEFT'),
                     renderOperationBtn('rotateRight', 'IMAGE_PREVIEW_ROTATE_RIGHT'),
-                    showPrintButton ? renderOperationBtn('print', 'IMAGE_PREVIEW_PRINT') : createCommentVNode(),
-                    showDownloadButton ? renderOperationBtn('download', 'IMAGE_PREVIEW_DOWNLOAD') : createCommentVNode()
+                    showPrintButton || toolbarOpts.print ? renderOperationBtn('print', 'IMAGE_PREVIEW_PRINT') : renderEmptyElement($xeImagePreview),
+                    showDownloadButton || toolbarOpts.download ? renderOperationBtn('download', 'IMAGE_PREVIEW_DOWNLOAD') : renderEmptyElement($xeImagePreview)
                 ])
             ]);
         };

package/es/image/src/util.js

@@ -27,6 +27,7 @@ export const openPreviewImage = (options) => {
                         urlField: opts.urlField,
                         marginSize: opts.marginSize,
                         maskClosable: opts.maskClosable,
+                        toolbarConfig: opts.toolbarConfig,
                         showPrintButton: opts.showPrintButton,
                         showDownloadButton: opts.showDownloadButton,
                         beforeDownloadMethod: opts.beforeDownloadMethod,

package/es/list-design/src/list-view.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, h, reactive, provide, watch, nextTick, computed, createCommentVNode } from 'vue';
-import { VxeUI, getConfig, createEvent, getI18n, renderer, useSize } from '../../ui';
+import { defineComponent, ref, h, reactive, provide, watch, nextTick, computed } from 'vue';
+import { VxeUI, getConfig, createEvent, getI18n, renderer, useSize, renderEmptyElement } from '../../ui';
 import { errLog } from '../../ui/src/log';
 import { toCssUnit } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -403,7 +403,7 @@ export default defineComponent({
                             }), Object.assign({}, slots, {
                                 default: undefined
                             }))
-                            : createCommentVNode())
+                            : renderEmptyElement($xeListView))
                 ]),
                 /**
                  * 加载中

package/es/loading/src/loading.js

@@ -1,5 +1,5 @@
-import { reactive, defineComponent, h, computed, watch, createCommentVNode } from 'vue';
-import { getConfig, getIcon, getI18n, createEvent, useSize } from '../../ui';
+import { reactive, defineComponent, h, computed, watch } from 'vue';
+import { getConfig, getIcon, getI18n, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import XEUtils from 'xe-utils';
 export default defineComponent({
@@ -75,7 +75,7 @@ export default defineComponent({
             const loadingIcon = computeLoadingIcon.value;
             const loadingText = computeLoadingText.value;
             if (!initialized && !modelValue) {
-                return createCommentVNode();
+                return renderEmptyElement($xeLoading);
             }
             return h('div', {
                 class: ['vxe-loading', {

package/es/menu/src/menu.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, inject, resolveComponent, createCommentVNode, watch, computed, nextTick, onBeforeUnmount, onMounted } from 'vue';
+import { defineComponent, ref, h, reactive, inject, resolveComponent, watch, computed, nextTick, onBeforeUnmount, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, getIcon, createEvent, permission, useSize, globalEvents } from '../../ui';
+import { getConfig, getIcon, createEvent, permission, useSize, globalEvents, renderEmptyElement } from '../../ui';
 import { toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -263,7 +263,7 @@ export default defineComponent({
                             class: isExpand ? getIcon().MENU_ITEM_EXPAND_OPEN : getIcon().MENU_ITEM_EXPAND_CLOSE
                         })
                     ])
-                    : createCommentVNode()
+                    : renderEmptyElement($xeMenu)
             ];
         };
         const renderDefaultChildren = (item) => {
@@ -272,7 +272,7 @@ export default defineComponent({
             const isCollapsed = computeIsCollapsed.value;
             if (item.permissionCode) {
                 if (!permission.checkVisible(item.permissionCode)) {
-                    return createCommentVNode();
+                    return renderEmptyElement($xeMenu);
                 }
             }
             return h('div', {
@@ -303,14 +303,14 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-menu--item-group'
                     }, childList.map(child => renderDefaultChildren(child)))
-                    : createCommentVNode()
+                    : renderEmptyElement($xeMenu)
             ]);
         };
         const renderCollapseChildren = (item) => {
             const { itemKey, level, hasChild, isActive, isExactActive, routerLink, childList } = item;
             if (item.permissionCode) {
                 if (!permission.checkVisible(item.permissionCode)) {
-                    return createCommentVNode();
+                    return renderEmptyElement($xeMenu);
                 }
             }
             return h('div', {
@@ -340,7 +340,7 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-menu--item-group'
                     }, childList.map(child => renderDefaultChildren(child)))
-                    : createCommentVNode()
+                    : renderEmptyElement($xeMenu)
             ]);
         };
         const renderVN = () => {
@@ -376,9 +376,9 @@ export default defineComponent({
                             ? h('div', {
                                 class: 'vxe-menu--item-list'
                             }, menuList.map(child => renderDefaultChildren(child)))
-                            : createCommentVNode()
+                            : renderEmptyElement($xeMenu)
                     ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeMenu),
                 /**
                  * 加载中
                  */

package/es/modal/src/modal.js

@@ -1,8 +1,8 @@
-import { defineComponent, h, Teleport, ref, inject, computed, reactive, provide, nextTick, watch, onMounted, onUnmounted, createCommentVNode } from 'vue';
+import { defineComponent, h, Teleport, ref, inject, computed, reactive, provide, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { getDomNode, getEventTargetNode, toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, getFuncText, handleBooleanDefaultValue } from '../../ui/src/utils';
-import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize } from '../../ui';
+import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from '../../ui';
 import VxeButtonComponent from '../../button/src/button';
 import VxeLoadingComponent from '../../loading/index';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -1112,7 +1112,7 @@ export default defineComponent({
                         ? h('div', {
                             class: 'vxe-modal--corner-wrapper'
                         }, getSlotVNs(cornerSlot({ $modal: $xeModal })))
-                        : createCommentVNode(),
+                        : renderEmptyElement($xeModal),
                     (XEUtils.isBoolean(showMinimize) ? showMinimize : showZoom)
                         ? h('div', {
                             class: ['vxe-modal--zoom-btn', 'trigger--btn'],
@@ -1123,7 +1123,7 @@ export default defineComponent({
                                 class: zoomStatus === 'minimize' ? getIcon().MODAL_ZOOM_REVERT : getIcon().MODAL_ZOOM_MIN
                             })
                         ])
-                        : createCommentVNode(),
+                        : renderEmptyElement($xeModal),
                     (XEUtils.isBoolean(showMaximize) ? showMaximize : showZoom) && zoomStatus !== 'minimize'
                         ? h('div', {
                             class: ['vxe-modal--zoom-btn', 'trigger--btn'],
@@ -1134,7 +1134,7 @@ export default defineComponent({
                                 class: zoomStatus === 'maximize' ? getIcon().MODAL_ZOOM_OUT : getIcon().MODAL_ZOOM_IN
                             })
                         ])
-                        : createCommentVNode(),
+                        : renderEmptyElement($xeModal),
                     showClose
                         ? h('div', {
                             class: ['vxe-modal--close-btn', 'trigger--btn'],
@@ -1145,7 +1145,7 @@ export default defineComponent({
                                 class: getIcon().MODAL_CLOSE
                             })
                         ])
-                        : createCommentVNode()
+                        : renderEmptyElement($xeModal)
                 ])
             ];
         };
@@ -1164,7 +1164,7 @@ export default defineComponent({
                             'is--ellipsis': props.showTitleOverflow
                         }] }, headerOns), headerSlot ? getSlotVNs(headerSlot({ $modal: $xeModal })) : renderTitles());
             }
-            return createCommentVNode();
+            return renderEmptyElement($xeModal);
         };
         const renderBody = () => {
             const { slots: propSlots = {}, status, message, iconStatus } = props;
@@ -1193,7 +1193,7 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-modal--body-left'
                     }, getSlotVNs(leftSlot({ $modal: $xeModal })))
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeModal),
                 h('div', {
                     class: 'vxe-modal--body-default'
                 }, contVNs),
@@ -1201,9 +1201,9 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-modal--body-right'
                     }, getSlotVNs(rightSlot({ $modal: $xeModal })))
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeModal),
                 isMsg
-                    ? createCommentVNode()
+                    ? renderEmptyElement($xeModal)
                     : h(VxeLoadingComponent, {
                         class: 'vxe-modal--loading',
                         modelValue: props.loading
@@ -1252,7 +1252,7 @@ export default defineComponent({
                     class: 'vxe-modal--footer'
                 }, footerSlot ? getSlotVNs(footerSlot({ $modal: $xeModal })) : [renderDefaultFooter()]);
             }
-            return createCommentVNode();
+            return renderEmptyElement($xeModal);
         };
         const renderVN = () => {
             const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize } = props;
@@ -1307,9 +1307,9 @@ export default defineComponent({
                                                 class: ['vxe-modal--status-icon', iconStatus || getIcon()[`MODAL_${status}`.toLocaleUpperCase()]]
                                             })
                                         ])
-                                        : createCommentVNode()
+                                        : renderEmptyElement($xeModal)
                                 ])
-                            : createCommentVNode(),
+                            : renderEmptyElement($xeModal),
                         h('div', {
                             class: 'vxe-modal--container'
                         }, !reactData.initialized || (destroyOnClose && !reactData.visible)
@@ -1328,7 +1328,7 @@ export default defineComponent({
                                             onMousedown: dragEvent
                                         });
                                     }))
-                                    : createCommentVNode()
+                                    : renderEmptyElement($xeModal)
                             ])
                     ])
                 ])

package/es/password-input/src/password-input.js

@@ -1,6 +1,6 @@
-import { defineComponent, h, ref, computed, reactive, inject, nextTick, watch, createCommentVNode } from 'vue';
+import { defineComponent, h, ref, computed, reactive, inject, nextTick, watch } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, getIcon, getI18n, createEvent, useSize } from '../../ui';
+import { getConfig, getIcon, getI18n, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getFuncText } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 export default defineComponent({
@@ -237,8 +237,8 @@ export default defineComponent({
                                 class: getIcon().INPUT_CLEAR
                             })
                         ])
-                        : createCommentVNode(),
-                    controls ? renderPasswordIcon() : createCommentVNode(),
+                        : renderEmptyElement($xePasswordInput),
+                    controls ? renderPasswordIcon() : renderEmptyElement($xePasswordInput),
                     suffixSlot || suffixIcon
                         ? h('div', {
                             class: 'vxe-password-input--suffix-icon',
@@ -250,7 +250,7 @@ export default defineComponent({
                                     class: suffixIcon
                                 })
                             ])
-                        : createCommentVNode()
+                        : renderEmptyElement($xePasswordInput)
                 ])
                 : null;
         };
@@ -304,7 +304,7 @@ export default defineComponent({
                     }],
                 spellcheck: false
             }, [
-                prefix || createCommentVNode(),
+                prefix || renderEmptyElement($xePasswordInput),
                 h('div', {
                     class: 'vxe-password-input--wrapper'
                 }, [
@@ -326,7 +326,7 @@ export default defineComponent({
                         onBlur: blurEvent
                     })
                 ]),
-                suffix || createCommentVNode()
+                suffix || renderEmptyElement($xePasswordInput)
             ]);
         };
         $xePasswordInput.renderVN = renderVN;

package/es/print/src/print.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, provide, createCommentVNode } from 'vue';
+import { defineComponent, ref, h, reactive, provide } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, createEvent } from '../../ui';
+import { getConfig, createEvent, renderEmptyElement } from '../../ui';
 import { printHtml, trimHtml } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 export default defineComponent({
@@ -107,7 +107,7 @@ export default defineComponent({
                                 ? h('div', {
                                     class: 'vxe-print-page-break--header-title'
                                 }, `${title || ''}`)
-                                : createCommentVNode()
+                                : renderEmptyElement($xePrint)
                         ]),
                     h('div', {
                         class: 'vxe-print-page-break--body'
@@ -131,7 +131,7 @@ export default defineComponent({
                                 ? h('div', {
                                     class: 'vxe-print-page-break--footer-page-number'
                                 }, `${currentPage}/${pageCount}`)
-                                : createCommentVNode()
+                                : renderEmptyElement($xePrint)
                         ])
                 ]);
             });
@@ -164,7 +164,7 @@ export default defineComponent({
                                 ? h('div', {
                                     class: 'vxe-print-page-break--header-title'
                                 }, `${title || ''}`)
-                                : createCommentVNode()
+                                : renderEmptyElement($xePrint)
                         ]),
                     h('div', {
                         class: 'vxe-print-page-break--body'
@@ -188,7 +188,7 @@ export default defineComponent({
                                 ? h('div', {
                                     class: 'vxe-print-page-break--footer-page-number'
                                 }, `${currentPage}/${pageCount}`)
-                                : createCommentVNode()
+                                : renderEmptyElement($xePrint)
                         ])
                 ]);
             });

package/es/pulldown/src/pulldown.js

@@ -1,6 +1,6 @@
-import { defineComponent, h, Teleport, ref, onUnmounted, reactive, inject, computed, nextTick, watch, createCommentVNode } from 'vue';
+import { defineComponent, h, Teleport, ref, onUnmounted, reactive, inject, computed, nextTick, watch } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, globalEvents, createEvent, useSize } from '../../ui';
+import { getConfig, globalEvents, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getEventTargetNode, updatePanelPlacement } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 export default defineComponent({
@@ -335,7 +335,7 @@ export default defineComponent({
                                     ? h('div', {
                                         class: 'vxe-pulldown--panel-header'
                                     }, headerSlot({ $pulldown: $xePulldown }))
-                                    : createCommentVNode(),
+                                    : renderEmptyElement($xePulldown),
                                 h('div', {
                                     class: 'vxe-pulldown--panel-body'
                                 }, dropdownSlot
@@ -347,7 +347,7 @@ export default defineComponent({
                                     ? h('div', {
                                         class: 'vxe-pulldown--panel-footer'
                                     }, footerSlot({ $pulldown: $xePulldown }))
-                                    : createCommentVNode()
+                                    : renderEmptyElement($xePulldown)
                             ]
                             : [])
                     ])