centaline-data-driven 1.4.6 → 1.4.8

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/PropertyContact/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          chanceID: "1580430736434008064", actionType: 2
+          
         },
         topHeight:10,
       }

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) {
@@ -441,7 +441,7 @@
             "mediaLabelName": "",
             "fileExtension": "",
             "progressFlag": true,
-            "loadProgress": 1,
+            "loadProgress": 0,
             "uid": uid,
           }
           this.model.fileList.push(awaitfile);
@@ -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/dynamicForm/src/dynamicFormListTable.vue

@@ -104,7 +104,7 @@
         model: null,
         foucus: false,
         itemKey: Math.random(),
-		 tableColumnWith: 0
+		    tableColumnWith: 0
       }
     },
     created() {      
@@ -233,6 +233,7 @@
               fd.$forceUpdate();
             }
           });
+          self.itemKey = Math.random();
         });
       },
       fieldsValidExcute() {
@@ -375,23 +376,23 @@
 
         return sums;
       },
-	  // 表头部重新渲染
-    renderHeader(h, { column, $index }) {
-      // 新建一个 span
-      let span = document.createElement('span');
-      // 设置表头名称
-      span.innerText = column.label;
-      span.style.whiteSpace = 'nowrap';
-      span.style.width = 'auto';
-      // 临时插入 document
-      document.body.appendChild(span);
-      // 重点：获取 span 最小宽度，设置当前列，注意这里加了 10，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 。（可能还有边距/边框等值，需要根据实际情况加上）
-      column.minWidth = span.getBoundingClientRect().width + 10;
-      this.tableColumnWith = column.minWidth
-      // 移除 document 中临时的 span
-      document.body.removeChild(span);
-      return h('span', column.label);
-    }
+      // 表头部重新渲染
+      renderHeader(h, { column, $index }) {
+        // 新建一个 span
+        let span = document.createElement('span');
+        // 设置表头名称
+        span.innerText = column.label;
+        span.style.whiteSpace = 'nowrap';
+        span.style.width = 'auto';
+        // 临时插入 document
+        document.body.appendChild(span);
+        // 重点：获取 span 最小宽度，设置当前列，注意这里加了 10，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 。（可能还有边距/边框等值，需要根据实际情况加上）
+        column.minWidth = span.getBoundingClientRect().width + 10;
+        this.tableColumnWith = column.minWidth
+        // 移除 document 中临时的 span
+        document.body.removeChild(span);
+        return h('span', column.label);
+      }
     }
   }
 </script>

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -142,7 +142,7 @@
                   </a>
                 </template>
                 <a v-if="itemFile.rightDownload"
-                   :href="resultObject.replace(/\/preview$/,'/download')" target="_blank"
+                   :href="downloadUrl(resultObject)" target="_blank"
                    class="magnify-btn el-icon-download"
                    title="下载"
                    :download="(itemFile.mediaLabelName || itemFile.fileName)"></a>
