centaline-data-driven 1.3.10 → 1.3.13

package/package.json

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

package/src/SearchList.vue

@@ -4,15 +4,15 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+    <!-- <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
-    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist>
+    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+                   ></ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/max.css

@@ -248,7 +248,6 @@
 .max.el-button.el-button--mini{
     height: 26px;
 }
-.ct-text .showLabel label{
-    display: inline-block;
+.ct-text .showLabel label{ 
     line-height: 27px!important;
   }

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

@@ -186,12 +186,11 @@ export default {
     overflow-x: hidden;
     overflow-y: hidden;
     white-space: nowrap;
-    background-color: #fff;
+    background-color: rgb(255 255 255);
     opacity: 0.8;
     .img-i {
       width: auto;
       height: 20px;
-      margin-right: 10px;
       display: inline-block;
       opacity: 0.8;
       //background-color: rgba(0, 0, 0, 0.5);
@@ -202,73 +201,70 @@ export default {
         width: 100%;
         height: 100%;
       }
+    }
 
-       
+    .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 {
-  display: flex;
-  position: relative;
-  border: 1px solid #3d3d3d;
-  border-radius: 10px;
-  width: auto;
-  overflow: hidden;
-  font-weight: Bold;
-  opacity:1;
-  background: rgb(24 24 24);
-}
 
-.slide-tabs * {
-  z-index: 2;
-}
+    .slide-tabs * {
+      z-index: 2;
+    }
 
-.slide-tabs input[type="radio"] {
-  display: none;
-}
+    .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 .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 .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"]: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(2):checked ~ .glider {
+      transform: translateX(100%);
+    }
 
-.slide-tabs input[type="radio"]:nth-of-type(3):checked ~ .glider {
-  transform: translateX(200%);
-}
+    .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;
-}
+    .slide-tabs.tabs-3x .tab1,
+    .slide-tabs.tabs-3x .glider {
+      width: 50px;
+    }
   }
 }
-
 </style>

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',
         }"
@@ -1008,6 +1006,11 @@ export default {
         }
       }
     },
+    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/dynamicForm/src/dynamicForm.vue

@@ -39,7 +39,7 @@
           <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index" :disabled="item.lock" :class="item.lock?'ct-collapse-item-title':''">
             <template slot="title">
               <i class="sign"></i>
-              {{item.label}}
+              <span :class="[item.labelClass]">{{item.label}}</span>
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
@@ -591,7 +591,12 @@
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
               if(i===0 && f.model.label){
-                self.$message.error('【'+f.model.label+'】不能为空！');
+                if(f.model.is=="ct-file"){
+                  self.$message.error(f.validMessage);
+                }
+                else{
+                  self.$message.error('【'+f.model.label+'】不能为空！');
+                }
               }
               i++;
 

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();
       },
@@ -1272,7 +1272,7 @@
     border-bottom: 1px solid #ebeef5;
     width: 100%;
     outline: 0;
-    border-top: 1px solid #fff;
+   border-top: 1px solid #ebeef5;
   }
 
   .ct-searchtable .ct-table {
@@ -1282,7 +1282,7 @@
 
     .ct-searchtable .ct-table th {
       background-color: #f4f7fa !important;
-      border-top: 1px solid #ebeef5;
+      
     }
 
   .ct-searchtable .ct-tr > .ct-td {