centaline-data-driven 1.4.19 → 1.4.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.19",
+  "version": "1.4.21",
   "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="'/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyTrust/getLayoutOfNewZJJ'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "originalTraId":"1594610564600369153","actionType":3,"pageStyle":2,"pageTitle":"修改成交单","pageOnly":true
+          chanceID: "1569617379699331072", actionType: 2
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -12,8 +12,8 @@
     </ct-searchlist> -->
 
     <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/PropertyRETList/getLayoutOfSearchForCustomerReqMatch'" 
-      :searchDataApi="'/PropertyRETList/getListOfSearchModel'">
+      :searchConditionApi="'/PropertyTrustList/getLayoutOfSearch'" 
+      :searchDataApi="'/PropertyTrustList/getListOfSearchModel'">
     </ct-searchlist>
 
     <!-- <ct-searchlist 
@@ -45,7 +45,7 @@
     data() {
       return {
         para:{
-          customerReqID:'D113B951-0BF0-428E-BE73-584BAC0D0044'
+          chanceID: "1569617379699331072"
         },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}

package/src/centaline/common/index.js

@@ -288,32 +288,37 @@ const common = {
       this.openDialog(dialogOption);
     })
   },
-  viewerfile(pageTitle, MediaAlbum, groupIndex, index) {
-    var self = this;
-    var width = parseInt(window.document.body.clientWidth * 0.8);
-    width = width > 1160 ? 1160 : width;
-    return new Promise((resolve, reject) => {
-      var dialogOption = {
-        title: pageTitle,
-        name: 'ct-viewerfile',
-        content: [{
-          component: 'ct-viewerfile',
-          attrs: {
-            showTitle: false,
-            MediaAlbum: MediaAlbum,
-            groupIndex: groupIndex || 0,
-            index: index || 0,
-            // width: self.modelPhotoselect.router.pageWidth + 'px',
-            // height: self.modelPhotoselect.router.pageHeight+'px',
-            width: width + "px",
-            height: parseInt(window.document.body.clientHeight * 0.8).toString() +
-              "px"
-          },
-          on: {}
-        }]
-      };
-      this.openDialog(dialogOption);
-    })
+  viewerfile(pageTitle, MediaAlbum, groupIndex, index,mediaViewPageType) {
+    if (mediaViewPageType &&mediaViewPageType ==2) { 
+      common.getDataDrivenOpts().handler.openTabviewerFile(pageTitle, MediaAlbum, groupIndex, index);
+    }
+    else
+    {
+      var width = parseInt(window.document.body.clientWidth * 0.8);
+      width = width > 1160 ? 1160 : width;
+      return new Promise((resolve, reject) => {
+        var dialogOption = {
+          title: pageTitle,
+          name: 'ct-viewerfile',
+          content: [{
+            component: 'ct-viewerfile',
+            attrs: {
+              showTitle: false,
+              MediaAlbum: MediaAlbum,
+              groupIndex: groupIndex || 0,
+              index: index || 0,
+              width: width + "px",
+              height: parseInt(window.document.body.clientHeight * 0.8).toString() +
+                "px"
+            },
+            on: {}
+          }]
+        };
+        this.openDialog(dialogOption);
+      });
+    }
+
+
   },
 
   /**

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

@@ -810,13 +810,14 @@ export default {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
           if (field.isBrowseAttachment) {//浏览附件
+            var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               var vsubmitData = {
                 ...field.getActionPara(submitData).para,
@@ -828,7 +829,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
             }
           }
           else if (field.isOpenForm) {

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

@@ -799,14 +799,15 @@ export default {
           // if (typeof field.onClick !== 'undefined') {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
-          if (field.isBrowseAttachment) {//浏览附件
+          if (field.isBrowseAttachment) {//浏览附件       
+            var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               } 
               var vsubmitData = {
                 ...field.getActionPara(submitData).para,
@@ -818,7 +819,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
             }
           }
           else if (field.isOpenForm) {

package/src/centaline/dynamicDtd/src/dynamicDtd.vue

@@ -90,6 +90,7 @@
       },
       load(data) {
         this.model = data;
+        this.model.self=this;
       },
       changeModel(event) {
         this.inputHandler(event);

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

@@ -37,6 +37,11 @@
             </span>
             <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="model.videoPlayIconUrl && file.mediaTypeID==4">
+              <div class="swiper-i">
+                <img :src="model.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+              </div>
             </span>
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
               <!--锁定-->
@@ -111,6 +116,12 @@
             <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="model.videoPlayIconUrl && file.mediaTypeID==4">
+              <div class="swiper-i">
+                <img :src="model.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+              </div>
+            </span>
+
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
               <!--锁定-->
               <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
@@ -236,7 +247,7 @@
         var index = MediaAlbum[0].medias.findIndex(
           (v) => (v === file.source)
         ); 
-      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index); 
+      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index,self.model.mediaViewPageType); 
       },
       getPreviewSrcList(file) {
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
@@ -580,4 +591,29 @@
     background: #409eff ;
 }
   
+  .ct-file .cover-list-item-play{
+  position: inherit;
+    bottom: 50%;
+    display: block;
+    opacity: 0.8;
+    left: 50%;
+}
+.swiper-i {
+    position: relative;
+    width: 100%;
+    height: 100%; 
+  }
+  .swiper-i img {
+      width: 100%;
+      height: 100%;
+    }
+    .swiper-i .hous-icon {
+      width: 48px;
+      height: 48px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+ 
 </style>

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

@@ -54,23 +54,20 @@
     </div>
     <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
       {{ validMessage }}
-    </div>
-    <ct-viewer ref="photoSelectViewer" />
+    </div> 
   </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import dynamicElement from "../../mixins/dynamicElement";
-import Enum from "../../loader/src/ctl/lib/Enum";
-import dynamicViewer from "../../dynamicViewer/src/dynamicViewer.vue";
+import Enum from "../../loader/src/ctl/lib/Enum"; 
 
 export default {
   name: "ct-photoselect",
   mixins: [dynamicElement],
   components: {
-    draggable: draggable,
-    "ct-viewer": dynamicViewer,
+    draggable: draggable, 
   },
   props: {
     vmodel: Object,
@@ -151,6 +148,7 @@ export default {
               api: self.modelPhotoselect.action, //  self.api,//source.xx
               showTitle: false,
               Selected: chooseList,
+              mediaViewPageType:(self.model.source.mediaViewPageType||0),
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
               width: "772px",
@@ -183,22 +181,8 @@ export default {
         ],
       };
       self.$common.openDialog(dialogOption);
-    },
-    viewerOpen(list, index) {
-      debugger
-      var showList = [];
-      var viewerList = [];
-      list.forEach((v) => {
-        showList.push(v.mediaUrl);
-        viewerList.push({ url: v.mediaUrl, title: v.mediaLabelName });
-      });
-      this.$refs.photoSelectViewer.open(showList, index, viewerList);
-
-      self.$common.viewerfile((this.title || "预览媒体"), this.newMediaAlbums, this.activeAlbumsIndex, (index || 0));
-
-
-    },
-  viewerfile(list,index) {
+    }, 
+    viewerfile(list,index) {
         var self = this;
         var MediaAlbum = [{ albumName: this.model.label || "媒体", medias: [] }];
 
@@ -208,9 +192,8 @@ export default {
         fileList.forEach((v) => {
           MediaAlbum[0].medias.push(v);
         });
-      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index); 
-      },
-
+      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index,this.model.source.mediaViewPageType); 
+    },
     onEnd(a, b) {
       var self = this;
       self.$nextTick(function () {

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -16,7 +16,7 @@
                       :src="item.thumbnailUrl"
                       style="width: 100px; height: 100px"
                       :z-index="previewZIndex"
-                      @click="viewerOpen(imageList, index)">
+                      @click="viewerfile(imageList, index)">
             </el-image> 
             <span class="cover-list-item-span" v-if="item.mediaLabelName">
               <span class="el-dropdown-link">
@@ -37,28 +37,22 @@
 
     <div style="width:100%;text-align:center">
       <el-button type="primary" style="position:absolute;bottom:30px;" @click="handleClick()">选择</el-button>
-    </div>
-    <ct-viewer ref="photoSelectListViewer" />
-
+    </div> 
   </div>
 
 </template>
 
 <script>
-
-  import dynamicViewer from '../../dynamicViewer/src/dynamicViewer.vue';
-
+ 
   import dynamicElement from '../../mixins/dynamicElement'
   export default {
     name: 'ct-photoSelectList',
-    mixins: [dynamicElement],
-    components: { 
-      'ct-viewer': dynamicViewer,
-    },
+    mixins: [dynamicElement], 
     props: {
       Selected: Array,
       api: String, 
       para: Object,
+      mediaViewPageType:Number
     },
     data() {
       return {
@@ -142,17 +136,19 @@
         } else {
           this.$message.warning("请选择至少一张图片");
         }
-        
       },
-      viewerOpen(list, index) {
-        var showList = [];
-        var viewerList = [];
-        list.forEach((v) => {
-          showList.push(v.mediaUrl);
-          viewerList.push({ url: v.mediaUrl, title: v.mediaLabelName });
+      viewerfile(list,index) {
+        var self = this;
+        var MediaAlbum = [{ albumName: this.model.label || "媒体", medias: [] }];
+
+        let fileList =list.filter((item) => {
+          return item.flagDeleted !== true;
         });
-        this.$refs.photoSelectListViewer.open(showList, index, viewerList);
-      }
+        fileList.forEach((v) => {
+          MediaAlbum[0].medias.push(v);
+        });
+      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index,this.mediaViewPageType); 
+      }, 
     }
   }
 </script>

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

@@ -881,13 +881,14 @@ export default {
             self.$common.browseVideo(field, submitData);
           }
           else if (field.isBrowseAttachment) {//浏览附件
+            var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               self.model.getAction(field.action, submitData, callback);
             }
@@ -895,9 +896,9 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
             }
-          }
+         }
           else if (field.isUrlInLayer) {//URL页面（弹层iframe）
             var dialogOption = {
               title: field.pageTitle,

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -89,13 +89,14 @@ export default {
             self.$common.browseVideo(field, submitData);
           }
           else if (field.isBrowseAttachment) {//浏览附件
+            var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               self.model.getAction(field.action, submitData, callback);
             }
@@ -103,7 +104,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
             }
           }
           else if (field.isUrlInLayer) {//URL页面（弹层）

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

@@ -5,7 +5,7 @@ import Vue from 'vue';
 import common from '../../../common';
 import valid from '../../../validate/index';
 //元数据、附件列表元数据、对应router、下拉框数据api
-const box = function (source, fileSourceList, router, optionApi) {
+const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl) {
   var self = this;
   var init = function (data) {
     var rtn = {
@@ -25,6 +25,12 @@ const box = function (source, fileSourceList, router, optionApi) {
       get fileAccept() {
         return data.fileAccept1;
       },
+      get mediaViewPageType() {
+        return data.mediaViewPageType;
+      },
+      get videoPlayIconUrl() {
+        return videoPlayIconUrl;
+      },
       _fileList: [],
       get fileList() {
         if (this._fileList.length !== 0) {

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

@@ -96,18 +96,23 @@ const Mo = function (source, moreActionRouter) {
       });
       this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
     },
-    //searchObj: {
-    //  get searchValue1() {
-    //    var rtnStr = "";
-    //    rtn.value.forEach((v1, i1) => {
-    //      rtnStr += "'" + v1 + "'";
-    //      if (i1 !== rtn.value.length - 1) {
-    //        rtnStr += ",";
-    //      }
-    //    });
-    //    return rtnStr;
-    //  }
-    //},
+    searchObj: {
+     get searchValue1() {
+       var rtnStr = "";
+       rtn.value.forEach((v1, i1) => {
+        if(source.searchDataType && source.searchDataType===2){
+          rtnStr += v1;
+        }
+        else{
+         rtnStr += "'" + v1 + "'";
+        }
+        if (i1 !== rtn.value.length - 1) {
+          rtnStr += ",";
+        }
+       });
+       return rtnStr;
+     }
+    },
     attrs: {
       style: {
         width: '100%'

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

@@ -309,7 +309,7 @@ const LibFunction = {
             }
           })
         }
-        item = File(field, files, router, source.parameterAction);
+        item = File(field, files, router, source.parameterAction,source.videoPlayIconUrl);
         item.is = 'ct-file';
         break;
       case Enum.ControlType.PhotoSelect: //图片选择

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzrEOwjAMBNB_8VxLdWKcpBtNy8JHVIkSpDIh2kogxL-TId2684Ybbrn7wLJF6MBUeBC7yVV4ELuJiJ0hGfHsjEcW1mjJW_Qsni_DqH0_QAP59YCORJxY4ZYbmMNai7Yoxbbk5zW__3Huvs5lNqSgFN0UBiuCnAKhO8WI0eUcI6uUk4bvDwAA__8.7hkTnbfWX2X-x8TQqtnB1Va0K3FyZSL7ajbd0TdZds8',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbKOmt7nQ6c0HCIyLGNFCqUjwRC3B0QSZeeKaaY5r0nTEsPNdgV3NFG51ZwRxsdETtLpsWDsx7ZcIVCXtCz8Xxq2sofGygg329QkzFOrNhSFzCE-ResU9U3LFMez_nxj3PXefjMqkvUQUeFQVJG7lmjaEeYSgkmMFMsE7zeAAAA__8.ukJUtoKA3fqRkflees-rsM7t4LslfhjU0h3vZfHlOgs',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',