zydx-plus 1.35.589 → 1.35.591

package/package.json

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

package/src/components/buttonGroup/src/buttonGroup.vue

@@ -242,21 +242,14 @@ export default defineComponent({
   border: none;
 }
 
-<<<<<<< .mine
-.z-button.active {
-  /* color: #00ff00 !important; */
-}
-||||||| .r51551
 .z-button.active {
   color: #00ff00 !important;
 }
-=======
 /*
  */
 /* .z-button.textActivep {
   color: rgba(75, 12, 119, 1) !important;
 }  */
->>>>>>> .r52223
 
 
 .z-button:disabled {

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

@@ -2,7 +2,7 @@ li{list-style-type:none;}
 .cale{
 	position: fixed;
 	width: 300px;
-	z-index: 100;
+	z-index: 20000;
 	background-color: #fff;
 	box-shadow: 0 0 4px 1px #ccc;
 	border-radius: 5px;

package/src/components/chat/src/chat.vue

@@ -114,6 +114,10 @@ export default {
     }
   },
   props: {
+    apiPrefix: {
+      type: String,
+      default: 'zydx'
+    },
     title: {
       type: String,
       default: 'AI助手'
@@ -345,7 +349,7 @@ export default {
     },
     async getAccessToken(v) {
       return axios({
-        url: '/zydx/voice/getBaiduToken',
+        url: `/${this.apiPrefix}/voice/getBaiduToken`,
         method: 'post',
         headers: {
           'Authorization':  localStorage.getItem('sessionId') || sessionStorage.getItem('sessionId'),

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

@@ -237,6 +237,7 @@ export default {
         this.reducePop()
         this.state = false
         this.$emit('enlarge', this.state)
+        this.draggableState.draggable({enabled: true})
       }
     },
     // 全屏
@@ -427,7 +428,7 @@ export default {
             left: this.x,
             top: this.y
           })
-        },100)
+        },200)
       }
       this.$emit('enlarge', this.state)
     },

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

@@ -244,6 +244,7 @@ export default {
          this.reducePop()
          this.state = false
          this.$emit('enlarge', this.state)
+         this.draggableState.draggable({enabled: true})
        }
     },
     // 全屏
@@ -299,13 +300,13 @@ export default {
         }
       })
       sessionStorage.setItem('pop', JSON.stringify(pop))
+
     },
     disconnect() {
       this.$emit('dragStatus')
     },
     init() {
       let that = this
-      console.log(window.devicePixelRatio)
       if(this.fixedStart) {
         if(!this.isInitShowBottomRight) {
           const wid = document.getElementById('app').offsetWidth
@@ -437,7 +438,7 @@ export default {
             left: this.x,
             top: this.y
           })
-        },100)
+        },200)
       }
       this.$emit('enlarge', this.state)
     },
@@ -592,7 +593,6 @@ export default {
     opacity: 1;
   }
 }
-
 .drag-pop {
   position: fixed;
   /* top: 0;

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

@@ -65,7 +65,7 @@
         </div>
       </div>
     </div>
-    <zydx-chat v-model='isShowAi'></zydx-chat>
+    <zydx-chat v-model='isShowAi' :apiPrefix="apiPrefix"></zydx-chat>
     <div :class="[{'editor-content-show': !editableShow},  `editor-content-${refSrc}`]" class="editor-content">
       <div class="editing">
         <div v-if="signMenuShow" class="editing-header">
@@ -857,6 +857,10 @@ export default {
     }
   },
   props: {
+    apiPrefix: {
+      type: String,
+      default: 'zydx'
+    },
     isShowAiTool: {
       type: Boolean,
       default: true
@@ -893,7 +897,7 @@ export default {
           headers: {
             Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
-          server: '/zydx/open/function/lessonResource/editOfficeFile',
+          server: `/${this.apiPrefix}/open/function/lessonResource/editOfficeFile`,
           // server: '/zydx/lessonResource/editOfficeFile',
         }
       }
@@ -902,7 +906,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          server: '/zydx/lessonResource/upload/img',
+          server: `/${this.apiPrefix}/lessonResource/upload/img`,
           headers: {
             Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
@@ -921,7 +925,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          server: '/zydx/fileanex/uploadfile',
+          server: `/${this.apiPrefix}/fileanex/uploadfile`,
           fieldName: 'file',
           maxFileSize: 100 * 1024 * 1024,
           meta: {},
@@ -4021,7 +4025,7 @@ export default {
       const xhr = new XMLHttpRequest()
       // xhr.open('GET', 'http://192.168.15.124:8888/zydx/voice/getDesKeyId')
       // xhr.setRequestHeader('Authorization', '4a7ab02c-11b7-420f-bf85-ac5549b2aa81')
-      xhr.open('GET', '/zydx/voice/getVoideKey')
+      xhr.open('GET', `/${this.apiPrefix}/voice/getVoideKey`)
       xhr.setRequestHeader('Authorization', token)
       this.error = true
       xhr.onreadystatechange = () => {

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

@@ -30,7 +30,7 @@
         <button v-if="butText !== '' && readOnly" class="buts" @click="complete">{{ butText }}</button>
       </div>
     </div>
-    <zydx-chat v-model='isShowAi'></zydx-chat>
+    <zydx-chat v-model='isShowAi' :apiPrefix="apiPrefix"></zydx-chat>
     <div class="ed-cont" :style="heightStyleCont">
       <div  :style="{'border': (borderShow)? '1px solid #ccc': '0'}" v-if="editorShow">
         <editor-content @paste.native.capture.prevent="preventPaste" ref="editorRef" class="editor" :editor="editor"
@@ -231,6 +231,10 @@ export default {
     // document.removeEventListener('mouseup', this.getSelectedText)
   },
   props: {
+    apiPrefix: {
+      type: String,
+      default: 'zydx'
+    },
     isShowWhiteboarde: {
       type: Boolean,
       default: true
@@ -713,7 +717,7 @@ export default {
       const xhr = new XMLHttpRequest()
       // xhr.open('GET', 'http://192.168.15.124:8888/zydx/voice/getDesKeyId')
       // xhr.setRequestHeader('Authorization', '7a129186-7e51-431d-b965-735dfed8e459')
-      xhr.open('GET', '/zydx/voice/getVoideKey')
+      xhr.open('GET', `/${this.apiPrefix}/voice/getVoideKey`)
       xhr.setRequestHeader('Authorization', token)
       this.error = true
       xhr.onreadystatechange = () => {

package/src/components/year/src/year.vue

@@ -148,7 +148,7 @@ export default {
 .year{
   position: fixed;
   width: 300px;
-  z-index: 100;
+  z-index: 20000;
   background-color: #fff;
   box-shadow: 0 0 4px 1px #ccc;
   border-radius: 5px;

package/src/index.js

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