vxe-pc-ui 3.14.28 → 3.14.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/es/date-panel/src/date-panel.js +4 -3
  2. package/es/date-range-picker/src/date-range-picker.js +80 -2
  3. package/es/ui/index.js +1 -1
  4. package/es/ui/src/log.js +1 -1
  5. package/es/watermark/src/util.js +24 -20
  6. package/lib/date-panel/src/date-panel.js +7 -3
  7. package/lib/date-panel/src/date-panel.min.js +1 -1
  8. package/lib/date-range-picker/src/date-range-picker.js +82 -2
  9. package/lib/date-range-picker/src/date-range-picker.min.js +1 -1
  10. package/lib/index.umd.js +121 -41
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/ui/index.js +1 -1
  13. package/lib/ui/index.min.js +1 -1
  14. package/lib/ui/src/log.js +1 -1
  15. package/lib/ui/src/log.min.js +1 -1
  16. package/lib/watermark/src/util.js +30 -34
  17. package/lib/watermark/src/util.min.js +1 -1
  18. package/package.json +1 -1
  19. package/packages/date-panel/src/date-panel.ts +19 -18
  20. package/packages/date-range-picker/src/date-range-picker.ts +81 -3
  21. package/packages/watermark/src/util.ts +26 -22
  22. package/types/components/date-panel.d.ts +19 -2
  23. package/types/components/date-range-picker.d.ts +2 -0
  24. package/types/components/gantt.d.ts +4 -0
  25. package/types/components/table.d.ts +1 -0
  26. /package/es/icon/{iconfont.1780570410811.ttf → iconfont.1780656821823.ttf} +0 -0
  27. /package/es/icon/{iconfont.1780570410811.woff → iconfont.1780656821823.woff} +0 -0
  28. /package/es/icon/{iconfont.1780570410811.woff2 → iconfont.1780656821823.woff2} +0 -0
  29. /package/es/{iconfont.1780570410811.ttf → iconfont.1780656821823.ttf} +0 -0
  30. /package/es/{iconfont.1780570410811.woff → iconfont.1780656821823.woff} +0 -0
  31. /package/es/{iconfont.1780570410811.woff2 → iconfont.1780656821823.woff2} +0 -0
  32. /package/lib/icon/style/{iconfont.1780570410811.ttf → iconfont.1780656821823.ttf} +0 -0
  33. /package/lib/icon/style/{iconfont.1780570410811.woff → iconfont.1780656821823.woff} +0 -0
  34. /package/lib/icon/style/{iconfont.1780570410811.woff2 → iconfont.1780656821823.woff2} +0 -0
  35. /package/lib/{iconfont.1780570410811.ttf → iconfont.1780656821823.ttf} +0 -0
  36. /package/lib/{iconfont.1780570410811.woff → iconfont.1780656821823.woff} +0 -0
  37. /package/lib/{iconfont.1780570410811.woff2 → iconfont.1780656821823.woff2} +0 -0
