zydx-plus 1.35.529 → 1.35.531

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.529",
+  "version": "1.35.531",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/calendar/src/Calendar.css

@@ -255,6 +255,9 @@ li{list-style-type:none;}
 .cle-but-right{
 	flex: 2;
 }
+.cle-but-right-cont{
+	display: flex;
+}
 .cle-time{
 	display: inline-block;
 	position: relative;

package/src/components/calendar/src/Calendar.vue

@@ -60,7 +60,7 @@
                <div class="cle-frame"></div>
                <div class="cle-time-y">
                  <ul @scroll="scrollHour($event)">
-                   <li v-for="(item,index) in 30"></li>
+                   <li v-for="(item,index) in 30*4"></li>
                  </ul>
                  <div class="cle-time-li" :style="{transform: 'translateY('+ transHour +'px)'}">
                    <p v-for="(item,index) in 30" :class="{'cle-time-act': index === -(transHour/26)+3}">{{ (index > 2 && index < 27)? ((index - 3) < 10)? '0'+(index - 3): (index - 3) : '' }}</p>
@@ -68,7 +68,7 @@
                </div>
                <div class="cle-time-y">
                  <ul @scroll="scrollMinute($event)">
-                   <li v-for="(item,index) in 66"></li>
+                   <li v-for="(item,index) in 66*4"></li>
                  </ul>
                  <div class="cle-time-li" :style="{transform: 'translateY('+ transMinute +'px)'}">
                    <p v-for="(item,index) in 66" :class="{'cle-time-act': index === -(transMinute/26)+3}">{{ (index > 2 && index < 63)? ((index - 3) < 10)? '0'+(index - 3): (index - 3) : '' }}</p>
@@ -78,8 +78,10 @@
            </div>
         </div>
         <div class="cle-but-right">
-          <button class="cle-but" @click="cancel">取消</button>
-          <button class="cle-but" @click="confirm">确认</button>
+          <div class="cle-but-right-cont">
+            <button class="cle-but" @click="cancel">取消</button>
+            <button class="cle-but" @click="confirm">确认</button>
+          </div>
         </div>
       </div>
     </div>
@@ -248,15 +250,17 @@ export default {
             this.cleFocusShow = true
         },
         scrollMinute(e) {
-            let top = e.target.scrollTop
+            let top = e.target.scrollTop/3.8
             let index = Math.floor(top/26)
+            if(index > 59 || index < 0) return
             this.transMinute = -(index * 26)
             this.minute = (index < 10)? '0'+ index: index
             this.cleDate = `${this.hour}:${this.minute}`
         },
         scrollHour(e) {
-            let top = e.target.scrollTop
+            let top = e.target.scrollTop/3.8
             let index = Math.floor(top/26)
+            if(index > 23 || index < 0) return
             this.transHour = -(index * 26)
             this.hour = (index < 10)? '0'+ index: index
             this.cleDate = `${this.hour}:${this.minute}`

package/src/components/dragPopup/src/dragPopup.vue

@@ -3,6 +3,7 @@
     <div v-show="!fixedStart" class="drag-head" :style="{'background-color':titleColor}" @click="selectedDrag">
       <span :id="'draggable' + id" :style="{'text-align': title === ''? 'center':'left'}" v-html="title"></span>
       <div class="drag-i">
+        <i class="share" v-if="share" @click.stop="shareTap"></i>
         <i class="minimize-cir" v-if="minimizeCir" @click.stop="minimizeTap"></i>
         <i class="minimize" v-if="minimize" @click.stop="minimizeTap"></i>
         <slot name="icon"></slot>
@@ -13,7 +14,7 @@
     </div>
     <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
       <div class="drag-cont-slot" :class="{'zIndexSlot': footIsMove}">
-        <div class="zIndexSlot" v-if="footIsMove"></div>
+        <div class="zIndexSlot" v-if="footIsMove || draggableMove"></div>
         <slot name="content"></slot>
       </div>
       <div v-show="!fixedStart&&!autoHeight">
@@ -56,7 +57,8 @@ export default {
       transAll: false,
       fixedStart: false,
       initWidth: 1280,
-      draggableState: null
+      draggableState: null,
+      draggableMove: false
     }
   },
   props: {
@@ -133,6 +135,10 @@ export default {
     autoHeight: {
       type: Boolean,
       default: false
+    },
+    share: {
+      type: Boolean,
+      default: false
     }
   },
   beforeUnmount() {
@@ -221,7 +227,7 @@ export default {
       }
     },
   },
-  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
+  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup', 'share'],
   methods: {
     handleFullScreenChange() {
       if (!document.fullscreenElement) {
@@ -316,6 +322,7 @@ export default {
           enabled: true,
           listeners: {
             start (event) {
+              that.draggableMove = true
               that.dragTap()
             },
             move (event) {
@@ -335,6 +342,9 @@ export default {
               if (that.y > that.clientHeight - that.footDownOffset + that.footDownOffset / 2) {
                 that.y = that.clientHeight - that.footDownOffset + that.footDownOffset / 2
               }
+            },
+            end (event) {
+              that.draggableMove = false
             }
           }
         })
@@ -417,6 +427,9 @@ export default {
       if(this.state) this.exitFullscreen()
       this.$emit('minimize');
     },
+    shareTap() {
+      this.$emit('share');
+    },
     close() {
       this.isMove = false
       this.footIsMove = false
@@ -533,6 +546,10 @@ export default {
   background-size: 15px 15px !important;
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAABYpJREFUeF7t3EGKJFcQBFHVyYVOXkIHaIEH5EC2Pa095qebl6Fdf/7yHwII/Ejggw0CCPxMgCB+HQj8DwGC+HkgQBC/AQRuBPwf5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSPwRwT5fr9/3z7PFQI/E/h8Pv88zedPCfJ9uoh/v0fg8/k8/vt9/IH/Zvt+vwTp/X4fb0yQxxF74M0ECPLm9Xz74wQI8jhiD7yZAEHevJ5vf5wAQR5H7IE3EyDIm9fz7Y8TIMjjiD3wZgIEefN6vv1xAgR5HLEH3kyAIG9ez7c/ToAgjyP2wJsJEOTN6/n2xwkQ5HHEHngzAYK8eT3f/jgBgjyO2ANvJkCQN6/n2x8nQJDHEXvgzQQI8ub1fPvjBAjyOGIPvJkAQd68nm9/nABBHkfsgTcTIMib1/PtjxP4TYL4w3GP/1x6D/yaPxzXm07j30Lgj/zhuN8CS48eAYL0Ntd4IECQAZZojwBBeptrPBAgyABLtEeAIL3NNR4IEGSAJdojQJDe5hoPBAgywBLtESBIb3ONBwIEGWCJ9ggQpLe5xgMBggywRHsECNLbXOOBAEEGWKI9AgTpba7xQIAgAyzRHgGC9DbXeCBAkAGWaI8AQXqbazwQIMgAS7RHgCC9zTUeCBBkgCXaI0CQ3uYaDwQIMsAS7REgSG9zjQcCBBlgifYIEKS3ucYDAYIMsER7BAjS21zjgQBBBliiPQIE6W2u8UCAIAMs0R4BgvQ213ggQJABlmiPAEF6m2s8ECDIAEu0R4Agvc01HggQZIAl2iNAkN7mGg8ECDLAEu0RIEhvc40HAgQZYIn2CBCkt7nGAwGCDLBEewQI0ttc44EAQQZYoj0CBOltrvFAgCADLNEeAYL0Ntd4IECQAZZojwBBeptrPBAgyABLtEeAIL3NNR4IEGSAJdojQJDe5hoPBAgywBLtESBIb3ONBwIEGWCJ9ggQpLe5xgMBggywRHsECNLbXOOBAEEGWKI9AgTpba7xQIAgAyzRHgGC9DbXeCBAkAGWaI8AQXqbazwQIMgAS7RHgCC9zTUeCBBkgCXaI0CQ3uYaDwQIMsAS7REgSG9zjQcCBBlgifYIEKS3ucYDAYIMsER7BAjS21zjgQBBBliiPQIE6W2u8UCAIAMs0R4BgvQ213ggQJABlmiPAEF6m2s8ECDIAEu0R4Agvc01Hgj8CwmaaMkz/sxmAAAAAElFTkSuQmCC") !important;
 }
+.share{
+  background-size: 17px 17px !important;
+  background-image: url("data:image/png;base64,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") !important;
+}
 .minimize-cir{
   background-size: 17px 17px !important;
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQQAAAEECAYAAADOCEoKAAAAAXNSR0IArs4c6QAAIABJREFUeF7tXQnYtdW4vm9kFmlQSYMSIk0ajpJOA2VISkk0KE2nQSMnaToNSoo0OKgoaUSTUh0iKUQDjUQkMoU4CJ26z3V/re/3/V/fsPe71vvu9937ea5rX/uP93nWWvd69/2t4RmIkKFBQNILACwG4HkA5gewQPoe//dzADwDwNMAPD19/O9nJRD+F8BDAP6WPv73XwA8COD3AB5I3+P//g2A+0j+cmhAHPGBcMTH37nhS3oZgJUBvBTAUgBMAoun70GO516TA4CfA/gZgNsB3ETyrkF2KtruD4EghP7wavRpSf7hr5QIwN/+PLXRTuQ35tXGTQBuTt8miR/kmw0LdSAQhFAHqn3alDQPgOUBrJI+JoJXAHhKn6a68ri3IrcAuHHC5w6Sj3RlAMPazyCEAc2spBcB2AjAhgDWSfv6AfWmFc36rOKrAL4M4HKS3n6ENIxAEEKDgEt6A4DXJxJ4YYNNd7Epn0FcBeBLJK/u4gC62OcghJpnTZL3/dsC2ArAgjU3N6zmfwHgswBOJ/njYR1kG8YVhFDDLEjydd82ALZLZwM1tDKyJr8N4DMAzibpa9KQgggEIRQCU9KTALwJwLvS2YD/O6Q+BP4O4CIAp/nsgaTqa2p0LAchZM61pOUAvBvAO2NLkAlmdXX7PnjV4C2F/SFCKiIQhFAROEnbA9gZwGoVTYRaPQj4APIUkl+ox/xwWw1C6GN+09nAbgB2Te7BfWjHow0jcA+AE72liLOG3pEPQugBK0l2EnpfuinoQSMeaREC9pQ8A8AxsZ2YfVaCEGbASNKSAI4CsCWAwGr296nNT/wTwH8DOILk79rc0UH2LV7yKdCXZH+BQwDsBMBuxSHDg4CvKo8D8GGSfx2eYZUZSRDCBBwlOQx4fwD7ptDgMiiHlTYi4FXCYSRPbmPnBtWnIISEvCQfFnpVMAzehD8F4Os3/wWc/HHMgPfVE//3cQcfE6LzJcz2eSaAJQB4S9V1+YnPh+JW4rFpHHlCkLQ5gKMBdC22wElJHEb8fQA+UR/7kDQZNCaSjNv4Z2kAK6RIzUUa60SZhq4H8B6S3ytjrptWRpYQJK0K4CMA1uzA1P0QwHcAfBfArc4tQPLPbe63JGdnchi3w7pXB/BvHVlRnAvg/U0Ta1vmcuQIQZITjBwOYL+2TMIU/bgOgP9ifRPAdSSdsqzzImkhAGulj4m4rU5ddov2NuJjnQe9zwGMFCFI8l+qswAs0ydOdT/u/f6V6fM/o+JIk1YRzgfxuvRp2zbDxPxOkk4JNxIyEoQgyYlEjwSwd4tm1f73Dsz5PMk7WtSvgXVFkjNG+UzHUaJOFNsG8WrhAJIfbUNn6u7D0BOCJO9dvSpow6GhU4d93oE4kfRj5ldbkhPJmBhMEG2QawFsPezejkNNCJKOAfDeFrxNjuE/FcB5JH3tF9IjApKeC+AdKX7EmaYHKZ67/Una43EoZSgJIaUqPw+AU5YPSuz4ciaAT5H0LUFIJgLpZmgHAG8HMG+muRz1K5z3guSvc4y0UXfoCEHSASn+YFB43wDgWJLeGoTUgEA6E3JKOnuUDmrV8AcAO5B0kpahkaEhBEn2rnMMvE+smxanD/eLcTxJXxeGNISAJN9SmBjWb6jJyc14W2q/hUcH1H7RZoeCECTZQ+7SAf21OCkFykSmnqKvZn/GUuaqD6TtRH/K+U97C/G2tjuL9TLMzhOCpHUBXNjwnvLhdGXoUNqoa9jLm9bQM5JenBzP3tqwa76zQW/U9azQnSYESb5B8JKtSXHuvkNI2o8gpKUISLLLtHNZvLHBLv7J16Qk/6fBNos21UlCSBmO/cP0dVRT4qpCu5K8u6kGo518BJJ36idS0FW+wdkt+DxpL5LeSnZOOkcIkuZzNR8Ar2oIbV8Z7kPy8obai2YKIyDJ77mdnD7YoAfkpwDs0rXDxk4RgiTHIPgAx4eIdYujCQ8axQCXuoEdlH1J9l04tEEXdm8dNutSbEpnCEHSqwFcAsBhtXWLC47uGAeGdcM8GPvpfMFOYys20IM7fRXeleK1nSAESa6O7JVB3eXRH0hJMs5u4EWJJgaIgKQnphB4rxgcEl+nuDblq7sQNdl6QpBkRyM7/dQ9aXZq2nlYcg/U+XYPk21JL0qFZB0aX6e4vP3abSeFVhOCpA0AXFZz5mPnE9yNpKsLh4wgAmm1YKemgwB45VCXtH6l0FpCaIgMnI/Qhz5OtBky4ghIcjan8wHUmail1aTQSkJI2wSfGdQpx5Fscxq1OscetqdBIF1r28dl4xpB8vbBZwqtc3dvHSFIWjulEqvrzMBRak6L5ZuEkEBgSgQk7ekYlRq3q86OvXrbqki1ihBSCq1v1FgkxaHJm8Z1YrBALwhIchLYCwAs3svzFZ7xleRaJP1HqhXSGkJIBVVNBs+uARml8l3Ojfd/NdgPk0OKgCS/j+c4cKmmIbq2hm8fHAcxcGkFIUh6SUo5Pn8NiLhC0VYk7dQUEghUQkDSwS79Vkl5diXX3FivDbUmB04Ikl4AwDkHF50dt76fuD95id3Wt2YoBAKTEJC0aVotPLkGcK5O7+pAV7ADJQRJXhF4X19HRuSbAWxI8rc1TF6YHFEEUvSkg+sWqAECn1c40Yq3uAORgRFCSnl2DQDn4i8tzp60JUkXNQ0JBIoiIMmHjC6s461uaXEaPqeEG4gMhBBSPgNHgjlGobR8DsA2XQs7LQ1C2KsXgVR1yn/QXlFDS+8leWwNdmc1OShCON1prGftXf8PnERyj/7VQiMQ6B8BSc9KQXd15OZw5qXGM3c3TgiSdgTwyf7hn1XjgyTfP+tT8UAgUBCBlBLeW9T1Cpq1KW93V2g6R2OjhCBpJQA3FQbO5g4k6fx5IYHAQBCQ5IxapX0V7Lj0yibPwhojhOTgYSeM0l5fsTIYyE8gGp2IgCRfRfqgsfS5mIsBN1bfshFCSDntrqqhmIbLpO0Ur2Yg0AYEJD0dwNcBrFq4P7uTPLmwzSnNNUUIBwI4ovCAziDpxJkhgUBrEEjRknbBf3nhTq1Cso7t9lzdrJ0QJK0B4FuFwfkSyTcVthnmAoEiCEhaCIDdkZcsYvAxIy4Es2Ld7s21EkK6lrkDwGIFgfE5xBokHypoM0wFAkURSKXlTArPLGj4TJLbFrT3OFN1E8IXAbyl4ABcfnulYSzDXRCjMNUSBFKiH98+PKFgl95K0vk/a5HaCKEGfwOvCLwy8AohJBDoBAKS9gLwkYKddQ5Q+yc4wUpxqYUQUgSjKx49rWCPndjERV1DAoFOISDJpeRK3oZdT3LNOkCoixCcD9Hp00vJ4SQdjx4SCHQOAUnzAPDNgw/YS4kLCZ1ayti4neKEIMlluB3GWUpcZHWDQYaElhpI2BldBNLNw60AfANRQh4EsBRJfxeTooQgySeqro68cKEe3gNg5baklyo0pjAzogikK3ivFLxiKCGfJrl9CUO1rBAk+fDEhyglxIeIvlHwWURIIDAUCEjaFcApBQezJsnrS9krtkKQ5MKZzlJUSrYmeVYpY2EnEGgLApLOA7BFof7cRnL5QrZQkhC+68isQh37AkmfRYQEAkOHQCpLf1fBClH7kjy+BFBFCEGSk5046UkJsfPRsiR93xoSCAwlApJeA+BrQJE/yv6tvJCkq5dnSTYhJPdkH/6VSDrp5JLrkPTBS0ggMNQISHJlqFL5Ez9LcptcwEoQwscAlEpbdgzJ/8wdVOgHAl1BQNLtAJYr1N/sA8YsQpDkwwwfJJYooe0KzMuR/GchcMJMINB6BNJh/PcK/Ybs1u+IyMpp3HMJwRliXlsAdQ/AhS99MBkSCIwUApKOBvC+QoPejuQZVW1VJoRUCNPhnSVkoLnoSwwgbAQCVRFI6de8dVimqo0Jes6b8OKqZQhyCMEp0TYoMIB7XfCC5N8L2AoTgUAnEUh/YF3SsPJvcsLAK68SKjVeeHWwPknHK4QEAiONgCSXJ3CZglypvEqoSghfKZSH/hKSb84dfegHAsOAgKQFU6q0eQuMp9IqoW9CkOQqNdcV6LBNLE3SPgwhgUAgAEDSPgCOKwDG3SSX7ddOFUJw5ds39NvQFM9/iGSpk9UC3QkTgcDgEUi5E5yHtMQBoytJn9/PqPoiBEmudutqMrnyu+Rq+ZdcQ6EfCAwbApKcUfySAuO6geTq/djplxCcoWWHfhqY5tm9SJ5QwE6YCASGEgFJrsHg0oe5sjbJa3s10jMhpAOPXwBwyaoccfDSEuGRmANh6A47ApI2BPDlAuO8mOQmvdrphxBceckVmHJlT5In5hoJ/UBg2BEotEqwF/AyvR7e90MIvwfw3MxJ+BXJRTNthHogMBIIFFwlnEJyt15A64kQJLmG4qd7MTjLM3uQPKmAnTARCIwEApIcHrBa5mD/CuB5vZSB65UQSnTqj06+GmcHmVMb6iOFgCRXPnMFtFzZhaTrQ8wosxJCqlHnwItcOZTkYblGQj8QGCUEJPk36tQAS2WO+1aSr5jNRi+EUMK/2jkOvDrwKiEkEAgE+kCgYKZmpxi4YaamZyQESU8HYCcif+fIx0n+R46B0A0ERhWBFB7t6/r5MjGYtY7DbITwbgCfyuyE1X3t4WVPSCAQCFRAQNKhAA6poDpRxbVO5ifp7yllNkIokfPgKpIl6zxmYhLqgUD3EJDk63o7Bs66zZ9ldJuT/HzfhCDJyxNvF3LzJW5BsmStx+7NZvQ4ECiAgKTLAWyUaeo8kltWIQTHLORWl3We+EVJPpw5iFAPBEYeAUmbAZj2r3uPAHm78Jzprv+nXX5IKlHSPXIl9jhL8VggMBsCKTT6lwCcSCVH3kLyoqkMTEkIqfiKrwhztwtO9vijnJ6HbiAQCPwLAUlOnuIkKjlyFsmt+yEEV4CpnMo5NXQjyVK1HnMGH7qBwNAgUKio8p9JPrsfQvA+xfuVHNmfpEtVhQQCgUBBBCR51f2iTJPrkbx6so3HbRkkeZvw5wLOSIuTvC+z06EeCAQCkxCQdDiAD2QCM+X53lSEsC6A3LTo15NcM7PDoR4IBAJTICDp5QBuzQTnLpIv7WWF4Drze2c2FklQMgEM9UBgJgQKbRteQNLOTnNkqhXCDwH0nb55UucXIWnf65BAIBCoAYFCrsy7kzx5WkKQtCSAn2b2/yaSq2TaCPVAIBCYAYFC1dMuJzlXSYW5VgiS3gXg9MyZOJzkwZk2Qj0QCARmJgT/dn+T6aTky4P5JhaGnUwIpwHYPnMmZo25zrQf6oFAIPBYlSf7CtlnKEdWIPmDcQOTCSH3/MCxCwuRdKbXkEAgEKgRAUlbADgvs4ndSJ7yOEKQtECKbsyxfybJbXMMhG4gEAj0hoAkexs+2NvT0z51Nsl3TEUIJZI57kgyN0Iyc3yhHgiMDgKSvg9g1lyJMyDyc5JLTEUIxwLYLxPKl5D0tiMkEAgEGkBAkpf7u2Y29XyS99vGnDMESV8DsE6G4d+T9LYjJBAIBBpCQJKX+2dlNrcxyUsnE4LDnZ+TYfgSkm/O0A/VQCAQ6BOBQr5DB5I8ag4hpHxtTryQI+8l6W1HSCAQCDSIgCSnOsxZnZ9L8u0TCcFJUJ0hKUfWJeltR0ggEAg0iICkiwFsnNHk7SQdMPXYGYKk/QF8KMOgVe3xlHsFktmFUA8ERg8BSUcCeH/GyB8FMI89FscJ4UwAU6ZU6rGRX5NcpMdn47FAIBAoiIAkZ1E+J9PkmMfiOCF8F0BOurMrSW6Y2aFQDwQCgQoISHoZgNsqqE5UeRvJ88cJ4Q+ZZaKOI5nrw5A5nlAPBEYTAUlPAOBSB/6uKgeQPJqS5gXwp6pWkt52JHOTsmZ2IdQDgdFFQJIzKI0dDFaUT5DcxYSwIoCbKxoZV1uL5HWZNkI9EAgEKiIgyXUWcvyAxkoumhA2BfCFiv0YV5vj+phpJ9QDgUCgAgKSPgrgPRVUx1XuJrmsCWFfADnp0h8h+aSMjoRqIBAIZCIgaS8AH8kw838AnmxCOBHA7hmGfkjyJRn6oRoIBAKZCEjaBMCFmWYWNSHkFmWJK8fMWQj1QCAXgUJngauYEHKjHD9JcufcAYV+IBAIVEdA0nwA7D6QI681IdihwY4NVeUIkgdVVQ69QCAQKIOApEcyfRG2MiE4c+tCGV3ai+QJGfqhGggEAgUQKPBb3tOEkJsQ9R0kzy4wnjARCAQCGQhIuh3Achkm/qsEIbyO5FUZnQjVQCAQKICApG8AeHWGqZNLEMIqJG/K6ETnVVPF7M6Po+sDIOk99MiKJDsY2tGwqpxTghCWJXl31R50VU/S25Kr6L8DWLir4xiyfrueqG/NLiaZW6+gc9BI+iSAHTM6/qUShPBSkndldKJTqqnc3YEAlu5Ux0evsz8BcCTJT4/K0CXlZk6/tgQhLE8yNxa7E3MmyTUnduhEZ6OT4wicRvLdowCHJGdNcvakqnJLCUJYieQtVXvQFT1JmwM4vyv9jX7OhcDmJO2RO9QiyfUZ5pRlqzDYe0oQwqokv1eh8U6pSPIYo8x9p2ZtTmdvJJmTEawTo5bkzMk5LgAPlCCEV5H8VicQq9hJSesC+GpF9VBrBwLrkby6HV2ppxeSnMbwyxnW/2FCyHV3XJ/kUP9YJB0HYJ8MoEN18AgcT9Kh/kMrktYD8JWMAT5iQngIwFMzjLyeZA4rZTTdjKqk7wBYrZnWopWaELiB5Oo12W6FWUmvB3BZRmceMiE4n6LzKlaVTUi6UMTQSoEKu0OLTYcG9gOSK3Sov313VVJuBfcHTQi5ZaC2IHlB373vkEJcN3Zosqbv6tBfPxaoz/BbE4JrOi6aMeVbk8ytPpvRfP2qceVYP8YNtDAKf7i2BfCZDCzvMyHcA2CpDCM7kDw9Q78TqgWIsxPjHNJO3k/y+UM6tjnDkmS3ZbsvV5UfmxDuBJCTE3EfkjnJHat2vlE9SXsDOL7RRqOxUgiMyjuaW6P1dhNC7gn6B0nmFJosNem12ymQbq72PkYDj0Pg6yQdgDb0UiCW4ToTgq8pfF1RVUYmp6Ikp5v3KmGPqmCFXqMIOKO4VwdOMT70IsmBXNtlDPRiE4JLsG2TYeSLJDfL0O+cqiRnpXGQk7cRY/UxQ1qDgDOAeQvrW4U7WtOrBjoi6VIAb8xo6jQTgv/i+cWuKteQXKeqctf1JC0BYPGuj2NI+v9zkvcOyVj6HoYkhxCs0bfivxTGir0eAOCoDCO3k8wpMpnRdKgGAoHAOAKSnAPihRmI7GdC2AnAJzKMPETy6Rn6oRoIBAIFEJDks5InZpjazoTwJgCXZBix6nNJ/jHTRqgHAoFARQQkLQbgvorq42pjhVrs352b4OSVJG/M7EyoBwKBQEUEJK0N4JqK6uNqLzYhPA3A3zINvZVkbkn5zC6EeiAwughI8k2hbwxz5EljV2aSXBPOteGqyn4knTMgJBAIBAaAgKRDABya0fQvSS42Tgi56cE+TvI/MjoTqoFAIJCBgKQzAWydYeIbJF8zTgi5JeG/STKnYkzGOEI1EAgEJPkcMCffw5kktx0nhNx87g+SzNlyxIwGAoFABgIFarQeSvKwcULY3q6eGf2x6gtI/iLTRqgHAoFAnwgkV3oXes2RsXwR44SwKoAbcqw5QGrYcytm4hPqgUAtCBTIlOR+jVVgGyeEJwP4R2Zv30vSW4+QQCAQaBABSa7WlJOC4GEnWib56JxIPUku2LpMxjjOJ+kCqCGBQCDQIAKSrgTw2owmbyI5VoRoIiF8EYCztlaVsXvMqsqhFwgEAv0jIOkJAB4E8Kz+tedofIbkuyYTwmEADs4watUlRzn8NBO7UA8E+kZA0koAbupbcW6FfUmOpQecuELYBMCFmYa3InlOpo1QDwQCgR4RkLQbgJN6fHy6x9YhORYHMZEQFgDgGg05cgpJdzAkEAgEGkBA0rkAcs7uHDL9LJJ/n4sQ/B+Sfghg2YxxDH11nAxsQjUQKI6ApF8BWDjD8LdJ/tu4/lz5ACW5vsLY4UKGLEQyd6WR0XyoBgKjgUCh1AXHkdxvOkJw4tBTM+HcieSnMm2EeiAQCMyCgCT7HtgHIUfeQvKi6QjhxQDuyrEO4CKSOdeXmc2HeiAwGghIuh7AnOV+xVHPT9LpD8bkcSnEJf0WwIIVjVvtLyRz7kQzmg7VQGA0EJA0P4AHMkd7B8mXTbQxFSG4WKSLRubIBiS/kmMgdAOBQGB6BCS9E8BnMzGa6/xguhXCFgDOy2xoZKo5ZeIU6oFAJQQkXQxg40rK/1Jal+TXZlshPBvA7zPTOXtP4tuGRzI7HOqBQCAwCQFJ3pL7NzpPBjjOozrv5N/olGXIJNlryVlcc+R1JK/KMRC6gUAg8HgEJLl+o+s45sgFJL0bmEumI4T3AjgmpzUAp5P0NWZIIBAIFERA0hUAXpdpcjuSj8vSPB0huJhpbgaWSKuWOWOhHghMRkBSiRADm12Q5ONuKaatXCzJ/gj2S8iRTUnmBkzltB+6gcBQISBpDwAfyxzU10n++1Q2ZiKEIwAcmNnwZSRzylNnNh/qgcBwISDpBwCWzxzV7iRP7pcQVgRwc2bDj6bkq/dn2gn1QGDkEZBUIvepACxC8jd9EYIflvRTJz3JnIkDSeaUm89sPtQDgeFAQJKrtLtae45cS3LaG8RptwyJEI4G8L6c1gH8lGROzfrM5kM9EOg+ApKeknwPnpE5mj1JnjidjdkIwYkXXeYtV8KVORfB0B9pBCS9G0CJKOLnk5x2Cz8jIaRVQolDjCtJbjjSMxqDDwQqIiDJv1Pf+uUkL3Lrl5N8w0zd6IUQXMR1yhPJPsf3EpLOyBQSCAQCfSAgyTELjl3IlY1JXppLCN6z+EQyd+9yBkm7XIYEAoFAHwhIuhbAWn2oTPWof8OLuhhLFiGkbYP3Lt7D5IiTOXr/4nwLIYFAINADApJeCeC7PTw62yMHkbRv0Ywy65YhEUKJ3O82dSxJx0mEBAKBQA8ISHJ6szf38Ohsjyw8ne/BRMWeCCGRgovB2jEiR5zqefFIwpoDYeiOCgKSSjgHGq4pIxunwrEfQtgSQIkiLB8muf+oTGqMMxCoikChJChuflWSPbkP9EMIriF3L4Dc+o0PpVVCbj64qjiHXiDQegQKpVj3OL9J8tW9DrhnQkjbhr0BjNWAy5RYJWQCGOrDjYAkXw+WCAzchGTPV5b9EsIzAfwCgNOs5YhXCcvM5DGVYzx0A4EuIyBpDQDfKjCGH5HsK4VBX4SQVgkfAlDiDOBzJJ05NiQQCAQmICDp+wBeUQCUXUg6IKpnqUIIiwL4Zc8tzPzgGiS/U8hWmAkEOo9AoXyJxuHXJBfpF5C+CSGtEuzKbJfmXLmZ5Mq5RkI/EBgGBCQ9PR3cO01aruxF8oR+jVQlBDPPzwA8ud8Gp3h+W5JnFrATJgKBTiMgyYmNSzju/RrAEiT/2S8glQghrRJOAbBrvw1O8bxdmZcl+acCtsJEINBJBCS9FIAji59UYAAz5jyYyX4OIZRcJZxFcusCQISJQKBzCEiyj89NAFYo0PnKqwO3XZkQ0irh4wB2KTAIm1if5FcL2QozgUBnEChU1n18vHuQPKnq4HMJwasE5zgoUe3ZNxfOmfCXqoMJvUCgawhIWhrAHYXO4+5Jv6GHq+KQRQhplbAPgOOqdmCS3mkkc8OsC3UlzAQC9SMgqUTQ4HhHs1fZJQjhiQBuMzMVgm/WrC6F2gkzgcBAEZB0GICDC3XiiyQ3y7WVTQhplbCmgyhyO5P0/+iKUREiXQjNMNNKBCStDuB6AD5QzBWHAvg3c1+uoSKEkEjhfACb53Yo6V9FMreYZaGuhJlAoCwCkpyO8E4XMSpkuVjtk5KEYJfmHxXIvTiOUdZpaSGgw0wgUBwBSZ8BsG0hw3eRtA9DESlGCGmVUCpDs839A8CrSPp+NiQQGAoEJJkITAglxGXZHA/kg8kiUpoQbM9hm94flRAXlFie5B9KGAsbgcAgEZDk3KQO5punUD9OJrl7IVtjZooSQlolvCjdOpSIc7DJbwBYl+QjJQcetgKBJhGQtCAAhzX3HYE4TT9r8dspTgiJFD4A4PCCgH+UpLM1hQQCnUNAkq/mfaOwWsHOZ/scTNWXWgghkUKJEnAT+/xOkp8rCGiYCgQaQUBSSRd/9/lMkqUOJefCoE5CsKOSl0iltg52x1yTZImiFY28CNFIICBpDwAfK4jEr5J78p8L2pxjqjZCSKsEx3Y7xruU/A7AKiUcMEp1KOwEAtMhIGkDAFcUcj4ab2YdktfUhXrdhGD79mB8VcEBOBBk9QiCKohomCqOQMpv4NVsbk3UiX2r/SytVkJIq4QlAdwOwOmhSskVJDcqZSzsBAIlEUg3CvYN8LtfSu4kuVwpY9PZqZ0QEilsD+C0woM5h+RWhW2GuUAgCwFJz02r4mLeg6lDK5O8OatzPSg3QgiJFC4A8NYe+tTPI58h+a5+FOLZQKAuBCS5bsnXfc5VuI3dSTqxce3SJCF4y+D6cqWZ8wSSe9WOVDQQCMyAgKSnAviaXYkLA1UkrLnXPjVGCGmVsGzKHVfyoMWm/4vkIb0OOp4LBEojIMm3CaUjdH32thrJv5Xu73T2GiWERApvAnBJDQOs/QS2hj6HyY4jkEKZvwyg54KqPQ7ZqQRXJPmTHp8v8ljjhJBIoVQ5uMkgnEJytyLIhJFAYBYEJD0HwJWFXZLHW92U5IVNT8KgCMFZYjzYjWsYsN2btyH5aA22w2QgMIaApPkBXF2oBuNkVHcl+d+DgHoghDA+UEk+kX1NDQM32WxF8u812A6TI46AJPsX+Mygr8rKPcJ2NMkDeny2+GODJgSnb3cU2MuLjwy4EcAbSP6mBtthckQRkGSv2y8BmK8GCAbuWzNQQkhLr+cBsFfX4jUA7Jjx15N05GVIIJCFgKR3pGxHJcqtTe7LVeldHWjej4ETQiIFF6twzMPCWTM2tbKAtdOnAAAHOklEQVRPa7ckeVkNtsPkiCAg6SgAdS3lr/WVJUlnTx6otIIQEinYYcmkYNfP0uLcc0cDOCgyL5WGdrjtpbgEe9nWcdZl8Ly1dQRjKyqWtYYQEim8AsB1AOwCWof4vGIzki6IGRIIzIiAJJPAuTWtXN22t7Jrt6nyeasIIZGCXT9d9LVkdOTEiXdOhc3rjCmP31m3EZDk38X7AbiyktOf1SF3p4zJrUog3DpCSKSwdnL4sH94XXIkSed+DAkE5iAgyYfc9mVZr0ZYXJTV2b9at1JtJSEkUlgXgA8C6ySFbwPYIjIw1fjqd8i0pNcmMligxm6bDFxvpJXX4a0lhAZJ4U8AtiN5UY0vQZhuMQKSXCfBqf4cNVvnb6LVZOApqnPwRV4BSV4p+EyhbnE1nb3adMBT94DD/pgL8vIAzgDgIip1isscvqaN24SJg249ITS4UnBTvwWwffgs1Pm7aIdtSc4GfiiA/QHU4Wg0caCtXxmMd7YThJBIYS0AlwJwhFnd4krWu5F8oO6Gwn7zCEhaE8DpAJyfo27plAt9ZwghkcIy6aCxiYn0dZDLbA8k6qzut3QU7UvyYeERAHZuaPxfALB1GzwQex1vpwghkcKzU3CJVwxNiLPW7EzSDlMhHURAkrcELphycEMrTKN0FMkDuwZX5wghkYJPhU913oMGAbf76j4kf9Fgm9FUJgKS7E/gUmouQtyE/BOAyw76femcdJIQxlGWtB+AYxtG/UQvO0n6ADKkpQhIssfrka4c3mAXfeb0ZpJ2ke+kdJoQ0mphfQDeq83b4Aw4Ks1psY+Jg8cGUe+hKUmv9HIdgMuoNSmuY7oRSdde7Kx0nhASKfiw0TcQLjDbpJgYXMjTCV5b54baJBCDbkuSk5x6xVhHWr7ZhncuybfP9lAX/v+hIIRECl4hnOMkEwMA3vtGt/0hkq49GdIAApIceLS5z3YArNpAk5ObcN7OA0g6afBQyNAQwvhsSHLA0uEDnJ2vAPgIycsH2IehbjplO3bFrr0BvGBAg70/XSk60erQyNARQlot2A3VEWulq0T1M/E/T+m2To3gqX5gm/rZFJLsG4MdALwFwFPyrVa24HfLmZH/t7KFlioOJSFMWC34BsL7ykGLYzE+0dWrqEGCJ8krABcL3q5wNeUqw/q9CYnkxVWUu6Az1ISQVgs+bPosgCVaMCGOrDzblbBJ2qU1ZBoEJPmQzquBOvMS9IO/Q/Ed5zLU181DTwiJFJ7mAz8Au/fzBtT87G0APg3ggthSPIZ0uinYNh0UNnmNPNNU/xHAniTPqvl9aIX5kSCECVsIB7V4Yl1oo01yZyr84bJg14xKgRlJi7p2RiqS6pVAE4Fr/cy7a5Du1NZkJv0MpNdnR4oQJqwWPgjgPb2CNIDnfFPh2Al7vH1rWA6vJNl92IVOVk9ZjJcbALa9NOlVgaNdfZU8UjJyhDBptWBvwxU6MOPOzusU9bekTL3fb/sqIh0GOou2E5CYBLw6qyPFfunpc3TrIcN+VjAdaCNLCBOIYevk6rpY6TerZns/BnBrIggn4Bj7kPT9eCMiyfkuXzjps3IigbYt/2fDxCn03kfSmY1GVkaeECYQg73d7NRUR82+Jl8wF7j9GQATw18BuACIv/3xvbndrf+W/nv82/+7vf5cD+MZE76dCt/1N/2/Tfz4wG8pAIs0ObCa2rrZDk6Rlv8xdIMQJrxlkkwGLtfltFohw43AvSkBjp2MQhICQQhTvArp9Nvuz74Cq6tQR7yEg0HA6c89t58k+fBgutDeVoMQZpgbSXZ99o3Em9s7hdGzHhH4M4APAziepLdPIVMgEITQw2uRYuz3dRXpHh6PR9qFgN2NTwFwAkn/O2QGBIIQ+ng90lZiTwA7duQKrY/RDd2jN5kEXKyVpMPTQ3pAIAihB5AmP5Ku23xdaeeml1UwESr1IXAhgOMiKW41gIMQquE2R0uSE3M4Gs/BOM4IHdI8AvbHcJ2FsyKlXR74QQh5+E0kBsfnb5bIwYk9A9tC2E5jxu7Fdi0+PSJHywEdL205LCeSg2P4Hb/va8ula2hiVE0+AsABYK7FeDHJf4wqEHWNOwihLmST3VQ2zOSwRcOZoWseWaPmHSpuEjhzVGMMmkI7CKEhpNNB5BtTqK+/F26o6a428x0Azkt5WWwJmpvCIITmsJ6rJUmOBNwofRwN6GpUoyz2ILxiPC8ESZ8RhDSMQBBCw4BP1ZwkZ3RaEcAqEz72kqy7TPmgRu9CuvYTcBq5sW+SPxlUZ6LdfyEQhNDStyFtMZw92pWITBYOK/Z31+R3E378JoBbSDpUO6SFCAQhtHBSZuqSJK8iTA7OPuRcBL7RWHzAZxIOqb4PgFPP+9s/eCd1uSmK43brBQtC6NZ8zdhbSSaI5wNYCMACAOaf9O08Bs5r4C3K+Mc5D5wHweIAIOdImPhxPgUv8R0H4GKm49/OPuzPfeEMNDwv0f8D8q4llTET6NEAAAAASUVORK5CYII=") !important;

package/src/components/dragPopup2/src/dragPopup.vue

@@ -4,6 +4,7 @@
       <div v-show="!fixedStart" class="drag-head" :style="{'background-color':titleColor}" @click="selectedDrag">
         <span :id="'draggable' + id" :style="{'text-align': title === ''? 'center':'left'}" v-html="title"></span>
         <div class="drag-i">
+          <i class="share" v-if="share" @click.stop="shareTap"></i>
           <i class="minimize-cir" v-if="minimizeCir" @click.stop="minimizeTap"></i>
           <i class="minimize" v-if="minimize" @click.stop="minimizeTap"></i>
           <slot name="icon"></slot>
@@ -14,7 +15,7 @@
       </div>
       <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
         <div class="drag-cont-slot">
-          <div class="zIndexSlot" v-if="footIsMove"></div>
+          <div class="zIndexSlot" v-if="footIsMove || draggableMove"></div>
           <slot name="content"></slot>
         </div>
         <div v-show="!fixedStart&&!autoHeight">
@@ -57,7 +58,8 @@ export default {
       transAll: false,
       fixedStart: false,
       initWidth: 1280,
-      draggableState: null
+      draggableState: null,
+      draggableMove: false
     }
   },
   props: {
@@ -138,6 +140,10 @@ export default {
     zIndex: {
       type: Number,
       default: 0
+    },
+    share: {
+      type: Boolean,
+      default: false
     }
   },
   beforeUnmount() {
@@ -230,7 +236,7 @@ export default {
       }
     },
   },
-  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
+  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup','share'],
   methods: {
      handleFullScreenChange() {
        if (!document.fullscreenElement) {
@@ -325,7 +331,12 @@ export default {
         this.draggableState.draggable({
           enabled: true,
           listeners: {
+            start (event) {
+              that.draggableMove = true
+              that.dragTap()
+            },
             move (event) {
+              console.log('移动')
               // 获取滚动距离
               const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
               that.y = event.rect.top - scrollTop
@@ -343,8 +354,8 @@ export default {
                 that.y = that.clientHeight - that.footDownOffset + that.footDownOffset / 2
               }
             },
-            onend (event) {
-              console.log('结束')
+            end (event) {
+              that.draggableMove = false
             }
           }
         })
@@ -543,6 +554,10 @@ export default {
   background-size: 15px 15px !important;
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAABYpJREFUeF7t3EGKJFcQBFHVyYVOXkIHaIEH5EC2Pa095qebl6Fdf/7yHwII/Ejggw0CCPxMgCB+HQj8DwGC+HkgQBC/AQRuBPwf5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSNAkBs3VxECBIkMreaNAEFu3FxFCBAkMrSaNwIEuXFzFSFAkMjQat4IEOTGzVWEAEEiQ6t5I0CQGzdXEQIEiQyt5o0AQW7cXEUIECQytJo3AgS5cXMVIUCQyNBq3ggQ5MbNVYQAQSJDq3kjQJAbN1cRAgSJDK3mjQBBbtxcRQgQJDK0mjcCBLlxcxUhQJDI0GreCBDkxs1VhABBIkOreSPwRwT5fr9/3z7PFQI/E/h8Pv88zedPCfJ9uoh/v0fg8/k8/vt9/IH/Zvt+vwTp/X4fb0yQxxF74M0ECPLm9Xz74wQI8jhiD7yZAEHevJ5vf5wAQR5H7IE3EyDIm9fz7Y8TIMjjiD3wZgIEefN6vv1xAgR5HLEH3kyAIG9ez7c/ToAgjyP2wJsJEOTN6/n2xwkQ5HHEHngzAYK8eT3f/jgBgjyO2ANvJkCQN6/n2x8nQJDHEXvgzQQI8ub1fPvjBAjyOGIPvJkAQd68nm9/nABBHkfsgTcTIMib1/PtjxP4TYL4w3GP/1x6D/yaPxzXm07j30Lgj/zhuN8CS48eAYL0Ntd4IECQAZZojwBBeptrPBAgyABLtEeAIL3NNR4IEGSAJdojQJDe5hoPBAgywBLtESBIb3ONBwIEGWCJ9ggQpLe5xgMBggywRHsECNLbXOOBAEEGWKI9AgTpba7xQIAgAyzRHgGC9DbXeCBAkAGWaI8AQXqbazwQIMgAS7RHgCC9zTUeCBBkgCXaI0CQ3uYaDwQIMsAS7REgSG9zjQcCBBlgifYIEKS3ucYDAYIMsER7BAjS21zjgQBBBliiPQIE6W2u8UCAIAMs0R4BgvQ213ggQJABlmiPAEF6m2s8ECDIAEu0R4Agvc01HggQZIAl2iNAkN7mGg8ECDLAEu0RIEhvc40HAgQZYIn2CBCkt7nGAwGCDLBEewQI0ttc44EAQQZYoj0CBOltrvFAgCADLNEeAYL0Ntd4IECQAZZojwBBeptrPBAgyABLtEeAIL3NNR4IEGSAJdojQJDe5hoPBAgywBLtESBIb3ONBwIEGWCJ9ggQpLe5xgMBggywRHsECNLbXOOBAEEGWKI9AgTpba7xQIAgAyzRHgGC9DbXeCBAkAGWaI8AQXqbazwQIMgAS7RHgCC9zTUeCBBkgCXaI0CQ3uYaDwQIMsAS7REgSG9zjQcCBBlgifYIEKS3ucYDAYIMsER7BAjS21zjgQBBBliiPQIE6W2u8UCAIAMs0R4BgvQ213ggQJABlmiPAEF6m2s8ECDIAEu0R4Agvc01Hgj8CwmaaMkz/sxmAAAAAElFTkSuQmCC") !important;
 }
+.share{
+  background-size: 17px 17px !important;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAEkpJREFUeF7tnY9x3DoOh1eV5KWS3Kskl0ouruSSSi6u5DmV6BYKuUPLWgkAAYqgfjuTceylKBLEJ+IPSU03fCCBxhKY5/mv2+32r9vt9indmn4v/72lv9PP/P/X/Ldpmn61avLU6ka4z7UlkKD4elf4fycYagRC0Py43W6v3rAAkJphwrW7EkhQ/CdB4SUtgoVmlJ8esAAQr2G7cL2NwNiSMMHyzRIUAHJhRbbuegLjv8m/sK5eUh+ZXy/TNGX/RXLtu7IARC06XJgl0BEY5aBkP4VMLzUoAAR6XiWBBMf/DBzvqnbsXExw0GxCs4r4A0DEIsMFxcxBDvj3ABJZZpNpml6kbQUgUomh/K1Tk4ozMt+lkAAQjlhR5p0E5nkmk4oSfRE/NJv8zfVLAEjEIT6xzYZwZCeaevM7ZczfSHHTDEV/z9l1+v8Xw3wKGxIAcqKyRbu1ARxVGfAEDkFDGXmawej/2s+vaZr+ProYgBxJCN8vEqiEQ+0kPxN/sZ6LAgVaUMhx/7Y3xAAEABxKYJ5nbbTKHIx1Y4s1Xtpo2q7jDkAO1ePaBeZ5JlOGnHLph2XCSCs9mFHI9JKCsrs8BYBYjdCg9ShNK3E41UJ8FbPJU6cdgFiMzKB1KE0rCqE226+xJXpluzf9EQAyqHLXdktpWp0OR+53mk3+Echh09QCIAIJXqmowrTqBo4CEtqcRauLuZ8PfhMA4YruQuXmeZYq1ik+B2dIFObWO9ABCEfKFysjnD2aRqukQ6HYvPWuPwBEKvELlL8/dWduN++L/7rXIYU/8phFuu8cd6BQzkYC8zyTzU4mFufTrWm1brzQbHxEtAAIRw0uVGaeZ4r8sJZuRJg9VlEt7sYuWjT5ma4FIBdS/qOuCp+ydDiCapfeUTu8vhf2bzGzAIjXaASsV2JeRZo9VrMI91CJxXwEIAEV2avJAvPqcBWsVxtr6xWEfRczC4DUSnyg6wXRq+6SgtxhEK4Q+BuAcCU7eDmJ4kQ0r1ZmFncJyjcAMrjic7sncGDDmlcFJNw99d8BCFeDBi8ncNDDRa82ciLcDWAAZHC9P+xeMq0ossPKfaSzb0OFdzcA4W4CQ5j3UIMGLVBxtlVYB70wsQDIoHpd3a0KMPK9P3PPlKpurFMFgrVZb/BBnAaht2oNwFi6FDmCpYhkAZDeFNm6PYrl3rtNGAEQ6iA354MZxFojO6nPGoyiWzCxOhljNEMhAUcwcmvgpCvGBZecLIGKI2+kLR8hD8LdUvwDJpZUPTor3xCM3PMwm6SeDZVo1UBn443mMCVwAhi5ZV3vQeeIT7RqgFMhyvQjAUcw6FwoTjb9sduuH6nIWsKNYC2rBmRVo/RZEnAGg5aO/Ly/VoC7yjWsoy4wr2iosR/kLIXn3tcbjPKVZILjfsKu6BWYV0tSFDMIV1Mbl2sJRu6adLddY5GY3E66axKAmIjdrpIzwCgA4S7io0vChXvF5tU0YamJnWrX1XQmGGXLBQ5sOGddMHs81pxhBqnTa5OrBaaN9H7inIXAD6G2iOuXdsCqvFDGODjOSvA19QgHTXIrteIKloJTe8LMIoKZkfqFo0cl2mZdtkcwVmYWd882XdZ9REs4K+LwamuF59aXwKB1QJyEHLdac1NHOIuY31/S8aOyiocRXn9wJFTr7z3BoASfxw4/4VO3S0gkRxmlMf8wG8JJt6ahqC8iGLn5CuXafVuso5g3q1a0n+r5sNcFgDiMnOKkEG4r6OWYlH8gZXT/KMwT9/eiczqthAMv8eQIt6bMKGAUswj5StxXBpSiU0fRauRP1yqgzrfc3CmJGaR2RP4MCmWgJWdLce/adMbYapTCYc/VNF0WX3koxdPFlwCEq6ob5SoHZe/Ovdnz3B146z41MbkqZg1q7+6SGQCiAOQqYJSiUUS1ystdQKkEg9p3mMMBIAJArgjGyh/hvnzmmVQJFDIbKTRNP8UfwzVrLBMQgDCGyBmMlyivMjOWQ4blNQ0B/U5LV97SfejPFCSgf59Sme+M4eIUYS+RASA74nQ8QoeUIQwYK1OLFLZ2JuEosVcZ1syRbw5AnjvfdEQ+93XI3MEMC8YgkBz6HOuBBCCFRJxnDBqcFy5JvZcz9AVadVW1wQuA/MljkNnw9T5SVjZuHnSX6E0rjeLcJ8lOk0zkVG9RpipkfmlAAIaF/rk+YGobWJ3RbwpIUkjKOueoRI5S5J/lGqMlqpEkRJEOcq5M1iABjFq9274+rSgg343G+MyP2QoEd0AKZbTYB/EIDWpCowCjjc4ah4Mlja4yp7Zu5AKIoyKWfWAnnRzbM7yPIdHOdVnHoMdaD+jgu1dt8nGvj6aAnPzk+BAlAhg16m13bRqHHAihn7Um2PJg8oKi7LkJII2eFJwRW/IMaTmDR1SK2lDt+HE6MnKZlS+atx+X/mj2NbMfmn//bemLcmRcBYjjE5rT9tZlAEZriXdwPzUgyl1bHXRZ3ASAIRbZOBeoABEe4RhVWgAj6sgZtlsMiOR0bMN2tqyKsukuJ4W07ATuZSMBNiAnRqhsenpcC8A4ltHlSkgAkZy2tyfIHKKjMhSV2NsHQGW+OKyqLdtnlnW9nPZcoMMsQCq3W5IYq+LWqzg6xdAtTiYEGBdQ8NouHgJS6XOYZ5qLGDqt+dGCIto0UytkXB9XAruAVESrzMFYi9ggB4MoVVy9bdbyp4BU5DmaPp0rQDFf2NZs1HCjZhLYA2RWtOKUp3INJNM0fVb0E5dcRAKbgCj9jtNfDaw8J0m8T/kiuoFu3hf2fQAkPY2578vOQjwdjtyQ6O2HVvYlgS1ApPmObuAoIJEeldnUb+pLBdCaPQm8A0ThmJ/ic3CGVGFudQc6p58o4yuBNSCS2aPrp65ij0rX/fFVA9T+TAIPQKQ5j/sZT4dJxrPFrvBHMIucPWid3b8EhI6T5J4k2K1ptZFQlPgjmEU6U9Czm1MCQpEr1tKNCLPHKqrFPdiMfajx2QOH+7eRwAKI0LxSHeHYpjvbdxH2D2bWmYPV2b0zIGzzKtLssZpFuCeShzEfO9OlIZuTAeGaV2GzzoKwL8ysIVVd16kMCHfdVVjzQ5jjCdtPnRrgqqdhXol9HtG8WplZ3CU0AATMLBKYBICENa8KSLiJUPghAOQBCNdBDxe92siJ0C5EzjtAwj8MoN82EqAZ5EqA0H52mkWOPkgYHknoIt8TIFyzI7xdLnDUAchFADjqJgHCDfF+tnqBzVGjvL4XrM1CqNdrEILVS4CwQryRI1iKSBYACabIXs29FCAkxCs9ELyU5kr1wsTaHm3MIFeiYKevcNIBCFA4AORKYV7u3hBEsYDNI1HITZ6Fzy5fadUA9NtGAmRicQEJ/1QVJEXDPwxs1AO1ECDc7HJ4x5Ubwbq/liH8shqoto0ECBDaZjv8KleBeUWSDZ8UtVEP1JL3g3CXm4RdxCcwr24jJEWh2jYSyIBw/ZCwZpZgSU3Yh4CNSqCWUgIZEK4fQteGs8+F5lW4/kGl/SRQHvvDNbPCzSKC2QPmlZ+uhaz5CgfHcc1HGkCYVyHV2K/RJSASMyvMLCII7ZKUw+958VOVa9Zcc3h1909bwWYwGv3widBrqrBvr9eASHIi1LJuM86CFQJZwpg9fHUtZO0WL9DpDhLB6oBy0JAcDKnCvo22eAVbV2+LVcJBUqZ+/LofhfQSfWuxr8pcq3arl3i6vxedMywVcJTVAxSOsC9S5hkg5ItwXxlQiuo0c0vhcxwN8QL9fV3WT8woR6Ia9/u996RLHfYspabRoLTYkntyu2YkAYpGaoNcs/saNeESjbWZQmHgF085Ocwae80FKJ6D2Wndh+8ZrFRCF9+ksk21Q+HSp9pG4XofCXAAIVOr1oTJji/Z8xQpEn+SKfX1fiHnbF1x/YoLAIpCaNEuOQSEOpSUU+O0b8kjw/KavqTfaenKW7oP/ZmgpH+fUhkrKOheuX6rsQIoVpLssB4WIAUktPCP+ybc3rq7BA8cZyKA0tuIG7SHDUgBSU9mDlcEH8LPAIUrumuXEwGSRXWykywdsd01VgBFKs5rlVcB4uCXeEhdtAQGoHgMQfw61YB0bnKpM/oAJb5SW/agCpDC5KKIUw8OPC0NMVlsCFAs1ex9XUm2pDNfiohlGb3M0cYlwpmufkQ9takCTY9MAFmBUpsz0fSDhEi+Rhampo7NawCKjSiT30qVWYTs86qGV29YTAEpQKHtuxTtop/0pPD4NF364QwKzXo0+w31cZRZKafqJPSe0F0AKW9YCIlgoX81n6ZQbDXUcdCpb0OAkrYdkCXh9XB8pkOiwAxHEd0B2YAlQ0L2J31y1px+rm3P/PvvtGfc3ITiCGkHFA+/y3yQtX2UXtdgZTW3SWa+aFNAuL2LVC4pxaVBcZxVa1TBxNoAIDVDUFzr+PTsekYx2sVpNAqb1VTJD4AYD82VQAm0okK9Tg6AGAOSq3MEJW8DVm0bsOqu8Mwxq9vW1iNOIAOQWpEfXD8iKEHhyCMl2hIOQJwBKWYU2iaQc0OWdzWL2HAaZQhHdqLpthSl3NsXRGUo6mm11YJ9dC4A4WiFYZm0z98alJwsM1lm86y7BnBUZcCLJSoWSWjW0bkAxFD5JVUlUCg8bJlMcwOlEg61k7wDK8mNcmo1Mjz0SQCIRKuNy6YnYu0gb7XKFJSKaJU5GOvOGuRgdiEBIMZKr6nOGZSqw+8q8hwiZ1gjt/KaClB28yQApHZkDK8vBpmcUWvTSwWK5O1chSgOTRdDsT2qqoFkmqbPW20CIB4jVVmnNyjcA/2Ufsfpr5FQmoSbTjsAqVRmz8vPBEVpWp0ORxFWlx6du7mnCIB4arhR3RWmw1ELnjrRitmjGzgKSMhUpWX33M+HWQSAcEXXQblWoCjOZD7F5+AMidDc+uCwAxCOlDsr4w1Kyi9wN7c1jVZJh0KxHeFdfwCIVOIdlXcEhd3Lu8PfvQ4lOf3D7lTxtuPuOyfo1GWLnghKt6bVWhmEZuOjXwBkIKxagxJh9lhFtbgHsD8WMwKQgQBZKYP3Gcrfop3EIpxFlqgcABkQkBagRJo9VvLgntu2mFkAZGBAVophebAEa6l4j6IVhH2XaBYA6XEUndqkCHk+a0l3SUGuyAQrBBY/BIBwJTtQuVpQIppXq9mUG/LFDDKQ3ou7otwvH9a8KiChaBYnEfoNM4hYrca7QJhICxe92siJkD/GOUT7OwAZT99VPRLs+xgBEJo9aBY5+gCQIwld5XsBIGEd9MLE4gKCPMhVADjq5z38OR+VSd9/9ngPC/PeJsUEJiUAMZH4AJVwAYkcwVJEst7ggwyg3LVdEDxRbyMAQvJiPhAASK1yjXI9U2GouzCxRhl09IMvATjpm7L6AROLr0NDlxTsQR8hzMvdqw5AhtZ6QefmeaZVrpzDocNsknrWfcGyd2TSBTo0dFHpKtfIwhA8DABI5IG2bLsAEParAyzbZ1mXICCBxYqWgo9cl2AZOHUzbDZdYF79idhFHlS03U4CklzI/dzgsCt6BebV0kcAYqdj4WsSRLLCmlmCcPYSrQMg4dXargNCMytcuFdsXk0TMul26hW/JqGZFW4WEcweDxMSM0h8vTbtgcDMovuGyYkIonTUr8fsCEBM1St+ZUIzK8wsIgjt/oleTRMdZH0DIPF12rQHin3q3Ue0hLPiu/4AEFP1GqMy4SzStaklNK3ezR6YQcbQZ5deCJ+6XUKiAB0v0HHRpgErVSjX7ttiW4tI0f4PswdmkNajFux+ilnE/b3oHBEq4diMyMEH4Uj8omWEeZFSSqeFfxU+B7X7aTQOgFxU+bndFmafy2qbvppNEX0r2/p08SUA4WrKhcspn8rLkzktbHzxFF9F+6hZuyuTAYjnyA1Ut2AV7FavXUCpBIMVeQMgAymxZ1cqTZjcNALl1z1T/ZPe3qRpr+Fr5lgmIADRjNJFr0nKyX3P35GUMiyvqSD9Ts7yW7oP/fmv9O9TKsM5cProvvQ9Cw4qCEA44kSZhwSMITlDsmw4AMgZwzPAPQ3NnNbSEIefMYO0HqKB7mfgJLeUhmofPQBpOUQD3qsiT9JKGlVLYABIq2Ea+D4dm1xik2o9TABkYMVt3TWjULBFs6vByI0AIBbDgTreSeBEUCi3Qttll92AFh8AYiFF1LEpgeSffGGe+auV4pKlT8lHMzAwg2iHA9eJJVAk/r6m1y9zXsG8dx9XKMobYwYRDzcuqJVAAiZDQjMMfXLWnH7mmWDJrhe//6bD3GrvL7n+/1aEt3BaMCFnAAAAAElFTkSuQmCC") !important;
+}
 .minimize-cir{
   background-size: 17px 17px !important;
   background-image: url("data:image/png;base64,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") !important;

package/src/components/editor/src/butJson.js

@@ -54,9 +54,9 @@ export function butJson(editor, data) {
                   <p data-signid="subject" style="text-align: center;margin: 80px 0 60px"><strong><span style="font-size: 24px; font-family: SimHei; color:#333333;line-height: 1;">请在此处输入标题</span></strong></p>
                   <p data-signid="lookUp"><strong><span style="font-size: 18px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入抬头:</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-1" style="text-align: center;" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()}"><strong><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
                   <p data-signid="paragraph" style="margin: 30px 0px 0px; text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入落款</span></strong></p>
                   <p data-signid="date" style="text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入日期</span></strong></p>`
@@ -66,11 +66,11 @@ export function butJson(editor, data) {
                     key: 'newsFormat',
                     menuKeys: [],
                     html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入标题</span></strong></p>
-                  <p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>
+                  <p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-1" style="text-align: center" class="title ${randomId()} "><strong><span style="font-size: 18px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()} "><strong><span style="font-size: 18px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color: #333333">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()}"><strong><span style="font-size: 16px; font-family: SimHei; color: #333333">（一）请在此处输入二级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
                   <p data-signid="paragraph" style="margin: 30px 0px 0px; text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入落款</span></strong></p>
                   <p data-signid="date" style="text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入日期</span></strong></p>`
@@ -80,13 +80,13 @@ export function butJson(editor, data) {
                     key: 'paperFormat',
                     menuKeys: [],
                     html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入题目</span></strong></p>
-                  <p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者</span></p>
+                  <p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者</span></p>
                   <p data-signid="abstract" class="abstract"><strong><span style="font-size: 14px; font-family: FangSong; color: #333333;">摘要:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)">请在此处输入摘要文本...</span></p>
                   <p data-signid="keyword" class="keyword"><strong><span contenteditable="false" style="font-size: 14px; font-family: FangSong; color: #333333">关键词:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)"> 请在此处输入关键字...</span></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-1" style="text-align: center" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()}"><strong><span style="font-size: 20px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color: #333333">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color: #333333">（一）请在此处输入二级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本（复用格式建议直接复制粘贴段落）</span></p>
                   <p data-signid="splitLine" contenteditable="false" class="paging-line">分  页  线（保存文档时线下内容另起一页）</p>
                   <p data-signid="annotation" contenteditable="false" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">注释</span></strong></p>
@@ -210,7 +210,7 @@ export function butJson(editor, data) {
                     name: '作者',
                     key: 'authorMenu',
                     menuKeys: [],
-                    html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
+                    html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
                 },
                 {name: '一级标题', key: 'title-1'},
                 {name: '二级标题', key: 'title-2'},
@@ -237,13 +237,19 @@ export function butJson(editor, data) {
             name: '一级标题',
             key: 'firstLevelHeading',
             menuKeys: [],
-            html: `<p data-signid="title-1" style="text-align: center" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
+            html: `<p data-signid="title-1" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
         },
         secondaryHeading: {
             name: '二级标题',
             key: 'secondaryHeading',
             menuKeys: [],
-            html: `<p data-signid="title-2" class="title ${randomId()} indent"><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></p>`
+            html: `<p data-signid="title-2" class="title ${randomId()}"><span style="font-size: 16px; font-family: SimHei; color:#333333">（二）请在此处输入二级标题</span></p>`
+        },
+        level3Heading: {
+            name: '三级标题',
+            key: 'level3Heading',
+            menuKeys: [],
+            html: `<p data-signid="title-3" class="title ${randomId()}"><span style="font-size: 16px; font-family: SimHei; color:#333333">（三）请在此处输入三级标题</span></p>`
         },
         paragraphBody: {
             name: '正文文本',
@@ -326,7 +332,7 @@ export function butJson(editor, data) {
             name: '作者',
             key: 'authorMenu',
             menuKeys: [],
-            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-family: KaiT;">${menusData(data, 'authorMenu').text}</span></p>`
+            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiT;">${menusData(data, 'authorMenu').text}</span></p>`
         },
         numberMenu: {
             name: '参考编号',

package/src/components/editor/src/editor.vue

@@ -1197,7 +1197,6 @@ export default {
         this.limits = true
       },
       onUpdate: ({editor}) => {
-        _this.$emit('changeOutlineMenu', _this.changeOutlineMenu())
         editor.commands.focus()
         const json = editor.getJSON()
         for (let i = 0; i < json.content.length; i++) {
@@ -1251,6 +1250,7 @@ export default {
             _this.interpositionData = []
           }
         }
+        _this.$emit('changeOutlineMenu', _this.changeOutlineMenu())
       },
       onTransaction: () => {
         const index = _this.editor.state.selection.$anchor.path[1]
@@ -2911,7 +2911,7 @@ export default {
                 // {name: '四级标题', key: 'title-4'},
                 {name: '正文文本', key: 'text'},]
             }
-            if(this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
+            if(this.templateType === 'newsFormat'){
               obj.menuKeys = [
                 {
                   name: '文章标题',
@@ -2923,13 +2923,32 @@ export default {
                   name: '作者',
                   key: 'authorMenu',
                   menuKeys: [],
-                  html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
+                  html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
                 },
                 {name: '一级标题', key: 'title-1'},
                 {name: '二级标题', key: 'title-2'},
                 // {name: '三级标题', key: 'title-3'},
                 // {name: '四级标题', key: 'title-4'},
                 {name: '正文文本', key: 'text'},]
+            }else if(this.templateType === 'paperFormat'){
+              obj.menuKeys = [
+                {
+                  name: '文章标题',
+                  key: 'subjectMenu',
+                  menuKeys: [],
+                  html: `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入标题</span></strong></p>`
+                },
+                {
+                  name: '作者',
+                  key: 'authorMenu',
+                  menuKeys: [],
+                  html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
+                },
+                {name: '一级标题', key: 'title-1'},
+                {name: '二级标题', key: 'title-2'},
+                {name: '三级标题', key: 'title-3'},
+                // {name: '四级标题', key: 'title-4'},
+                {name: '正文文本', key: 'text'},]
             }
             this.butData.push(obj)
             return
@@ -3328,28 +3347,7 @@ export default {
       // 大纲级别
       if (data.key === 'outlineMenu') {
         const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
-        if (this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
-          const level = key.key.split('-')[1]
-          // 一级标题
-          if (level === '1') {
-            const html = butJson(this.editor, this.menusText)['firstLevelHeading'].html
-            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
-          }
-          // 二级标题
-          if (level === '2') {
-            const html = butJson(this.editor, this.menusText)['secondaryHeading'].html
-            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
-          }
-          // 正文
-          if (key.key === 'text') {
-            const html = butJson(this.editor, this.menusText)['paragraphBody'].html
-            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-          }
-          return
-        }
-
+        if (!key.key)return
         // 题目
         if (key.key === 'subjectMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
@@ -3401,6 +3399,56 @@ export default {
           officialDocumentFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
           newsFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
         }
+
+        if (this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
+          const level = key.key.split('-')[1]
+          // 一级标题
+          if (level === '1') {
+            const html = butJson(this.editor, this.menusText)['firstLevelHeading'].html
+            if(this.templateType === 'paperFormat'){
+              const obj1 = sizeObj1[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(from, html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+14 }).setFontSize(obj1.size).setTextSelection(from+14).run()
+            }else {
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            }
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 二级标题
+          if (level === '2') {
+            const html = butJson(this.editor, this.menusText)['secondaryHeading'].html
+            if(this.templateType === 'paperFormat'){
+              const obj2 = sizeObj2[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+15 }).setFontSize(obj2.size).setTextSelection(from+15).run()
+            }else {
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            }
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 三级标题
+          if (level === '3') {
+            const html = butJson(this.editor, this.menusText)['level3Heading'].html
+            if(this.templateType === 'paperFormat'){
+              const obj3 = sizeObj3[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+15 }).setFontSize(obj3.size).setTextSelection(from+15).run()
+            }else {
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            }
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 正文
+          if (key.key === 'text') {
+            const html = butJson(this.editor, this.menusText)['paragraphBody'].html
+            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+          }
+          return
+        }
+
         if (key.key === 'text') {
           this.tipTitle = window.getSelection().toString()
           if (this.tipTitle.length === 0) {

package/src/components/menuTree/src/ZydxMenuTreeInfo.vue

@@ -14,18 +14,16 @@ selectItem 传入当前选择的节点，是一个对象
 <template>
   <div>
     <div
-      class="lineHeight30"
-      :class="menuInfo.level === 0 ? '' : 'marginLeft14'"
+        :class="menuInfo.level === 0 ? '' : 'marginLeft14'"
+        class="lineHeight30"
     >
       <div
-        :class=" menuConfig.isShowLine ? 'dashed' : 'no_dashed'"
+          :class=" menuConfig.isShowLine ? 'dashed' : 'no_dashed'"
       >
-        <div
-          class="widthB100 ellipse cursor "
-          :class="menuTitleStyle"
-          @click.stop="clickItem(menuInfo)"
-          :title="menuInfo.title"
-        >
+        <div :class="menuTitleStyle"
+             :title="menuInfo.title"
+             class="widthB100 ellipse cursor "
+             @click.stop="clickItem(menuInfo)">
           <template v-if="menuConfig.isCheckBox">
             <checkBox v-model="menuConfig.checkBoxValue" :value="menuInfo.catalogId"></checkBox>
           </template>
@@ -33,21 +31,23 @@ selectItem 传入当前选择的节点，是一个对象
         </div>
         <div v-show="menuConfig.isShowUpDown && menuInfo.children">
           <template v-if="menuConfig.isShowBtn">
-            <button class="z-button" @click="clickFont(menuInfo)">{{menuInfo.isShowUpDown ? '收&ensp;&ensp;起': '展&ensp;&ensp;开'}}</button>
+            <button class="z-button" @click="clickFont(menuInfo)">
+              {{ menuInfo.isShowUpDown ? '收&ensp;&ensp;起' : '展&ensp;&ensp;开' }}
+            </button>
           </template>
           <template v-else>
-            <span class="iconfont" v-html="defaultFont" @click="clickFont(menuInfo)"></span>
+            <span class="iconfont" @click="clickFont(menuInfo)" v-html="defaultFont"></span>
           </template>
         </div>
       </div>
       <div v-show="menuInfo.isShowUpDown">
         <div v-for="(item, index) in menuInfo.children" :key="index">
           <zydx-menu-tree-info
-            :menuConfig="menuConfig"
-            :selectItem="selectItem"
-            :menu-info="item"
-            :nodeLevel="nodeLevel"
-            @clickItem="clickItem"
+              :menu-info="item"
+              :menuConfig="menuConfig"
+              :nodeLevel="nodeLevel"
+              :selectItem="selectItem"
+              @clickItem="clickItem"
           >
           </zydx-menu-tree-info>
         </div>
@@ -68,17 +68,17 @@ export default {
   props: {
     // 目录配置
     menuConfig: {
-        type: Object,
-        default: function () {
-            return {
-                isShowUpDown: false,    // 是否显示收起展开
-                isShowLine: false,    // 是否显示下划线
-                isShowBtn: false,    // 显示按钮或者图标
-                isCheckBox: false,    // 是否显示复选框
-                isUnifyFontSize: false,    // 字体是否需要统一字号，
-                checkBoxValue: [],    // 复选款选中的值
-            };
-        }
+      type: Object,
+      default: function () {
+        return {
+          isShowUpDown: false,    // 是否显示收起展开
+          isShowLine: false,    // 是否显示下划线
+          isShowBtn: false,    // 显示按钮或者图标
+          isCheckBox: false,    // 是否显示复选框
+          isUnifyFontSize: false,    // 字体是否需要统一字号，
+          checkBoxValue: [],    // 复选款选中的值
+        };
+      }
     },
     // 显示可操作节点
     nodeLevel: {
@@ -109,21 +109,24 @@ export default {
       let ar = [];
       ar.push("level" + this.menuInfo.level);
       if (!this.menuConfig.isUnifyFontSize) {
-          if (parseInt(this.menuInfo.level) == 0) {
-              ar.push("text_center");
-          }
-          if (parseInt(this.menuInfo.level) == 0 || parseInt(this.menuInfo.level) == 1) {
-              ar.push("font_border");
-          }
+        if (parseInt(this.menuInfo.level) == 0) {
+          ar.push("text_center");
+        }
+        if (parseInt(this.menuInfo.level) == 0 || parseInt(this.menuInfo.level) == 1) {
+          ar.push("font_border");
+        }
+      }
+      if (this.menuInfo.hasData !== undefined && !this.menuInfo.hasData) {
+        ar.push("disable");
       }
       if (parseInt(this.menuInfo.level) > parseInt(this.nodeLevel)) {
         ar.push("disable");
       }
       // 如果显示复选。 怎不显示高亮
       if (!this.menuConfig.isCheckBox) {
-          if (this.selectItem && (this.selectItem.catalogId === this.menuInfo.catalogId)) {
-              ar.push("active");
-          }
+        if (this.selectItem && (this.selectItem.catalogId === this.menuInfo.catalogId)) {
+          ar.push("active");
+        }
       }
       return ar;
     }
@@ -144,6 +147,7 @@ export default {
   font-family: "iconfont";
   src: url("./iconfont.ttf?t=1660878683989") format("truetype");
 }
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -152,51 +156,64 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   cursor: pointer;
 }
+
 .cursor {
   cursor: pointer;
 }
+
 .disable {
   color: #7c7c7c;
   pointer-events: none;
   cursor: default;
 }
+
 .border_bottom {
   border-bottom: 1px #cccccc dashed;
 }
+
 .active {
   color: #4B0C77;
 }
+
 .ellipse {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
 }
+
 .marginLeft14 {
   margin-left: 14px;
 }
+
 .widthB100 {
   width: 100%;
 }
+
 .dashed {
   display: flex;
   flex-direction: row;
   border-bottom: 1px #CCCCCC dashed;
 }
+
 .no_dashed {
   display: flex;
   flex-direction: row;
   border-bottom: 1px #FFFFFF dashed;
 }
+
 .lineHeight30 {
-   line-height: 30px;
+  line-height: 30px;
 }
-  .text_center {
-    font-size: 16px;
-    text-align: center;
-  }
-  .font_border {
-    font-weight: bolder;
-  }
+
+.text_center {
+  font-size: 16px;
+  text-align: center;
+}
+
+.font_border {
+  font-weight: bolder;
+}
+
 .z-button {
   margin: 1px;
   width: auto;
@@ -219,9 +236,11 @@ export default {
   font-weight: normal;
   box-sizing: border-box;
 }
+
 .level0 {
   font-weight: bold;
 }
+
 .level1 {
   font-weight: bold;
 }

package/src/components/variableBox/index.vue

@@ -24,6 +24,22 @@ export default {
       type: Boolean,
       default: true
     },
+    leftInitWidth:{
+      type: Number,
+      default: 310
+    },
+    leftMinWidth:{
+      type: Number,
+      default: 0
+    },
+    rightMinWidth:{
+      type: Number,
+      default: 0
+    },
+    isPercent: {
+      type: Boolean,
+      default: false
+    },
   },
   watch: {
     isShowsRight: {
@@ -59,29 +75,35 @@ export default {
   mounted() {
   },
   methods: {
-    handleResize(leftMinWidth = 310, rightMinWidth = 310) {
+    handleResize() {
       // 获取Dom节点
       const boxDom = this.$refs.boxRef,
           leftDom = this.$refs.leftRef,
           resizeDom = this.$refs.resizeRef,
           rightDom = this.$refs.rightRef;
       if (resizeDom) {
-        leftDom.style.width = '50%'
-        rightDom.style.width = '50%'
+        const maxWidth = boxDom.clientWidth - resizeDom.offsetWidth; // 左右两边区域的总宽度 = 外层容器宽度 - 中间区域拖拉框的宽度
+        leftDom.style.width = `${this.isPercent?
+            this.leftInitWidth<=0||this.leftInitWidth>=100 ? 30 : this.leftInitWidth
+            : this.leftInitWidth}${this.isPercent? '%' : 'px'}`
+        rightDom.style.width = `${this.isPercent?
+            this.leftInitWidth<=0||this.leftInitWidth>=100 ? 70 : 100-this.leftInitWidth
+            : maxWidth-this.leftInitWidth}${this.isPercent? '%' : 'px'}`
+        /*leftDom.style.width = '50%'
+        rightDom.style.width = '50%'*/
         resizeDom.onmousedown = e => {
           const startX = e.clientX; // 记录坐标起始位置
           leftDom.left = leftDom.offsetWidth; // 左边元素起始宽度
           document.onmousemove = e => {
             const endX = e.clientX; // 鼠标拖动的终止位置
             let moveLen = leftDom.left + (endX - startX); // 移动的距离 =  endX - startX，左边区域最后的宽度 = resizeDom.left + 移动的距离
-            const maxWidth = boxDom.clientWidth - resizeDom.offsetWidth; // 左右两边区域的总宽度 = 外层容器宽度 - 中间区域拖拉框的宽度
             // 限制左边区域的最小宽度为 leftMinWidth
-            if (moveLen < leftMinWidth) {
-              moveLen = leftMinWidth;
+            if (moveLen < this.leftMinWidth) {
+              moveLen = this.leftMinWidth;
             }
             // 右边区域最小宽度为 rightMinWidth
-            if (moveLen > maxWidth - rightMinWidth) {
-              moveLen = maxWidth - rightMinWidth;
+            if (moveLen > maxWidth - this.rightMinWidth) {
+              moveLen = maxWidth - this.rightMinWidth;
             }
             leftDom.style.width = (moveLen / maxWidth) * 100 + "%"; // 设置左边区域的宽度，通过换算为百分比的形式，实现窗体放大缩小自适应
             rightDom.style.width = ((maxWidth - moveLen) / maxWidth) * 100 + "%"; // 右边区域 = 总大小 - 左边宽度 - 拖动条宽度

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.529',
+    version: '1.35.531',
     install,
     Calendar,
     Message,