centaline-data-driven 1.4.9 → 1.4.11

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1583031531402825728"} ,
+        apiParam: {actionType: 1,chanceID: "1590537844491948032"} ,
       }
     },
     mounted() {

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="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,33 @@
     data() {
       return {
         apiParam:{
-          
+          actionType
+: 
+2,
+buildingID
+: 
+"1",
+estateID
+: 
+"1",
+floorID
+: 
+"1",
+pageOnly
+: 
+true,
+pageTitle
+: 
+"开盘",
+propertyID
+: 
+"",
+roomNo
+: 
+"1527",
+tradeID
+: 
+"200",
         },
         topHeight:10,
       }

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -53,6 +53,16 @@
     },
     methods: {
       load(data) {
+        if(data.options && data.code1){
+          var checked = data.code1 === '' ? [] : [].concat(JSON.parse(data.code1));
+          checked.forEach((n) => {
+            let ic=data.options.findIndex((op) => { return op.code === n.code });
+            if(ic===-1){
+              n.flagDeleted=true;
+            }
+          });
+          data.code1 = JSON.stringify(checked);
+        }
         this.model = data;
       },
       clearClickHandle: function (event) {

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

@@ -62,7 +62,7 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
         </div>
       </el-upload>
     </template>
@@ -128,7 +128,7 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
         </div>
       </el-upload>
     </template>
@@ -329,7 +329,7 @@
             return false;
           }
         }
-        if (this.model.min && this.model.required) {
+        if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
             if (eventName == "change" && this.model.getfileListLength() > 0) {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -82,7 +82,7 @@
       </component>
     </div>
     <div style="min-height:200px" v-if="loading"></div>
-    <iframe :src="downloadUrl" style="height:0px;width:0px"> </iframe>
+    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;"> </iframe>
   </div>
 </template>
 <script>

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -227,7 +227,7 @@ export default {
           return false;
         }
       }
-      if (this.modelPhotoselect.min && this.modelPhotoselect.required) {
+      if (this.modelPhotoselect.min) {
         if (
           this.modelPhotoselect.getfileListLength() < this.modelPhotoselect.min
         ) {

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -67,6 +67,18 @@
     },
     methods: {
       load(data) {
+        if(data.segmentValue && data.value){
+          let flagExists=false;
+          data.segmentValue.forEach((n) => {
+            if(n.code===data.value){
+              flagExists=true;
+              return;
+            }
+          });
+          if(!flagExists){
+            data.value='';
+          }
+        }
         this.model = data;
         this.model.self = this;
       },

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -394,9 +394,11 @@ const LibFunction = {
           var colNum = source.colSpan ? source.colSpan : 3;
           if (item1.excLine) {
             num = 24;
-          } else if (field.spanCols > 0) {
+          } 
+          else if (field.spanCols > 0) {
             num = field.spanCols * (24 / colNum);
-          } else {
+          } 
+          else {
             num = 24 / colNum;
           }
           return num;
@@ -414,9 +416,10 @@ const LibFunction = {
           //size: 'mini'
         },
         get excLine() {
-          return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine ||
-            field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File ||
-            field.controlType === Enum.ControlType.SearchPage;
+          return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine 
+            || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
+            || field.controlType === Enum.ControlType.SliceUpload 
+            || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel
       };

package/src/main.js

@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZhdseZWTpdsPEjCMiaYGV4JBrjv6sROnpPcYrT3PuEcW6hAF3ADa3UYQE3tFITcVCSCvdBI7KwR6NoGFkiH8vKx0MJGaT7DQoSMXJBXcigb6ZfyNn7b5jHNJzS4x_nrlP_mc29mjXiselEkHeiaMyKnbizo0toJRm83gAAAP__.78xofT8L8z7miXVcEL3cQjrfiX6nuUdXUZV2ZUahFt8',
+        oldToken: '20ad6f77-b0fc-4a65-9334-eda7a89c5bcf',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhufX2jk4ObPwIcndugZURSDTGfxcjdPS-4hWTSWZeMM4JapAV3NFG71dwRxs9EXsh2-HRS0C2bNBRcBjYBj61nQlNCwXo4wY1WesqplKkgCFOv4AObL_BPOr9rM9_nLtOwzJbSZZoMqGLmpeyMeiVSmStLlKq-kQJ3h8AAAD__w.IYKSKulo_uX60Qc84xUSb5OPIb_Eir5EbSHfO9k1l3A',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',