vxe-pc-ui 4.14.9 → 4.14.10

package/es/button/src/button.js

@@ -419,7 +419,7 @@ const VxeButtonComponent = defineVxeComponent({
         };
         const renderTooltipIcon = (tipOpts, type) => {
             return h(VxeTooltipComponent, {
-                useHTML: tipOpts.useHTML,
+                useHtml: XEUtils.isBoolean(tipOpts.useHtml) ? tipOpts.useHtml : tipOpts.useHTML,
                 content: tipOpts.content,
                 enterable: tipOpts.enterable,
                 theme: tipOpts.theme

package/es/drawer/src/drawer.js

@@ -61,6 +61,10 @@ export default defineVxeComponent({
             default: () => getConfig().drawer.showClose
         },
         content: [Number, String],
+        useHtml: {
+            type: Boolean,
+            default: () => getConfig().drawer.useHtml
+        },
         showCancelButton: {
             type: Boolean,
             default: null
@@ -436,7 +440,7 @@ export default defineVxeComponent({
             return renderEmptyElement($xeDrawer);
         };
         const renderBody = () => {
-            const { slots: propSlots = {}, content } = props;
+            const { slots: propSlots = {}, content, useHtml } = props;
             const defaultSlot = slots.default || propSlots.default;
             const leftSlot = slots.left || propSlots.left;
             const rightSlot = slots.right || propSlots.right;
@@ -451,9 +455,16 @@ export default defineVxeComponent({
                 h('div', {
                     class: 'vxe-drawer--body-default'
                 }, [
-                    h('div', {
-                        class: 'vxe-drawer--content'
-                    }, defaultSlot ? getSlotVNs(defaultSlot({ $drawer: $xeDrawer })) : getFuncText(content))
+                    useHtml && !defaultSlot
+                        ? h('div', {
+                            key: 'hc',
+                            class: 'vxe-drawer--content',
+                            innerHTML: getFuncText(content)
+                        })
+                        : h('div', {
+                            key: 'dc',
+                            class: 'vxe-drawer--content'
+                        }, defaultSlot ? getSlotVNs(defaultSlot({ $drawer: $xeDrawer })) : getFuncText(content))
                 ]),
                 rightSlot
                     ? h('div', {

package/es/modal/src/modal.js

@@ -40,6 +40,10 @@ export default defineVxeComponent({
             default: () => getConfig().modal.duration
         },
         content: [Number, String],
+        useHtml: {
+            type: Boolean,
+            default: () => getConfig().modal.useHtml
+        },
         showCancelButton: {
             type: Boolean,
             default: null
@@ -1197,7 +1201,7 @@ export default defineVxeComponent({
             return renderEmptyElement($xeModal);
         };
         const renderBody = () => {
-            const { slots: propSlots = {}, status, message, iconStatus } = props;
+            const { slots: propSlots = {}, status, message, iconStatus, useHtml } = props;
             const content = props.content || message;
             const isMsg = computeIsMsg.value;
             const defaultSlot = slots.default || propSlots.default;
@@ -1213,9 +1217,16 @@ export default defineVxeComponent({
                     })
                 ]));
             }
-            contVNs.push(h('div', {
-                class: 'vxe-modal--content'
-            }, defaultSlot ? getSlotVNs(defaultSlot({ $modal: $xeModal })) : getFuncText(content)));
+            contVNs.push(useHtml && !defaultSlot
+                ? h('div', {
+                    key: 'hc',
+                    class: 'vxe-modal--content',
+                    innerHTML: getFuncText(content)
+                })
+                : h('div', {
+                    key: 'dc',
+                    class: 'vxe-modal--content'
+                }, defaultSlot ? getSlotVNs(defaultSlot({ $modal: $xeModal })) : getFuncText(content)));
             return h('div', {
                 class: 'vxe-modal--body'
             }, [

package/es/tooltip/src/tooltip.js

@@ -26,7 +26,15 @@ export default defineVxeComponent({
             type: [String, Number],
             default: null
         },
-        useHTML: Boolean,
+        useHtml: {
+            type: Boolean,
+            default: () => XEUtils.isBoolean(getConfig().tooltip.useHtml) ? getConfig().tooltip.useHtml : null
+        },
+        // 已废弃，请使用 useHtml
+        useHTML: {
+            type: Boolean,
+            default: () => getConfig().tooltip.useHTML
+        },
         zIndex: [String, Number],
         popupClassName: [String, Function],
         width: {
@@ -406,25 +414,25 @@ export default defineVxeComponent({
         };
         Object.assign($xeTooltip, tooltipMethods);
         const renderContent = () => {
-            const { useHTML } = props;
+            const { useHtml, useHTML } = props;
             const { tipContent } = reactData;
             const wrapperStyle = computeWrapperStyle.value;
             const contentSlot = slots.content;
             const contVNs = [];
             if (contentSlot) {
                 contVNs.push(h('div', {
-                    key: 1
+                    key: 'ct'
                 }, getSlotVNs(contentSlot({}))));
             }
-            else if (useHTML) {
+            else if (XEUtils.isBoolean(useHtml) ? useHtml : useHTML) {
                 contVNs.push(h('div', {
-                    key: 2,
+                    key: 'ch',
                     innerHTML: tipContent
                 }));
             }
             else {
                 contVNs.push(h('span', {
-                    key: 3
+                    key: 'cd'
                 }, `${tipContent}`));
             }
             return h('div', {

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "4.14.9";
+export const version = "4.14.10";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {
@@ -128,6 +128,7 @@ setConfig({
     },
     drawer: {
         // size: null,
+        // useHtml: false,
         position: 'right',
         showHeader: true,
         lockView: true,
@@ -227,6 +228,7 @@ setConfig({
         // size: null,
         top: 16,
         showHeader: true,
+        // useHtml: false,
         // width: null,
         // height: null,
         minWidth: 340,

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"4.14.9"}`;
+const version = `ui v${"4.14.10"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/button/src/button.js

@@ -469,7 +469,7 @@ const VxeButtonComponent = (0, _comp.defineVxeComponent)({
     };
     const renderTooltipIcon = (tipOpts, type) => {
       return (0, _vue.h)(_tooltip.default, {
-        useHTML: tipOpts.useHTML,
+        useHtml: _xeUtils.default.isBoolean(tipOpts.useHtml) ? tipOpts.useHtml : tipOpts.useHTML,
         content: tipOpts.content,
         enterable: tipOpts.enterable,
         theme: tipOpts.theme

package/lib/button/src/button.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_tooltip=_interopRequireDefault(require("../../tooltip"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let VxeButtonComponent=(0,_comp.defineVxeComponent)({name:"VxeButton",props:{type:String,mode:String,className:[String,Function],popupClassName:[String,Function],size:{type:String,default:()=>(0,_ui.getConfig)().button.size||(0,_ui.getConfig)().size},zIndex:Number,name:[String,Number],routerLink:Object,permissionCode:[String,Number],content:String,placement:String,status:String,title:String,shadow:Boolean,icon:String,iconRender:Object,prefixIcon:String,prefixRender:Object,suffixIcon:String,suffixRender:Object,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,trigger:{type:String,default:()=>(0,_ui.getConfig)().button.trigger},align:String,prefixTooltip:Object,suffixTooltip:Object,options:Array,showDropdownIcon:{type:Boolean,default:()=>(0,_ui.getConfig)().button.showDropdownIcon},destroyOnClose:{type:Boolean,default:()=>(0,_ui.getConfig)().button.destroyOnClose},popupConfig:Object,transfer:{type:Boolean,default:null}},emits:["click","mouseenter","mouseleave","dropdown-click","dropdownClick","contextmenu"],setup(N,e){let{slots:P,emit:i}=e,n=(0,_vue.inject)("$xeModal",null),o=(0,_vue.inject)("$xeDrawer",null),u=(0,_vue.inject)("$xeTable",null),l=(0,_vue.inject)("$xeTree",null),a=(0,_vue.inject)("$xeForm",null),s=(0,_vue.inject)("$xeButtonGroup",null);var t=_xeUtils.default.uniqueId();let I=(0,_ui.useSize)(N).computeSize,S=(0,_ui.usePermission)(N).computePermissionInfo,B=(0,_vue.reactive)({initialized:!1,visiblePanel:!1,isAniVisible:!1,isActivated:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),r={showTime:void 0,tooltipTimeout:void 0},j=(0,_vue.ref)(),z=(0,_vue.ref)(),U=(0,_vue.ref)(),v={refElem:j},$={xID:t,props:N,context:e,reactData:B,internalData:r,getRefMaps:()=>v};let V=(0,_vue.computed)(()=>{var e=N.transfer,t=D.value;if(_xeUtils.default.isBoolean(t.transfer))return t.transfer;if(null===e){t=(0,_ui.getConfig)().button.transfer;if(_xeUtils.default.isBoolean(t))return t;if(u||l||n||o||a)return!0}return e}),E=(0,_vue.computed)(()=>{var e=N.disabled,t=S.value;return e||t.disabled}),M=(0,_vue.computed)(()=>{var e=N.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),Z=(0,_vue.computed)(()=>{var{type:e,mode:t}=N;return"text"===t||"text"===e||s&&"text"===s.props.mode?"text":"button"}),J=(0,_vue.computed)(()=>{var e=N.status;return e||(s?s.props.status:"")}),K=(0,_vue.computed)(()=>{var e=N.align;return e||!!s&&s.props.align}),Q=(0,_vue.computed)(()=>{var e=N.round;return e||!!s&&s.props.round}),X=(0,_vue.computed)(()=>{var e=N.circle;return e||!!s&&s.props.circle}),ee=(0,_vue.computed)(()=>{var e=N.options;return e?e.filter(e=>{e=e.permissionCode;return!e||_ui.permission.checkVisible(e)}):[]}),D=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.popupConfig,N.popupConfig)),_=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.prefixTooltip,N.prefixTooltip)),b=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.suffixTooltip,N.suffixTooltip)),p=()=>{var e=D.value.zIndex||N.zIndex;e?B.panelIndex=_xeUtils.default.toNumber(e):B.panelIndex<(0,_utils.getLastZIndex)()&&(B.panelIndex=(0,_utils.nextZIndex)())},d=()=>{let n=N.placement,i=B.panelIndex,o=z.value,u=U.value,l=V.value,a=D.value;var e=()=>{var e=(0,_dom.updatePanelPlacement)(o,u,{placement:a.placement||n,defaultPlacement:a.defaultPlacement,teleportTo:l}),t=Object.assign(e.style,{zIndex:i});B.panelStyle=t,B.panelPlacement=e.placement};return e(),(0,_vue.nextTick)().then(e)},q=e=>{s&&s.handleClick({name:N.name},e),W("click",{$event:e},e)},te=e=>{0===e.button&&e.stopPropagation()},ne=e=>{var t=e.currentTarget;let n=U.value;var{flag:t,targetElem:i}=(0,_dom.getEventTargetNode)(e,t,"vxe-button");t&&(n&&(n.dataset.active="N"),B.visiblePanel=!1,setTimeout(()=>{n&&"Y"===n.dataset.active||(B.isAniVisible=!1)},350),W("dropdown-click",{name:i.getAttribute("name"),option:null},e))},A=()=>{let e=U.value;e&&(e.dataset.active="Y",B.isAniVisible=!0,setTimeout(()=>{"Y"===e.dataset.active&&(B.visiblePanel=!0,p(),d(),setTimeout(()=>{B.visiblePanel&&d()},50))},20))},ie=e=>{var t=N.loading;E.value||t||(c(),R(e))},oe=e=>{G(),F(e)},R=e=>{W("mouseenter",{},e)},F=e=>{W("mouseleave",{},e)},L=e=>{W("contextmenu",{},e)},Y=e=>{var{loading:t,trigger:n}=N;E.value||t||("click"===n&&(B.visiblePanel?G:c)(),q(e))},c=()=>{var e=N.trigger;let t=U.value;return t&&(t.dataset.active="Y",B.initialized||(B.initialized=!0),r.showTime=setTimeout(()=>{"Y"===t.dataset.active?A():B.isAniVisible=!1},"click"===e?50:250)),(0,_vue.nextTick)()},G=()=>{let e=U.value;return clearTimeout(r.showTime),e?(e.dataset.active="N",setTimeout(()=>{"Y"!==e.dataset.active&&(B.visiblePanel=!1,setTimeout(()=>{"Y"!==e.dataset.active&&(B.isAniVisible=!1)},350))},100)):(B.isAniVisible=!1,B.visiblePanel=!1),(0,_vue.nextTick)()},ue=()=>{G()},m=(e,t)=>(0,_vue.h)(_tooltip.default,{useHTML:e.useHTML,content:e.content,enterable:e.enterable,theme:e.theme},{default(){return(0,_vue.h)("span",{class:`vxe-button--item vxe-button--tooltip-${t}-icon`},[(0,_vue.h)("i",{class:e.icon||(0,_ui.getIcon)().BUTTON_TOOLTIP_ICON})])}}),H=()=>{var{content:e,suffixIcon:t,loading:n,prefixTooltip:i,suffixTooltip:o,suffixRender:u}=N,l=N.prefixIcon||N.icon,a=N.prefixRender||N.iconRender,s=_.value,r=b.value,v=P.prefix||P.icon,d=P.suffix,c=P.default,p=[];return i&&p.push(m(s,"prefix")),n?p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--loading-icon",(0,_ui.getIcon)().BUTTON_LOADING]})):v?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--custom-prefix-icon"},v({}))):a?(s=(i=_ui.renderer.get(a.name))?i.renderButtonPrefix:null,p.push((0,_vue.h)("span",{class:["vxe-button--item vxe-button--custom-prefix-icon"]},s?(0,_vn.getSlotVNs)(s(a,{$button:$})):[]))):l&&p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--prefix-icon",l]})),c?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--content"},c({}))):e&&p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--content"},(0,_utils.getFuncText)(e))),d?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--custom-suffix-icon"},d({}))):u?(v=(n=_ui.renderer.get(u.name))?n.renderButtonSuffix:null,p.push((0,_vue.h)("span",{class:["vxe-button--item vxe-button--custom-suffix-icon"]},v?(0,_vn.getSlotVNs)(v(u,{$button:$})):[]))):t&&p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--suffix-icon",t]})),o&&p.push(m(r,"suffix")),p},W=(e,t,n)=>{i(e,(0,_ui.createEvent)(n,{$button:$},t))},x=(t={dispatchEvent:W,openPanel:c,closePanel:G,focus(){var e=z.value;return e&&e.focus(),(0,_vue.nextTick)()},blur(){var e=z.value;return e&&e.blur(),(0,_vue.nextTick)()}},e=>{var t=U.value;B.visiblePanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&G()}),f=e=>{var t,n=E.value,i=B.visiblePanel;n||(n=j.value,t=U.value,B.isActivated=(0,_dom.getEventTargetNode)(e,n).flag||(0,_dom.getEventTargetNode)(e,t).flag,i&&!B.isActivated&&G())},g=()=>{var e=B.visiblePanel;e&&d()};Object.assign($,t);return $.renderVN=()=>{let{className:e,trigger:t,title:n,routerLink:i,type:o,destroyOnClose:u,name:l,loading:a,shadow:s,showDropdownIcon:r}=N;var{initialized:v,isAniVisible:d,visiblePanel:c}=B,p=M.value;let m=Z.value;var _=J.value;let b=Q.value;var x=K.value;let f=X.value;var g,h=V.value,T=E.value,C=S.value,w=ee.value,y=D.value,O=I.value,k=P.dropdowns,y=y.className||N.popupClassName;return C.visible?k||w.length?(C={onContextmenu:L},g={},"hover"===t&&(C.onMouseenter=ie,C.onMouseleave=oe,g.onMouseenter=A,g.onMouseleave=ue),(0,_vue.h)("div",{ref:j,class:["vxe-button--dropdown",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,"is--active":c}]},[i?(0,_vue.h)((0,_vue.resolveComponent)("router-link"),Object.assign({ref:z,class:["vxe-button","vxe-button--link","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,to:i,onClick:Y},C),{default(){return H().concat(r?[(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+(0,_ui.getIcon)().BUTTON_DROPDOWN})]:[])}}):(0,_vue.h)("button",Object.assign({ref:z,class:["vxe-button","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,onClick:Y},C),H().concat(r?[(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+(0,_ui.getIcon)().BUTTON_DROPDOWN})]:[])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!h||!v},[(0,_vue.h)("div",Object.assign({ref:U,class:["vxe-button--dropdown-panel",y?_xeUtils.default.isFunction(y)?y({$button:$}):y:"",{["size--"+O]:O,"is--transfer":h,"ani--leave":d,"ani--enter":c}],placement:B.panelPlacement,style:B.panelStyle},g),v&&(c||d)?[k?(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:te,onClick:ne},v&&(!u||c||d)?k({}):[]):(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper"},v&&(!u||c||d)?w.map((t,e)=>(0,_vue.h)(VxeButtonComponent,{key:e,type:t.type,mode:t.mode||m,className:t.className,name:t.name,routerLink:t.routerLink,permissionCode:t.permissionCode,title:t.title,content:t.content,status:t.status,icon:t.icon,round:_xeUtils.default.isBoolean(t.round)?t.round:"text"!==m&&b,circle:_xeUtils.default.isBoolean(t.circle)?t.circle:"text"!==m&&f,disabled:t.disabled,loading:t.loading,align:t.align,onClick(e){((e,t)=>{e=e.$event;G(),W("dropdown-click",{name:t.name,option:t},e)})(e,t)}})):[])]:[])])])):i?(0,_vue.h)((0,_vue.resolveComponent)("router-link"),{ref:z,class:["vxe-button","vxe-button--link","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,to:i,onClick:q,onMouseenter:R,onMouseleave:F,onContextmenu:L},{default(){return H()}}):(0,_vue.h)("button",{ref:z,class:["vxe-button","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,onClick:q,onMouseenter:R,onMouseleave:F,onContextmenu:L},H()):(0,_ui.renderEmptyElement)($)},(0,_vue.onMounted)(()=>{"text"===N.type&&(0,_log.warnLog)("vxe.error.delProp",["[button] type=text","mode=text"]),_ui.globalEvents.on($,"mousewheel",x),_ui.globalEvents.on($,"mousedown",f),_ui.globalEvents.on($,"resize",g)}),(0,_vue.onUnmounted)(()=>{_ui.globalEvents.off($,"mousewheel"),_ui.globalEvents.off($,"mousedown"),_ui.globalEvents.off($,"resize")}),$},render(){return this.renderVN()}});var _default=exports.default=VxeButtonComponent;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_tooltip=_interopRequireDefault(require("../../tooltip"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let VxeButtonComponent=(0,_comp.defineVxeComponent)({name:"VxeButton",props:{type:String,mode:String,className:[String,Function],popupClassName:[String,Function],size:{type:String,default:()=>(0,_ui.getConfig)().button.size||(0,_ui.getConfig)().size},zIndex:Number,name:[String,Number],routerLink:Object,permissionCode:[String,Number],content:String,placement:String,status:String,title:String,shadow:Boolean,icon:String,iconRender:Object,prefixIcon:String,prefixRender:Object,suffixIcon:String,suffixRender:Object,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,trigger:{type:String,default:()=>(0,_ui.getConfig)().button.trigger},align:String,prefixTooltip:Object,suffixTooltip:Object,options:Array,showDropdownIcon:{type:Boolean,default:()=>(0,_ui.getConfig)().button.showDropdownIcon},destroyOnClose:{type:Boolean,default:()=>(0,_ui.getConfig)().button.destroyOnClose},popupConfig:Object,transfer:{type:Boolean,default:null}},emits:["click","mouseenter","mouseleave","dropdown-click","dropdownClick","contextmenu"],setup(N,e){let{slots:P,emit:i}=e,n=(0,_vue.inject)("$xeModal",null),o=(0,_vue.inject)("$xeDrawer",null),u=(0,_vue.inject)("$xeTable",null),l=(0,_vue.inject)("$xeTree",null),a=(0,_vue.inject)("$xeForm",null),s=(0,_vue.inject)("$xeButtonGroup",null);var t=_xeUtils.default.uniqueId();let I=(0,_ui.useSize)(N).computeSize,B=(0,_ui.usePermission)(N).computePermissionInfo,S=(0,_vue.reactive)({initialized:!1,visiblePanel:!1,isAniVisible:!1,isActivated:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),r={showTime:void 0,tooltipTimeout:void 0},j=(0,_vue.ref)(),z=(0,_vue.ref)(),U=(0,_vue.ref)(),v={refElem:j},$={xID:t,props:N,context:e,reactData:S,internalData:r,getRefMaps:()=>v};let V=(0,_vue.computed)(()=>{var e=N.transfer,t=M.value;if(_xeUtils.default.isBoolean(t.transfer))return t.transfer;if(null===e){t=(0,_ui.getConfig)().button.transfer;if(_xeUtils.default.isBoolean(t))return t;if(u||l||n||o||a)return!0}return e}),E=(0,_vue.computed)(()=>{var e=N.disabled,t=B.value;return e||t.disabled}),D=(0,_vue.computed)(()=>{var e=N.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),Z=(0,_vue.computed)(()=>{var{type:e,mode:t}=N;return"text"===t||"text"===e||s&&"text"===s.props.mode?"text":"button"}),J=(0,_vue.computed)(()=>{var e=N.status;return e||(s?s.props.status:"")}),K=(0,_vue.computed)(()=>{var e=N.align;return e||!!s&&s.props.align}),Q=(0,_vue.computed)(()=>{var e=N.round;return e||!!s&&s.props.round}),X=(0,_vue.computed)(()=>{var e=N.circle;return e||!!s&&s.props.circle}),ee=(0,_vue.computed)(()=>{var e=N.options;return e?e.filter(e=>{e=e.permissionCode;return!e||_ui.permission.checkVisible(e)}):[]}),M=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.popupConfig,N.popupConfig)),_=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.prefixTooltip,N.prefixTooltip)),b=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().button.suffixTooltip,N.suffixTooltip)),p=()=>{var e=M.value.zIndex||N.zIndex;e?S.panelIndex=_xeUtils.default.toNumber(e):S.panelIndex<(0,_utils.getLastZIndex)()&&(S.panelIndex=(0,_utils.nextZIndex)())},d=()=>{let n=N.placement,i=S.panelIndex,o=z.value,u=U.value,l=V.value,a=M.value;var e=()=>{var e=(0,_dom.updatePanelPlacement)(o,u,{placement:a.placement||n,defaultPlacement:a.defaultPlacement,teleportTo:l}),t=Object.assign(e.style,{zIndex:i});S.panelStyle=t,S.panelPlacement=e.placement};return e(),(0,_vue.nextTick)().then(e)},q=e=>{s&&s.handleClick({name:N.name},e),W("click",{$event:e},e)},te=e=>{0===e.button&&e.stopPropagation()},ne=e=>{var t=e.currentTarget;let n=U.value;var{flag:t,targetElem:i}=(0,_dom.getEventTargetNode)(e,t,"vxe-button");t&&(n&&(n.dataset.active="N"),S.visiblePanel=!1,setTimeout(()=>{n&&"Y"===n.dataset.active||(S.isAniVisible=!1)},350),W("dropdown-click",{name:i.getAttribute("name"),option:null},e))},A=()=>{let e=U.value;e&&(e.dataset.active="Y",S.isAniVisible=!0,setTimeout(()=>{"Y"===e.dataset.active&&(S.visiblePanel=!0,p(),d(),setTimeout(()=>{S.visiblePanel&&d()},50))},20))},ie=e=>{var t=N.loading;E.value||t||(c(),R(e))},oe=e=>{H(),F(e)},R=e=>{W("mouseenter",{},e)},F=e=>{W("mouseleave",{},e)},L=e=>{W("contextmenu",{},e)},Y=e=>{var{loading:t,trigger:n}=N;E.value||t||("click"===n&&(S.visiblePanel?H:c)(),q(e))},c=()=>{var e=N.trigger;let t=U.value;return t&&(t.dataset.active="Y",S.initialized||(S.initialized=!0),r.showTime=setTimeout(()=>{"Y"===t.dataset.active?A():S.isAniVisible=!1},"click"===e?50:250)),(0,_vue.nextTick)()},H=()=>{let e=U.value;return clearTimeout(r.showTime),e?(e.dataset.active="N",setTimeout(()=>{"Y"!==e.dataset.active&&(S.visiblePanel=!1,setTimeout(()=>{"Y"!==e.dataset.active&&(S.isAniVisible=!1)},350))},100)):(S.isAniVisible=!1,S.visiblePanel=!1),(0,_vue.nextTick)()},ue=()=>{H()},m=(e,t)=>(0,_vue.h)(_tooltip.default,{useHtml:_xeUtils.default.isBoolean(e.useHtml)?e.useHtml:e.useHTML,content:e.content,enterable:e.enterable,theme:e.theme},{default(){return(0,_vue.h)("span",{class:`vxe-button--item vxe-button--tooltip-${t}-icon`},[(0,_vue.h)("i",{class:e.icon||(0,_ui.getIcon)().BUTTON_TOOLTIP_ICON})])}}),G=()=>{var{content:e,suffixIcon:t,loading:n,prefixTooltip:i,suffixTooltip:o,suffixRender:u}=N,l=N.prefixIcon||N.icon,a=N.prefixRender||N.iconRender,s=_.value,r=b.value,v=P.prefix||P.icon,d=P.suffix,c=P.default,p=[];return i&&p.push(m(s,"prefix")),n?p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--loading-icon",(0,_ui.getIcon)().BUTTON_LOADING]})):v?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--custom-prefix-icon"},v({}))):a?(s=(i=_ui.renderer.get(a.name))?i.renderButtonPrefix:null,p.push((0,_vue.h)("span",{class:["vxe-button--item vxe-button--custom-prefix-icon"]},s?(0,_vn.getSlotVNs)(s(a,{$button:$})):[]))):l&&p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--prefix-icon",l]})),c?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--content"},c({}))):e&&p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--content"},(0,_utils.getFuncText)(e))),d?p.push((0,_vue.h)("span",{class:"vxe-button--item vxe-button--custom-suffix-icon"},d({}))):u?(v=(n=_ui.renderer.get(u.name))?n.renderButtonSuffix:null,p.push((0,_vue.h)("span",{class:["vxe-button--item vxe-button--custom-suffix-icon"]},v?(0,_vn.getSlotVNs)(v(u,{$button:$})):[]))):t&&p.push((0,_vue.h)("i",{class:["vxe-button--item vxe-button--suffix-icon",t]})),o&&p.push(m(r,"suffix")),p},W=(e,t,n)=>{i(e,(0,_ui.createEvent)(n,{$button:$},t))},x=(t={dispatchEvent:W,openPanel:c,closePanel:H,focus(){var e=z.value;return e&&e.focus(),(0,_vue.nextTick)()},blur(){var e=z.value;return e&&e.blur(),(0,_vue.nextTick)()}},e=>{var t=U.value;S.visiblePanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&H()}),f=e=>{var t,n=E.value,i=S.visiblePanel;n||(n=j.value,t=U.value,S.isActivated=(0,_dom.getEventTargetNode)(e,n).flag||(0,_dom.getEventTargetNode)(e,t).flag,i&&!S.isActivated&&H())},g=()=>{var e=S.visiblePanel;e&&d()};Object.assign($,t);return $.renderVN=()=>{let{className:e,trigger:t,title:n,routerLink:i,type:o,destroyOnClose:u,name:l,loading:a,shadow:s,showDropdownIcon:r}=N;var{initialized:v,isAniVisible:d,visiblePanel:c}=S,p=D.value;let m=Z.value;var _=J.value;let b=Q.value;var x=K.value;let f=X.value;var g,h=V.value,T=E.value,C=B.value,w=ee.value,y=M.value,O=I.value,k=P.dropdowns,y=y.className||N.popupClassName;return C.visible?k||w.length?(C={onContextmenu:L},g={},"hover"===t&&(C.onMouseenter=ie,C.onMouseleave=oe,g.onMouseenter=A,g.onMouseleave=ue),(0,_vue.h)("div",{ref:j,class:["vxe-button--dropdown",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,"is--active":c}]},[i?(0,_vue.h)((0,_vue.resolveComponent)("router-link"),Object.assign({ref:z,class:["vxe-button","vxe-button--link","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,to:i,onClick:Y},C),{default(){return G().concat(r?[(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+(0,_ui.getIcon)().BUTTON_DROPDOWN})]:[])}}):(0,_vue.h)("button",Object.assign({ref:z,class:["vxe-button","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,onClick:Y},C),G().concat(r?[(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+(0,_ui.getIcon)().BUTTON_DROPDOWN})]:[])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!h||!v},[(0,_vue.h)("div",Object.assign({ref:U,class:["vxe-button--dropdown-panel",y?_xeUtils.default.isFunction(y)?y({$button:$}):y:"",{["size--"+O]:O,"is--transfer":h,"ani--leave":d,"ani--enter":c}],placement:S.panelPlacement,style:S.panelStyle},g),v&&(c||d)?[k?(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:te,onClick:ne},v&&(!u||c||d)?k({}):[]):(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper"},v&&(!u||c||d)?w.map((t,e)=>(0,_vue.h)(VxeButtonComponent,{key:e,type:t.type,mode:t.mode||m,className:t.className,name:t.name,routerLink:t.routerLink,permissionCode:t.permissionCode,title:t.title,content:t.content,status:t.status,icon:t.icon,round:_xeUtils.default.isBoolean(t.round)?t.round:"text"!==m&&b,circle:_xeUtils.default.isBoolean(t.circle)?t.circle:"text"!==m&&f,disabled:t.disabled,loading:t.loading,align:t.align,onClick(e){((e,t)=>{e=e.$event;H(),W("dropdown-click",{name:t.name,option:t},e)})(e,t)}})):[])]:[])])])):i?(0,_vue.h)((0,_vue.resolveComponent)("router-link"),{ref:z,class:["vxe-button","vxe-button--link","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,to:i,onClick:q,onMouseenter:R,onMouseleave:F,onContextmenu:L},{default(){return G()}}):(0,_vue.h)("button",{ref:z,class:["vxe-button","type--"+m,x?"align--"+x:"",e?_xeUtils.default.isFunction(e)?e({$button:$}):e:"",{["size--"+O]:O,["theme--"+_]:_,"is--round":b,"is--circle":f,"is--shadow":s,"is--disabled":T||a,"is--loading":a}],title:n,name:l,type:p?o:"button",disabled:T||a,onClick:q,onMouseenter:R,onMouseleave:F,onContextmenu:L},G()):(0,_ui.renderEmptyElement)($)},(0,_vue.onMounted)(()=>{"text"===N.type&&(0,_log.warnLog)("vxe.error.delProp",["[button] type=text","mode=text"]),_ui.globalEvents.on($,"mousewheel",x),_ui.globalEvents.on($,"mousedown",f),_ui.globalEvents.on($,"resize",g)}),(0,_vue.onUnmounted)(()=>{_ui.globalEvents.off($,"mousewheel"),_ui.globalEvents.off($,"mousedown"),_ui.globalEvents.off($,"resize")}),$},render(){return this.renderVN()}});var _default=exports.default=VxeButtonComponent;

package/lib/drawer/src/drawer.js

@@ -68,6 +68,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       default: () => (0, _ui.getConfig)().drawer.showClose
     },
     content: [Number, String],
+    useHtml: {
+      type: Boolean,
+      default: () => (0, _ui.getConfig)().drawer.useHtml
+    },
     showCancelButton: {
       type: Boolean,
       default: null
@@ -484,7 +488,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const renderBody = () => {
       const {
         slots: propSlots = {},
-        content
+        content,
+        useHtml
       } = props;
       const defaultSlot = slots.default || propSlots.default;
       const leftSlot = slots.left || propSlots.left;
@@ -497,7 +502,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         $drawer: $xeDrawer
       }))) : (0, _ui.renderEmptyElement)($xeDrawer), (0, _vue.h)('div', {
         class: 'vxe-drawer--body-default'
-      }, [(0, _vue.h)('div', {
+      }, [useHtml && !defaultSlot ? (0, _vue.h)('div', {
+        key: 'hc',
+        class: 'vxe-drawer--content',
+        innerHTML: (0, _utils.getFuncText)(content)
+      }) : (0, _vue.h)('div', {
+        key: 'dc',
         class: 'vxe-drawer--content'
       }, defaultSlot ? (0, _vn.getSlotVNs)(defaultSlot({
         $drawer: $xeDrawer

package/lib/drawer/src/drawer.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.allActiveDrawers=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_button=_interopRequireDefault(require("../../button/src/button")),_index=_interopRequireDefault(require("../../loading/index"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let allActiveDrawers=exports.allActiveDrawers=[];var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeDrawer",props:{modelValue:Boolean,id:String,title:String,loading:{type:Boolean,default:null},className:String,position:{type:[String,Object],default:()=>(0,_ui.getConfig)().drawer.position},lockView:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.lockView},lockScroll:Boolean,mask:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.mask},maskClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.maskClosable},escClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.escClosable},cancelClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.cancelClosable},confirmClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.confirmClosable},showHeader:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showHeader},showFooter:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showFooter},showClose:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showClose},content:[Number,String],showCancelButton:{type:Boolean,default:null},cancelButtonText:{type:String,default:()=>(0,_ui.getConfig)().drawer.cancelButtonText},showConfirmButton:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showConfirmButton},confirmButtonText:{type:String,default:()=>(0,_ui.getConfig)().drawer.confirmButtonText},destroyOnClose:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.destroyOnClose},showTitleOverflow:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showTitleOverflow},width:[Number,String],height:[Number,String],resize:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.resize},zIndex:Number,transfer:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.transfer},padding:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.padding},size:{type:String,default:()=>(0,_ui.getConfig)().drawer.size||(0,_ui.getConfig)().size},beforeHideMethod:{type:Function,default:()=>(0,_ui.getConfig)().drawer.beforeHideMethod},slots:Object},emits:["update:modelValue","show","hide","before-hide","close","confirm","cancel","resize"],setup(g,e){let{slots:p,emit:i}=e;var t=_xeUtils.default.uniqueId();let r=(0,_vue.inject)("$xeModal",null),l=(0,_vue.inject)("$xeDrawer",null),o=(0,_vue.inject)("$xeTable",null),a=(0,_vue.inject)("$xeForm",null),h=(0,_ui.useSize)(g).computeSize,m=(0,_vue.ref)(),x=(0,_vue.ref)(),n=(0,_vue.ref)(),s=(0,_vue.ref)(),b=(0,_vue.reactive)({initialized:!1,visible:!1,contentVisible:!1,drawerZIndex:0,resizeFlag:1}),u={refElem:m},y=(0,_vue.computed)(()=>{var e=g.transfer;if(null===e){var t=(0,_ui.getConfig)().modal.transfer;if(_xeUtils.default.isBoolean(t))return t;if(o||r||l||a)return!0}return e}),C=(0,_vue.computed)(()=>{switch(g.position){case"top":return"sb";case"bottom":return"st";case"left":return"wr"}return"wl"}),d={},B={xID:t,props:g,context:e,reactData:b,getRefMaps:()=>u,getComputeMaps:()=>d},k=()=>x.value,c=()=>{var{width:e,height:t}=g,r=k();return r&&(r.style.width=(0,_dom.toCssUnit)(e),r.style.height=(0,_dom.toCssUnit)(t)),(0,_vue.nextTick)()},v=()=>{var e=g.zIndex,t=b.drawerZIndex;e?b.drawerZIndex=e:t<(0,_utils.getLastZIndex)()&&(b.drawerZIndex=(0,_utils.nextZIndex)())},_=()=>{-1<allActiveDrawers.indexOf(B)&&_xeUtils.default.remove(allActiveDrawers,e=>e===B)},f=e=>{var t=g.beforeHideMethod,r=b.visible;let l={type:e};return r&&Promise.resolve(t?t(l):null).then(e=>{_xeUtils.default.isError(e)||(b.contentVisible=!1,_(),z("before-hide",l,null),setTimeout(()=>{b.visible=!1,i("update:modelValue",!1),z("hide",l,null)},200))}).catch(e=>e),(0,_vue.nextTick)()},w=e=>{var t="close";z(t,{type:t},e),f(t)},E=e=>{var t=g.confirmClosable,r="confirm";z(r,{type:r},e),t&&f(r)},V=e=>{var t=g.cancelClosable,r="cancel";z(r,{type:r},e),t&&f(r)},S=()=>{let r=g.showFooter;var{initialized:e,visible:t}=b;return e||(b.initialized=!0),t||(b.visible=!0,b.contentVisible=!1,v(),allActiveDrawers.push(B),setTimeout(()=>{c(),b.contentVisible=!0,(0,_vue.nextTick)(()=>{r&&(e=n.value,t=s.value,e=e||t)&&e.focus();var e,t={type:""};i("update:modelValue",!0),z("show",t,null)})},10)),(0,_vue.nextTick)()},z=(e,t,r)=>{i(e,(0,_ui.createEvent)(r,{$drawer:B},t))};t={dispatchEvent:z,open:S,close(){return f("close")},getBox:k};let D=e=>{var t=m.value;g.maskClosable&&e.target===t&&f("mask")},N=t=>{if(_ui.globalEvents.hasKey(t,_ui.GLOBAL_EVENT_KEYS.ESCAPE)){let e=_xeUtils.default.max(allActiveDrawers,e=>e.reactData.drawerZIndex);e&&setTimeout(()=>{e===B&&e.props.escClosable&&(z("close",{type:"exit"},t),f("exit"))},10)}},T=()=>{let t=b.drawerZIndex;allActiveDrawers.some(e=>e.reactData.visible&&e.reactData.drawerZIndex>t)&&v()},I=e=>{e.preventDefault();let{visibleHeight:o,visibleWidth:a}=(0,_dom.getDomNode)();let n=e.target.getAttribute("type"),s=a,u=o,d=k(),c=d.clientWidth,v=d.clientHeight,_=e.clientX,f=e.clientY,w=d.offsetTop,g=d.offsetLeft,p={type:"resize"};document.onmousemove=e=>{e.preventDefault();let t,r,l,i;switch(n){case"wl":t=_-e.clientX,l=t+c,0<g-t&&0<l&&(d.style.width=`${l<s?l:s}px`);break;case"st":r=f-e.clientY,i=v+r,0<w-r&&0<i&&(d.style.height=`${i<u?i:u}px`);break;case"wr":t=e.clientX-_,l=t+c,g+l+0<a&&0<l&&(d.style.width=`${l<s?l:s}px`);break;case"sb":r=e.clientY-f,i=r+v,w+i+0<o&&0<i&&(d.style.height=`${i<u?i:u}px`)}d.className=d.className.replace(/\s?is--drag/,"")+" is--drag",z("resize",p,e),b.resizeFlag++},document.onmouseup=()=>{document.onmousemove=null,document.onmouseup=null,b.resizeFlag++,setTimeout(()=>{d.className=d.className.replace(/\s?is--drag/,"")},50)}};Object.assign(B,t,{});let $=()=>{var{slots:e={},showClose:t,title:r}=g,l=p.title||e.title,e=p.corner||e.corner;return[(0,_vue.h)("div",{class:"vxe-drawer--header-title"},l?(0,_vn.getSlotVNs)(l({$drawer:B})):r?(0,_utils.getFuncText)(r):(0,_ui.getI18n)("vxe.alert.title")),(0,_vue.h)("div",{class:"vxe-drawer--header-right"},[e?(0,_vue.h)("div",{class:"vxe-drawer--corner-wrapper"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),t?(0,_vue.h)("div",{class:["vxe-drawer--close-btn","trigger--btn"],title:(0,_ui.getI18n)("vxe.drawer.close"),onClick:w},[(0,_vue.h)("i",{class:(0,_ui.getIcon)().DRAWER_CLOSE})]):(0,_ui.renderEmptyElement)(B)])]},q=()=>{var{slots:e={},showCancelButton:t,showConfirmButton:r,loading:l}=g,i=p.leftfoot||e.leftfoot,e=p.rightfoot||e.rightfoot,o=[];return t&&o.push((0,_vue.h)(_button.default,{key:1,ref:s,content:g.cancelButtonText||(0,_ui.getI18n)("vxe.button.cancel"),onClick:V})),r&&o.push((0,_vue.h)(_button.default,{key:2,ref:n,loading:l,status:"primary",content:g.confirmButtonText||(0,_ui.getI18n)("vxe.button.confirm"),onClick:E})),(0,_vue.h)("div",{class:"vxe-drawer--footer-wrapper"},[(0,_vue.h)("div",{class:"vxe-drawer--footer-left"},i?(0,_vn.getSlotVNs)(i({$drawer:B})):[]),(0,_vue.h)("div",{class:"vxe-drawer--footer-right"},e?(0,_vn.getSlotVNs)(e({$drawer:B})):o)])};return(0,_vue.watch)(()=>g.width,c),(0,_vue.watch)(()=>g.height,c),(0,_vue.watch)(()=>g.modelValue,e=>{e?S():f("model")}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{g.modelValue&&S(),c()}),g.escClosable&&_ui.globalEvents.on(B,"keydown",N)}),(0,_vue.onUnmounted)(()=>{_ui.globalEvents.off(B,"keydown"),_()}),(0,_vue.provide)("$xeDrawer",B),B.renderVN=()=>{var{slots:e={},className:t,position:r,loading:l,lockScroll:i,padding:o,lockView:a,mask:n,resize:s,destroyOnClose:u}=g,{initialized:d,contentVisible:c,visible:v}=b,e=p.aside||e.aside,_=h.value,f=C.value,w=y.value;return(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!w||!d},[(0,_vue.h)("div",{ref:m,class:["vxe-drawer--wrapper","pos--"+r,t||"",{["size--"+_]:_,"is--padding":o,"lock--scroll":i,"lock--view":a,"is--resize":s,"is--mask":n,"is--visible":c,"is--active":v,"is--loading":l}],style:{zIndex:b.drawerZIndex},onClick:D},[(0,_vue.h)("div",{ref:x,class:"vxe-drawer--box",onMousedown:T},[e?(0,_vue.h)("div",{class:"vxe-drawer--aside"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)("div",{class:"vxe-drawer--container"},!b.initialized||u&&!b.visible?[]:[(()=>{var{slots:e={},showTitleOverflow:t}=g,e=p.header||e.header;return g.showHeader?(0,_vue.h)("div",{class:["vxe-drawer--header",{"is--ellipsis":t}]},e?(0,_vn.getSlotVNs)(e({$drawer:B})):$()):(0,_ui.renderEmptyElement)(B)})(),(()=>{var{slots:e={},content:t}=g,r=p.default||e.default,l=p.left||e.left,e=p.right||e.right;return(0,_vue.h)("div",{class:"vxe-drawer--body"},[l?(0,_vue.h)("div",{class:"vxe-drawer--body-left"},(0,_vn.getSlotVNs)(l({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)("div",{class:"vxe-drawer--body-default"},[(0,_vue.h)("div",{class:"vxe-drawer--content"},r?(0,_vn.getSlotVNs)(r({$drawer:B})):(0,_utils.getFuncText)(t))]),e?(0,_vue.h)("div",{class:"vxe-drawer--body-right"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)(_index.default,{class:"vxe-drawer--loading",modelValue:g.loading})])})(),(()=>{var{slots:e={}}=g,e=p.footer||e.footer;return g.showFooter?(0,_vue.h)("div",{class:"vxe-drawer--footer"},e?(0,_vn.getSlotVNs)(e({$drawer:B})):[q()]):(0,_ui.renderEmptyElement)(B)})(),s?(0,_vue.h)("span",{class:"vxe-drawer--resize"},[(0,_vue.h)("span",{class:f+"-resize",type:f,onMousedown:I})]):(0,_ui.renderEmptyElement)(B)])])])])},B},render(){return this.renderVN()}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.allActiveDrawers=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_button=_interopRequireDefault(require("../../button/src/button")),_index=_interopRequireDefault(require("../../loading/index"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let allActiveDrawers=exports.allActiveDrawers=[];var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeDrawer",props:{modelValue:Boolean,id:String,title:String,loading:{type:Boolean,default:null},className:String,position:{type:[String,Object],default:()=>(0,_ui.getConfig)().drawer.position},lockView:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.lockView},lockScroll:Boolean,mask:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.mask},maskClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.maskClosable},escClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.escClosable},cancelClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.cancelClosable},confirmClosable:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.confirmClosable},showHeader:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showHeader},showFooter:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showFooter},showClose:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showClose},content:[Number,String],useHtml:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.useHtml},showCancelButton:{type:Boolean,default:null},cancelButtonText:{type:String,default:()=>(0,_ui.getConfig)().drawer.cancelButtonText},showConfirmButton:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showConfirmButton},confirmButtonText:{type:String,default:()=>(0,_ui.getConfig)().drawer.confirmButtonText},destroyOnClose:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.destroyOnClose},showTitleOverflow:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.showTitleOverflow},width:[Number,String],height:[Number,String],resize:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.resize},zIndex:Number,transfer:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.transfer},padding:{type:Boolean,default:()=>(0,_ui.getConfig)().drawer.padding},size:{type:String,default:()=>(0,_ui.getConfig)().drawer.size||(0,_ui.getConfig)().size},beforeHideMethod:{type:Function,default:()=>(0,_ui.getConfig)().drawer.beforeHideMethod},slots:Object},emits:["update:modelValue","show","hide","before-hide","close","confirm","cancel","resize"],setup(g,e){let{slots:p,emit:i}=e;var t=_xeUtils.default.uniqueId();let r=(0,_vue.inject)("$xeModal",null),l=(0,_vue.inject)("$xeDrawer",null),o=(0,_vue.inject)("$xeTable",null),a=(0,_vue.inject)("$xeForm",null),h=(0,_ui.useSize)(g).computeSize,m=(0,_vue.ref)(),x=(0,_vue.ref)(),n=(0,_vue.ref)(),s=(0,_vue.ref)(),b=(0,_vue.reactive)({initialized:!1,visible:!1,contentVisible:!1,drawerZIndex:0,resizeFlag:1}),u={refElem:m},y=(0,_vue.computed)(()=>{var e=g.transfer;if(null===e){var t=(0,_ui.getConfig)().modal.transfer;if(_xeUtils.default.isBoolean(t))return t;if(o||r||l||a)return!0}return e}),C=(0,_vue.computed)(()=>{switch(g.position){case"top":return"sb";case"bottom":return"st";case"left":return"wr"}return"wl"}),d={},B={xID:t,props:g,context:e,reactData:b,getRefMaps:()=>u,getComputeMaps:()=>d},k=()=>x.value,c=()=>{var{width:e,height:t}=g,r=k();return r&&(r.style.width=(0,_dom.toCssUnit)(e),r.style.height=(0,_dom.toCssUnit)(t)),(0,_vue.nextTick)()},v=()=>{var e=g.zIndex,t=b.drawerZIndex;e?b.drawerZIndex=e:t<(0,_utils.getLastZIndex)()&&(b.drawerZIndex=(0,_utils.nextZIndex)())},_=()=>{-1<allActiveDrawers.indexOf(B)&&_xeUtils.default.remove(allActiveDrawers,e=>e===B)},f=e=>{var t=g.beforeHideMethod,r=b.visible;let l={type:e};return r&&Promise.resolve(t?t(l):null).then(e=>{_xeUtils.default.isError(e)||(b.contentVisible=!1,_(),z("before-hide",l,null),setTimeout(()=>{b.visible=!1,i("update:modelValue",!1),z("hide",l,null)},200))}).catch(e=>e),(0,_vue.nextTick)()},w=e=>{var t="close";z(t,{type:t},e),f(t)},E=e=>{var t=g.confirmClosable,r="confirm";z(r,{type:r},e),t&&f(r)},V=e=>{var t=g.cancelClosable,r="cancel";z(r,{type:r},e),t&&f(r)},S=()=>{let r=g.showFooter;var{initialized:e,visible:t}=b;return e||(b.initialized=!0),t||(b.visible=!0,b.contentVisible=!1,v(),allActiveDrawers.push(B),setTimeout(()=>{c(),b.contentVisible=!0,(0,_vue.nextTick)(()=>{r&&(e=n.value,t=s.value,e=e||t)&&e.focus();var e,t={type:""};i("update:modelValue",!0),z("show",t,null)})},10)),(0,_vue.nextTick)()},z=(e,t,r)=>{i(e,(0,_ui.createEvent)(r,{$drawer:B},t))};t={dispatchEvent:z,open:S,close(){return f("close")},getBox:k};let T=e=>{var t=m.value;g.maskClosable&&e.target===t&&f("mask")},D=t=>{if(_ui.globalEvents.hasKey(t,_ui.GLOBAL_EVENT_KEYS.ESCAPE)){let e=_xeUtils.default.max(allActiveDrawers,e=>e.reactData.drawerZIndex);e&&setTimeout(()=>{e===B&&e.props.escClosable&&(z("close",{type:"exit"},t),f("exit"))},10)}},N=()=>{let t=b.drawerZIndex;allActiveDrawers.some(e=>e.reactData.visible&&e.reactData.drawerZIndex>t)&&v()},I=e=>{e.preventDefault();let{visibleHeight:o,visibleWidth:a}=(0,_dom.getDomNode)();let n=e.target.getAttribute("type"),s=a,u=o,d=k(),c=d.clientWidth,v=d.clientHeight,_=e.clientX,f=e.clientY,w=d.offsetTop,g=d.offsetLeft,p={type:"resize"};document.onmousemove=e=>{e.preventDefault();let t,r,l,i;switch(n){case"wl":t=_-e.clientX,l=t+c,0<g-t&&0<l&&(d.style.width=`${l<s?l:s}px`);break;case"st":r=f-e.clientY,i=v+r,0<w-r&&0<i&&(d.style.height=`${i<u?i:u}px`);break;case"wr":t=e.clientX-_,l=t+c,g+l+0<a&&0<l&&(d.style.width=`${l<s?l:s}px`);break;case"sb":r=e.clientY-f,i=r+v,w+i+0<o&&0<i&&(d.style.height=`${i<u?i:u}px`)}d.className=d.className.replace(/\s?is--drag/,"")+" is--drag",z("resize",p,e),b.resizeFlag++},document.onmouseup=()=>{document.onmousemove=null,document.onmouseup=null,b.resizeFlag++,setTimeout(()=>{d.className=d.className.replace(/\s?is--drag/,"")},50)}};Object.assign(B,t,{});let $=()=>{var{slots:e={},showClose:t,title:r}=g,l=p.title||e.title,e=p.corner||e.corner;return[(0,_vue.h)("div",{class:"vxe-drawer--header-title"},l?(0,_vn.getSlotVNs)(l({$drawer:B})):r?(0,_utils.getFuncText)(r):(0,_ui.getI18n)("vxe.alert.title")),(0,_vue.h)("div",{class:"vxe-drawer--header-right"},[e?(0,_vue.h)("div",{class:"vxe-drawer--corner-wrapper"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),t?(0,_vue.h)("div",{class:["vxe-drawer--close-btn","trigger--btn"],title:(0,_ui.getI18n)("vxe.drawer.close"),onClick:w},[(0,_vue.h)("i",{class:(0,_ui.getIcon)().DRAWER_CLOSE})]):(0,_ui.renderEmptyElement)(B)])]},q=()=>{var{slots:e={},showCancelButton:t,showConfirmButton:r,loading:l}=g,i=p.leftfoot||e.leftfoot,e=p.rightfoot||e.rightfoot,o=[];return t&&o.push((0,_vue.h)(_button.default,{key:1,ref:s,content:g.cancelButtonText||(0,_ui.getI18n)("vxe.button.cancel"),onClick:V})),r&&o.push((0,_vue.h)(_button.default,{key:2,ref:n,loading:l,status:"primary",content:g.confirmButtonText||(0,_ui.getI18n)("vxe.button.confirm"),onClick:E})),(0,_vue.h)("div",{class:"vxe-drawer--footer-wrapper"},[(0,_vue.h)("div",{class:"vxe-drawer--footer-left"},i?(0,_vn.getSlotVNs)(i({$drawer:B})):[]),(0,_vue.h)("div",{class:"vxe-drawer--footer-right"},e?(0,_vn.getSlotVNs)(e({$drawer:B})):o)])};return(0,_vue.watch)(()=>g.width,c),(0,_vue.watch)(()=>g.height,c),(0,_vue.watch)(()=>g.modelValue,e=>{e?S():f("model")}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{g.modelValue&&S(),c()}),g.escClosable&&_ui.globalEvents.on(B,"keydown",D)}),(0,_vue.onUnmounted)(()=>{_ui.globalEvents.off(B,"keydown"),_()}),(0,_vue.provide)("$xeDrawer",B),B.renderVN=()=>{var{slots:e={},className:t,position:r,loading:l,lockScroll:i,padding:o,lockView:a,mask:n,resize:s,destroyOnClose:u}=g,{initialized:d,contentVisible:c,visible:v}=b,e=p.aside||e.aside,_=h.value,f=C.value,w=y.value;return(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!w||!d},[(0,_vue.h)("div",{ref:m,class:["vxe-drawer--wrapper","pos--"+r,t||"",{["size--"+_]:_,"is--padding":o,"lock--scroll":i,"lock--view":a,"is--resize":s,"is--mask":n,"is--visible":c,"is--active":v,"is--loading":l}],style:{zIndex:b.drawerZIndex},onClick:T},[(0,_vue.h)("div",{ref:x,class:"vxe-drawer--box",onMousedown:N},[e?(0,_vue.h)("div",{class:"vxe-drawer--aside"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)("div",{class:"vxe-drawer--container"},!b.initialized||u&&!b.visible?[]:[(()=>{var{slots:e={},showTitleOverflow:t}=g,e=p.header||e.header;return g.showHeader?(0,_vue.h)("div",{class:["vxe-drawer--header",{"is--ellipsis":t}]},e?(0,_vn.getSlotVNs)(e({$drawer:B})):$()):(0,_ui.renderEmptyElement)(B)})(),(()=>{var{slots:e={},content:t,useHtml:r}=g,l=p.default||e.default,i=p.left||e.left,e=p.right||e.right;return(0,_vue.h)("div",{class:"vxe-drawer--body"},[i?(0,_vue.h)("div",{class:"vxe-drawer--body-left"},(0,_vn.getSlotVNs)(i({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)("div",{class:"vxe-drawer--body-default"},[r&&!l?(0,_vue.h)("div",{key:"hc",class:"vxe-drawer--content",innerHTML:(0,_utils.getFuncText)(t)}):(0,_vue.h)("div",{key:"dc",class:"vxe-drawer--content"},l?(0,_vn.getSlotVNs)(l({$drawer:B})):(0,_utils.getFuncText)(t))]),e?(0,_vue.h)("div",{class:"vxe-drawer--body-right"},(0,_vn.getSlotVNs)(e({$drawer:B}))):(0,_ui.renderEmptyElement)(B),(0,_vue.h)(_index.default,{class:"vxe-drawer--loading",modelValue:g.loading})])})(),(()=>{var{slots:e={}}=g,e=p.footer||e.footer;return g.showFooter?(0,_vue.h)("div",{class:"vxe-drawer--footer"},e?(0,_vn.getSlotVNs)(e({$drawer:B})):[q()]):(0,_ui.renderEmptyElement)(B)})(),s?(0,_vue.h)("span",{class:"vxe-drawer--resize"},[(0,_vue.h)("span",{class:f+"-resize",type:f,onMousedown:I})]):(0,_ui.renderEmptyElement)(B)])])])])},B},render(){return this.renderVN()}});

