centaline-data-driven 1.4.32 → 1.4.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.32",
+  "version": "1.4.34",
   "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="'/PropertyRET/getLayoutOfEdit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,21 @@
     data() {
       return {
         apiParam:{
-          chanceID: "1602509155166457856", actionType: 3
+          actionType
+: 
+"3",
+originalTraId
+: 
+"1603271493445812226",
+pageOnly
+: 
+"true",
+pageStyle
+: 
+"2",
+pageTitle
+: 
+"成交报告"
         },
         topHeight:10,
       }

package/src/centaline/dynamicDetail/src/dynamicAlbums.vue

@@ -2,32 +2,32 @@
 <template>
   <div>
     <div style="position: relative">
-      <template v-if="newMediaAlbums.length > 0">
+      <template v-if="carouselMediaAlbums.length > 0">
         <el-carousel
           arrow="hover"
           height="199px"
           :autoplay="false"
           indicator-position="none"
-          :initial-index="getinitialIndex(albumsList)"
+          :initial-index="getinitialIndex(carouselMediaAlbums)" @change="changeAlbumsIndex" ref="mediaAlbumsCarousel"
         >
-          <template v-for="(item, index) in albumsList.medias">
+          <template v-for="(item, index) in carouselMediaAlbums">
             <el-carousel-item :key="index">
-              <div class="swiper-i">
-                <img :src="getShowUrl(item)" @click="viewerfile(index)" />
+              <div class="swiper-i"> 
+                <img :src="getShowUrl(item)" @click="viewerfile(item)" />
                 <img
-                  :src="albumsList.albumBigImageUrl"
+                  :src="item.albumBigImageUrl"
                   alt=""
-                  @click="viewerfile(index)"
+                  @click="viewerfile(item)"
                   class="hous-icon"
                   v-if="
-                    albumsList.albumBigImageUrl &&
-                    albumsList.albumBigImageUrl != ''
+                    item.albumBigImageUrl &&
+                    item.albumBigImageUrl != ''
                   "
                 />
               </div> </el-carousel-item
           ></template>
         </el-carousel>
-
+        <div class="page">{{page}}</div>
         <div
           class="hous-img"
           style="position: absolute; bottom: 0; z-index: 9"
@@ -73,25 +73,50 @@ export default {
   },
   data() {
     return {
-      newMediaAlbums: [],
-      albumsList: [],
+      newMediaAlbums: [], 
       activeAlbumsIndex: 0,
       flagChange: true,
+      carouselMediaAlbums:[],
+      page:""
     };
   },
   created() {
     this.init();
   },
   methods: {
+    setPage(item){
+      this.page=item.page;
+    },
     init() {
       var self = this;
-      this.newMediaAlbums = this.mediaAlbums || [];
-      this.albumsList = this.newMediaAlbums[0];
+      this.newMediaAlbums = this.mediaAlbums || []; 
+      this.mediaAlbums.forEach((item,index)=>{
+        item.medias.forEach((n,i)=>{
+           n.albumSmallImageUrl=item.albumSmallImageUrl;
+           n.groupindex=index;
+		       n.index=i; 
+          n.page= (i+1)+"/"+item.medias.length;
+           n.albumKey=item.albumKey;
+           n.albumName=item.albumName;
+           n.albumBigImageUrl=item.albumBigImageUrl;     
+          self.carouselMediaAlbums.push(n);
+        })
+      })
+      this.setPage( self.carouselMediaAlbums[self.getinitialIndex(self.carouselMediaAlbums)]);
       self.$forceUpdate();
     },
+
+    changeAlbumsIndex(newindex,oldValue){
+     var self = this;
+     self.activeAlbumsIndex=  self.carouselMediaAlbums[newindex].groupindex;
+     this.setPage( self.carouselMediaAlbums[newindex]);
+    },
     handleClick(index) {
-      if (index == this.activeAlbumsIndex) return;
-      this.albumsList = this.newMediaAlbums[index];
+        var self = this;
+      if (index == this.activeAlbumsIndex) return; 
+       var   initialIndex = this.carouselMediaAlbums.findIndex((v) => v.groupindex == index) | 0;
+       this.setPage(self.carouselMediaAlbums[initialIndex]);
+       this.$refs.mediaAlbumsCarousel.setActiveItem(initialIndex);
       this.activeAlbumsIndex = index;
       this.flagChange = !this.flagChange;
       this.$forceUpdate();
@@ -105,12 +130,7 @@ export default {
         initialIndex = list.medias.findIndex((v) => v.flagDefault == 1) | 0;
       } catch (error) {}
       return initialIndex < 0 ? 0 : initialIndex;
-    },
-    getDefaultUrl(list) {
-      var initialIndex = this.getinitialIndex(list);
-      return this.getShowUrl(list.medias[initialIndex]);
-    },
-
+    }, 
     getShowUrl(list) {
       if (list.mediaTypeID == "2") {
         return list.mediaUrl + "/260/200";
@@ -118,9 +138,9 @@ export default {
         return list.thumbnailUrl;
       }
     },
-    viewerfile(index) {
+    viewerfile(item) {
       var self = this; 
-      self.$common.viewerfile((this.title || "预览媒体"), this.newMediaAlbums, this.activeAlbumsIndex, (index || 0));
+      self.$common.viewerfile((this.title || "预览媒体"), this.newMediaAlbums, item.groupindex, (item.index || 0));
     }
   },
   watch: {
@@ -151,7 +171,16 @@ export default {
       transform: translate(-50%, -50%);
     }
   }
-
+ .page{
+     position: absolute;
+    bottom: 20px;
+    text-align: right;
+    right: 0px;
+   background-color: rgb(14 12 24 / 38%);
+    color: #FFF;
+    padding: 0px 5px; 
+    z-index: 9
+    }
   .hous-img {
     margin-top: 10px;
     width: 100%;

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

@@ -602,9 +602,7 @@ export default {
       var collapseItemArr = [];
       var col = 0;
       var colCount = 4;
-      debugger
       self.model.fields2Dic.forEach((v, index) => {
-        
         if (v.type === 13) {
           collapseItemArr = [];
           col = 0;
@@ -623,30 +621,21 @@ 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/dynamicForm/src/dynamicFormListTable.vue

@@ -38,7 +38,7 @@
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
-                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
+                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :rowData="scope.row" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
 
@@ -74,6 +74,7 @@
     props: {
       vmodel: Object,
       rowNum: String,
+      rowData: Object,
     },
     data: function () {
       return {
@@ -84,9 +85,12 @@
         if (this.vmodel.is === "ct-inputNumber") {
           return 'ct-table-inputnumber';
         }
+      },      
+      getFontColor() {
+        return this.rowData.fontColor || '';
       }
     },
-    template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
+    template: '<div :class="getClass()" :style="{\'color\':getFontColor()}">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
   }
 
   export default {

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

@@ -88,6 +88,16 @@
                             :displayAreaWidth="displayAreaWidth">
               </ct-viewerPDF>
             </template>
+             <template v-else>
+           <div class="viewerContent"
+                   style="max-height: 200px; text-align: center">
+                <a :href="resultObject">
+                  <img :src="itemFile.thumbnailUrl" /><br />{{
+                    itemFile.mediaLabelName || itemFile.fileName
+                  }}
+                </a>
+              </div>        
+             </template>
           </template>
           <template v-else>
            <div class="viewerContent"

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

@@ -127,6 +127,7 @@ const FormList = function (source, master) {
       var row = {
         field: [],
         isSet: false,
+        fontColor: r.fontColor,
         get delete() {//删除权限
           return r.rightDelete === true;
         },
@@ -194,6 +195,7 @@ const FormList = function (source, master) {
             Vue.set(row, 'isSet', false);
             Vue.set(row, 'edit', rows[i].edit);
             Vue.set(row, 'delete', rows[i].delete);
+            Vue.set(row, 'fontColor', rows[i].fontColor);
             this._tableData.push(row);
           }
         }

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/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/max-uplink-api/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.69:8080/api/", 
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjsEKgzAQRP9lzy4kcc0m3mq0l36ErDQBeypVoaX035tCvHnvO7zDwDDzhmWboAUu4IF2Rl_AA-2MWpNnbQc8eQ5Ilmp0OjgMZAOd-6EOXQ8VxOcdWm1ZK2edNxXMspZAKfoF2xIfl_j6x7nbOufZZKJjyTvJpgZzUVD4apBiE71wM4kQfL4AAAD__w.i7gJJvineymQatDJAX7K6sKT3_-TWK2nsrCwWZVmL8c',
+        oldToken: '9a73e482-db16-4a24-81e7-67daef02b64d',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMw7mRmlk4XbDwEWdg1wcoIJBrj3dUIHb2veMVr_n_COHdQgS7ghlZav4AbWmmJ2CtJg3uvAVnYoVEwDCyBj3XjwqGGAvL9ChWJEimbKwsY4vQLpRl_wzzm2yk__nHuMg2fWeoT5bNEjJoEOfWGplpiktg7z7LrjOD1BgAA__8.GYKnl1m1p9DYoV4G8e7guCAXfIZblTzhcpUhjbliuX0',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',