@@ -225,6 +225,17 @@
       }
     },
     methods: {
+      downloadUrl(url) {
+        if (/\/viewer\//.test(url)) {
+          return url.replace(/\/viewer\//, '/download/');
+        }
+        else if (/\/preview$/.test(url)) {
+          return url.replace(/\/preview$/, '/download');
+        }
+        else {
+          return url;
+        }
+      },
       handleMouse(e) {
         e.preventDefault();
       },

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

@@ -270,8 +270,7 @@ const box = function (source, fileSourceList, router, optionApi) {
       setByPieces(res, Progress, file) {
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
-
-
+        var  data = {};
           if (res.content.finished == 1) {
             //下面的方式绑定，会有一些问题 todo 不强与页面关联
             fileSourceList.push(res.content.media);
@@ -279,6 +278,24 @@ const box = function (source, fileSourceList, router, optionApi) {
             data = rtn.getFileData(res.content.media);
             data.progressFlag = false;
             data.loadProgress = 100;
+
+            Vue.set(file, "url", data.url);
+            Vue.set(file, "source", data.source);
+            Vue.set(file, "mediaUrl", data.mediaUrl);
+            Vue.set(file, "fileName", data.fileName);
+            Vue.set(file, "flagDefault", data.flagDefault);
+            Vue.set(file, "mediaTypeID", data.mediaTypeID);
+            Vue.set(file, "flagDeleted", data.flagDeleted);
+            Vue.set(file, "actionType", data.actionType);
+            Vue.set(file, "rightDel", data.rightDel);
+            Vue.set(file, "rightEdit", data.rightEdit);
+            Vue.set(file, "rightDownload", data.rightDownload);
+            Vue.set(file, "mediaLabelID", data.mediaLabelID);
+            Vue.set(file, "mediaLabelName", data.mediaLabelName);
+            Vue.set(file, "fileExtension", data.fileExtension);
+
+            Vue.set(file, "progressFlag", data.progressFlag);
+            Vue.set(file, "loadProgress", data.loadProgress);
           }
           else {
             data.progressFlag = true;
@@ -287,25 +304,6 @@ const box = function (source, fileSourceList, router, optionApi) {
           let i = this.fileList.findIndex(v => v.uid === file.uid);
           if (i === -1) return;
 
-          Vue.set(file, "url", data.url);
-          Vue.set(file, "source", data.source);
-          Vue.set(file, "mediaUrl", data.mediaUrl);
-          Vue.set(file, "fileName", data.fileName);
-          Vue.set(file, "flagDefault", data.flagDefault);
-          Vue.set(file, "mediaTypeID", data.mediaTypeID);
-          Vue.set(file, "flagDeleted", data.flagDeleted);
-          Vue.set(file, "actionType", data.actionType);
-          Vue.set(file, "rightDel", data.rightDel);
-          Vue.set(file, "rightEdit", data.rightEdit);
-          Vue.set(file, "rightDownload", data.rightDownload);
-          Vue.set(file, "mediaLabelID", data.mediaLabelID);
-          Vue.set(file, "mediaLabelName", data.mediaLabelName);
-          Vue.set(file, "fileExtension", data.fileExtension);
-
-          Vue.set(file, "progressFlag", false);
-          Vue.set(file, "loadProgress", 100);
-
-
           Vue.set(rtn.fileList, i, {
             url: data.url,
             source: data.source,

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

@@ -5,7 +5,18 @@ 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;
+      if (rtn == "") {
+        if (xhr.status === 0) {
+          rtn = "网络请求失败:" + api;
+        } else {
+          rtn = "status:" + xhr.status;
+        }
+      }
+      callback(xhr, rtn);
     }
   }
   xhr.send(data)
@@ -21,16 +32,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

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://10.25.10.67:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.39:8080/api/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
@@ -43,14 +43,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwMDszSycLNh6CuGFJsDICicZ4dzVCR-8rXvGa_58wLREq0BXc0UbnV3BHGx0ReyVp8eA1IAuXaBQMA0vgY9OWoW4gg3S_QkUi6p0WuWYwnudfMM3tG5Yp3U7p8Y9zl3n8zBIPYs4bRjcocuEMPYkh5cZ9ZNeXHOH1BgAA__8.J4WTk1z7IsB5k_3a-fvnnjm6AUgGBRi7Y631pFLVCPo',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhub29PTo9sPEjyJ2eCVZGINEY_1000NH7ildMJpl5wTAlqMEt4IZWOr-AG1rpiNg7khZ33gVkYYNKQTGwBD40rQn7BgrIjxvUJKIlq1dbQB_HX-C8VPYbTEO-H_PzH-euYz_PluyrFO0FrZt7fFJFlTOjIRtjijmbiuD9AQAA__8.ps7UJfVktTvSQGwtbwB3WniD6KYKapmBPH_moOJScMQ',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjcyYzkxMzRlLTc5ODItNDFiYi04NDZjLWRhNmE0YTAwNGUzZSJ9.Dqw228vC10bapkK7Rnz_REvV_1x3igpsmFVHfeSIMFPHkMSpeh6py61NJ7HtkYnTTrSeRr2IjXvH9EoHLH3T3Q',
+        authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImViNGU3NDFlLTYwZjEtNGVlMC04YTZlLWU5NjMwYjcyODU0YyJ9.8MyYlz55w4tL8iRmqQyMrq8DbvYSYkf2h8O5ei8UPghAqX3eQzfH233_D9yzU_qFeesjrw_hh8iq3e8J43CEXg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作