@@ -1 +1 @@
1
- function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("../../date-panel/src/util"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_datePanel=_interopRequireDefault(require("../../date-panel/src/date-panel")),_button=_interopRequireDefault(require("../../button/src/button")),_buttonGroup=_interopRequireDefault(require("../../button/src/button-group"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,a){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:a,enumerable:!0,configurable:!0,writable:!0}):e[t]=a,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var a=e[Symbol.toPrimitive];if(void 0===a)return("string"===t?String:Number)(e);a=a.call(e,t||"default");if("object"!=_typeof(a))return a;throw new TypeError("@@toPrimitive must return a primitive value.")}function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_unsupportedIterableToArray(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var a;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(a="Object"===(a={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:a)||"Set"===a?Array.from(e):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?_arrayLikeToArray(e,t):void 0}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var a=0,n=Array(t);a<t;a++)n[a]=e[a];return n}function _iterableToArrayLimit(e,t){var a=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=a){var n,r,i,l,o=[],u=!0,s=!1;try{if(i=(a=a.call(e)).next,0===t){if(Object(a)!==a)return;u=!1}else for(;!(u=(n=i.call(a)).done)&&(o.push(n.value),o.length!==t);u=!0);}catch(e){s=!0,r=e}finally{try{if(!u&&null!=a.return&&(l=a.return(),Object(l)!==l))return}finally{if(s)throw r}}return o}}function _arrayWithHoles(e){if(Array.isArray(e))return e}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeDateRangePicker",mixins:[_ui.globalMixins.sizeMixin],model:{prop:"value",event:"modelValue"},props:{value:[String,Number,Date,Array],startValue:[String,Number,Date],endValue:[String,Number,Date],immediate:{type:Boolean,default:!0},name:String,type:{type:String,default:"date"},clearable:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.clearable}},readonly:{type:Boolean,default:null},disabled:{type:Boolean,default:null},placeholder:String,autoComplete:{type:String,default:"off"},form:String,className:String,zIndex:Number,size:{type:String,default:function(){return(0,_ui.getConfig)().dateRangePicker.size||(0,_ui.getConfig)().size}},minDate:[String,Number,Date],maxDate:[String,Number,Date],defaultDate:[String,Number,Date,Array],defaultTime:[String,Number,Date,Array],startDay:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.startDay}},labelFormat:String,valueFormat:String,timeFormat:String,valueType:String,editable:{type:Boolean,default:!0},festivalMethod:{type:Function,default:function(){return(0,_ui.getConfig)().dateRangePicker.festivalMethod}},disabledMethod:{type:Function,default:function(){return(0,_ui.getConfig)().dateRangePicker.disabledMethod}},separator:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.separator}},selectDay:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.selectDay}},showClearButton:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.showClearButton}},showConfirmButton:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.showConfirmButton}},autoClose:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.autoClose}},prefixIcon:String,suffixIcon:String,placement:String,transfer:{type:Boolean,default:null},timeConfig:Object,popupConfig:Object,shortcutConfig:Object},inject:{$xeModal:{default:null},$xeDrawer:{default:null},$xeTable:{default:null},$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null}},provide:function(){return{$xeDateRangePicker:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{initialized:!1,panelIndex:0,visiblePanel:!1,isAniVisible:!1,panelStyle:{},panelPlacement:"",isActivated:!1,startValue:"",endValue:""},internalData:{}}},computed:Object.assign(Object.assign({},{}),{computeBtnTransfer:function(){var e=this,t=e.$xeTable,a=e.$xeModal,n=e.$xeDrawer,r=e.$xeForm,i=e.transfer,e=e.computePopupOpts;if(_xeUtils.default.isBoolean(e.transfer))return e.transfer;if(null===i){e=(0,_ui.getConfig)().dateRangePicker.transfer;if(_xeUtils.default.isBoolean(e))return e;if(t||a||n||r)return!0}return i},computeFormReadonly:function(){var e=this.$xeForm,t=this.readonly;return null===t?!!e&&e.readonly:t},computeIsDisabled:function(){var e=this.$xeForm,t=this.disabled;return null===t?!!e&&e.disabled:t},computeDefaultDates:function(){var e=this.defaultDate;return e?_xeUtils.default.isArray(e)?e:-1<"".concat(e).indexOf(",")?"".concat(e).split(","):[e,e]:[]},computeDefaultTimes:function(){var e=this.defaultTime;return e?_xeUtils.default.isArray(e)?e:-1<"".concat(e).indexOf(",")?"".concat(e).split(","):[e,e]:[]},computeMVal:function(){var e=this.startValue,t=this.endValue;return"".concat(e||"").concat(t||"")},computeIsDateTimeType:function(){var e=this.type;return"time"===e||"datetime"===e},computeIsDatePickerType:function(){return-1<["date","week","month","quarter","year"].indexOf(this.type)},computeIsClearable:function(){return this.clearable},computeInpPlaceholder:function(){var e=this.placeholder;return(e=e||(0,_ui.getConfig)().dateRangePicker.placeholder)?(0,_utils.getFuncText)(e):(0,_ui.getI18n)("vxe.dateRangePicker.pleaseRange")},computeInpImmediate:function(){return this.immediate},computeTimeOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.timeConfig,this.timeConfig)},computePopupOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.popupConfig,this.popupConfig)},computeShortcutOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.shortcutConfig,this.shortcutConfig)},computeShortcutList:function(){var e=this.computeShortcutOpts.options;return e?e.map(function(e,t){return Object.assign({name:"".concat(e.name||e.code||t)},e)}):[]},computeDateLabelFormat:function(){return this.labelFormat||(0,_ui.getI18n)("vxe.input.date.labelFormat.".concat(this.type))},computeDateValueFormat:function(){var e=this.type,t=this.valueFormat;return(0,_util.handleValueFormat)(e,t)},computeFirstDayOfWeek:function(){var e=this.startDay;return _xeUtils.default.toNumber(e)},computePanelLabelObj:function(){var e=this.reactData,t=e.startValue,e=e.endValue;return this.formatRangeLabel(t||e?[t||"",e||""]:[])},computeInputLabel:function(){return this.computePanelLabelObj.label}}),methods:{dispatchEvent:function(e,t,a){this.$emit(e,(0,_ui.createEvent)(a,{$dateRangePicker:this},t))},emitModel:function(e){var t=this._events;t&&t.modelValue?this.$emit("modelValue",e):this.$emit("model-value",e)},formatRangeLabel:function(e){var t=this.type,a=this.separator,n=this.computeDateLabelFormat,r=this.computeDateValueFormat,i=this.computeFirstDayOfWeek,l=e[0]?(0,_util.parseDateObj)(e[0],t,{valueFormat:r,labelFormat:n,firstDay:i}):null,e=e[1]?(0,_util.parseDateObj)(e[1],t,{valueFormat:r,labelFormat:n,firstDay:i}):null,t=l?l.label:"",r=e?e.label:"";return{label:(t||r?[t,r]:[]).join("".concat(a||" ~ ")),startLabel:t,endLabel:r}},getRangeValue:function(e,t){var a=this.value,n=this.valueType,r=_xeUtils.default.isArray(a);if(n)switch(n){case"array":r=!0;break;case"string":r=!1}return e||t?(a=[e||"",t||""],r?a:a.join(",")):r?[]:""},paraeUpdateModel:function(){var e,t=this.type,a=this.value,n=this.computeDateValueFormat,r="",i="";return _xeUtils.default.isArray(a)?(e=(0,_util.parseDateString)(a[0],t,{valueFormat:n}),t=(0,_util.parseDateString)(a[1],t,{valueFormat:n}),(e||t)&&(r=e||"",i=t||"")):_xeUtils.default.isString(a)&&((n=a.split(","))[0]||n[1])&&(r=n[0]||"",i=n[1]||""),{sValue:r,eValue:i}},parseUpdateData:function(){var e=this.type,t=this.startValue,a=this.endValue,n=this.computeDateValueFormat;return{sValue:(0,_util.parseDateString)(t,e,{valueFormat:n}),eValue:(0,_util.parseDateString)(a,e,{valueFormat:n})}},updateModelValue:function(e){var t=this,a=t.reactData,n=t.value,r=t.startValue,i=t.endValue,l={sValue:"",eValue:""},l=e?n?t.paraeUpdateModel():t.parseUpdateData():r||i?t.parseUpdateData():t.paraeUpdateModel();a.startValue=l.sValue,a.endValue=l.eValue},triggerEvent:function(e){var t=this.reactData,a=t.startValue,t=t.endValue,n=this.getRangeValue(a,t);this.dispatchEvent(e.type,{value:n,startValue:a,endValue:t},e)},handleChange:function(e,t,a){var n=this,r=n.reactData,i=n.$xeForm,l=n.formItemInfo,o=n.value,r=(r.startValue=e,n.getRangeValue(e,r.endValue=t)),u=e&&t||!e&&!t;n.emitModel(r),n.$emit("update:startValue",e||""),n.$emit("update:endValue",t||""),_xeUtils.default.toValueString(o)!==r&&(n.dispatchEvent("change",{value:r,startValue:e,endValue:t,isFinish:u},a),i)&&l&&i.triggerItemEvent(a,l.itemConfig.field,r)},changeEvent:function(e){this.computeInpImmediate||this.triggerEvent(e)},focusEvent:function(e){var t=this.reactData,a=this.computePopupOpts.trigger;t.isActivated=!0,a&&"default"!==a||this.dateRangePickerOpenEvent(e),this.triggerEvent(e)},clickPrefixEvent:function(e){var t,a,n=this.reactData;this.computeIsDisabled||(t=n.startValue,n=n.endValue,a=this.getRangeValue(t,n),this.dispatchEvent("prefix-click",{value:a,startValue:t,endValue:n},e))},hidePanel:function(){var t=this.reactData,a=this.internalData;return new Promise(function(e){t.visiblePanel=!1,a.hpTimeout=setTimeout(function(){t.isAniVisible=!1,e()},350)})},clearValueEvent:function(e,t){this.computeIsDatePickerType&&this.hidePanel();this.handleChange("","",e),this.dispatchEvent("clear",{value:t,startValue:"",endValue:""},e)},checkValue:function(){var e=this.$refs.refStartDatePanel,t=this.$refs.refEndDatePanel;e&&t&&(e=e.getModelValue(),t=t.getModelValue(),e&&t||this.handleChange("","",{type:"check"}))},panelCellClassName:function(e){var e=e.date,t=this.reactData,a=t.startValue,t=t.endValue;if(a&&t){e=e.getTime(),a=_xeUtils.default.toStringDate(a).getTime(),t=_xeUtils.default.toStringDate(t).getTime();if(a<=e&&e<=t)return"is--range-selected"}return""},handleSelectClose:function(){var e=this,t=e.reactData,a=e.internalData,n=e.autoClose,r=t.startValue,t=t.endValue,i=a.selectStatus;n?i&&e.computeIsDatePickerType&&r&&t&&e.hidePanel():r&&t&&(a.selectStatus=!1)},clickSuffixEvent:function(e){var t,a,n=this.reactData;this.computeIsDisabled||(t=n.startValue,n=n.endValue,a=this.getRangeValue(t,n),this.dispatchEvent("suffix-click",{value:a,startValue:t,endValue:n},e))},blurEvent:function(e){var t=this,a=t.reactData,n=t.$xeForm,r=t.formItemInfo,i=a.startValue,l=a.endValue;t.computeInpImmediate||t.handleChange(i,l,e),a.visiblePanel||(a.isActivated=!1),t.dispatchEvent("blur",{value:"",startValue:i,endValue:l},e),n&&r&&n.triggerItemEvent(e,r.itemConfig.field,"")},keydownEvent:function(e){this.triggerEvent(e)},keyupEvent:function(e){this.triggerEvent(e)},confirmEvent:function(e){var t,a,n=this,r=n.$refs.refStartDatePanel,i=n.$refs.refEndDatePanel;r&&i&&(t=r.getModelValue(),a=i.getModelValue(),t&&!a||!t&&a?n.handleChange("","",e):(r.confirmByEvent(e),i.confirmByEvent(e)),r=n.getRangeValue(t,a),n.dispatchEvent("confirm",{value:r,startValue:t,endValue:a},e)),n.hidePanel()},startPanelChangeEvent:function(e){var a=this,t=a.reactData,n=a.internalData,r=n.selectStatus,i=e.value,l=r?t.endValue:"";a.handleChange(i,l,e.$event),a.handleSelectClose(),r||(n.selectStatus=!0),a.$nextTick(function(){var e=a.$refs.refStartDatePanel,t=a.$refs.refEndDatePanel;e&&t&&(e=e.getModelValue(),!l)&&e&&t.setPanelDate(_xeUtils.default.toStringDate(e))})},endPanelChangeEvent:function(e){var a=this,t=a.reactData,n=a.internalData,r=n.selectStatus,i=e.value,l=r?t.startValue:"";a.handleChange(l,i,e.$event),a.handleSelectClose(),r||(n.selectStatus=!0),a.$nextTick(function(){var e=a.$refs.refStartDatePanel,t=a.$refs.refEndDatePanel;e&&t&&(t=t.getModelValue(),!l)&&t&&e.setPanelDate(_xeUtils.default.toStringDate(t))})},handleGlobalMousedownEvent:function(e){var t=this,a=t.reactData,n=a.visiblePanel,r=t.$refs.refElem,i=t.$refs.refPanelWrapper;!t.computeIsDisabled&&a.isActivated&&(a.isActivated=(0,_dom.getEventTargetNode)(e,r).flag||(0,_dom.getEventTargetNode)(e,i).flag,a.isActivated||n&&(t.checkValue(),t.hidePanel()))},handleGlobalKeydownEvent:function(e){var t,a=this.reactData,n=a.visiblePanel;this.computeIsDisabled||(t=_ui.globalEvents.hasKey(e,_ui.GLOBAL_EVENT_KEYS.TAB),e=_ui.globalEvents.hasKey(e,_ui.GLOBAL_EVENT_KEYS.ESCAPE),t&&(a.isActivated=!1),n&&(e||t)&&(this.checkValue(),this.hidePanel()))},handleGlobalMousewheelEvent:function(e){var t=this,a=t.reactData.visiblePanel;t.computeIsDisabled||a&&(a=t.$refs.refPanelWrapper,(0,_dom.getEventTargetNode)(e,a).flag?t.updatePlacement():(t.checkValue(),t.hidePanel()))},handleGlobalBlurEvent:function(){var e=this.reactData,t=e.visiblePanel,a=e.isActivated;t&&(this.checkValue(),this.hidePanel()),a&&(e.isActivated=!1),(t||a)&&(e=this.$refs.refInputTarget)&&e.blur()},handleGlobalResizeEvent:function(){this.reactData.visiblePanel&&this.updatePlacement()},updateZindex:function(){var e=this.reactData,t=this.computePopupOpts.zIndex||this.zIndex;t?e.panelIndex=_xeUtils.default.toNumber(t):e.panelIndex<(0,_utils.getLastZIndex)()&&(e.panelIndex=(0,_utils.nextZIndex)())},updatePlacement:function(){function e(){var e=(0,_dom.updatePanelPlacement)(i,l,{placement:u.placement||n,defaultPlacement:u.defaultPlacement,teleportTo:o}),t=Object.assign(e.style,{zIndex:r});a.panelStyle=t,a.panelPlacement=e.placement}var t=this,a=t.reactData,n=t.placement,r=a.panelIndex,i=t.$refs.refInputTarget,l=t.$refs.refInputPanel,o=t.computeBtnTransfer,u=t.computePopupOpts;return e(),t.$nextTick().then(e)},showPanel:function(){var e=this,t=e.reactData,a=e.internalData,n=t.visiblePanel,r=e.computeBtnTransfer,i=e.$refs.refInputPanel;return e.computeIsDisabled||n?e.$nextTick():(t.initialized||(t.initialized=!0,r&&i&&document.body.appendChild(i)),a.hpTimeout&&(clearTimeout(a.hpTimeout),a.hpTimeout=void 0),a.selectStatus=!1,t.isActivated=!0,t.isAniVisible=!0,setTimeout(function(){t.visiblePanel=!0,e.updatePlacement()},10),e.updateZindex(),e.updatePlacement())},dateRangePickerOpenEvent:function(e){this.computeFormReadonly||(e.preventDefault(),this.showPanel())},clickIconEvent:function(e){var t=this.computePopupOpts.trigger;t&&"default"!==t&&"icon"!==t||this.dateRangePickerOpenEvent(e)},clickEvent:function(e){this.triggerEvent(e)},handleShortcutEvent:function(e){var t=e.option,a=e.$event,n=this,e=n.reactData,r=n.type,i=n.computeShortcutOpts,l=i.autoClose,o=t.code,u=t.clickMethod,s=e.startValue,c=n.getRangeValue(s,m=e.endValue),d={$dateRangePicker:n,option:t,value:c,startValue:s,endValue:m,code:o};if(!u&&o){e=_ui.commands.get(o),t=e?e.dateRangePickerCommandMethod:null;if(t)t(d);else{var p=n.computeDateValueFormat,f=n.computeFirstDayOfWeek;switch(o){case"last1":case"last3":case"last7":case"last30":case"last60":case"last90":case"last180":var m,h=(0,_util.getRangeDateByCode)(o,c,r,{valueFormat:p,firstDay:f}),s=h.startValue,c=n.getRangeValue(s,m=h.endValue);d.value=c,d.startValue=s,d.endValue=m,n.handleChange(s,m,a);break;default:(0,_log.errLog)("vxe.error.notCommands",["[date-range-picker] ".concat(o)])}}}else{e=u||i.clickMethod;e&&e(d)}l&&n.hidePanel(),n.dispatchEvent("shortcut-click",d,a)},setModelValue:function(e,t){var a=this.reactData,a=(a.startValue=e||"",a.endValue=t||"",this.getRangeValue(e,t));this.emitModel(a)},setModelValueByEvent:function(e,t,a){this.handleChange(t||"",a||"",e)},focus:function(){var e=this.reactData,t=this.$refs.refInputTarget;return e.isActivated=!0,t.focus(),this.$nextTick()},blur:function(){var e=this.reactData;return this.$refs.refInputTarget.blur(),e.isActivated=!1,this.$nextTick()},select:function(){var e=this.reactData;return this.$refs.refInputTarget.select(),e.isActivated=!1,this.$nextTick()},renderShortcutBtn:function(e,t,a){var n=this.computeShortcutOpts,r=n.position,i=n.align,l=n.mode,o=this.computeShortcutList;return(0,_utils.isEnableConf)(n)&&o.length&&(r||"left")===t?e("div",{class:"vxe-date-range-picker--layout-".concat(t,"-wrapper")},[e(_buttonGroup.default,{props:{options:o,mode:l,align:i,vertical:a},on:{click:this.handleShortcutEvent}})]):(0,_ui.renderEmptyElement)(this)},renderPanel:function(e){var t=this,a=t,n=t.$scopedSlots,r=t.reactData,i=a.type,l=a.separator,o=a.autoClose,u=a.showConfirmButton,s=a.showClearButton,c=r.initialized,d=r.isAniVisible,p=r.visiblePanel,f=r.panelPlacement,m=r.panelStyle,h=r.startValue,r=r.endValue,v=t.computeSize,g=t.computeBtnTransfer,y=t.computeIsClearable,b=t.computePanelLabelObj,_=t.computeShortcutList,D=t.computeIsDateTimeType,P=t.computeDefaultTimes,x=t.computeTimeOpts,V=b.startLabel,b=b.endLabel,E=t.computeShortcutOpts.position,k=n.header,S=n.footer,I=n.top,C=n.bottom,T=n.left,n=n.right,$=t.computePopupOpts.className,F=_slicedToArray(t.computeDefaultDates,2),R=F[0],F=F[1],P=_slicedToArray(P,2),w=P[0],P=P[1],_=0<_.length,D=null===u?D||!o:u,o=null===s?y:s;return e("div",{ref:"refInputPanel",class:["vxe-table--ignore-clear vxe-date-range-picker--panel","type--".concat(i),$?_xeUtils.default.isFunction($)?$({$dateRangePicker:t}):$:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(v),v),"is--transfer",g),"ani--leave",d),"ani--enter",p),"show--top",!!(I||k||_&&("top"===E||"header"===E))),"show--bottom",!!(C||S||_&&("bottom"===E||"footer"===E))),"show--left",!!(T||_&&"left"===E)),"show--right",!!(n||_&&"right"===E))],attrs:{placement:f},style:m},c&&(p||d)?[e("div",{ref:"refPanelWrapper",class:["vxe-date-range-picker--layout-all-wrapper","type--".concat(i),_defineProperty({},"size--".concat(v),v)]},[I?e("div",{class:"vxe-date-range-picker--layout-top-wrapper"},I({})):t.renderShortcutBtn(e,"top"),e("div",{class:"vxe-date-range-picker--layout-body-layout-wrapper"},[T?e("div",{class:"vxe-date-range-picker--layout-left-wrapper"},T({})):t.renderShortcutBtn(e,"left",!0),e("div",{class:"vxe-date-range-picker--layout-body-content-wrapper"},[k?e("div",{class:"vxe-date-range-picker--layout-header-wrapper"},k({})):t.renderShortcutBtn(e,"header"),e("div",{class:"vxe-date-range-picker--layout-body-wrapper"},[e(_datePanel.default,{ref:"refStartDatePanel",props:{value:h,type:a.type,className:a.className,minDate:a.minDate,maxDate:a.maxDate,endDate:r,startDay:a.startDay,labelFormat:a.labelFormat,valueFormat:a.valueFormat,timeFormat:a.timeFormat,defaultDate:R,defaultTime:w,timeConfig:x,festivalMethod:a.festivalMethod,disabledMethod:a.disabledMethod,cellClassName:t.panelCellClassName,selectDay:a.selectDay},on:{change:t.startPanelChangeEvent}}),e(_datePanel.default,{ref:"refEndDatePanel",props:{value:r,type:a.type,className:a.className,minDate:a.minDate,maxDate:a.maxDate,startDate:h,startDay:a.startDay,labelFormat:a.labelFormat,valueFormat:a.valueFormat,timeFormat:a.timeFormat,defaultDate:F,defaultTime:P,timeConfig:x,festivalMethod:a.festivalMethod,disabledMethod:a.disabledMethod,cellClassName:t.panelCellClassName,selectDay:a.selectDay},on:{change:t.endPanelChangeEvent}})]),e("div",{class:"vxe-date-range-picker--layout-footer-wrapper"},[e("div",{class:"vxe-date-range-picker--layout-footer-label"},V||b?[e("span",V),e("span","".concat(l||"")),e("span",b)]:"".concat(l||"")),e("div",{class:"vxe-date-range-picker--layout-footer-custom"},S?S({}):[t.renderShortcutBtn(e,"footer")]),e("div",{class:"vxe-date-range-picker--layout-footer-btns"},[o?e(_button.default,{props:{size:"mini",disabled:!(h||r),content:(0,_ui.getI18n)("vxe.button.clear")},on:{click:t.clearValueEvent}}):(0,_ui.renderEmptyElement)(t),D?e(_button.default,{props:{size:"mini",status:"primary",content:(0,_ui.getI18n)("vxe.button.confirm")},on:{click:t.confirmEvent}}):(0,_ui.renderEmptyElement)(t)])])]),n?e("div",{class:"vxe-date-range-picker--layout-right-wrapper"},n({})):t.renderShortcutBtn(e,"right",!0)]),C?e("div",{class:"vxe-date-range-picker--layout-bottom-wrapper"},C({})):t.renderShortcutBtn(e,"bottom")])]:[])},renderPrefixIcon:function(e){var t=this.$scopedSlots,a=this.prefixIcon,t=t.prefix;return t||a?e("div",{class:"vxe-date-range-picker--prefix",on:{click:this.clickPrefixEvent}},[e("div",{class:"vxe-date-range-picker--prefix-icon"},t?(0,_vn.getSlotVNs)(t({})):[e("i",{class:a})])]):null},renderSuffixIcon:function(e){var t=this,a=t.$scopedSlots,n=t.reactData,r=t.suffixIcon,i=n.startValue,a=a.suffix,l=t.computeIsClearable;return e("div",{class:["vxe-date-range-picker--suffix",{"is--clear":l&&!t.computeIsDisabled&&(i||n.endValue)}]},[l?e("div",{class:"vxe-date-range-picker--clear-icon",on:{click:t.clearValueEvent}},[e("i",{class:(0,_ui.getIcon)().INPUT_CLEAR})]):(0,_ui.renderEmptyElement)(t),t.renderExtraSuffixIcon(e),a||r?e("div",{class:"vxe-date-range-picker--suffix-icon",on:{click:t.clickSuffixEvent}},a?(0,_vn.getSlotVNs)(a({})):[e("i",{class:r})]):(0,_ui.renderEmptyElement)(t)])},renderExtraSuffixIcon:function(e){return e("div",{class:"vxe-date-range-picker--control-icon",on:{click:this.dateRangePickerOpenEvent}},[e("i",{class:["vxe-date-range-picker--date-picker-icon",(0,_ui.getIcon)().DATE_PICKER_DATE]})])},renderVN:function(e){var t,a,n,r,i=this,l=i.reactData,o=i.className,u=i.type,s=i.name,c=i.autoComplete,d=l.startValue,p=l.endValue,f=l.visiblePanel,l=l.isActivated,m=i.computeSize,h=i.computeIsDisabled,v=i.computeInputLabel;return i.computeFormReadonly?e("div",{ref:"refElem",class:["vxe-date-range-picker--readonly","type--".concat(u),o]},v):(t=i.computeInpPlaceholder,a=i.computeIsClearable,n=i.renderPrefixIcon(e),r=i.renderSuffixIcon(e),e("div",{ref:"refElem",class:["vxe-date-range-picker","type--".concat(u),o,_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(m),m),"is--prefix",!!n),"is--suffix",!!r),"is--visible",f),"is--disabled",h),"is--active",l),"show--clear",a&&!h&&(d||p))],attrs:{spellcheck:!1}},[n||(0,_ui.renderEmptyElement)(i),e("div",{class:"vxe-date-range-picker--wrapper"},[e("input",{ref:"refInputTarget",class:"vxe-date-range-picker--inner",domProps:{value:v},attrs:{name:s,type:"text",placeholder:t,editable:!1,disabled:h,autocomplete:c},on:{keydown:i.keydownEvent,keyup:i.keyupEvent,click:i.clickEvent,change:i.changeEvent,focus:i.focusEvent,blur:i.blurEvent}})]),r||(0,_ui.renderEmptyElement)(i),i.renderPanel(e)]))}},watch:{value:function(){this.updateModelValue(!0)},computeMVal:function(){this.updateModelValue(!1)}},created:function(){var e=this;e.updateModelValue(!0),_ui.globalEvents.on(e,"mousewheel",e.handleGlobalMousewheelEvent),_ui.globalEvents.on(e,"mousedown",e.handleGlobalMousedownEvent),_ui.globalEvents.on(e,"keydown",e.handleGlobalKeydownEvent),_ui.globalEvents.on(e,"blur",e.handleGlobalBlurEvent),_ui.globalEvents.on(e,"resize",e.handleGlobalResizeEvent)},deactivated:function(){this.checkValue()},beforeDestroy:function(){var e=this,t=e.$refs.refInputPanel;t&&t.parentNode&&t.parentNode.removeChild(t),e.checkValue(),_ui.globalEvents.off(e,"mousewheel"),_ui.globalEvents.off(e,"mousedown"),_ui.globalEvents.off(e,"blur"),_ui.globalEvents.off(e,"resize")},render:function(e){return this.renderVN(e)}});
1
+ function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("../../date-panel/src/util"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_datePanel=_interopRequireDefault(require("../../date-panel/src/date-panel")),_button=_interopRequireDefault(require("../../button/src/button")),_buttonGroup=_interopRequireDefault(require("../../button/src/button-group"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,a){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:a,enumerable:!0,configurable:!0,writable:!0}):e[t]=a,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var a=e[Symbol.toPrimitive];if(void 0===a)return("string"===t?String:Number)(e);a=a.call(e,t||"default");if("object"!=_typeof(a))return a;throw new TypeError("@@toPrimitive must return a primitive value.")}function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_unsupportedIterableToArray(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var a;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(a="Object"===(a={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:a)||"Set"===a?Array.from(e):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?_arrayLikeToArray(e,t):void 0}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var a=0,n=Array(t);a<t;a++)n[a]=e[a];return n}function _iterableToArrayLimit(e,t){var a=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=a){var n,r,i,l,o=[],u=!0,s=!1;try{if(i=(a=a.call(e)).next,0===t){if(Object(a)!==a)return;u=!1}else for(;!(u=(n=i.call(a)).done)&&(o.push(n.value),o.length!==t);u=!0);}catch(e){s=!0,r=e}finally{try{if(!u&&null!=a.return&&(l=a.return(),Object(l)!==l))return}finally{if(s)throw r}}return o}}function _arrayWithHoles(e){if(Array.isArray(e))return e}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeDateRangePicker",mixins:[_ui.globalMixins.sizeMixin],model:{prop:"value",event:"modelValue"},props:{value:[String,Number,Date,Array],startValue:[String,Number,Date],endValue:[String,Number,Date],immediate:{type:Boolean,default:!0},name:String,type:{type:String,default:"date"},clearable:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.clearable}},linkedPanels:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.linkedPanels}},readonly:{type:Boolean,default:null},disabled:{type:Boolean,default:null},placeholder:String,autoComplete:{type:String,default:"off"},form:String,className:String,zIndex:Number,size:{type:String,default:function(){return(0,_ui.getConfig)().dateRangePicker.size||(0,_ui.getConfig)().size}},minDate:[String,Number,Date],maxDate:[String,Number,Date],defaultDate:[String,Number,Date,Array],defaultTime:[String,Number,Date,Array],startDay:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.startDay}},labelFormat:String,valueFormat:String,timeFormat:String,valueType:String,editable:{type:Boolean,default:!0},festivalMethod:{type:Function,default:function(){return(0,_ui.getConfig)().dateRangePicker.festivalMethod}},disabledMethod:{type:Function,default:function(){return(0,_ui.getConfig)().dateRangePicker.disabledMethod}},separator:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.separator}},selectDay:{type:[String,Number],default:function(){return(0,_ui.getConfig)().dateRangePicker.selectDay}},showClearButton:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.showClearButton}},showConfirmButton:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.showConfirmButton}},autoClose:{type:Boolean,default:function(){return(0,_ui.getConfig)().dateRangePicker.autoClose}},prefixIcon:String,suffixIcon:String,placement:String,transfer:{type:Boolean,default:null},timeConfig:Object,popupConfig:Object,shortcutConfig:Object},inject:{$xeModal:{default:null},$xeDrawer:{default:null},$xeTable:{default:null},$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null}},provide:function(){return{$xeDateRangePicker:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{initialized:!1,panelIndex:0,visiblePanel:!1,isAniVisible:!1,panelStyle:{},panelPlacement:"",isActivated:!1,startValue:"",endValue:""},internalData:{}}},computed:Object.assign(Object.assign({},{}),{computeBtnTransfer:function(){var e=this,t=e.$xeTable,a=e.$xeModal,n=e.$xeDrawer,r=e.$xeForm,i=e.transfer,e=e.computePopupOpts;if(_xeUtils.default.isBoolean(e.transfer))return e.transfer;if(null===i){e=(0,_ui.getConfig)().dateRangePicker.transfer;if(_xeUtils.default.isBoolean(e))return e;if(t||a||n||r)return!0}return i},computeFormReadonly:function(){var e=this.$xeForm,t=this.readonly;return null===t?!!e&&e.readonly:t},computeIsDisabled:function(){var e=this.$xeForm,t=this.disabled;return null===t?!!e&&e.disabled:t},computeDefaultDates:function(){var e=this.defaultDate;return e?_xeUtils.default.isArray(e)?e:-1<"".concat(e).indexOf(",")?"".concat(e).split(","):[e,e]:[]},computeDefaultTimes:function(){var e=this.defaultTime;return e?_xeUtils.default.isArray(e)?e:-1<"".concat(e).indexOf(",")?"".concat(e).split(","):[e,e]:[]},computeMVal:function(){var e=this.startValue,t=this.endValue;return"".concat(e||"").concat(t||"")},computeIsDateTimeType:function(){var e=this.type;return"time"===e||"datetime"===e},computeIsDatePickerType:function(){return-1<["date","week","month","quarter","year"].indexOf(this.type)},computeIsClearable:function(){return this.clearable},computeInpPlaceholder:function(){var e=this.placeholder;return(e=e||(0,_ui.getConfig)().dateRangePicker.placeholder)?(0,_utils.getFuncText)(e):(0,_ui.getI18n)("vxe.dateRangePicker.pleaseRange")},computeInpImmediate:function(){return this.immediate},computeTimeOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.timeConfig,this.timeConfig)},computePopupOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.popupConfig,this.popupConfig)},computeShortcutOpts:function(){return Object.assign({},(0,_ui.getConfig)().dateRangePicker.shortcutConfig,this.shortcutConfig)},computeShortcutList:function(){var e=this.computeShortcutOpts.options;return e?e.map(function(e,t){return Object.assign({name:"".concat(e.name||e.code||t)},e)}):[]},computeDateLabelFormat:function(){return this.labelFormat||(0,_ui.getI18n)("vxe.input.date.labelFormat.".concat(this.type))},computeDateValueFormat:function(){var e=this.type,t=this.valueFormat;return(0,_util.handleValueFormat)(e,t)},computeFirstDayOfWeek:function(){var e=this.startDay;return _xeUtils.default.toNumber(e)},computePanelLabelObj:function(){var e=this.reactData,t=e.startValue,e=e.endValue;return this.formatRangeLabel(t||e?[t||"",e||""]:[])},computeInputLabel:function(){return this.computePanelLabelObj.label}}),methods:{dispatchEvent:function(e,t,a){this.$emit(e,(0,_ui.createEvent)(a,{$dateRangePicker:this},t))},emitModel:function(e){var t=this._events;t&&t.modelValue?this.$emit("modelValue",e):this.$emit("model-value",e)},formatRangeLabel:function(e){var t=this.type,a=this.separator,n=this.computeDateLabelFormat,r=this.computeDateValueFormat,i=this.computeFirstDayOfWeek,l=e[0]?(0,_util.parseDateObj)(e[0],t,{valueFormat:r,labelFormat:n,firstDay:i}):null,e=e[1]?(0,_util.parseDateObj)(e[1],t,{valueFormat:r,labelFormat:n,firstDay:i}):null,t=l?l.label:"",r=e?e.label:"";return{label:(t||r?[t,r]:[]).join("".concat(a||" ~ ")),startLabel:t,endLabel:r}},getRangeValue:function(e,t){var a=this.value,n=this.valueType,r=_xeUtils.default.isArray(a);if(n)switch(n){case"array":r=!0;break;case"string":r=!1}return e||t?(a=[e||"",t||""],r?a:a.join(",")):r?[]:""},paraeUpdateModel:function(){var e,t=this.type,a=this.value,n=this.computeDateValueFormat,r="",i="";return _xeUtils.default.isArray(a)?(e=(0,_util.parseDateString)(a[0],t,{valueFormat:n}),t=(0,_util.parseDateString)(a[1],t,{valueFormat:n}),(e||t)&&(r=e||"",i=t||"")):_xeUtils.default.isString(a)&&((n=a.split(","))[0]||n[1])&&(r=n[0]||"",i=n[1]||""),{sValue:r,eValue:i}},parseUpdateData:function(){var e=this.type,t=this.startValue,a=this.endValue,n=this.computeDateValueFormat;return{sValue:(0,_util.parseDateString)(t,e,{valueFormat:n}),eValue:(0,_util.parseDateString)(a,e,{valueFormat:n})}},updateModelValue:function(e){var t=this,a=t.reactData,n=t.value,r=t.startValue,i=t.endValue,l={sValue:"",eValue:""},l=e?n?t.paraeUpdateModel():t.parseUpdateData():r||i?t.parseUpdateData():t.paraeUpdateModel();a.startValue=l.sValue,a.endValue=l.eValue},triggerEvent:function(e){var t=this.reactData,a=t.startValue,t=t.endValue,n=this.getRangeValue(a,t);this.dispatchEvent(e.type,{value:n,startValue:a,endValue:t},e)},handleChange:function(e,t,a){var n=this,r=n.reactData,i=n.$xeForm,l=n.formItemInfo,o=n.value,r=(r.startValue=e,n.getRangeValue(e,r.endValue=t)),u=e&&t||!e&&!t;n.emitModel(r),n.$emit("update:startValue",e||""),n.$emit("update:endValue",t||""),_xeUtils.default.toValueString(o)!==r&&(n.dispatchEvent("change",{value:r,startValue:e,endValue:t,isFinish:u},a),i)&&l&&i.triggerItemEvent(a,l.itemConfig.field,r)},changeEvent:function(e){this.computeInpImmediate||this.triggerEvent(e)},focusEvent:function(e){var t=this.reactData,a=this.computePopupOpts.trigger;t.isActivated=!0,a&&"default"!==a||this.dateRangePickerOpenEvent(e),this.triggerEvent(e)},clickPrefixEvent:function(e){var t,a,n=this.reactData;this.computeIsDisabled||(t=n.startValue,n=n.endValue,a=this.getRangeValue(t,n),this.dispatchEvent("prefix-click",{value:a,startValue:t,endValue:n},e))},hidePanel:function(){var t=this.reactData,a=this.internalData;return new Promise(function(e){t.visiblePanel=!1,a.hpTimeout=setTimeout(function(){t.isAniVisible=!1,e()},350)})},clearValueEvent:function(e,t){this.computeIsDatePickerType&&this.hidePanel();this.handleChange("","",e),this.dispatchEvent("clear",{value:t,startValue:"",endValue:""},e)},checkValue:function(){var e=this.$refs.refStartDatePanel,t=this.$refs.refEndDatePanel;e&&t&&(e=e.getModelValue(),t=t.getModelValue(),e&&t||this.handleChange("","",{type:"check"}))},panelCellClassName:function(e){var e=e.date,t=this.reactData,a=t.startValue,t=t.endValue;if(a&&t){e=e.getTime(),a=_xeUtils.default.toStringDate(a).getTime(),t=_xeUtils.default.toStringDate(t).getTime();if(a<=e&&e<=t)return"is--range-selected"}return""},handleSelectClose:function(){var e=this,t=e.reactData,a=e.internalData,n=e.autoClose,r=t.startValue,t=t.endValue,i=a.selectStatus;n?i&&e.computeIsDatePickerType&&r&&t&&e.hidePanel():r&&t&&(a.selectStatus=!1)},clickSuffixEvent:function(e){var t,a,n=this.reactData;this.computeIsDisabled||(t=n.startValue,n=n.endValue,a=this.getRangeValue(t,n),this.dispatchEvent("suffix-click",{value:a,startValue:t,endValue:n},e))},blurEvent:function(e){var t=this,a=t.reactData,n=t.$xeForm,r=t.formItemInfo,i=a.startValue,l=a.endValue;t.computeInpImmediate||t.handleChange(i,l,e),a.visiblePanel||(a.isActivated=!1),t.dispatchEvent("blur",{value:"",startValue:i,endValue:l},e),n&&r&&n.triggerItemEvent(e,r.itemConfig.field,"")},keydownEvent:function(e){this.triggerEvent(e)},keyupEvent:function(e){this.triggerEvent(e)},confirmEvent:function(e){var t,a,n=this,r=n.$refs.refStartDatePanel,i=n.$refs.refEndDatePanel;r&&i&&(t=r.getModelValue(),a=i.getModelValue(),t&&!a||!t&&a?n.handleChange("","",e):(r.confirmByEvent(e),i.confirmByEvent(e)),r=n.getRangeValue(t,a),n.dispatchEvent("confirm",{value:r,startValue:t,endValue:a},e)),n.hidePanel()},startPanelChangeEvent:function(e){var a=this,t=a.reactData,n=a.internalData,r=n.selectStatus,i=e.value,l=r?t.endValue:"";a.handleChange(i,l,e.$event),a.handleSelectClose(),r||(n.selectStatus=!0),a.$nextTick(function(){var e=a.$refs.refStartDatePanel,t=a.$refs.refEndDatePanel;e&&t&&(e=e.getModelValue(),!l)&&e&&t.setPanelDate(_xeUtils.default.toStringDate(e))})},endPanelChangeEvent:function(e){var a=this,t=a.reactData,n=a.internalData,r=n.selectStatus,i=e.value,l=r?t.startValue:"";a.handleChange(l,i,e.$event),a.handleSelectClose(),r||(n.selectStatus=!0),a.$nextTick(function(){var e=a.$refs.refStartDatePanel,t=a.$refs.refEndDatePanel;e&&t&&(t=t.getModelValue(),!l)&&t&&e.setPanelDate(_xeUtils.default.toStringDate(t))})},startPanelDateBtnChangeEvent:function(e){if(this.linkedPanels){var e=e.viewType,t=this.$refs.refStartDatePanel,a=this.$refs.refEndDatePanel;if(t&&a){var n=t.getPanelDate();if(n){var r=n.getFullYear(),i=n.getMonth();switch(e){case"day":case"date":case"week":i<11?n.setMonth(i+1):(n.setFullYear(r+1),n.setMonth(0)),a.setPanelDate(n)}}}}},endPanelDateBtnChangeEvent:function(e){if(this.linkedPanels){var e=e.viewType,t=this.$refs.refStartDatePanel,a=this.$refs.refEndDatePanel;if(t&&a){var n=a.getPanelDate();if(n){var r=n.getFullYear(),i=n.getMonth();switch(e){case"day":case"date":case"week":i?n.setMonth(i-1):(n.setFullYear(r-1),n.setMonth(11)),t.setPanelDate(n)}}}}},handleGlobalMousedownEvent:function(e){var t=this,a=t.reactData,n=a.visiblePanel,r=t.$refs.refElem,i=t.$refs.refPanelWrapper;!t.computeIsDisabled&&a.isActivated&&(a.isActivated=(0,_dom.getEventTargetNode)(e,r).flag||(0,_dom.getEventTargetNode)(e,i).flag,a.isActivated||n&&(t.checkValue(),t.hidePanel()))},handleGlobalKeydownEvent:function(e){var t,a=this.reactData,n=a.visiblePanel;this.computeIsDisabled||(t=_ui.globalEvents.hasKey(e,_ui.GLOBAL_EVENT_KEYS.TAB),e=_ui.globalEvents.hasKey(e,_ui.GLOBAL_EVENT_KEYS.ESCAPE),t&&(a.isActivated=!1),n&&(e||t)&&(this.checkValue(),this.hidePanel()))},handleGlobalMousewheelEvent:function(e){var t=this,a=t.reactData.visiblePanel;t.computeIsDisabled||a&&(a=t.$refs.refPanelWrapper,(0,_dom.getEventTargetNode)(e,a).flag?t.updatePlacement():(t.checkValue(),t.hidePanel()))},handleGlobalBlurEvent:function(){var e=this.reactData,t=e.visiblePanel,a=e.isActivated;t&&(this.checkValue(),this.hidePanel()),a&&(e.isActivated=!1),(t||a)&&(e=this.$refs.refInputTarget)&&e.blur()},handleGlobalResizeEvent:function(){this.reactData.visiblePanel&&this.updatePlacement()},updateZindex:function(){var e=this.reactData,t=this.computePopupOpts.zIndex||this.zIndex;t?e.panelIndex=_xeUtils.default.toNumber(t):e.panelIndex<(0,_utils.getLastZIndex)()&&(e.panelIndex=(0,_utils.nextZIndex)())},updatePlacement:function(){function e(){var e=(0,_dom.updatePanelPlacement)(i,l,{placement:u.placement||n,defaultPlacement:u.defaultPlacement,teleportTo:o}),t=Object.assign(e.style,{zIndex:r});a.panelStyle=t,a.panelPlacement=e.placement}var t=this,a=t.reactData,n=t.placement,r=a.panelIndex,i=t.$refs.refInputTarget,l=t.$refs.refInputPanel,o=t.computeBtnTransfer,u=t.computePopupOpts;return e(),t.$nextTick().then(e)},showPanel:function(){var e=this,t=e.reactData,a=e.internalData,n=t.visiblePanel,r=e.computeBtnTransfer,i=e.$refs.refInputPanel;return e.computeIsDisabled||n?e.$nextTick():(t.initialized||(t.initialized=!0,r&&i&&document.body.appendChild(i)),a.hpTimeout&&(clearTimeout(a.hpTimeout),a.hpTimeout=void 0),a.selectStatus=!1,t.isActivated=!0,t.isAniVisible=!0,setTimeout(function(){t.visiblePanel=!0,e.updatePlacement()},10),e.updateZindex(),e.updatePlacement())},dateRangePickerOpenEvent:function(e){this.computeFormReadonly||(e.preventDefault(),this.showPanel())},clickIconEvent:function(e){var t=this.computePopupOpts.trigger;t&&"default"!==t&&"icon"!==t||this.dateRangePickerOpenEvent(e)},clickEvent:function(e){this.triggerEvent(e)},handleShortcutEvent:function(e){var t=e.option,a=e.$event,n=this,e=n.reactData,r=n.type,i=n.computeShortcutOpts,l=i.autoClose,o=t.code,u=t.clickMethod,s=e.startValue,c=n.getRangeValue(s,m=e.endValue),d={$dateRangePicker:n,option:t,value:c,startValue:s,endValue:m,code:o};if(!u&&o){e=_ui.commands.get(o),t=e?e.dateRangePickerCommandMethod:null;if(t)t(d);else{var f=n.computeDateValueFormat,p=n.computeFirstDayOfWeek;switch(o){case"last1":case"last3":case"last7":case"last30":case"last60":case"last90":case"last180":var m,h=(0,_util.getRangeDateByCode)(o,c,r,{valueFormat:f,firstDay:p}),s=h.startValue,c=n.getRangeValue(s,m=h.endValue);d.value=c,d.startValue=s,d.endValue=m,n.handleChange(s,m,a);break;default:(0,_log.errLog)("vxe.error.notCommands",["[date-range-picker] ".concat(o)])}}}else{e=u||i.clickMethod;e&&e(d)}l&&n.hidePanel(),n.dispatchEvent("shortcut-click",d,a)},setModelValue:function(e,t){var a=this.reactData,a=(a.startValue=e||"",a.endValue=t||"",this.getRangeValue(e,t));this.emitModel(a)},setModelValueByEvent:function(e,t,a){this.handleChange(t||"",a||"",e)},focus:function(){var e=this.reactData,t=this.$refs.refInputTarget;return e.isActivated=!0,t.focus(),this.$nextTick()},blur:function(){var e=this.reactData;return this.$refs.refInputTarget.blur(),e.isActivated=!1,this.$nextTick()},select:function(){var e=this.reactData;return this.$refs.refInputTarget.select(),e.isActivated=!1,this.$nextTick()},renderShortcutBtn:function(e,t,a){var n=this.computeShortcutOpts,r=n.position,i=n.align,l=n.mode,o=this.computeShortcutList;return(0,_utils.isEnableConf)(n)&&o.length&&(r||"left")===t?e("div",{class:"vxe-date-range-picker--layout-".concat(t,"-wrapper")},[e(_buttonGroup.default,{props:{options:o,mode:l,align:i,vertical:a},on:{click:this.handleShortcutEvent}})]):(0,_ui.renderEmptyElement)(this)},renderPanel:function(e){var t=this,a=t,n=t.$scopedSlots,r=t.reactData,i=a.type,l=a.separator,o=a.autoClose,u=a.showConfirmButton,s=a.showClearButton,c=r.initialized,d=r.isAniVisible,f=r.visiblePanel,p=r.panelPlacement,m=r.panelStyle,h=r.startValue,r=r.endValue,v=t.computeSize,g=t.computeBtnTransfer,y=t.computeIsClearable,b=t.computePanelLabelObj,D=t.computeShortcutList,P=t.computeIsDateTimeType,_=t.computeDefaultTimes,x=t.computeTimeOpts,E=b.startLabel,b=b.endLabel,V=t.computeShortcutOpts.position,k=n.header,S=n.footer,C=n.top,I=n.bottom,T=n.left,n=n.right,w=t.computePopupOpts.className,$=_slicedToArray(t.computeDefaultDates,2),F=$[0],$=$[1],_=_slicedToArray(_,2),R=_[0],_=_[1],D=0<D.length,P=null===u?P||!o:u,o=null===s?y:s;return e("div",{ref:"refInputPanel",class:["vxe-table--ignore-clear vxe-date-range-picker--panel","type--".concat(i),w?_xeUtils.default.isFunction(w)?w({$dateRangePicker:t}):w:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(v),v),"is--transfer",g),"ani--leave",d),"ani--enter",f),"show--top",!!(C||k||D&&("top"===V||"header"===V))),"show--bottom",!!(I||S||D&&("bottom"===V||"footer"===V))),"show--left",!!(T||D&&"left"===V)),"show--right",!!(n||D&&"right"===V))],attrs:{placement:p},style:m},c&&(f||d)?[e("div",{ref:"refPanelWrapper",class:["vxe-date-range-picker--layout-all-wrapper","type--".concat(i),_defineProperty({},"size--".concat(v),v)]},[C?e("div",{class:"vxe-date-range-picker--layout-top-wrapper"},C({})):t.renderShortcutBtn(e,"top"),e("div",{class:"vxe-date-range-picker--layout-body-layout-wrapper"},[T?e("div",{class:"vxe-date-range-picker--layout-left-wrapper"},T({})):t.renderShortcutBtn(e,"left",!0),e("div",{class:"vxe-date-range-picker--layout-body-content-wrapper"},[k?e("div",{class:"vxe-date-range-picker--layout-header-wrapper"},k({})):t.renderShortcutBtn(e,"header"),e("div",{class:"vxe-date-range-picker--layout-body-wrapper"},[e(_datePanel.default,{ref:"refStartDatePanel",props:{value:h,type:a.type,className:a.className,minDate:a.minDate,maxDate:a.maxDate,endDate:r,startDay:a.startDay,labelFormat:a.labelFormat,valueFormat:a.valueFormat,timeFormat:a.timeFormat,defaultDate:F,defaultTime:R,timeConfig:x,festivalMethod:a.festivalMethod,disabledMethod:a.disabledMethod,cellClassName:t.panelCellClassName,selectDay:a.selectDay},on:{change:t.startPanelChangeEvent,datePrev:t.endPanelDateBtnChangeEvent,dateToday:t.endPanelDateBtnChangeEvent,dateNext:t.endPanelDateBtnChangeEvent}}),e(_datePanel.default,{ref:"refEndDatePanel",props:{value:r,type:a.type,className:a.className,minDate:a.minDate,maxDate:a.maxDate,startDate:h,startDay:a.startDay,labelFormat:a.labelFormat,valueFormat:a.valueFormat,timeFormat:a.timeFormat,defaultDate:$,defaultTime:_,timeConfig:x,festivalMethod:a.festivalMethod,disabledMethod:a.disabledMethod,cellClassName:t.panelCellClassName,selectDay:a.selectDay},on:{change:t.endPanelChangeEvent,datePrev:t.endPanelDateBtnChangeEvent,dateToday:t.endPanelDateBtnChangeEvent,dateNext:t.endPanelDateBtnChangeEvent}})]),e("div",{class:"vxe-date-range-picker--layout-footer-wrapper"},[e("div",{class:"vxe-date-range-picker--layout-footer-label"},E||b?[e("span",E),e("span","".concat(l||"")),e("span",b)]:"".concat(l||"")),e("div",{class:"vxe-date-range-picker--layout-footer-custom"},S?S({}):[t.renderShortcutBtn(e,"footer")]),e("div",{class:"vxe-date-range-picker--layout-footer-btns"},[o?e(_button.default,{props:{size:"mini",disabled:!(h||r),content:(0,_ui.getI18n)("vxe.button.clear")},on:{click:t.clearValueEvent}}):(0,_ui.renderEmptyElement)(t),P?e(_button.default,{props:{size:"mini",status:"primary",content:(0,_ui.getI18n)("vxe.button.confirm")},on:{click:t.confirmEvent}}):(0,_ui.renderEmptyElement)(t)])])]),n?e("div",{class:"vxe-date-range-picker--layout-right-wrapper"},n({})):t.renderShortcutBtn(e,"right",!0)]),I?e("div",{class:"vxe-date-range-picker--layout-bottom-wrapper"},I({})):t.renderShortcutBtn(e,"bottom")])]:[])},renderPrefixIcon:function(e){var t=this.$scopedSlots,a=this.prefixIcon,t=t.prefix;return t||a?e("div",{class:"vxe-date-range-picker--prefix",on:{click:this.clickPrefixEvent}},[e("div",{class:"vxe-date-range-picker--prefix-icon"},t?(0,_vn.getSlotVNs)(t({})):[e("i",{class:a})])]):null},renderSuffixIcon:function(e){var t=this,a=t.$scopedSlots,n=t.reactData,r=t.suffixIcon,i=n.startValue,a=a.suffix,l=t.computeIsClearable;return e("div",{class:["vxe-date-range-picker--suffix",{"is--clear":l&&!t.computeIsDisabled&&(i||n.endValue)}]},[l?e("div",{class:"vxe-date-range-picker--clear-icon",on:{click:t.clearValueEvent}},[e("i",{class:(0,_ui.getIcon)().INPUT_CLEAR})]):(0,_ui.renderEmptyElement)(t),t.renderExtraSuffixIcon(e),a||r?e("div",{class:"vxe-date-range-picker--suffix-icon",on:{click:t.clickSuffixEvent}},a?(0,_vn.getSlotVNs)(a({})):[e("i",{class:r})]):(0,_ui.renderEmptyElement)(t)])},renderExtraSuffixIcon:function(e){return e("div",{class:"vxe-date-range-picker--control-icon",on:{click:this.dateRangePickerOpenEvent}},[e("i",{class:["vxe-date-range-picker--date-picker-icon",(0,_ui.getIcon)().DATE_PICKER_DATE]})])},renderVN:function(e){var t,a,n,r,i=this,l=i.reactData,o=i.className,u=i.type,s=i.name,c=i.autoComplete,d=l.startValue,f=l.endValue,p=l.visiblePanel,l=l.isActivated,m=i.computeSize,h=i.computeIsDisabled,v=i.computeInputLabel;return i.computeFormReadonly?e("div",{ref:"refElem",class:["vxe-date-range-picker--readonly","type--".concat(u),o]},v):(t=i.computeInpPlaceholder,a=i.computeIsClearable,n=i.renderPrefixIcon(e),r=i.renderSuffixIcon(e),e("div",{ref:"refElem",class:["vxe-date-range-picker","type--".concat(u),o,_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(m),m),"is--prefix",!!n),"is--suffix",!!r),"is--visible",p),"is--disabled",h),"is--active",l),"show--clear",a&&!h&&(d||f))],attrs:{spellcheck:!1}},[n||(0,_ui.renderEmptyElement)(i),e("div",{class:"vxe-date-range-picker--wrapper"},[e("input",{ref:"refInputTarget",class:"vxe-date-range-picker--inner",domProps:{value:v},attrs:{name:s,type:"text",placeholder:t,editable:!1,disabled:h,autocomplete:c},on:{keydown:i.keydownEvent,keyup:i.keyupEvent,click:i.clickEvent,change:i.changeEvent,focus:i.focusEvent,blur:i.blurEvent}})]),r||(0,_ui.renderEmptyElement)(i),i.renderPanel(e)]))}},watch:{value:function(){this.updateModelValue(!0)},computeMVal:function(){this.updateModelValue(!1)}},created:function(){var e=this;e.updateModelValue(!0),_ui.globalEvents.on(e,"mousewheel",e.handleGlobalMousewheelEvent),_ui.globalEvents.on(e,"mousedown",e.handleGlobalMousedownEvent),_ui.globalEvents.on(e,"keydown",e.handleGlobalKeydownEvent),_ui.globalEvents.on(e,"blur",e.handleGlobalBlurEvent),_ui.globalEvents.on(e,"resize",e.handleGlobalResizeEvent)},deactivated:function(){this.checkValue()},beforeDestroy:function(){var e=this,t=e.$refs.refInputPanel;t&&t.parentNode&&t.parentNode.removeChild(t),e.checkValue(),_ui.globalEvents.off(e,"mousewheel"),_ui.globalEvents.off(e,"mousedown"),_ui.globalEvents.off(e,"blur"),_ui.globalEvents.off(e,"resize")},render:function(e){return this.renderVN(e)}});
package/lib/index.umd.js CHANGED
@@ -13214,7 +13214,7 @@ function checkDynamic() {
13214
13214
  }
