centaline-data-driven 1.4.29 → 1.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "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: "1569558581076955136"} ,
+        apiParam: {actionType: 1,chanceID: "1545603758526959616"} ,
       }
     },
     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="'/salemanage/pointcontractbatchadjustform/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyRET/getLayoutOfEdit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "actionType":2
+          chanceID: "1602509155166457856", actionType: 3
         },
         topHeight:10,
       }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -234,7 +234,7 @@
                     <div class="user-title" v-html="m.empNameCN"></div>
                     <div class="user-title" style="margin-left: 10px" v-html="m.commissionPercentDesc"></div>
                   </div>
-                  <div class="user-but w56" v-html="m.commissionRoleName"></div>
+                  <div class="user-but" v-html="m.commissionRoleName"></div>
                 </div>
               </div>
             </div>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -229,7 +229,7 @@
                     <div class="user-title" v-html="m.empNameCN"></div>
                     <div class="user-title" style="margin-left: 10px" v-html="m.commissionPercentDesc"></div>
                   </div>
-                  <div class="user-but w56" v-html="m.commissionRoleName"></div>
+                  <div class="user-but" v-html="m.commissionRoleName"></div>
                 </div>
               </div>
             </div>
@@ -602,7 +602,9 @@ export default {
       var collapseItemArr = [];
       var col = 0;
       var colCount = 4;
+      debugger
       self.model.fields2Dic.forEach((v, index) => {
+        
         if (v.type === 13) {
           collapseItemArr = [];
           col = 0;
@@ -621,21 +623,30 @@ export default {
           collapseItemArr.push(v);
           col = col + v.spanCols;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
+            debugger
             self.collapse.push(collapseItemArr);
             collapseItemArr = [];
             col = 0;
           }
+          if (index === 6) {
+            debugger
+          }
+          if (index === 7) {
+            debugger
+          }
         } 
         else {
           collapseItemArr.push(v);
           col = col + 1;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
+            debugger
             self.collapse.push(collapseItemArr);
             collapseItemArr = [];
             col = 0;
           }
         }
       });
+      debugger
     },
     loadOperation() {
       this.model._operationList = null;

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

@@ -38,10 +38,15 @@
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
               <i class="el-icon-delete" @click="handleRemove(file)"></i>
             </span>
-           <span class="cover-list-item-play" v-if="file.mediaTypeID==4 && file.videoPlayIconUrl">
+              <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
               <div class="swiper-i">
                 <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
               </div>
+            </span>
+             <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
+              <div class="swiper-i">
+                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon"  @click="viewerfile(file)"/>
+              </div>
             </span>
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
               <!--锁定-->
@@ -116,11 +121,16 @@
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
               <i class="el-icon-delete" @click="handleRemove(file)"></i>
             </span>
-           <span class="cover-list-item-play" v-if="file.mediaTypeID==4 && file.videoPlayIconUrl">
+              <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
               <div class="swiper-i">
                 <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
               </div>
             </span>
+             <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
+              <div class="swiper-i">
+                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon"  @click="viewerfile(file)"/>
+              </div>
+            </span>
 
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
               <!--锁定-->
@@ -582,8 +592,10 @@
 
   .circleCenter {
     position: absolute;
-    top: 38px;
-    left: 32px;
+    top: 50%;
+    left: 50%;
+    margin-top: -11px;
+    margin-left: -20px;
   }
  
 .browseDefault .el-radio__input.is-checked .el-radio__inner {

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -100,5 +100,6 @@
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
+  word-break:break-all;
 }
 </style>

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

@@ -15,6 +15,9 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
       get sourceList() {
         return fileSourceList;
       },
+      get videoPlayIconUrl() {
+        return videoPlayIconUrl;
+      },
       set action(v) {
         data.action = v;
       },
@@ -228,7 +231,7 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             return fileSource.fileExtension;
           },
           get videoPlayIconUrl() {
-            return (fileSource.videoPlayIconUrl || videoPlayIconUrl);
+            return fileSource.videoPlayIconUrl;
           },
         }
 

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

@@ -21,6 +21,9 @@ const box = function (source, callBack) {
         source.clear = v;
       },
       get value() {
+        if(source.code1 && source.decimals1>-1){
+          source.code1 = Number(source.code1).toFixed(source.decimals1);
+        }
         return source.code1;
       },
       set value(v) {

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

@@ -126,9 +126,11 @@ export default {
   position: relative;
 }
 
-.circleCenter {
+.circleBox .circleCenter {
   position: absolute;
-  top: 55px;
-  left: 145px;
+  top: 50%;
+  left: 50%;
+  margin-top: -10px;
+  margin-left: -15px;
 }
 </style>

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkEKwjAQRe-StQPJzCQz6S41ZuMhSltbqCuxLSji3Y3gHdw-_n__v8y6D6Yx1ErrsxcIyTMwnhg0SwEOmSWrlGPiLhSfEUWApCgcnSVATBnsN0qZYhDbZY5JkQkqompyJ9CWEqBnZSqeo3hzMNPjZhpXCxo9ox7M0m8_YKP9gn2d7ufp-Y9z122ps8JznNUqaBgDsA0RBpQLjLPrXT9EIprN-wMAAP__.OwgXf5vZ8GNH_jZkyqKKWGoITPeGzxrEizwMfYU9dRI',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsKwkAQRf9l6gzsuOM80ukmNn5EyMIKsRJNQBH_XcWkS-8pTnGae59wmzLUoDO4ooXOZ3BFCx0Ru5K0uHNNyMIRjZJhYkl8aNqY9g1UUO4XqEk0uDE5VzD04y-Yq37DdCvXY3n849x5HD6zFEU2JRhmEkPuc8betifM7NGLqXsI8HoDAAD__w.jOAitG_FwNBBh1-Zd0w28DaGuXUjH0YvrTNKuG99tn0',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',