centaline-data-driven 1.4.12 → 1.4.13

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
+    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1590537844491948032"} ,
+        apiParam: {actionType: 1,chanceID: "1511930510518128640"} ,
       }
     },
     mounted() {

package/src/centaline/browseIframe/src/browseIframe.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width:100%;height:100%;">
-    <iframe :src="src" ref="iframe" style="width:100%;height:99%;" frameborder="0" @load="sendMessage()"></iframe>
+    <iframe :src="src" ref="iframe" style="width:100%;height:99%;border-width: 0px;" frameborder="0" @load="sendMessage()"></iframe>
   </div>
 </template>
 <script>

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

@@ -1,9 +1,9 @@
 <template>
-  <div style="width: 100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
+  <div style="width: 100%" ref="refupload" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
     <!--分片上传-->
     <template v-if="model.type==51">
       <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
-                   :http-request="SliceUpload"
+                 :http-request="SliceUpload"
                  :disabled="model.lock"
                  :accept="model.fileAccept"
                  :on-change="handleChange"
@@ -64,8 +64,8 @@
           </div>
           <div>
             <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
-              :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
-              :width="96" :height="96" class="file-cirle"></el-progress>
+                         :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
+                         :width="96" :height="96" class="file-cirle"></el-progress>
             <div class="circleCenter" v-if="file.progressFlag">
               <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
             </div>
@@ -137,8 +137,8 @@
           </div>
           <div>
             <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
-              :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
-              :width="96" :height="96" class="file-cirle"></el-progress>
+                         :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
+                         :width="96" :height="96" class="file-cirle"></el-progress>
             <div class="circleCenter" v-if="file.progressFlag">
               <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
             </div>
@@ -455,32 +455,36 @@
       uploadguid() {
         return (this.S4() + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + this.S4() + this.S4());
       },
-      uploadpro(uploadOptions, res, xhr) {
+      uploadpro(uploadOptions, res, xhr, flagError) {
         const { file, onProgress, onSuccess, onError } = uploadOptions;
-        if (xhr.status >= 400) {
-          this.$message.error(res);
-          file.source = { "actionType": 2 };
-          this.model.deleteFile(file, false);
-          this.selfValidExcute("remove");
-        }
-        else if (xhr.status == 0) {
-          this.$message.error(res);
-          file.source= { "actionType": 2 } ;
-          this.model.deleteFile(file, false);
-          this.selfValidExcute("remove");
-        }
-        else if (xhr.status == 200) {
-          if (res.rtnCode != 200 && res.rtnMsg != "") {
-            this.$message.error(res.rtnMsg);
-            return;
+
+        var refupload = this.$refs.refupload;
+        if (refupload) {
+          if (flagError) {
+            this.$message.error(res);
+            file.source = { "actionType": 2 };
+            this.model.deleteFile(file, false);
+            this.selfValidExcute("remove");
+            return false;
           }
-          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 == 200) {
+            if (res.rtnCode != 200 && res.rtnMsg != "") {
+              this.$message.error(res.rtnMsg);
+              return false;
+            }
+            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();
+            }
+            return true;
           }
         }
+        else {
+          xhr = null;
+          return false;
+        }
       },
 
 
@@ -590,9 +594,10 @@
   .file-cirle .el-progress-circle {
     margin-left: 15px;
   }
+
   .circleCenter {
-  position: absolute;
-  top: 38px;
-  left: 32px;
-}
+    position: absolute;
+    top: 38px;
+    left: 32px;
+  }
 </style>

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -162,8 +162,6 @@
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
         }