13215
13215
  ;// ./packages/ui/src/log.ts
13216
13216
 
13217
- var log_version = "ui v".concat("3.14.28");
13217
+ var log_version = "ui v".concat("3.14.30");
13218
13218
  var warnLog = log.create('warn', log_version);
13219
13219
  var errLog = log.create('error', log_version);
13220
13220
  ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
13222
13222
 
13223
13223
 
13224
13224
 
13225
- var ui_version = "3.14.28";
13225
+ var ui_version = "3.14.30";
13226
13226
  VxeUI.uiVersion = ui_version;
13227
13227
  VxeUI.dynamicApp = dynamicApp;
13228
13228
  function config(options) {
@@ -31395,7 +31395,9 @@ var Countdown = VxeCountdown;
31395
31395
  $xeDatePanel.hidePanel();
31396
31396
  }
31397
31397
  $xeDatePanel.dispatchEvent('date-today', {
31398
- type: props.type
31398
+ viewType: reactData.datePanelType,
31399
+ type: props.type,
31400
+ viewDate: reactData.selectMonth
31399
31401
  }, evnt);
31400
31402
  },
31401
31403
  dateNextEvent: function dateNextEvent(evnt) {
@@ -31433,7 +31435,8 @@ var Countdown = VxeCountdown;
31433
31435
  $xeDatePanel.dispatchEvent('date-next', {
31434
31436
  viewType: datePanelType,
31435
31437
  value: value,
31436
- type: type
31438
+ type: type,
31439
+ viewDate: viewDate
31437
31440
  }, evnt);
31438
31441
  }
