cnhis-design-vue 2.1.129 → 2.1.133

package/es/button/index.js

@@ -4062,7 +4062,7 @@ module.exports = function (it) {
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/button/src/ButtonPrint/index.vue?vue&type=template&id=77eaa1c2&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/button/src/ButtonPrint/index.vue?vue&type=template&id=77eaa1c2&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('span',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOutside),expression:"handleClickOutside"}],on:{"click":_vm.handleClickWrap}},[_c('a-dropdown',{attrs:{"visible":_vm.visible,"overlayClassName":"rowFoldHideBtnList-dropdown"}},[_c('a-menu',{attrs:{"slot":"overlay"},slot:"overlay"},[_c('a-sub-menu',{key:"format",staticClass:"format-name",attrs:{"title":_vm.formatTitle}},_vm._l((_vm.formatList),function(item){return _c('a-menu-item',{key:item.id,class:{ active: item.id === _vm.currentFormatId },on:{"click":function($event){return _vm.handleClickFormat(item.id)}}},[_vm._v(" "+_vm._s(item.name)+" ")])}),1),_c('a-menu-divider'),_c('a-menu-item',{on:{"click":function (e) { return _vm.handleClickPrint(e); }}},[_vm._v(" "+_vm._s(_vm.printText)+" ")]),_c('a-menu-item',{on:{"click":function (e) { return _vm.handleClickPreview(e); }}},[_vm._v(" "+_vm._s(_vm.previewText)+" ")]),_c('a-menu-item',{on:{"click":function (e) { return _vm.handleClickEdit(e); }}},[_vm._v(" "+_vm._s(_vm.formatEditText)+" ")])],1),_vm._t("button",function(){return [_c('a-button',{staticClass:"dropdown-button",staticStyle:{"margin":"0 8px 8px 0"},on:{"click":function($event){$event.stopPropagation();return _vm.handleClickBtn.apply(null, arguments)}}},[(_vm.spinning)?_c('a-icon',{staticStyle:{"line-height":"10px"},attrs:{"type":"loading"}}):_vm._e(),_vm._v(" "+_vm._s(_vm.btnText)+" "),_c('a-icon',{attrs:{"type":"down"}})],1)]},{"handleClickPrintBtn":_vm.handleClickBtn,"printSpinning":_vm.spinning,"printbtnText":_vm.btnText,"printVisible":_vm.visible})],2),_c('IdentityVerification',{attrs:{"printConfig":_vm.printConfig,"baseUrl":_vm.baseUrl,"verifyUserUrl":_vm.verifyUserUrl,"visible":_vm.identityVerification.visible,"identityVerificationTitle":_vm.identityVerificationTitle,"authorizationKey":_vm.authorizationKey},on:{"update:visible":function($event){return _vm.$set(_vm.identityVerification, "visible", $event)},"success":_vm.verifiySuccess}})],1)}
 var staticRenderFns = []
 
@@ -4154,7 +4154,7 @@ var es_array_join_js_ = __webpack_require__("be94");
 // EXTERNAL MODULE: ./packages/button/src/ButtonPrint/js/print.es.min.js
 var print_es_min = __webpack_require__("2c29");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/button/src/ButtonPrint/components/IdentityVerification.vue?vue&type=template&id=9404f70a&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/button/src/ButtonPrint/components/IdentityVerification.vue?vue&type=template&id=9404f70a&scoped=true&
 var IdentityVerificationvue_type_template_id_9404f70a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"standard-modal standard-modal-white authentication-modal",attrs:{"centered":"","visible":_vm.visible,"maskClosable":false,"width":_vm.style.width,"bodyStyle":{ maxHeight: _vm.style.height, overflowY: 'auto' },"footer":null},on:{"cancel":_vm.handleClickClose},scopedSlots:_vm._u([{key:"title",fn:function(){return [_vm._v(" "+_vm._s(_vm.identityVerificationTitle)+" ")]},proxy:true}])},[_c('div',{staticClass:"content"},[_c('a-form-model',{ref:"ruleForm",staticClass:"login-form",attrs:{"model":_vm.form,"rules":_vm.rules}},[_c('a-form-model-item',{ref:"account",attrs:{"prop":"account"}},[_c('a-input',{attrs:{"placeholder":"请输入账号"},model:{value:(_vm.form.account),callback:function ($$v) {_vm.$set(_vm.form, "account", $$v)},expression:"form.account"}})],1),_c('a-form-model-item',{ref:"password",attrs:{"prop":"password"}},[_c('a-input-password',{attrs:{"placeholder":"请输入密码"},model:{value:(_vm.form.password),callback:function ($$v) {_vm.$set(_vm.form, "password", $$v)},expression:"form.password"}})],1),_c('a-form-model-item',[_c('a-button',{staticClass:"login-form-button",attrs:{"type":"primary"},on:{"click":_vm.handleClickSubmit}},[_vm._v("登录")])],1)],1)],1)])}
 var IdentityVerificationvue_type_template_id_9404f70a_scoped_true_staticRenderFns = []
 