package/lib/index.umd.js

@@ -4646,7 +4646,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.14.9"}`;
+const log_version = `ui v${"4.14.10"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -4654,7 +4654,7 @@ const errLog = log.create('error', log_version);
 
 
 
-const ui_version = "4.14.9";
+const ui_version = "4.14.10";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4781,6 +4781,7 @@ setConfig({
   },
   drawer: {
     // size: null,
+    // useHtml: false,
     position: 'right',
     showHeader: true,
     lockView: true,
@@ -4880,6 +4881,7 @@ setConfig({
     // size: null,
     top: 16,
     showHeader: true,
+    // useHtml: false,
     // width: null,
     // height: null,
     minWidth: 340,
@@ -7167,7 +7169,15 @@ var es_iterator_filter = __webpack_require__(2489);
       type: [String, Number],
       default: null
     },
-    useHTML: Boolean,
+    useHtml: {
+      type: Boolean,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(getConfig().tooltip.useHtml) ? getConfig().tooltip.useHtml : null
+    },
+    // 已废弃，请使用 useHtml
+    useHTML: {
+      type: Boolean,
+      default: () => getConfig().tooltip.useHTML
+    },
     zIndex: [String, Number],
     popupClassName: [String, Function],
     width: {
@@ -7588,6 +7598,7 @@ var es_iterator_filter = __webpack_require__(2489);
     Object.assign($xeTooltip, tooltipMethods);
     const renderContent = () => {
       const {
+        useHtml,
         useHTML
       } = props;
       const {
@@ -7598,16 +7609,16 @@ var es_iterator_filter = __webpack_require__(2489);
       const contVNs = [];
       if (contentSlot) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          key: 1
+          key: 'ct'
         }, vn_getSlotVNs(contentSlot({}))));
-      } else if (useHTML) {
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(useHtml) ? useHtml : useHTML) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          key: 2,
+          key: 'ch',
           innerHTML: tipContent
         }));
       } else {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-          key: 3
+          key: 'cd'
         }, `${tipContent}`));
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -8232,7 +8243,7 @@ const VxeButtonComponent = defineVxeComponent({
     };
     const renderTooltipIcon = (tipOpts, type) => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_tooltip, {
-        useHTML: tipOpts.useHTML,
+        useHtml: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(tipOpts.useHtml) ? tipOpts.useHtml : tipOpts.useHTML,
         content: tipOpts.content,
         enterable: tipOpts.enterable,
         theme: tipOpts.theme
@@ -24491,6 +24502,10 @@ const allActiveDrawers = [];
       default: () => getConfig().drawer.showClose
     },
     content: [Number, String],
+    useHtml: {
+      type: Boolean,
+      default: () => getConfig().drawer.useHtml
+    },
     showCancelButton: {
       type: Boolean,
       default: null
@@ -24907,7 +24922,8 @@ const allActiveDrawers = [];
     const renderBody = () => {
       const {
         slots: propSlots = {},
-        content
+        content,
+        useHtml
       } = props;
       const defaultSlot = slots.default || propSlots.default;
       const leftSlot = slots.left || propSlots.left;
@@ -24920,7 +24936,12 @@ const allActiveDrawers = [];
         $drawer: $xeDrawer
       }))) : renderEmptyElement($xeDrawer), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-drawer--body-default'
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [useHtml && !defaultSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'hc',
+        class: 'vxe-drawer--content',
+        innerHTML: getFuncText(content)
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'dc',
         class: 'vxe-drawer--content'
       }, defaultSlot ? vn_getSlotVNs(defaultSlot({
         $drawer: $xeDrawer
@@ -31639,6 +31660,10 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       default: () => getConfig().modal.duration
     },
     content: [Number, String],
+    useHtml: {
+      type: Boolean,
+      default: () => getConfig().modal.useHtml
+    },
     showCancelButton: {
       type: Boolean,
       default: null
@@ -32886,7 +32911,8 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         slots: propSlots = {},
         status,
         message,
-        iconStatus
+        iconStatus,
+        useHtml
       } = props;
       const content = props.content || message;
       const isMsg = computeIsMsg.value;
@@ -32901,7 +32927,12 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
           class: ['vxe-modal--status-icon', iconStatus || getIcon()[`MODAL_${status}`.toLocaleUpperCase()]]
         })]));
       }
-      contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      contVNs.push(useHtml && !defaultSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'hc',
+        class: 'vxe-modal--content',
+        innerHTML: getFuncText(content)
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'dc',
         class: 'vxe-modal--content'
       }, defaultSlot ? vn_getSlotVNs(defaultSlot({
         $modal: $xeModal