31439
31442
  },
@@ -31764,7 +31767,8 @@ var Countdown = VxeCountdown;
31764
31767
  getPanelDate: function getPanelDate() {
31765
31768
  var $xeDatePanel = this;
31766
31769
  var reactData = $xeDatePanel.reactData;
31767
- return reactData.selectMonth;
31770
+ var selectMonth = reactData.selectMonth;
31771
+ return selectMonth ? new Date(selectMonth.getTime()) : new Date();
31768
31772
  },
31769
31773
  checkValue: function checkValue(value) {
31770
31774
  var $xeDatePanel = this;
@@ -33650,6 +33654,12 @@ var DatePicker = VxeDatePicker;
33650
33654
  return getConfig().dateRangePicker.clearable;
33651
33655
  }
33652
33656
  },
33657
+ linkedPanels: {
33658
+ type: Boolean,
33659
+ default: function _default() {
33660
+ return getConfig().dateRangePicker.linkedPanels;
33661
+ }
33662
+ },
33653
33663
  readonly: {
33654
33664
  type: Boolean,
33655
33665
  default: null
@@ -34399,6 +34409,74 @@ var DatePicker = VxeDatePicker;
34399
34409
  }
34400
34410
  });
34401
34411
  },
34412
+ startPanelDateBtnChangeEvent: function startPanelDateBtnChangeEvent(params) {
34413
+ var $xeDateRangePicker = this;
34414
+ var props = $xeDateRangePicker;
34415
+ var linkedPanels = props.linkedPanels;
34416
+ if (linkedPanels) {
34417
+ var viewType = params.viewType;
34418
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
34419
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
34420
+ if (!$startDatePanel || !$endDatePanel) {
34421
+ return;
34422
+ }
34423
+ var startPanelDate = $startDatePanel.getPanelDate();
34424
+ if (!startPanelDate) {
34425
+ return;
34426
+ }
34427
+ var endYear = startPanelDate.getFullYear();
34428
+ var endMonth = startPanelDate.getMonth();
34429
+ switch (viewType) {
34430
+ case 'day':
34431
+ case 'date':
34432
+ case 'week':
34433
+ {
34434
+ if (endMonth < 11) {
34435
+ startPanelDate.setMonth(endMonth + 1);
34436
+ } else {
34437
+ startPanelDate.setFullYear(endYear + 1);
34438
+ startPanelDate.setMonth(0);
34439
+ }
34440
+ $endDatePanel.setPanelDate(startPanelDate);
34441
+ break;
34442
+ }
34443
+ }
34444
+ }
34445
+ },
34446
+ endPanelDateBtnChangeEvent: function endPanelDateBtnChangeEvent(params) {
34447
+ var $xeDateRangePicker = this;
34448
+ var props = $xeDateRangePicker;
34449
+ var linkedPanels = props.linkedPanels;
34450
+ if (linkedPanels) {
34451
+ var viewType = params.viewType;
34452
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
34453
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
34454
+ if (!$startDatePanel || !$endDatePanel) {
34455
+ return;
34456
+ }
34457
+ var endPanelDate = $endDatePanel.getPanelDate();
34458
+ if (!endPanelDate) {
34459
+ return;
34460
+ }
34461
+ var endYear = endPanelDate.getFullYear();
34462
+ var endMonth = endPanelDate.getMonth();
34463
+ switch (viewType) {
34464
+ case 'day':
34465
+ case 'date':
34466
+ case 'week':
34467
+ {
34468
+ if (endMonth) {
34469
+ endPanelDate.setMonth(endMonth - 1);
34470
+ } else {
34471
+ endPanelDate.setFullYear(endYear - 1);
34472
+ endPanelDate.setMonth(11);
34473
+ }
34474
+ $startDatePanel.setPanelDate(endPanelDate);
34475
+ break;
34476
+ }
34477
+ }
34478
+ }
34479
+ },
34402
34480
  // 全局事件
