centaline-data-driven 1.1.32 → 1.1.36

package/build/centaline/centaline.path.js

@@ -34,6 +34,7 @@ const paths = {
     "dynamicPlaceHolder": "./src/centaline/dynamicPlaceHolder/index.js",//占位控件
     "dynamicDetail": "./src/centaline/dynamicDetail/index.js",//详情页控件
     "dynamicTree": "./src/centaline/dynamicTree/index.js",//树组件
+    "dynamicSensitiveEye": "./src/centaline/dynamicSensitiveEye/index.js",////敏感数据小眼睛控
     "progress": "./src/centaline/progress/index.js",//进度条
   },
   "plugs": {

package/package.json

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

package/src/SearchTree.vue

@@ -1,13 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;">
-    <el-container style="height: 100vh;width:100vw; border: 1px solid #eee">
-      <el-aside width="200px" style="background-color: rgb(238, 241, 246);border-radius:6px;">
-        <ct-tree :flagsearch="true" :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getList'" @loaded="loaded"></ct-tree>
-      </el-aside>
-      <el-main v-if="isShowSearchlist">
-        <ct-searchlist :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getList'" :api-param="apiParam"></ct-searchlist>
-      </el-main>
-    </el-container>
+    <ct-treelist :flagsearch="true" :apiParam="apiParam"
+    :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" 
+    :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
   </div>
 </template>
 

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/css/max.css

@@ -189,4 +189,7 @@
   }
   .ct-so .ct-input_inner,.el-input__inner{
       border-radius: 6px!important;
+  }
+  .ct-radios .ct-font-size-mini .el-radio-button__inner{
+      padding: 5px 10px;
   }

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/dynamicSearchCategory.vue

@@ -3,7 +3,7 @@
       ]">
     <div style="flex:1;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">        
-        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1em;height: 1em;fill: currentColor;
+        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;
     overflow: hidden;vertical-align: middle;"/>
         {{model.label}}
       </div>
@@ -77,17 +77,18 @@
 }
   .ct-searchcategory .el-input-group__prepend{
     text-align: left;
-    color:#EE6B6B;
+    padding-left: 0px!important;
+    color: #ee6b6b !important;
     font-weight: Bold;
     text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
-    font-size: 20px;
+    font-size: 16px;
     vertical-align: middle;
   }
   .ct-searchcategory .ct-radios {
     color: #606266;
     border-radius: 4px;
     /*border: 1px solid #dcdfe6;*/
-    line-height: 40px;
+    line-height: 30px;
     padding-left: 15px;
     text-align: right;
   }

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

@@ -1,18 +1,18 @@
 <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>
     <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
     @changeCategory="categorychange" ></ct-searchcategory>
 
-    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKey"
+    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
     @loaded="screenLoaded" :screenPara="screenPara" 
     :categoryLoaded="loaded.categoryLoaded" @search="search()" 
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
     <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
-    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKey"
+    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
 </template>
@@ -69,7 +69,10 @@
         showTitle:false,
         screenPara:null,
         reloadKey:0,
+        reloadKeyScreen:'s0',
+        reloadKeyTable:'t0',
         isReload:false,
+        pageDisabled:false,
       }
     },
     methods: {
@@ -86,15 +89,21 @@
       categorychange(param) {
         if(param)this.screenPara=param;
         this.reloadKey = this.reloadKey+1;
+        this.reloadKeyScreen='s'+this.reloadKey;
+        this.reloadKeyTable='t'+this.reloadKey;
       },
       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>
@@ -45,11 +44,14 @@
     props: {
       api: String,
       vmodel: Object,
-      categoryLoaded:Boolean,
+      categoryLoaded:{
+        type:Boolean,
+        default:true
+      },
       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>

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -49,6 +49,10 @@
     padding-left: 0px;
     padding-right: 4px;
     cursor: pointer;
+    color: #388cd3;
+  }
+  .ct-tablecurrencyItem:hover{
+    color: #23527c;
   }
   .ct-tablecurrencyImg {
     width: 24px;