-
-        this.$refs.table.loadStats();
       },
       searchComplate(index) {
         this.pageDisabled=false;

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -169,7 +169,7 @@
       </el-button>
     </div>
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top: 30px"></div>
-    <iframe :src="downloadUrl" style="height:0px;width:0px">
+    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;">
     </iframe>
   </div>
 </template>

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

@@ -40,7 +40,7 @@
           <template v-if="itemFile.mediaTypeID == '1'">
             <iframe :src="resultObject"
                     :height="displayAreaHeight - 80 + 'px'"
-                    :width="displayAreaWidth + 'px'">
+                    :width="displayAreaWidth + 'px'" style="border-width: 0px;">
             </iframe>
           </template>
           <!--Photo-->
@@ -160,7 +160,7 @@
         </div>
       </el-main>
     </el-container>
-    <iframe :src="downloadUrl" style="height:0px;width:0px">
+    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;">
     </iframe>
   </div>
 </template>

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

@@ -8,7 +8,7 @@
       :height="displayAreaHeight - 78 + 'px'"
       :width="displayAreaWidth + 'px'"
       @load="complete()"
-             @contextmenu="handleMouse"
+             @contextmenu="handleMouse" style="border-width: 0px;"
     >
     </iframe>
   </div>

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

@@ -1,24 +1,24 @@
 
 async function postFile(api, data, callback) {
-  var xhr = new XMLHttpRequest();
-  xhr.open('POST', api)
+  var xhr = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP");
+  xhr.open('POST', api, !0)
   xhr.onreadystatechange = function () {
-    if (xhr.readyState === 4 && xhr.status === 200) {
-      var rtn = JSON.parse(xhr.responseText);
-      callback(xhr, rtn);
+    if (xhr.readyState != 4 || xhr.status < 200) {
+      return false;
     }
-    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);
+    else if (xhr.status >= 400) {
+      var msg = "\u521B\u5EFA\u4E0A\u4F20\u4EFB\u52A1\u5931\u8D25,\u72B6\u6001\u7801:" + xhr.status + xhr.responseText + ",\u8BF7\u68C0\u6D4B\u7F51\u7EDC...";
+      callback(xhr, msg, true);
+      return false;
     }
+    var rtn = JSON.parse(xhr.responseText);
+    callback(xhr, rtn, false);
   }
+  window.XMLHttpRequest && (xhr.onerror = function () {
+    var msg = "\u521B\u5EFA\u4E0A\u4F20\u4EFB\u52A1\u5931\u8D25,\u72B6\u6001\u7801:" + xhr.status + xhr.responseText + ",\u8BF7\u68C0\u6D4B\u7F51\u7EDC...";
+    callback(xhr, msg, true);
+    xhr = null;
+  });
   xhr.send(data)
 }
 
@@ -34,20 +34,20 @@ const uploadByPieces = async (url, { file }, callback, uploadOptions) => {
   };
 
   // 分片上传接口
-  const uploadChunk = async (xhr, data) => {
+  const uploadChunk = async (xhr, data, flagError) => {
     return new Promise((resolve, reject) => {
-
-      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);
+      if (callback(uploadOptions, data, xhr, flagError)) {
+        if (xhr.status === 200) {
+          xhr = null;
+          if (data.rtnCode == 200) {
+            if (data.content.finished != 1) {
+              uploadData.nextOffSet = data.content.nextOffSet;
+              uploadData.blockSize = data.content.blockSize;
+              readChunk(uploadData);
+            }
           }
         }
       }
-
     })
   }
   function readFile(filechunk) {

package/src/centaline/progress/src/progress.vue

@@ -84,13 +84,11 @@ export default {
             }
             setTimeout(() => {
               self.$emit('finished', data);
-              this.progressFlag = false;
             }, 800);
           }
           else {
             setTimeout(() => {
               self.getApiData();
-              this.progressFlag = false;
             }, 1000);
           }
         }

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -106,6 +106,7 @@ export default {
   text-align: left;
   top: 6px;
   right: 22px;
+  z-index: 10;
 }
 
 .my-icon-more {

package/src/centaline/validate/index.js

@@ -324,6 +324,7 @@ const valid = {
               rtnValidate.push(valid.requiredMultiCombo);
               break;
             case Enum.ControlType.File: 
+            case Enum.ControlType.SliceUpload:
                 rtnValidate.push(valid.requiredFile);
               break;
             case Enum.ControlType.PhotoSelect:

package/src/main.js

@@ -12,12 +12,12 @@ 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.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/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '94083010-671d-465a-95a9-1a3318ceb239',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZh3NmZWTpdsPEjCI81wcoIJBrjv6sROnpPcYrT3PuEcW6hAF3ADa3UYQE3tFITcVCSCvdBI7KwQ6NoGFkiH8vKxUMJGaT7FQoSMbacvWUwNNMvuMD5N8xjup3S4x_nLtPwmWURpjwR-r5zyO1O0bg_I1mnjap47wxebwAAAP__.R7h4AMsjakN5ut14PThDIYQJ_vYnaNXHblU4OLG-VqQ',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZhmNnH0MmCjR9BdsOaYGUEEo3x39UIHb2nOMVp7n3CtCSowa3gjjZ6XcEdbfREoo5shwd1AcUKo6fgMYgNcmw7Dk0LBeT7FWqy1jsmQ1rAGOdfsGLoG5Yp30758Y9zl3n8zKaB1Q-lR61UUBxlTIYjVo6TlPHsDZfwegMAAP__.QfhMlAY_T_oYDtowkrq5sZ68l1iqJ4nvaxGUgo7fUS8',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',