centaline-data-driven 1.1.35 → 1.1.36

package/package.json

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

package/src/centaline/css/common.css

@@ -716,3 +716,8 @@ html {
 .el-card.is-always-shadow{
   box-shadow: none!important;
 }
+
+.domDisabled {
+  pointer-events: none;
+  opacity:0.4;
+}

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

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" style="width:100%">
-    <div v-if="model !== null && !loading" class="ct-form"  :class="{'tableDisabled':model.pageDisabled}">
+    <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
@@ -523,9 +523,3 @@
     }
   }
 </script>
-<style>
-.tableDisabled {
-    pointer-events: none;
-    opacity:0.4;
-  }
-</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="ct-search-list" :style="searchListStyle"> 
+  <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
     <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
           <span style="font-weight:bold">{{title}}</span>
     </div>
@@ -12,7 +12,7 @@
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
     <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
-    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable"
+    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
 </template>
@@ -72,6 +72,7 @@
         reloadKeyScreen:'s0',
         reloadKeyTable:'t0',
         isReload:false,
+        pageDisabled:false,
       }
     },
     methods: {
@@ -93,12 +94,16 @@
       },
       search(btn) {
         if (this.$refs.table.model) {
+          this.pageDisabled=true;
           this.$refs.table.getPage(1);
         }
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model);
         }
       },
+      searchComplate() {
+        this.pageDisabled=false;
+      },
       toolbarClickHandler(field, submitData) {
         if (field.isExport) {
           this.$refs.screen.model.export(field, submitData);

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

@@ -8,7 +8,6 @@
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
-
       <!--<el-row>
         <el-col v-for="(col, index) in model.screen" :key="index" :span="col.colspan" style="padding:10px" v-if="col.show !== false">
           <component :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
@@ -52,7 +51,7 @@
       screenPara: {
         type: Object,
         default: () => { }
-      }
+      },
     },
     data() {
       return {

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

@@ -332,6 +332,7 @@
             self.tableLoading = false;
             self.rowColorChange();
           }
+          self.$emit('searchComplate');
         }
         self.tableLoading = true;
         this.model.getPage(index, next);

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

@@ -4,12 +4,13 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-      <span>{{showLable==true?model.labelValue1:model.labelValue}}</span>
-      <i v-if="model.labelValue" class="el-icon-view" @click="onSensitiveEye($event)"></i>
+      <span class="eyelabel">{{showLable==true?model.labelValue1:model.labelValue}}</span>
+      <i v-if="model.labelValue" :class="[!showLable?'el-icon-view':'el-icon-eye']" @click="onSensitiveEye($event)"></i>
     </div>
   </div>
-  
+
 </template>
+
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
   export default {
@@ -33,7 +34,7 @@
       }
     },
     computed: {
-     
+
     },
     methods: {
       onSensitiveEye() {
@@ -54,8 +55,20 @@
   }
 </script>
 <style>
-  .el-icon-view {
+  .el-icon-view, .el-icon-eye {
     margin-left: 5px;
     font-size: 16px;
   }
+  .eyelabel {
+    width:80px;
+  }
+  .el-icon-eye:before {
+    background: url("../../../assets/icon-eye.png") no-repeat;
+    content: '';
+    display: block;
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    background-size: 16px;
+  }
 </style>