zydx-plus 1.35.597 → 1.35.599

package/package.json

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

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

@@ -63,6 +63,10 @@ export default {
     }
   },
   props: {
+    isCustomizePosition: {
+      type: Boolean,
+      default: false
+    },
     isInitShowBottomRight: {
       type: Boolean,
       default: false
@@ -307,7 +311,12 @@ export default {
     },
     init() {
       let that = this
-      if(this.fixedStart) {
+      if (this.isCustomizePosition) {
+        this.x = this.left;
+        this.y = this.top
+        this.clientWidth = document.documentElement.clientWidth;
+        this.clientHeight = document.documentElement.clientHeight;
+      } else if(this.fixedStart) {
         if(!this.isInitShowBottomRight) {
           const wid = document.getElementById('app').offsetWidth
           this.x = this.left + (wid-this.initWidth)/2

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

@@ -10,21 +10,22 @@
         <slot name='titleSuffix'></slot>
       </div>
       <div class="ed-but" v-if="readOnly">
+        <slot name='leftToolBtn'></slot>
         <div class="ed-head-but" v-for="(item,index) in toolbars" :key="index">
-          <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)"
-                  :style="{color: (item.active)? '#4B0C77' :'#000'}">{{ item.title }}
+          <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)" :disabled="disabled"
+                  :style="{color: (disabled) ? '#ccc' : (item.active)? '#4B0C77' :'#000'}">{{ item.title }}
           </button>
           <label v-else-if="item.key === 'upImg' || item.key === 'uploadAtt'">
-            <input type="file" @change="upload($event,item.key)"
-                   :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;">
-            <span class="buts">{{ item.title }}</span>
-          </label>
-          <button v-else-if="item.key === 'paint'" class="buts" @click="toolTap('paint')">{{ item.title }}</button>
-          <button v-else-if="item.key === 'voice'" class="buts" @mousedown.stop="speechDown" @click="voice()"
-                  :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
+            <input type="file" @change="upload($event,item.key)" :disabled="disabled"
+                   :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;"/>
+            <span class="buts" :style="{color: ( disabled) ? '#ccc':'#000'}">{{ item.title }}</span>
+          </label >
+          <button v-else-if="item.key === 'paint'" class="buts" @click="toolTap('paint')" :disabled="disabled">{{ item.title }}</button>
+          <button v-else-if="item.key === 'voice'" class="buts" @mousedown.stop="speechDown" :disabled="disabled" @click="voice()"
+                  :style="{color:  (disabled) ? '#ccc' : (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
           </button>
-          <button v-else-if="item.key === 'ai'" class="buts" @click="showAi">AI助手</button>
-          <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
+          <button v-else-if="item.key === 'ai'" class="buts" :disabled="disabled" @click="showAi">AI助手</button>
+          <button v-else class="buts" @click="toolTap(item.key)" :disabled="disabled">{{ item.title }}</button>
         </div>
         <slot name='toolBtn'></slot>
         <button v-if="butText !== '' && readOnly" class="buts" @click="complete">{{ butText }}</button>
@@ -104,9 +105,9 @@
           </div>
           <div class="enclosure-item en-but">
             <div style="display: inline-block; height: 21px;">
-              <button class="buts but-f" v-if="!item.name" @click="see(index)">{{downName[0] || '查看附件'}}</button>
-              <button class="buts but-f" v-if="!item.name&&downloadShow" @click="download(index)">{{downName[1] || '下载附件'}}</button>
-              <button class="buts but-f" v-if="delShow" @click="del(index)">
+              <button class="buts but-f" v-if="!item.name" :disabled="disabled" @click="see(index)">{{downName[0] || '查看附件'}}</button>
+              <button class="buts but-f" v-if="!item.name&&downloadShow" :disabled="disabled" @click="download(index)">{{downName[1] || '下载附件'}}</button>
+              <button class="buts but-f" v-if="delShow" @click="del(index)" :disabled="disabled">
                 <span v-if="item.active">{{downName[2] || '删除附件'}}</span>
                 <svg v-else xmlns="http://www.w3.org/2000/svg"
                      width="14"
@@ -141,7 +142,8 @@
                   </g>
                 </svg>
               </button>
-              <button class="buts but-f" v-if="Object.keys(enclosureButton).length > 0" @click="enclosureButton.onClick(item,index)">{{ enclosureButton.name }}</button>
+              <button class="buts but-f" :disabled="disabled" v-if="Object.keys(enclosureButton).length > 0"
+                      @click="enclosureButton.onClick(item,index)">{{ enclosureButton.name }}</button>
             </div>
           </div>
         </div>
@@ -346,6 +348,10 @@ export default {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     enclosureButton: {
       type: Object,
       default: {}
@@ -380,14 +386,14 @@ export default {
       deep: true
     },
     toolbar: {
-      handler: function (e, oldVal) {
+      handler: function (e) {
         let status = null
         let upload = null
         this.toolbars = []
         e.forEach(x => {
           if(x.key === 'but') {
             status = x
-          } if (x.key === 'uploadAtt') {
+          } else if (x.key === 'uploadAtt') {
             upload = x
           }else {
             this.toolbars.push(x)
@@ -400,6 +406,14 @@ export default {
         if(this.isShowAiTool) this.toolbars.push({key: 'ai', title: 'AI助手'})
       },
       immediate: true
+    },
+    disabled: {
+      handler: function (e, oldVal) {
+        this.editor.setOptions({
+          editable: this.readOnly ?(!e):this.readOnly
+        })
+      },
+      deep: true
     }
   },
   mounted() {
@@ -410,7 +424,7 @@ export default {
     this.heightStyleCont = (this.height === '100%') ? {height: 'calc(100% - 44px)'} : {'min-height': `${height}px`}
     this.editor = new Editor({
       content: json2html({node: "root", child: this.dataChange(this.data).html }),
-      editable: this.readOnly,
+      editable: this.readOnly ?(!this.disabled):this.readOnly ,
       enablePasteRules: true,
       extensions: [
         sid,
@@ -503,7 +517,6 @@ export default {
       const clientX = e.clientX
       const clientY = e.clientX
       this.lastSelectedText = selectedText
-      console.log('selectedText', selectedText)
     },
     showAssets() {
       this.$emit('assets')
@@ -1156,7 +1169,7 @@ export default {
 }
 
 .ed-head-but label span {
-  line-height: 16px !important;
+  line-height: 14px !important;
 }
 .ed-head-vertical{
   overflow: hidden;

package/src/components/mind/src/mind.css

@@ -0,0 +1,208 @@
+:deep(.custom-select-options li) {
+    padding: 0 10px !important;
+}
+
+.table-left {
+    margin-right: 5px;
+    display: flex;
+    width: 100%;
+}
+
+.node-s {
+    animation: nodeShow 0.3s;
+    display: block !important;
+}
+
+.node-h {
+    animation: nodeHide 0.3s;
+}
+
+@keyframes nodeHide {
+    0% {
+        opacity: 1;
+        transform: translateX(0);
+    }
+    100% {
+        opacity: 0;
+        transform: translateX(110%);
+    }
+}
+
+@keyframes nodeShow {
+    0% {
+        opacity: 0;
+        transform: translateX(110%);
+    }
+    10% {
+        opacity: 1;
+        transform: translateX(100%);
+    }
+    100% {
+        opacity: 1;
+        transform: translateX(0);
+    }
+}
+
+.zIndex {
+    position: relative;
+    z-index: 30;
+}
+
+.zIndex2 {
+    position: relative;
+    z-index: 33;
+}
+
+.zIndex3 {
+    position: relative;
+    z-index: 32;
+}
+
+.zIndex4 {
+    position: relative;
+    z-index: 31;
+}
+
+.backColor {
+    width: 93px;
+    height: 30px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    margin-left: -40px;
+    box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
+    cursor: pointer;
+    background-color: #549688;
+}
+
+.back-col {
+    position: absolute;
+    top: 0;
+    left: 60px;
+    z-index: 40;
+}
+
+.node-but {
+    display: flex;
+    padding: 5px 0;
+}
+
+.node-but button {
+    flex: 1;
+    margin-right: 5px;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    padding: 5px 10px;
+    cursor: pointer;
+    font-size: 12px;
+}
+
+.node-but button:last-child {
+    margin: 0;
+}
+
+.style-title {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 5px 0 10px 0;
+}
+
+.mind {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow: hidden;
+}
+
+.mind-table {
+    background-color: #fff;
+    border-radius: 5px;
+    box-shadow: rgba(0, 0, 0, 0.06) 0 2px 16px 0;
+    z-index: 10;
+}
+
+.style-li {
+    position: relative;
+}
+
+.style-li img {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    width: 15px;
+    height: 15px;
+    cursor: pointer;
+}
+
+.style-list {
+    display: flex;
+    padding: 5px 0;
+}
+
+.node-left {
+    display: flex;
+    padding-right: 10px;
+}
+
+.node-left > span {
+    display: inline-block;
+    width: 80px;
+    line-height: 32px;
+    padding-right: 10px;
+    box-sizing: border-box;
+}
+
+.padd {
+    padding-right: 0;
+}
+
+.node-style {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    background-color: #fff;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    padding: 20px;
+    box-shadow: rgba(0, 0, 0, 0.06) 0 2px 16px 0;
+    z-index: 11;
+    width: 320px;
+    height: 550px;
+    margin-top: -270px;
+    display: none;
+}
+
+.mind-table button {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    cursor: pointer;
+    font-size: 14px;
+    height: 30px;
+    line-height: 30px;
+    flex: 1;
+}
+
+.mind-table button:last-child {
+    margin-right: 0;
+}
+
+.mindMapContainer {
+    width: 100%;
+    height: 100%;
+}
+
+:deep(.custom-select) {
+    width: 94px;
+    margin-left: -40px;
+}
+
+.full-screen {
+    background: #fff;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 100;
+}