34403
34481
  handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
34404
34482
  var $xeDateRangePicker = this;
@@ -34796,7 +34874,10 @@ var DatePicker = VxeDatePicker;
34796
34874
  selectDay: props.selectDay
34797
34875
  },
34798
34876
  on: {
34799
- change: $xeDateRangePicker.startPanelChangeEvent
34877
+ change: $xeDateRangePicker.startPanelChangeEvent,
34878
+ datePrev: $xeDateRangePicker.endPanelDateBtnChangeEvent,
34879
+ dateToday: $xeDateRangePicker.endPanelDateBtnChangeEvent,
34880
+ dateNext: $xeDateRangePicker.endPanelDateBtnChangeEvent
34800
34881
  }
34801
34882
  }), h(date_panel, {
34802
34883
  ref: 'refEndDatePanel',
@@ -34820,7 +34901,10 @@ var DatePicker = VxeDatePicker;
34820
34901
  selectDay: props.selectDay
34821
34902
  },
34822
34903
  on: {
34823
- change: $xeDateRangePicker.endPanelChangeEvent
34904
+ change: $xeDateRangePicker.endPanelChangeEvent,
34905
+ datePrev: $xeDateRangePicker.endPanelDateBtnChangeEvent,
34906
+ dateToday: $xeDateRangePicker.endPanelDateBtnChangeEvent,
34907
+ dateNext: $xeDateRangePicker.endPanelDateBtnChangeEvent
34824
34908
  }
34825
34909
  })]), h('div', {
34826
34910
  class: 'vxe-date-range-picker--layout-footer-wrapper'
@@ -63332,21 +63416,6 @@ function calcContentWH(contList) {
63332
63416
  contentHeight: contentHeight
63333
63417
  };
63334
63418
  }
63335
- function calcCanvasWH(contentWidth, opts) {
63336
- var gap = opts.gap;
63337
- var _ref = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [],
63338
- _ref2 = _slicedToArray(_ref, 2),
63339
- _ref2$ = _ref2[0],
63340
- gapX = _ref2$ === void 0 ? 0 : _ref2$,
63341
- _ref2$2 = _ref2[1],
63342
- gapY = _ref2$2 === void 0 ? 0 : _ref2$2;
63343
- var canvasWidth = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapX);
63344
- var canvasHeight = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapY);
63345
- return {
63346
- canvasWidth: canvasWidth,
63347
- canvasHeight: canvasHeight
63348
- };
63349
- }
63350
63419
  function getFontConf(item, key, opts) {
63351
63420
  return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
63352
63421
  }