package/es/captcha/index.js

@@ -1199,7 +1199,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/Index.vue?vue&type=template&id=062d46d0&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/Index.vue?vue&type=template&id=062d46d0&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"captcha"},[(_vm.type === 'captcha')?_c('captcha',_vm._g(_vm._b({},'captcha',_vm.$attrs,false),_vm.$listeners)):_c('slide-verify',_vm._g(_vm._b({},'slide-verify',_vm.$attrs,false),_vm.$listeners))],1)}
 var staticRenderFns = []
 
@@ -1212,7 +1212,7 @@ var defineProperty = __webpack_require__("ade3");
 // EXTERNAL MODULE: ./src/core/create.js
 var create = __webpack_require__("8aef");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/Captcha.vue?vue&type=template&id=af56ef4e&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/Captcha.vue?vue&type=template&id=af56ef4e&scoped=true&
 var Captchavue_type_template_id_af56ef4e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"captcha"},[_c('a-form-model',{ref:"form",attrs:{"model":_vm.formData,"rules":_vm.fromRules}},[(_vm.captchaType === 'phone')?_c('a-form-model-item',{attrs:{"prop":"phone"}},[_c('a-input',{ref:"phone",attrs:{"addon-before":"86+","placeholder":"请输入手机号"},model:{value:(_vm.formData.phone),callback:function ($$v) {_vm.$set(_vm.formData, "phone", $$v)},expression:"formData.phone"}})],1):_c('a-form-model-item',{attrs:{"prop":"email"}},[_c('a-input',{ref:"email",attrs:{"placeholder":"请输入邮箱号"},model:{value:(_vm.formData.email),callback:function ($$v) {_vm.$set(_vm.formData, "email", $$v)},expression:"formData.email"}})],1),_c('a-form-model-item',{attrs:{"prop":"captcha"}},[_c('a-input',{attrs:{"placeholder":"请输入验证码"},model:{value:(_vm.formData.captcha),callback:function ($$v) {_vm.$set(_vm.formData, "captcha", $$v)},expression:"formData.captcha"}}),_c('span',{staticClass:"captcha-wrap"},[_c('span',{class:['get-code', { disabled: _vm.count }],on:{"click":_vm.sendVerify}},[_vm._v(" "+_vm._s(_vm._f("getText")(_vm.firstSend,_vm.count))+" ")])])],1)],1)],1)}
 var Captchavue_type_template_id_af56ef4e_scoped_true_staticRenderFns = []
 
