centaline-data-driven 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/comfirm/src/comfirm.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="ct-comfirm-content max-comfirm-content">
-    <div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center;">
-      <span>{{text}}</span>
+    <div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center; display: flex; justify-content: center;">      
+      <div style="text-align: left;">{{text}}</div>
     </div>
-    <div style="text-align:center;width:100%">
+    <div style="text-align:center;width:100%;margin-bottom: 15px;">
       <el-button @click="clickHandler($event,true)"  type="primary" size="mini">{{options.confirmButtonText||'确定'}}</el-button>
       <el-button v-if="options.flagShowcCancelButton===undefined || options.flagShowcCancelButton==='1'" @click="clickHandler($event,false)"  size="mini">{{options.cancelButtonText||'取消'}}</el-button>
     </div>

package/src/centaline/common/index.js

@@ -247,7 +247,7 @@ const common = {
             options: options,
             text: message,
             width: '400px',
-            height: '95px'
+            height: 'auto'
           },
           on: {
             access() {

package/src/centaline/css/common.css

@@ -789,7 +789,7 @@ html {
   min-width: initial;
 }
 
-.el-message__content{
+.el-message__content,.ct-comfirm-content{
   white-space: pre-line;
   line-height: 20px!important;
 }

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -329,7 +329,7 @@
             return false;
           }
         }
-        if (this.model.min && this.modelPhotoselect.required) {
+        if (this.model.min && this.model.required) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
             if (eventName == "change" && this.model.getfileListLength() > 0) {
@@ -460,18 +460,26 @@
       uploadguid() {
         return (this.S4() + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + this.S4() + this.S4());
       },
-      uploadpro(uploadOptions, res) {
+      uploadpro(uploadOptions, res, xhr) {
 
-        if (res.rtnCode != 200 && res.rtnMsg != "") {
-          this.$message.error(res.rtnMsg);
-          return;
+        if (xhr.status >= 400) {
+          this.$message.error(res);
         }
-        const { file, onProgress, onSuccess, onError } = uploadOptions;
-        const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);
-        this.model.setByPieces(res, Progress, file);
+        else if (xhr.status == 0) {
+          this.$message.error(res);
+        }
+        else if (xhr.status == 200) {
+          if (res.rtnCode != 200 && res.rtnMsg != "") {
+            this.$message.error(res.rtnMsg);
+            return;
+          }
+          const { file, onProgress, onSuccess, onError } = uploadOptions;
+          const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);
+          this.model.setByPieces(res, Progress, file);
 
-        if (res.content.finished == 1) {
-          this.handleChange();
+          if (res.content.finished == 1) {
+            this.handleChange();
+          }
         }
       },
 

package/src/centaline/loader/src/ctl/SliceUpload.js

@@ -5,7 +5,11 @@ async function postFile(api, data, callback) {
   xhr.onreadystatechange = function () {
     if (xhr.readyState === 4 && xhr.status === 200) {
       var rtn = JSON.parse(xhr.responseText);
-      callback(rtn);
+      callback(xhr, rtn);
+    }
+    else if (xhr.readyState === 4 && (xhr.status === 0 || xhr.status >= 400)) {
+      var rtn = xhr.responseText || xhr.statusText;
+      callback(xhr, rtn);
     }
   }
   xhr.send(data)
@@ -13,7 +17,7 @@ async function postFile(api, data, callback) {
 
 //分片上传
 const uploadByPieces = async (url, { file }, callback, uploadOptions) => {
-  var uploadData = { blockSize: 5 * 1024 * 1024, nextOffSet: 0 };
+  var uploadData = { blockSize: 0.5 * 1024 * 1024, nextOffSet: 0 };
   // 获取当前chunk数据
   const getChunkInfo = (file, data) => {
     let start = data.nextOffSet;
@@ -21,16 +25,19 @@ const uploadByPieces = async (url, { file }, callback, uploadOptions) => {
     let chunk = file.slice(start, end);
     return { start, end, chunk };
   };
+
   // 分片上传接口
-  const uploadChunk = async (data) => {
+  const uploadChunk = async (xhr, data) => {
     return new Promise((resolve, reject) => {
 
-      callback(uploadOptions, data);
-      if (data.rtnCode == 200) {
-        if (data.content.finished != 1) {
-          uploadData.nextOffSet = data.content.nextOffSet;
-          uploadData.blockSize = data.content.blockSize;
-          readChunk(uploadData);
+      callback(uploadOptions, data, xhr);
+      if (xhr.status === 200) {
+        if (data.rtnCode == 200) {
+          if (data.content.finished != 1) {
+            uploadData.nextOffSet = data.content.nextOffSet;
+            uploadData.blockSize = data.content.blockSize;
+            readChunk(uploadData);
+          }
         }
       }
 

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxdcXXfv7OJpmnyEeGQFU4WokBDy7zFwdvZ5xSuGgZk3zGuEGjSBB9rpfQIPtNMTsVeSDk9eA7JwiY6Cw8AS-Nx2ZWhayMCed6hJRJ3Tgn0G07CkIM_dL1hne1zs9Y9zt2XaZn2lZcxpxGEsqq3sGH0sBiS6morZGMXg8wUAAP__.pRHigsL1V-LoAhchjSKQEXLI9EJv4RKjXEm6tliOaqk',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwMDszSycLNh6CuGFJsDICicZ4dzVCR-8rXvGa_58wLREq0BXc0UbnV3BHGx0ReyVp8eA1IAuXaBQMA0vgY9OWoW4gg3S_QkUi6p0WuWYwnudfMM3tG5Yp3U7p8Y9zl3n8zBIPYs4bRjcocuEMPYkh5cZ9ZNeXHOH1BgAA__8.J4WTk1z7IsB5k_3a-fvnnjm6AUgGBRi7Y631pFLVCPo',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',