centaline-data-driven 1.3.8 → 1.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.08",
+  "version": "1.3.11",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/browseIframe/src/browseIframe.vue

@@ -18,12 +18,12 @@
     },
     methods: {
       sendMessage () {
-        let deviceID= this.getCookie("DeviceID");
+        let token= this.getCookie("token");
         this.$refs.iframe.contentWindow.postMessage({
           functionName: 'cookie',
           params:  {
             success: true,
-            data: deviceID || 'XXXXXXXXXXX',
+            data: token,
           }
         }, '*');
       },

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

@@ -28,26 +28,33 @@
           ></template>
         </el-carousel>
 
-        <div class="hous-img" style="position: absolute; bottom: 0; z-index: 9">
-          <div
-            class="img-i"
-            v-for="(item, index) in newMediaAlbums"
-            :key="index"
-          >
-            <img :src="getDefaultUrl(item)" @click="handleClick(index)" />
-            <div class="img-bot">
-              <div>
-                <img
-                  :src="item.albumSmallImageUrl"
-                  v-if="
-                    item.albumSmallImageUrl && item.albumSmallImageUrl != ''
-                  "
-                  alt=""
-                  class="img-icon"
-                  @click="handleClick(index)"
+        <div
+          class="hous-img"
+          style="position: absolute; bottom: 0; z-index: 9"
+          v-if="newMediaAlbums.length > 1"
+        >
+          <div class="img-i">
+            <div class="slide-tabs tabs-3x">
+              <template v-for="(item, index) in newMediaAlbums">
+                <input
+                  type="radio"
+                  :id="'radio-' + index.toString()"
+                  name="MediaAlbums"
+                  :label="index"
+                  :value="index"
+                  :key="index + 1"
+                  v-model="activeAlbumsIndex"
                 />
-                <span @click="handleClick(index)">{{ item.albumName }}</span>
-              </div>
+                <label
+                  class="tab1"
+                  :for="'radio-' + index.toString()"
+                  :label="index"
+                  :value="index"
+                  @click="handleClick(index)"
+                  >{{ item.albumName }}</label
+                >
+              </template>
+              <span class="glider"></span>
             </div>
           </div>
         </div> </template
@@ -78,7 +85,7 @@ export default {
   methods: {
     init() {
       var self = this;
-      this.newMediaAlbums =this.mediaAlbums || [];
+      this.newMediaAlbums = this.mediaAlbums || [];
       this.albumsList = this.newMediaAlbums[0];
       self.$forceUpdate();
     },
@@ -175,35 +182,88 @@ export default {
   .hous-img {
     margin-top: 10px;
     width: 100%;
+    text-align: center;
     overflow-x: hidden;
     overflow-y: hidden;
     white-space: nowrap;
+    background-color: rgb(255 255 255);
+    opacity: 0.8;
     .img-i {
-      position: relative;
-      width: 80px;
-      height: 44px;
-      margin-right: 10px;
+      width: auto;
+      height: 20px;
       display: inline-block;
+      opacity: 0.8;
+      //background-color: rgba(0, 0, 0, 0.5);
+      -webkit-border-radius: 13px;
+      -moz-border-radius: 13px;
+      border-radius: 13px;
       img {
         width: 100%;
         height: 100%;
       }
-      .img-bot {
-        width: 100%;
-        height: 16px;
-        background: rgba(0, 0, 0, 0.5);
-        color: #fff;
-        position: absolute;
-        bottom: 0;
-        font-weight: Bold;
-        .img-icon {
-          width: 12px;
-          height: 12px;
-          margin: 0 5px;
-          margin: 0 5px;
-          vertical-align: -1.5px;
-        }
-      }
+    }
+
+    .slide-tabs {
+      display: flex;
+      position: relative;
+      border: 1px solid rgb(24 24 24);
+      border-radius: 10px;
+      width: auto;
+      overflow: hidden;
+      font-weight: Bold;
+      opacity: 1;
+      background: rgb(24 24 24);
+    }
+
+    .slide-tabs * {
+      z-index: 2;
+    }
+
+    .slide-tabs input[type="radio"] {
+      display: none;
+    }
+
+    .slide-tabs .tab1 {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 9px;
+      height: 18px;
+      font-size: 12px;
+      color: #fff;
+      cursor: pointer;
+    }
+
+    .slide-tabs .glider {
+      display: flex;
+      position: absolute;
+      border-radius: 9px;
+      height: 18px;
+      background: #f73638;
+      z-index: 1;
+      transition: 0.25s ease-out;
+    }
+    /*降低 z-index */
+
+    .slide-tabs input[type="radio"]:checked + label {
+      color: #fff;
+    }
+    /*按需修改当前项颜色*/
+    .slide-tabs input[type="radio"]:nth-of-type(1):checked ~ .glider {
+      transform: translateX(0%);
+    }
+
+    .slide-tabs input[type="radio"]:nth-of-type(2):checked ~ .glider {
+      transform: translateX(100%);
+    }
+
+    .slide-tabs input[type="radio"]:nth-of-type(3):checked ~ .glider {
+      transform: translateX(200%);
+    }
+
+    .slide-tabs.tabs-3x .tab1,
+    .slide-tabs.tabs-3x .glider {
+      width: 50px;
     }
   }
 }

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

@@ -1,12 +1,13 @@
 <template>
     <div>
       <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" :top="top" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'" 
-      @loaded="loaded"></ct-PropertyDetailOFI>
+      @loaded="loaded" @scrollHandle="scrollHandle" ></ct-PropertyDetailOFI>
+
       <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" :top="top" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'" 
-      @loaded="loaded"></ct-PropertyDetailRET>
+      @loaded="loaded" @scrollHandle="scrollHandle" ></ct-PropertyDetailRET>
+      
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
-      @loaded="loaded"
-      @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
+      @loaded="loaded" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
     </div>
 </template>
@@ -57,6 +58,9 @@
         //通知父组件加载完成
         this.$emit('loaded',model);
       },
+      scrollHandle(scrollTop,scrollLeft){
+        this.$emit('scrollHandle',scrollTop,scrollLeft)
+      },
     }
   }
 </script>

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