@@ -63354,12 +63423,12 @@ function createMarkFont(contConf, defaultFontSize, opts) {
63354
63423
  var offset = opts.offset;
63355
63424
  var text = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(contConf.textContent);
63356
63425
  var fontSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getFontConf(contConf, 'fontSize', opts) || defaultFontSize) || 14;
63357
- var _ref3 = offset ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(offset) ? offset : [offset, offset] : [],
63358
- _ref4 = _slicedToArray(_ref3, 2),
63359
- _ref4$ = _ref4[0],
63360
- offsetX = _ref4$ === void 0 ? 0 : _ref4$,
63361
- _ref4$2 = _ref4[1],
63362
- offsetY = _ref4$2 === void 0 ? 0 : _ref4$2;
63426
+ var _ref = offset ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(offset) ? offset : [offset, offset] : [],
63427
+ _ref2 = _slicedToArray(_ref, 2),
63428
+ _ref2$ = _ref2[0],
63429
+ offsetX = _ref2$ === void 0 ? 0 : _ref2$,
63430
+ _ref2$2 = _ref2[1],
63431
+ offsetY = _ref2$2 === void 0 ? 0 : _ref2$2;
63363
63432
  var _calcFontWH = calcFontWH(text, fontSize),
63364
63433
  width = _calcFontWH.width,
