centaline-data-driven 1.4.20 → 1.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.20",
+  "version": "1.4.22",
   "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/dynamicCb/src/dynamicCb.vue

@@ -53,6 +53,7 @@
       },
       changeCheckBoxHandler: function (event) {
         this.changeHandler();
+        if(this.model.autoSearch) this.$emit('click');
       }
     }
   }

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

@@ -38,9 +38,9 @@
             <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">
+             <span class="cover-list-item-play" v-if="file.videoPlayIconUrl ">
               <div class="swiper-i">
-                <img :src="model.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
               </div>
             </span>
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
@@ -116,9 +116,9 @@
             <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">
+           <span class="cover-list-item-play" v-if="file.videoPlayIconUrl && file.mediaTypeID==4">
               <div class="swiper-i">
-                <img :src="model.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
               </div>
             </span>
 

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -9,7 +9,7 @@
       </div>
 
       <div ref="highlights" v-if="model.forbiddenWords" class="backdrop" :style="{width:forbiddenWordsWidth+'px',height:forbiddenWordsHeight+'px',left:forbiddenWordsLeft+'px',top:forbiddenWordsTop+'px'}">
-        <div  class="highlights" v-html="forbiddenWordsValue"></div>
+        <div class="highlights" v-html="forbiddenWordsValue"></div>
       </div>
 
       <el-popover v-if="model.autoFill && model.paramName" placement="bottom-start" v-model="showDrop" :trigger="'manual'" class="autoFill">
@@ -281,6 +281,7 @@
   color: transparent;
   padding: 5px 15px 5px 15px;
   line-height: 1.5;
+  font-family: monospace;
 }
 .autoFill{
   width: 100%;

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 = {
@@ -27,10 +27,7 @@ const box = function (source, fileSourceList, router, optionApi) {
       },
       get mediaViewPageType() {
         return data.mediaViewPageType;
-      },
-      get videoPlayIconUrl() {
-        return data.videoPlayIconUrl;
-      },
+      }, 
       _fileList: [],
       get fileList() {
         if (this._fileList.length !== 0) {
@@ -230,6 +227,9 @@ const box = function (source, fileSourceList, router, optionApi) {
           get fileExtension() {
             return fileSource.fileExtension;
           },
+          get videoPlayIconUrl() {
+            return (fileSource.videoPlayIconUrl || videoPlayIconUrl);
+          },
         }
 
         return fileData;
@@ -258,7 +258,7 @@ const box = function (source, fileSourceList, router, optionApi) {
           Vue.set(file, "mediaLabelID", data.mediaLabelID);
           Vue.set(file, "mediaLabelName", data.mediaLabelName);
           Vue.set(file, "fileExtension", data.fileExtension);
-
+          Vue.set(file, "videoPlayIconUrl", data.videoPlayIconUrl);
           Vue.set(file, "progressFlag", false);
           Vue.set(file, "loadProgress", 100);
 
@@ -292,6 +292,7 @@ const box = function (source, fileSourceList, router, optionApi) {
           "progressFlag": true,
           "loadProgress": 0,
           "uid": file.uid,
+          "videoPlayIconUrl":""
         }
         rtn.fileList.push(awaitfile);
       },
@@ -322,7 +323,7 @@ const box = function (source, fileSourceList, router, optionApi) {
             Vue.set(file, "mediaLabelID", data.mediaLabelID);
             Vue.set(file, "mediaLabelName", data.mediaLabelName);
             Vue.set(file, "fileExtension", data.fileExtension);
-
+            Vue.set(file, "videoPlayIconUrl", data.videoPlayIconUrl);
             Vue.set(file, "progressFlag", data.progressFlag);
             Vue.set(file, "loadProgress", data.loadProgress);
           }
@@ -350,6 +351,7 @@ const box = function (source, fileSourceList, router, optionApi) {
             fileExtension: data.fileExtension,
             progressFlag: data.progressFlag,
             loadProgress: data.loadProgress,
+            videoPlayIconUrl:data.videoPlayIconUrl,
             "uid": file.uid,
           })
         }

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"}',