centaline-data-driven 1.5.40 → 1.5.42

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

@@ -226,7 +226,7 @@
                   </div>
                 </div>
                 <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
-                  :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false" 
+                  :pageHeight="model.appIDTags1=='Follow'?'675px':'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false" 
                   :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
                 </ct-searchlist>
               </div>
@@ -599,6 +599,7 @@ export default {
                 self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || "";
                 self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || "";
                 self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
+                self.model.appIDTags1 = self.model.tags1[i].appID || "";
               }
             }
           }
@@ -712,11 +713,10 @@ export default {
       this.model.activeIndex1 = i;
       if (this.model.tags1 && this.model.tags1[i]) {
         this.listKey = this.listKey + 1;
-        this.model.searchConditionApiTags1 =
-          this.model.tags1[i].searchConditionAction || "";
-        this.model.searchDataApiTags1 =
-          this.model.tags1[i].searchDataAction || "";
+        this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || "";
+        this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
+        this.model.appIDTags1 = this.model.tags1[i].appID || "";
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
@@ -728,12 +728,13 @@ export default {
       this.dropDownSelected = true;
       if (dropDownData && dropDownData[i]) {
         this.listKey = this.listKey + 1;
-        this.model.searchConditionApiTags1 =
-          dropDownData[i].searchConditionAction || "";
+        this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
         this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
-            //交换位置
-        let lastItemIndex = this.showData[0].length - 1;
+        this.model.appIDTags1 = dropDownData[i].appID || "";
+
+        //交换位置
+      let lastItemIndex = this.showData[0].length - 1;
        let lastItem = this.showData[0][lastItemIndex];
        this.showData[0][lastItemIndex]=col;
        this.showData[1][index]=lastItem;
@@ -1515,7 +1516,7 @@ export default {
             border-radius: 6px;
             display: flex;
             img {
-              width: 50px;
+              width: 37.5px;
               height: 50px;
               margin-right: 6px;
             }
@@ -1561,7 +1562,7 @@ export default {
         display: flex;
         margin-bottom: 16px;
         img {
-          width: 50px;
+          width: 37.5px;
           height: 50px;
           margin-right: 10px;
         }

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -125,7 +125,7 @@
               <div slot="label" v-html="col.appName"></div>
             </el-tab-pane>
           </el-tabs>
-          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1"
+          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1" :from="'simpleDetail'"
             :key="'list' + listKey.toString() + refershKey" :apiParam="model.paramDataTags1" :flagFocus="false"
             :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1"
             :flagAppMode="model.flagAppMode"></ct-searchlist>
@@ -266,7 +266,7 @@ export default {
       });
     },
     refreshPage() {
-      this.refreshKey = this.refreshKey + 1;
+      // this.refreshKey = this.refreshKey + 1;
       this.showIndex = 0;
       this.setDetailStyle();
     },

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

@@ -649,33 +649,33 @@
                 }
                 else {
                   if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                    //var tempwindow = window.open('about:blank');
-                    //tempwindow.location = field.action;
-                    if (field.action.indexOf("?") > -1) {
-                      self.downloadUrl = field.action + "&" + Math.random();
+                    if(field.action.indexOf(".zip") > -1){
+                      window.location.href = encodeURI(field.action);
                     }
-                    else {
-                      self.downloadUrl = field.action + "?" + Math.random();
+                    else{
+                      if (field.action.indexOf("?") > -1) {
+                        self.downloadUrl = field.action + "&" + Math.random();
+                      }
+                      else {
+                        self.downloadUrl = field.action + "?" + Math.random();
+                      }
                     }
-                    // document.body.addEventListener('click', function() {
-                    //   window.open(field.action, "_blank");
-                    // });
                   }
                   else {
                     field.doAction(submitData, (data) => {
                       if (data.content) {
                         if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                          //var tempwindow = window.open('about:blank');
-                          //tempwindow.location = data.content;
-                          if (data.content.indexOf("?") > -1) {
-                            self.downloadUrl = data.content + "&" + Math.random();
+                          if(data.action.indexOf(".zip") > -1){
+                            window.location.href = encodeURI(data.action);
                           }
-                          else {
-                            self.downloadUrl = data.content + "?" + Math.random();
+                          else{
+                            if (data.content.indexOf("?") > -1) {
+                              self.downloadUrl = data.content + "&" + Math.random();
+                            }
+                            else {
+                              self.downloadUrl = data.content + "?" + Math.random();
+                            }
                           }
-                          // document.body.addEventListener('click', function() {
-                          //   window.open(data.content, "_blank");
-                          // });
                         }
                         else {
                         }
@@ -989,7 +989,7 @@
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
               if (i === 0) {
-                if (f.model.is == "ct-file") {
+                if (f.model.is == "ct-file"||f.model.is == "ct-repeat") {
                   self.$message({
                     message: f.validMessage,
                     type: 'error',

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

@@ -20,6 +20,11 @@
               @click="viewerfile(photoList, index)"
             >
             </el-image>
+      <span class="cover-list-item-play" v-if="item.videoPlayIconUrl">
+              <div class="swiper-i" @click="viewerfile(photoList, index)"  >
+                <img :src="item.videoPlayIconUrl" class="hous-icon"/>
+              </div>
+            </span>
             <span
               class="cover-list-item-span-delete"
               v-if="!model.lock"
@@ -291,6 +296,32 @@ export default {
   position: sticky;
 }
 
+   
+ .ct-photoSelect  .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%);
+    }
+
 .ct-photoSelect .cover-list-item-span {
   position: inherit;
   bottom: 0px;

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

@@ -18,6 +18,11 @@
                       :z-index="previewZIndex"
                       @click="viewerfile(imageList, index)">
             </el-image> 
+            <span class="cover-list-item-play" v-if="item.videoPlayIconUrl">
+              <div class="swiper-i" @click="viewerfile(imageList, index)"  >
+                <img :src="item.videoPlayIconUrl" class="hous-icon"/>
+              </div>
+            </span>
             <span class="cover-list-item-span" v-if="item.mediaLabelName">
               <span class="el-dropdown-link">
                 &nbsp;{{ item.mediaLabelName }}
@@ -168,6 +173,32 @@
   .border-danger {
     border: 1px solid red !important;
   }
+ 
+ .ct-photoSelectList .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%);
+    }
+
   .ct-photoSelectList .cover-list-item-span {
     position: inherit;
     bottom: 0px;