zydx-plus 1.32.319 → 1.33.321

package/package.json

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

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

@@ -370,6 +370,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  font-size: 16px;
 }
 
 @keyframes linkDown {

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

@@ -1336,7 +1336,7 @@ li {
 .editing-cont {
   padding: 120px 0 66px 0;
   box-sizing: border-box;
-  max-width: 594px;
+  max-width: 770px;
   min-height: 700px;
   margin: 0 auto;
 }

package/src/components/tagging/src/tagging.vue

@@ -306,7 +306,7 @@ export default {
                 let size = parseInt(window.getComputedStyle(className, null).fontSize)
                 let textWidth = this.measureText(className.innerText,size)
                 let textRows = Math.round((className.offsetLeft + textWidth) - className.offsetWidth * (rows - 1))
-                linkWidth = className.offsetWidth - textRows + taggingLeft
+                linkWidth = className.offsetWidth - taggingLeft
             }
             // 左边坐标
             const y1 = className.offsetTop + className.offsetHeight + 60

package/src/components/upload/index.js

@@ -0,0 +1,25 @@
+import { createVNode, render } from 'vue'
+import XtxConfirm from './src/upload.vue'
+
+
+const divNode = createVNode('div', { class: 'xtx-confirm-upload' })
+render(divNode, document.body)
+// 获取 DOM 节点, 用于挂载组件或卸载组件
+const container = divNode.el
+
+const Confirm = ({ server, file, token, meta }) => {
+    // 返回 Promise 对象
+    return new Promise((resolve, reject) => {
+        const submit = (val) => {
+            resolve(val)
+        }
+        const cancel = () => {
+            render(null, container)
+            reject('点击取消')
+        }
+        // 1. 创建 XtxConfirm 组件
+        const VNode = createVNode(XtxConfirm, { server, file, token, meta, cancel, submit })
+        render(VNode, container)
+    })
+}
+export default Confirm

package/src/components/upload/src/upload.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="upload-content">
+    <div class="upload-centered">
+      <div class="upload-schedule">
+        <div class="upload-schedule-cont"></div>
+        <div class="upload-schedule-num"></div>
+      </div>
+      <button class="upload-but" @click="cancel">关闭</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import Mess from '../../tipBox/index'
+
+export default {
+  name: 'zydx-upload',
+  data() {
+    return {
+      uploadShow: false,
+    }
+  },
+  props: {
+    server: {
+      type: String,
+      default: ''
+    },
+    token: {
+      type: String,
+      default: ''
+    },
+    file: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    meta: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    cancel: {
+      type: Function,
+      default: () => {}
+    },
+    submit: {
+      type: Function,
+      default: () => {}
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.uploadFile()
+    })
+  },
+  methods: {
+    // 上传文件
+    uploadFile() {
+      let _this = this
+      const meta = _this.meta ? Object.keys(_this.meta) : []
+      const param = new FormData()
+      param.append('file', _this.file)
+      for (let i = 0; i < meta.length; i++) {
+        param.append(meta[i], _this.meta[meta[i]])
+      }
+      const xhr = new XMLHttpRequest()
+      xhr.open('POST', _this.server)
+      xhr.setRequestHeader('Authorization', _this.token)
+      xhr.upload.onprogress = _this.progressFunction
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === 4) {
+          if (xhr.status === 200) {
+            const text = JSON.parse(xhr.responseText)
+            if(text.code === '200') {
+              _this.submit(text)
+            }else {
+              Mess({
+                type: 'text',
+                cancelShow: false,
+                promptContent: text.msg
+              })
+            }
+          }
+        }
+      }
+      xhr.send(param)
+    },
+    progressFunction(evt) {
+      const progressBar = document.querySelector('.upload-schedule-cont')
+      const percentageDiv = document.querySelector('.upload-schedule-num')
+      if (evt.lengthComputable) {
+        progressBar.style.width = evt.loaded / evt.total * 100 + '%'
+        percentageDiv.innerHTML = Math.round(evt.loaded / evt.total * 100) + '%'
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.upload-content {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 9999;
+  background-color: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+
+.upload-centered {
+  margin: 0 auto;
+}
+
+.upload-schedule {
+  width: 300px;
+  height: 15px;
+  border-radius: 15px;
+  position: relative;
+  background-color: #fff;
+  box-shadow: inset 0 0 5px #ccc;
+}
+
+.upload-schedule-num {
+  font-size: 12px;
+  color: #666;
+  position: absolute;
+  right: 5px;
+  top: -1px;
+  mix-blend-mode: difference;
+}
+
+.upload-schedule-cont {
+  width: 0;
+  height: 100%;
+  border-radius: 15px;
+  background-color: #409EFF;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.upload-but {
+  width: 60px;
+  height: 20px;
+  background-color: #FFFFFF;
+  color: #000000;
+  border: #000000 1px solid;
+  line-height: 18px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  font-size: 12px !important;
+  text-align: center;
+  cursor: pointer;
+  padding: 0 5px;
+  font-weight: normal;
+  box-sizing: border-box;
+  margin-top: 10px;
+}
+
+</style>

package/src/index.js

@@ -1,4 +1,5 @@
 import Message from './components/tipBox/index';
+import Upload from './components/upload/index';
 import Calendar from './components/calendar/index';
 import Switch from './components/switch/index';
 import menuTree from './components/menuTree/index';
@@ -76,14 +77,16 @@ function install(app) {
     });
     app.config.globalProperties.$message = Message
     app.config.globalProperties.$spinner = spinner
+    app.config.globalProperties.$upload = Upload
 }
 
 export default {
-    version: '1.32.319',
+    version: '1.33.321',
     install,
     Calendar,
     Message,
     spinner,
+    Upload,
     Switch,
     menuTree,
     coloring,