63365
63434
  height = _calcFontWH.height;
@@ -63401,28 +63470,39 @@ function getContentUrl(content, defaultFontSize, options) {
63401
63470
  }
63402
63471
  var ctx = canvasEl.getContext('2d');
63403
63472
  if (ctx && contList.length) {
63473
+ var gap = opts.gap;
63474
+ var gapList = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [];
63475
+ var gapX = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[0]);
63476
+ var gapY = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[1]);
63404
63477
  var _calcContentWH = calcContentWH(contList),
63405
- contentWidth = _calcContentWH.contentWidth,
63406
- contentHeight = _calcContentWH.contentHeight;
63407
- var _calcCanvasWH = calcCanvasWH(contentWidth, opts),
63408
- canvasWidth = _calcCanvasWH.canvasWidth,
63409
- canvasHeight = _calcCanvasWH.canvasHeight;
63478
+ contentWidth = _calcContentWH.contentWidth;
63479
+ var canvasWidth = contentWidth * 2 + gapX * 2 + gapX / 2;
63480
+ var canvasHeight = contentWidth * 2 + gapY;
63410
63481
  canvasEl.width = canvasWidth;
63411
63482
  canvasEl.height = canvasHeight;
63412
- var x = (canvasWidth - contentWidth) / 2;
63413
- var y = (canvasHeight - contentHeight) / 2;
63414
- var drayX = x + contentWidth / 2;
63415
- var drayY = y + contentHeight / 2;
63483
+ var drayX = gapX / 2;
63484
+ var drayY = contentWidth + gapY / 2;
63416
63485
  ctx.save();