@@ -1398,7 +1398,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Captcha = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/SlideVerify.vue?vue&type=template&id=2999071c&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/captcha/src/SlideVerify.vue?vue&type=template&id=2999071c&scoped=true&
 var SlideVerifyvue_type_template_id_2999071c_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"slide"},[(_vm.title)?_c('div',{staticClass:"verify-title"},[_c('span',[_vm._v(_vm._s(_vm.title))]),_c('div',{staticClass:"right-icon",on:{"click":_vm.cancelVerify}},[_c('a-icon',{attrs:{"type":"close"}})],1)]):_vm._e(),_c('div',{staticClass:"verify-div"},[_c('div',{staticClass:"verify-container"},[_c('div',{staticClass:"slide-verify"},[_c('div',{staticClass:"bg-wrap"},[_c('img',{staticClass:"bg-img",style:(_vm.resourceStyle),attrs:{"src":_vm.resource.resourceImg,"alt":""}})]),_c('a-icon',{staticClass:"slide-verify-refresh-icon",attrs:{"type":"redo"},on:{"click":_vm.refresh}}),_c('img',{ref:"block",staticClass:"slide-verify-block",style:(_vm.puzzleStyle),attrs:{"src":_vm.resource.puzzleImg,"draggable":"false"},on:{"mousedown":_vm.sliderDown}}),_c('div',{staticClass:"slide-verify-slider",class:{
             'container-active': _vm.containerActive,
             'container-success': _vm.containerSuccess,

package/es/card-reader-sdk/index.js

@@ -2136,7 +2136,7 @@ var objectWithoutProperties = __webpack_require__("15fd");
 var external_vue_ = __webpack_require__("8bbf");
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/card-reader-sdk/src/components/readCardDialog.vue?vue&type=template&id=45defc3a&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/card-reader-sdk/src/components/readCardDialog.vue?vue&type=template&id=45defc3a&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',_vm._b({attrs:{"centered":"","title":"扫码电子健康卡","keyboard":false,"okText":"确认"},on:{"cancel":_vm.onClose,"ok":_vm.onConfirm},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},'a-modal',_vm.modalProps,false),[_c('a-input',_vm._b({ref:"inputRef",attrs:{"placeholder":"请输入健康卡号"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }$event.preventDefault();return _vm.onConfirm.apply(null, arguments)}},model:{value:(_vm.value),callback:function ($$v) {_vm.value=$$v},expression:"value"}},'a-input',_vm.inputProps,false))],1)}
 var staticRenderFns = []
 

package/es/checkbox/index.js

@@ -1402,7 +1402,7 @@ var create = __webpack_require__("8aef");
   name: 'checkbox-group',
   extends: checkbox_default.a.Group
 }));
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox/src/CheckboxImg/index.vue?vue&type=template&id=e0033962&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox/src/CheckboxImg/index.vue?vue&type=template&id=e0033962&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-checkbox-group',_vm._g(_vm._b({attrs:{"value":_vm.checked}},'a-checkbox-group',_vm.$attrs,false),_vm.checkListeners),_vm._l((_vm.option),function(v,k){return _c('span',{key:k,staticClass:"crosswise-checkbox-wrap"},[(_vm.is_contain_images == 1 && v.imageBase64)?_c('span',{staticClass:"checkbox-img"},[_c('img',{staticClass:"show-picture",attrs:{"src":v.imageBase64},on:{"click":function($event){$event.stopPropagation();$event.preventDefault();return _vm.previewPic(v.imageBase64)}}})]):_vm._e(),_c('a-checkbox',{attrs:{"value":v.value}},[_c('span',{staticClass:"radio-text-warp",on:{"click":function($event){$event.stopPropagation();$event.preventDefault();}}},[_vm._v(" "+_vm._s(v.text)+" ")])])],1)}),0),_c('viewer',{ref:"viewer",staticClass:"viewer-picture",staticStyle:{"display":"none"},attrs:{"images":_vm.previewImages},on:{"inited":_vm.inited},scopedSlots:_vm._u([{key:"default",fn:function(scope){return _vm._l((scope.images),function(src){return _c('img',{key:src,attrs:{"src":src}})})}}])})],1)}
 var staticRenderFns = []
 

package/es/color-picker/index.js

@@ -1763,7 +1763,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/color-picker/src/color-picker.vue?vue&type=template&id=8cf8e69a&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/color-picker/src/color-picker.vue?vue&type=template&id=8cf8e69a&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"colorPicker",staticClass:"m-colorPicker",on:{"click":function (event) { return event.stopPropagation(); }}},[_c('div',{staticClass:"colorBtn",class:{ disabled: _vm.disabled },style:(("background-color: " + _vm.showColor)),on:{"click":_vm.openPanel}}),_c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOutside),expression:"handleClickOutside"}],ref:"colorPickerBox",staticClass:"box",class:{ open: _vm.openStatus }},[_c('div',{staticClass:"hd"},[_c('div',{staticClass:"colorView",style:(("background-color: " + _vm.showPanelColor))}),_c('div',{staticClass:"defaultColor",on:{"click":_vm.handleDefaultColor,"mouseover":function($event){_vm.hoveColor = _vm.defaultColor},"mouseout":function($event){_vm.hoveColor = null}}},[_vm._v(" 默认颜色 ")])]),_c('div',{staticClass:"bd"},[_c('h3',[_vm._v("主题颜色")]),_c('ul',{staticClass:"tColor"},_vm._l((_vm.tColor),function(color,index){return _c('li',{key:index,style:({ backgroundColor: color }),on:{"mouseover":function($event){_vm.hoveColor = color},"mouseout":function($event){_vm.hoveColor = null},"click":function($event){return _vm.updataValue(color)}}})}),0),_c('ul',{staticClass:"bColor"},_vm._l((_vm.colorPanel),function(item,index){return _c('li',{key:index},[_c('ul',_vm._l((item),function(color,cindex){return _c('li',{key:cindex,style:({ backgroundColor: color }),on:{"mouseover":function($event){_vm.hoveColor = color},"mouseout":function($event){_vm.hoveColor = null},"click":function($event){return _vm.updataValue(color)}}})}),0)])}),0),_c('h3',[_vm._v("标准颜色")]),_c('ul',{staticClass:"tColor"},_vm._l((_vm.bColor),function(color,index){return _c('li',{key:index,style:({ backgroundColor: color }),on:{"mouseover":function($event){_vm.hoveColor = color},"mouseout":function($event){_vm.hoveColor = null},"click":function($event){return _vm.updataValue(color)}}})}),0),_c('a',{staticClass:"more",on:{"click":_vm.triggerHtml5Color}},[_vm._v("更多颜色...")]),_c('input',{directives:[{name:"model",rawName:"v-model",value:(_vm.html5Color),expression:"html5Color"}],ref:"html5Color",attrs:{"type":"color"},domProps:{"value":(_vm.html5Color)},on:{"change":function($event){return _vm.updataValue(_vm.html5Color)},"input":function($event){if($event.target.composing){ return; }_vm.html5Color=$event.target.value}}})])])])}
 var staticRenderFns = []
 