@@ -184,9 +184,7 @@
           </div>
         </div>
       </div>
-      <div
-        ref="detail"
-        class="details-mid y-auto"
+      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)"
         :style="{
           height: model.detailHeight ? model.detailHeight + 'px' : '780px',
         }"
@@ -983,41 +981,36 @@ export default {
     clickNextHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, 1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
-          let parm = this.apiParam;
+          let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
-          this.loaderObj.Detail(this.api, parm, this.load);
+          // this.loaderObj.Detail(this.api, parm, this.load);
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetailRET(parm,this.parentModel);
         }
       }
     },
     clickPrevHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, -1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
-          let parm = this.apiParam;
+          let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
-          this.loaderObj.Detail(this.api, parm, this.load);
+          // this.loaderObj.Detail(this.api, parm, this.load);
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetailRET(parm,this.parentModel);
         }
       }
     },
+    scrollHandle(ev) {   
+      this.$emit('scrollHandle',this.$refs.detail.scrollTop,this.$refs.detail.scrollLeft)
+      ev.cancelBubble = true;
+      ev.stopPropagation();
+    },
   },
 };
 </script>

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

@@ -168,7 +168,7 @@
             }
           }
         }
-        this.loadOperation();
+        // this.loadOperation();
         this.setDetailStyle();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {

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

@@ -182,9 +182,9 @@ export default {
         MediaAlbum[0].medias.push(v);
       });
       var index = MediaAlbum[0].medias.findIndex(
-        (v) => v.mediaID === file.source.mediaID
+        (v) => (v === file.source)
       );
-      debugger;
+      
       var width = parseInt(window.document.body.clientWidth * 0.8);
       var height = parseInt(window.document.body.clientHeight * 0.8);
       width = width > 1160 ? 1160 : width;

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

@@ -14,7 +14,7 @@
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
-      @rowClickHandle="rowClickHandle" 
+      @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
@@ -277,6 +277,9 @@
       saveShortcut(){
         this.$refs.table.getPage(1);
       },
+      scrollHandle(scrollTop,scrollLeft){
+        this.$emit('scrollHandle',scrollTop,scrollLeft)
+      },
     }
   }
 </script>

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

@@ -510,7 +510,6 @@
           }
         }
 
-        //debugger
         //let index = this.model.listData.length - 1;
         //let isSet = false;
         //for (; index >= 0; index--) {
@@ -594,6 +593,7 @@
             });
           }
         }
+        this.$emit('scrollHandle',this.$refs.tableParent.scrollTop,this.$refs.tableParent.scrollLeft)
         ev.cancelBubble = true;
         ev.stopPropagation();
       },

package/src/centaline/dynamicSensitiveEye/src/dynamicSensitiveEye.vue

@@ -32,6 +32,7 @@
       else {
         this.model = this.vmodel;
       }
+     
     },
     computed: {
 
@@ -60,7 +61,7 @@
     font-size: 16px;
   }
   .eyelabel {
-    width:80px;
+    min-width:80px;
   }
   .el-icon-eye:before {
     background: url("../../../assets/icon-eye.png") no-repeat;

package/src/centaline/dynamicTab/index.js

@@ -9,3 +9,4 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default dynamicTab;
+ 

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

@@ -446,9 +446,9 @@ html {
 .magnify-toolbar {
   display: inline-block;
   background-color: rgba(0, 0, 0, 0.5);
-  -webkit-border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
 }
 .magnify-toolbar .magnify-btn {
   margin: 15px 20px;
@@ -460,7 +460,9 @@ html {
 .magnify-btn-close:hover {
   color: #fff;
 }
-
+.viewerMenu{
+  border-right: solid 2px #e6e6e6 !important;
+}
 .viewerMenu .el-submenu__title,
 .viewerMenu .el-submenu .el-menu-item {
   height: 30px;

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

@@ -39,10 +39,9 @@ const SensitiveEye = function (source) {
     getOptions(paramsAction, extraData) {
       var self = this;
       var apiAddrs = paramsAction || this.api;
-      console.log(extraData);
       if (extraData=="") {
         extraData = rtn.getFormRefFieldPara();
-      } 
+      }
       var params = {
         action: apiAddrs,
         para: {