63417
63486
  ctx.translate(drayX, drayY);
63418
63487
  ctx.rotate(deg * Math.PI / 180);
63419
63488
  ctx.translate(-drayX, -drayY);
63420
- var offsetHeight = 0;
63489
+ var txtOffsetY = 0;
63490
+ contList.forEach(function (item) {
63491
+ drayFont(ctx, item, opts);
63492
+ var txtX = drayX;
63493
+ var txtY = drayY + txtOffsetY;
63494
+ ctx.fillText(item.text, txtX, txtY, contentWidth);
63495
+ txtOffsetY += item.height;
63496
+ });
63497
+ var offsetX = gapX;
63498
+ var offsetY = gapY + contentWidth;
63499
+ txtOffsetY = 0;
63421
63500
  contList.forEach(function (item) {
63422
- var align = getFontConf(item, 'align', opts);
63423
63501
  drayFont(ctx, item, opts);
63424
- ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth);
63425
- offsetHeight += item.height;
63502
+ var txtX = drayX + offsetX;
63503
+ var txtY = drayY + txtOffsetY + offsetY;
63504
+ ctx.fillText(item.text, txtX, txtY, contentWidth);
63505
+ txtOffsetY += item.height;
63426
63506
  });
63427
63507
  ctx.restore();
63428
63508
  resolve(canvasEl.toDataURL());