package/es/drag-layout/index.js

@@ -3388,7 +3388,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/drag-layout.vue?vue&type=template&id=4d8d8afe&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/drag-layout.vue?vue&type=template&id=4d8d8afe&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"drag-layout-container"},[_c('div',{staticClass:"border-box"}),_c('div',{staticClass:"text-area"},[_c('div',{staticClass:"info-header"},[_vm._v(_vm._s(_vm.getI18nText("1.1.8.6.3", "备选字段")))]),_c('draggable',{ref:"textDraggable",staticClass:"min-height text-draggable",attrs:{"options":{
         group: 'formitem',
         animation: 300
@@ -3541,7 +3541,7 @@ var create = __webpack_require__("8aef");
 var external_vuedraggable_ = __webpack_require__("289a");
 var external_vuedraggable_default = /*#__PURE__*/__webpack_require__.n(external_vuedraggable_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/DragFormLeftItem.vue?vue&type=template&id=49612963&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/DragFormLeftItem.vue?vue&type=template&id=49612963&scoped=true&
 var DragFormLeftItemvue_type_template_id_49612963_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"DragFormLeftItem"},[_c('a-col',{staticClass:"left-content",class:[_vm.element.extraField ? 'blue-border' : '', 'item-' + _vm.element.html_type],attrs:{"label":_vm.element}},[(_vm.element.html_type === 'TEXTAREA')?_c('div',{staticClass:"style-box"},[_c('a-textarea',{attrs:{"disabled":"","placeholder":_vm.element.fieldAlias || _vm.element.alias || _vm.element.name}})],1):(
         _vm.element.html_type === 'DATE' ||
           _vm.element.html_type === 'DATE-INPUT' ||
@@ -3655,7 +3655,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var DragFormLeftItem = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/DragFormRightItem.vue?vue&type=template&id=bbbdbb1e&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/drag-layout/DragFormRightItem.vue?vue&type=template&id=bbbdbb1e&scoped=true&
 var DragFormRightItemvue_type_template_id_bbbdbb1e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"DragFormRightItem"},[(_vm.element.html_type === 'COMBINATION')?_c('div',{staticClass:"combination-item",class:{
       'is-edit-class': _vm.element.is_edit == 0 ? true : _vm.element.mid_is_edit == 0
     }},[_c('div',[(_vm.element.is_null == 0)?_c('span',{staticClass:"red"},[_vm._v("*")]):_vm._e(),_vm._v(" "+_vm._s(_vm.element.fieldAlias || _vm.element.alias || _vm.element.name)+" "),_c('div',{staticClass:"form-btn"},[(_vm.element.html_type != 'TEXT')?[(_vm.element.is_edit == 1 && !_vm.isLineType(_vm.element.html_type))?_c('a-button',{attrs:{"type":"dashed","size":"small"},on:{"click":function($event){return _vm.handlechangIs_edit(_vm.element)}}},[_vm._v(_vm._s(("" + (_vm.element.mid_is_edit == 1 ? "不可编辑" : "启用编辑"))))]):_vm._e(),(_vm.element.is_drag == 1 && !_vm.isLineType(_vm.element.html_type))?_c('a-button',{attrs:{"type":"dashed","size":"small"},on:{"click":function($event){return _vm.handlechangNull(_vm.element)}}},[_vm._v(_vm._s(_vm.getI18nText("1.2.1.12.29", "必填")))]):_vm._e(),_c('a-button',{directives:[{name:"show",rawName:"v-show",value:(_vm.element.html_type != 'LINE_BREAKS'),expression:"element.html_type != 'LINE_BREAKS'"}],attrs:{"type":"dashed","size":"small"},on:{"click":function($event){return _vm.handleEdit(_vm.element, _vm.index, 'edit')}}},[_vm._v(_vm._s(_vm.getI18nText("1.1.1.3.4", "修改")))])]:_vm._e(),(

package/es/editor/index.js

@@ -1820,7 +1820,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/Editor.vue?vue&type=template&id=1dd365b8&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/Editor.vue?vue&type=template&id=1dd365b8&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"editor",attrs:{"id":_vm.editorWrapId}})}
 var staticRenderFns = []
 

package/es/ellipsis/index.js

@@ -846,7 +846,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/ellipsis/src/Ellipsis.vue?vue&type=template&id=2e802586&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/ellipsis/src/Ellipsis.vue?vue&type=template&id=2e802586&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-tooltip',{attrs:{"placement":"top","visible":_vm.visible}},[_c('template',{slot:"title"},[_c('span',[_vm._v(_vm._s(_vm.content))])]),_c('span',{ref:"contentRef",staticClass:"ellipsis-content",on:{"mouseenter":_vm.show,"mouseleave":_vm.hidden}},[_c('span',{ref:"contentInnerRef"},[_vm._v(_vm._s(_vm.content))])])],2)}
 var staticRenderFns = []
 

package/es/fabric-chart/index.js

@@ -295,7 +295,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-fabric-chart",style:({ width: _vm.canvasWidth })},[(_vm.rendercanvas)?_c('fabric-canvas',_vm._b({ref:"canvasEle",attrs:{"templateData":_vm.templateData}},'fabric-canvas',_vm.$attrs,false),[_c('fabric-grid'),(_vm.hasXScalevalue)?_c('fabric-text-group',_vm._g({ref:"otherGroups",attrs:{"templateData":_vm.templateData}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-scale-value',{attrs:{"templateData":_vm.templateData}}):_vm._e(),(_vm.hasTopTable)?_c('fabric-lines',_vm._g({ref:"lines",attrs:{"linesObj":_vm.templateData.top}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-polylines',_vm._g({ref:"polylines",attrs:{"polyline":_vm.polylines,"other":_vm.templateData.left.other || {},"timeRangeStyle":_vm.templateData.timeRangeStyle || {}},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners)):_vm._e()],1):_vm._e()],1)}
 var staticRenderFns = []
 
@@ -308,7 +308,7 @@ var objectSpread2 = __webpack_require__("5530");
 // EXTERNAL MODULE: ./src/core/create.js
 var create = __webpack_require__("8aef");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
 var FabricCanvasvue_type_template_id_37bd438c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('canvas',{attrs:{"id":_vm.id}}),_vm._t("default")],2)}
 var FabricCanvasvue_type_template_id_37bd438c_staticRenderFns = []
 
@@ -968,7 +968,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricCanvas = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
 var FabricPolylinesvue_type_template_id_6078d968_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
 var FabricPolylinesvue_type_template_id_6078d968_staticRenderFns = []
 
@@ -1845,7 +1845,7 @@ function sortByTime() {
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
 var MouseRightClickvue_type_template_id_25d4407a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-mouse-right-menu-popup c-animation-in",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-mouse-right-menu"},_vm._l((_vm.nodeList),function(item,index){return _c('div',{key:index,staticClass:"c-mouse-menu-item",on:{"click":function($event){return _vm.handleNodeClick(item)}}},[_c('span',[_vm._v(_vm._s(item.name))])])}),0)])}
 var MouseRightClickvue_type_template_id_25d4407a_scoped_true_staticRenderFns = []
 
@@ -1953,7 +1953,7 @@ var MouseRightClick_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var MouseRightClick = (MouseRightClick_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
 var DropPopupvue_type_template_id_c4db0ace_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-drop-popup",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-drop-popup-list"},[_c('span',[_vm._v(_vm._s(_vm.val.title))]),_vm._l((_vm.val.list),function(item){return _c('span',{key:item.id},[_vm._v(" "+_vm._s(((item.name) + ": " + (item.value)))+" ")])})],2)])}
 var DropPopupvue_type_template_id_c4db0ace_scoped_true_staticRenderFns = []
 
@@ -4142,12 +4142,12 @@ var FabricGrid_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricGrid = (FabricGrid_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=66af8164&
-var FabricTextGroupvue_type_template_id_66af8164_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
-var FabricTextGroupvue_type_template_id_66af8164_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=09668f04&
+var FabricTextGroupvue_type_template_id_09668f04_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
+var FabricTextGroupvue_type_template_id_09668f04_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=66af8164&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=09668f04&
 
 // EXTERNAL MODULE: external "core-js/modules/es.reflect.has.js"
 var es_reflect_has_js_ = __webpack_require__("bfdc");
@@ -4495,6 +4495,7 @@ var external_lodash_ = __webpack_require__("60bb");
 
 
 
+
 
 
 //
@@ -5221,78 +5222,24 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
       var baseY = _endY + 2; // 目前固定10像素的下边距
 
-      var baseYLimit = endY - 2; // 目前固定10像素的上边距
+      var baseYTop = endY - 2; // 目前固定10像素的上边距
 
       var lineHeightText = (((_obj$style = obj.style) === null || _obj$style === void 0 ? void 0 : _obj$style.fontSize) || 12) + 2;
       var lineHeightImg = (((_obj$iconStyle = obj.iconStyle) === null || _obj$iconStyle === void 0 ? void 0 : _obj$iconStyle.height) || 12) + 2;
       var lineHeightSeq = (((_obj$seqStyle = obj.seqStyle) === null || _obj$seqStyle === void 0 ? void 0 : (_obj$seqStyle$circle = _obj$seqStyle.circle) === null || _obj$seqStyle$circle === void 0 ? void 0 : _obj$seqStyle$circle.radius) || 9) * 2 + 2;
-      var prevLeft = originX;
-      var prevCondition;
+      var prevLeft = 0;
       var pointerObj = {};
-
-      var setTop = function setTop(item, lineHeight, i, condition) {
-        var _lineHeight = lineHeight;
-
-        if (item.desc && obj.showDesc) {
-          _lineHeight = lineHeight + lineHeightText;
-        }
-
-        if (!~condition.limitIndex) {
-          condition.y += i === 0 ? _lineHeight / 2 : _lineHeight;
-
-          if (condition.y >= endY + markHeight - _lineHeight / 2) {
-            condition.limitIndex++;
-
-            if (condition.limitIndex === 0) {
-              condition.y = baseYLimit;
-              condition.y -= _lineHeight / 2;
-            }
-          }
-        } else {
-          condition.y -= _lineHeight;
-        }
-
-        var y = condition.y;
-        var y1,
-            y2 = y;
-
-        if (item.desc && obj.showDesc) {
-          y1 = y + _lineHeight / 2 - lineHeight - lineHeightText / 2;
-          y2 = y + _lineHeight / 2 - lineHeight / 2;
-        }
-
-        return {
-          y1: y1,
-          y2: y2
-        };
-      };
-
       this.markData.forEach(function (item, index) {
-        var _pointerObj$;
-
-        var condition = {
-          limitIndex: -1,
-          // 标志点是否往上排列的标志，大于-1则表示需要往上排列
-          y: baseY
-        };
-
-        var x = _this13.computedX(item[0]); // 相隔小于或等于一个小格的宽度就继承上个时间标记的高度继续计算定位，即错位显示
-
-
-        var prevHasBelowShow = (_pointerObj$ = pointerObj["x_".concat(prevLeft)]) === null || _pointerObj$ === void 0 ? void 0 : _pointerObj$.some(function (o) {
-          return o > endY;
-        });
-
-        if (x - prevLeft <= xCellWidth && prevHasBelowShow) {
-          Object.assign(condition, prevCondition);
-        }
+        var x = _this13.computedX(item[0]);
 
         if (_this13.isLimit(item[0])) {
-          var pointList = [];
           pointerObj["x_".concat(x)] = [];
+          var pointList = [];
+          var startTop = baseY;
           item[1].forEach( /*#__PURE__*/function () {
             var _ref3 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(v, i) {
-              var common, conditionRes;
+              var common, lineHeight, isShowDesc, _computedTop, topObj, _startTop, oldStartTop;
+
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
@@ -5307,19 +5254,43 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                       };
 
                       if (_this13.isObject(v) && !v.value) {
-                        conditionRes = setTop(v, lineHeightImg, i, condition);
-                        pointList.push(_this13.drawMarkPoint(v, common, obj, conditionRes, x));
+                        lineHeight = lineHeightImg;
                       } else if (v.value) {
                         if (v.seq) {
-                          conditionRes = setTop(v, lineHeightSeq, i, condition);
-                          pointList.push(_this13.drawMarkPoint(v, common, obj, conditionRes, x));
+                          lineHeight = lineHeightSeq;
                         } else {
-                          conditionRes = setTop(v, lineHeightText, i, condition);
-                          pointList.push(_this13.drawMarkPoint(v, common, obj, conditionRes, x));
+                          lineHeight = lineHeightText;
                         }
                       }
 
-                      pointerObj["x_".concat(x)].push(conditionRes.y2);
+                      if (lineHeight) {
+                        isShowDesc = v.desc && obj.showDesc; // 错位显示处理
+
+                        if (prevLeft && x - prevLeft <= xCellWidth) {
+                          pointerObj["x_".concat(prevLeft)].forEach(function (_ref4) {
+                            var _ref5 = Object(slicedToArray["a" /* default */])(_ref4, 2),
+                                y1 = _ref5[0],
+                                y2 = _ref5[1];
+
+                            if (startTop + lineHeight + (isShowDesc ? lineHeightText : 0) >= endY + markHeight) {
+                              startTop = baseYTop;
+                            }
+
+                            if (y1 < y2 && startTop >= y1 && startTop < y2) {
+                              startTop = y2;
+                            }
+
+                            if (y1 > y2 && startTop > y2 && startTop <= y1) {
+                              startTop = y2;
+                            }
+                          });
+                        }
+
+                        _computedTop = computedTop(isShowDesc, startTop, lineHeight), topObj = _computedTop.topObj, _startTop = _computedTop.startTop, oldStartTop = _computedTop.oldStartTop;
+                        startTop = _startTop;
+                        pointerObj["x_".concat(x)].push([oldStartTop, startTop]);
+                        pointList.push(_this13.drawMarkPoint(v, common, obj, topObj, x));
+                      }
 
                     case 3:
                     case "end":
@@ -5334,7 +5305,6 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
             };
           }());
           prevLeft = x;
-          prevCondition = condition;
           Promise.all(pointList).then(function (res) {
             var _this13$markObjs, _this13$canvas;
 
@@ -5344,8 +5314,54 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           });
         }
       });
+
+      function computedTop(isShowDesc, startTop, lineHeight) {
+        var topObj = {};
+        var oldStartTop;
+
+        if (startTop > endY) {
+          var _top = startTop + lineHeight;
+
+          topObj.y2 = startTop + lineHeight / 2;
+
+          if (isShowDesc) {
+            _top += lineHeightText;
+            topObj.y1 = startTop + lineHeightText / 2;
+            topObj.y2 = startTop + lineHeightText + lineHeight / 2;
+          }
+
+          if (_top >= endY + markHeight) {
+            setTopY(baseYTop);
+          } else {
+            oldStartTop = startTop;
+            startTop = _top;
+          }
+        } else {
+          setTopY(startTop);
+        }
+
+        function setTopY(base) {
+          oldStartTop = base;
+          topObj.y2 = base - lineHeight / 2;
+
+          var _y = base - lineHeight;
+
+          if (isShowDesc) {
+            topObj.y1 = _y - lineHeightText / 2;
+            startTop = _y - lineHeightText;
+          } else {
+            startTop = _y;
+          }
+        }
+
+        return {
+          topObj: topObj,
+          startTop: startTop,
+          oldStartTop: oldStartTop
+        };
+      }
     },
-    drawMarkPoint: function drawMarkPoint(v, option, obj, _ref4, x) {
+    drawMarkPoint: function drawMarkPoint(v, option, obj, _ref6, x) {
       var _this14 = this;
 
       return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
@@ -5355,7 +5371,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                y1 = _ref4.y1, y2 = _ref4.y2;
+                y1 = _ref6.y1, y2 = _ref6.y2;
                 positionObj = {
                   left: x,
                   originX: 'center',
@@ -5494,9 +5510,9 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         });
       }
     },
-    updateMarkData: function updateMarkData(_ref5) {
-      var data = _ref5.data,
-          newVal = _ref5.newVal;
+    updateMarkData: function updateMarkData(_ref7) {
+      var data = _ref7.data,
+          newVal = _ref7.newVal;
       var id = data.id;
       var listIndex, index;
       listIndex = this.markData.findIndex(function (v) {
@@ -5679,8 +5695,8 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
 var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricTextGroupvue_type_script_lang_js_,
-  FabricTextGroupvue_type_template_id_66af8164_render,
-  FabricTextGroupvue_type_template_id_66af8164_staticRenderFns,
+  FabricTextGroupvue_type_template_id_09668f04_render,
+  FabricTextGroupvue_type_template_id_09668f04_staticRenderFns,
   false,
   null,
   null,
@@ -5689,14 +5705,14 @@ var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricTextGroup = (FabricTextGroup_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
 var FabricScaleValuevue_type_template_id_68258044_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.show)?_c('TimeScaleValue',{attrs:{"times":_vm.timeList,"templateData":_vm.templateData}}):_vm._e()}
 var FabricScaleValuevue_type_template_id_68258044_staticRenderFns = []
 
 
 // CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=3492877c&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=3492877c&scoped=true&
 var TimeScaleValuevue_type_template_id_3492877c_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"c-time-scalevalue",style:({ '--left': _vm.popupStyle.left, '--top': _vm.popupStyle.top, '--height': _vm.popupStyle.height, '--width': _vm.popupStyle.width })},_vm._l((_vm.times),function(item,index){return _c('span',{directives:[{name:"show",rawName:"v-show",value:(index % 2 == 0),expression:"index % 2 == 0"}],key:item.left,staticClass:"c-time-scalevalue-list",style:({ left: ((item.left - item.width / 2) + "px"), '--font-size': _vm.popupStyle.fontSize })},[_vm._v(" "+_vm._s(item.time)+" ")])}),0)}
 var TimeScaleValuevue_type_template_id_3492877c_scoped_true_staticRenderFns = []
 
@@ -6080,7 +6096,7 @@ var FabricScaleValue_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricScaleValue = (FabricScaleValue_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f92084ce-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47e43465-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
 var FabricLinesvue_type_template_id_74aef744_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
 var FabricLinesvue_type_template_id_74aef744_staticRenderFns = []