centaline-data-driven 1.1.31 → 1.1.35

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.31",
+  "version": "1.1.35",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getList'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

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,4 +716,3 @@ html {
 .el-card.is-always-shadow{
   box-shadow: none!important;
 }
-

package/src/centaline/css/max.css

@@ -46,6 +46,7 @@
 .max-btn-add button{ /*list-button*/
     height: 26px;
     background: #EE6B6B;
+    border-color:#EE6B6B;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }
@@ -140,6 +141,11 @@
     height:6px;
     background-color:#f1f1f1
 }
+.st-serach-screen::-webkit-scrollbar,.max-seachpopper::-webkit-scrollbar{
+    display: block;
+    width:4px;
+    height:6px;
+}
 .ct-table .cell:last-child{
     white-space: nowrap;
 }
@@ -183,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/dynamicFormListTable.vue

@@ -28,6 +28,9 @@
                              @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <!--<span v-else>{{scope.row[v.id].labelValue}}</span>-->
+                <span v-else-if="v.is=='ct-sensitiveeye'">
+                  <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
+                </span>
                 <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
@@ -127,6 +130,7 @@
       },
       //修改
       saveRow(row, index, isCancel) {
+        console.log(row);
         let app = this;
         if (app.model.dialogEdit) {
           this.editRow(row.$sourceIndex);

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

@@ -0,0 +1,115 @@
+<template>
+  <div style="width:100%;display:flex" v-if="model !== null" class="ct-searchcategory" :class="[model.attrs.size?'ct-searchcategory-'+model.attrs.size:''
+      ]">
+    <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: 1.3em;height: 1.3em;fill: currentColor;
+    overflow: hidden;vertical-align: middle;"/>
+        {{model.label}}
+      </div>
+      <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
+        <el-radio-group v-model="model.value" @change="changeHandler1($event)">
+          <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
+                    :label="value[model.optionAttrs.value]" :disabled="model.lock">
+            {{value[model.optionAttrs.label]}}
+          </el-radio-button >
+        </el-radio-group>
+      </div>
+    </div>
+    <span v-show="!valid" class="errorMessage">
+      {{validMessage}}
+    </span>
+  </div>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-searchcategory',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+      };
+    },
+    mounted() {
+      var self = this;
+      this.$nextTick(function () {        
+        if (self.vmodel) {
+          self.load(self.vmodel);
+        }
+        else if (typeof self.source !== 'undefined') {
+          self.loaderObj.SearchCategory(self.source,self.load);
+        }
+        else if (typeof self.api !== 'undefined') {
+          self.loaderObj.SearchCategory(self.api, self.load);
+        }
+      });
+    },
+    methods: {
+      load(data) {
+        this.model = data;
+        let parm={};
+        parm[this.model.id]=this.model.value;
+        this.$emit('loadedCategory',parm);
+      },
+      clearClickHandle: function (event) {
+        this.model.value = '';
+        this.inputHandler(this.model.value);
+        this.changeHandler(this.model.value);
+      },
+      changeHandler1: function (event) {
+        this.inputHandler(this.model.value);
+        this.changeHandler(this.model.value);
+        let parm={};
+        parm[this.model.id]=this.model.value;
+        this.$emit('changeCategory',parm);
+      }
+    }
+  }
+</script>
+<style>
+.ct-searchcategory {
+  margin-bottom: 10px;
+    line-height: 30px;
+}
+  .ct-searchcategory .el-input-group__prepend{
+    text-align: left;
+    padding-left: 0px!important;
+    color: #ee6b6b !important;
+    font-weight: Bold;
+    text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
+    font-size: 16px;
+    vertical-align: middle;
+  }
+  .ct-searchcategory .ct-radios {
+    color: #606266;
+    border-radius: 4px;
+    /*border: 1px solid #dcdfe6;*/
+    line-height: 30px;
+    padding-left: 15px;
+    text-align: right;
+  }
+    .ct-searchcategory .ct-radios:hover {
+      border-color: #c0c4cc;
+    }
+    .ct-searchcategory .ct-radios .el-radio {
+      margin-left: 0px;
+      margin-right: 10px;
+    }
+  .ct-searchcategory .ct-radios .ct-Seg-label {
+    margin-right: 15px;
+  }
+.ct-searchcategory .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  color: #FFF;
+  background-color: #EE6B6B;
+  border-color: #EE6B6B;
+  -webkit-box-shadow: -1px 0 0 0 #EE6B6B;
+  box-shadow: -1px 0 0 0 #EE6B6B;
+}
+.ct-searchcategory .el-radio-button__inner:hover {
+    color: #EE6B6B;
+}
+</style>

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

@@ -3,15 +3,22 @@
     <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
           <span style="font-weight:bold">{{title}}</span>
     </div>
-    <ct-searchscreen ref="screen" :api="searchConditionApi" @loaded="screenLoaded" :screenPara="apiParam" @search="search()" @showTitle="showTitleScreenHandler"></ct-searchscreen>
+    <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
+    @changeCategory="categorychange" ></ct-searchcategory>
+
+    <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" 
+    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable"
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
+  import dynamicSearchCategory from './dynamicSearchCategory.vue';
   import dynamicSearchScreen from './dynamicSearchScreen.vue';
   import dynamicSearchTable from './dynamicSearchTable.vue';
   import progress from '../../progress/src/progress.vue';
@@ -21,10 +28,12 @@
     components: {
       'ct-searchscreen': dynamicSearchScreen,
       'ct-searchtable': dynamicSearchTable,
-      'ct-progress': progress
+      'ct-progress': progress,
+      'ct-searchcategory': dynamicSearchCategory
     },
     props: {
       vmodel: Object,
+      searchCategoryApi: String,
       searchConditionApi: String,
       searchDataApi: String,
       searchDataStatisticsApi: String,
@@ -36,6 +45,10 @@
     },
     created() {
       this.model = this.vmodel;
+      this.screenPara=this.apiParam;
+      if(this.searchCategoryApi){
+        this.loaded.categoryLoaded=false;
+      }
     },
     computed: {
       searchListStyle: function() {
@@ -43,16 +56,22 @@
           return { 'height': this.pageHeight };
         }
         return {};
-      }
+      },
     },
     data() {
       return {
         loaded: {
           screenLoaded: false,
-          tableLoaded: false
+          tableLoaded: false,
+          categoryLoaded: true,
         },
         title:'',
         showTitle:false,
+        screenPara:null,
+        reloadKey:0,
+        reloadKeyScreen:'s0',
+        reloadKeyTable:'t0',
+        isReload:false,
       }
     },
     methods: {
@@ -61,6 +80,17 @@
         this.$refs.table.searchComplate(this.$refs.screen.model, defaultSearch);
         this.$emit('loaded', this.$refs.screen.model);
       },
+      categoryLoaded(param) {
+        this.loaded.categoryLoaded = true;
+        if(param)this.screenPara=param;
+        this.$refs.screen.searchComplate();
+      },
+      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.$refs.table.getPage(1);

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

@@ -45,6 +45,10 @@
     props: {
       api: String,
       vmodel: Object,
+      categoryLoaded:{
+        type:Boolean,
+        default:true
+      },
       screenPara: {
         type: Object,
         default: () => { }
@@ -61,17 +65,19 @@
     },
     mounted() {
       var self = this;
-      this.$nextTick(function () {
-        if (typeof self.api !== 'undefined') {
-          self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
-        }
-        if (typeof self.source !== 'undefined') {
-          self.load(self.loaderObj.SearchScreen(self.source));
-        }
-        if (self.vmodel) {
-          self.load(self.vmodel);
-        }
-      });
+      if(self.categoryLoaded){
+        this.$nextTick(function () {
+          if (typeof self.api !== 'undefined') {
+            self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
+          }
+          if (typeof self.source !== 'undefined') {
+            self.load(self.loaderObj.SearchScreen(self.source));
+          }
+          if (self.vmodel) {
+            self.load(self.vmodel);
+          }
+        });
+      }
     },
     methods: {
       clickHandler(model) {
@@ -156,7 +162,21 @@
         self.isLoading = false;
         self.$emit('loaded', self.model.defaultSearch);
         self.$emit('showTitle');
-      }
+      },
+      searchComplate() {
+        var self = this;
+        this.$nextTick(function () {
+          if (typeof self.api !== 'undefined') {
+            self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
+          }
+          if (typeof self.source !== 'undefined') {
+            self.load(self.loaderObj.SearchScreen(self.source));
+          }
+          if (self.vmodel) {
+            self.load(self.vmodel);
+          }
+        });
+      },
     }
   }
 </script>

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -38,8 +38,7 @@
     },
     mounted() {
       var self = this;
-      this.$nextTick(function () {
-        
+      this.$nextTick(function () {        
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');

package/src/centaline/dynamicSensitiveEye/index.js

@@ -0,0 +1,11 @@
+import dynamicSensitiveEye from './src/dynamicSensitiveEye'
+
+dynamicSensitiveEye.install = function (Vue) {
+  Vue.component(dynamicSensitiveEye.name, dynamicSensitiveEye);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicSensitiveEye);
+}
+
+export default dynamicSensitiveEye

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

@@ -0,0 +1,61 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+      <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>
+    </div>
+  </div>
+  
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  export default {
+    name: 'ct-sensitiveeye',
+    props: {
+      vmodel: Object,
+      vrowmodel: Object
+    },
+    mixins: [dynamicElement],
+    data: function () {
+      return {
+        showLable: false,
+      };
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.SensitiveEye(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+    },
+    computed: {
+     
+    },
+    methods: {
+      onSensitiveEye() {
+        if (this.model.labelValue1 == '') {
+          var extraData = "";
+          if (typeof this.vrowmodel != 'undefined') {
+            let submitData = {};
+            this.model.refFieldName.forEach((v) => {
+              submitData[v] = this.vrowmodel[v].value;
+            });
+            extraData = JSON.stringify(submitData);
+          }
+          this.model.getOptions(this.model.paramAction, extraData);
+        }
+        this.showLable = !this.showLable;
+      },
+    }
+  }
+</script>
+<style>
+  .el-icon-view {
+    margin-left: 5px;
+    font-size: 16px;
+  }
+</style>

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

@@ -46,7 +46,8 @@ const box = function (source, callBack) {
           checked.forEach((v) => {
             if (self.checkedItemArr.indexOf(v[this.optionAttrs.value]) > -1) {
               v[this.optionAttrs.flagDeleted] = false;
-              currentOptions.splice(currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] }), 1);
+              let ic=currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] });
+              if(ic>-1) currentOptions.splice(ic, 1);
             }
             else {
               v[this.optionAttrs.flagDeleted] = true;

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

@@ -0,0 +1,50 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Enum from './lib/Enum';
+import common from '../../../common';
+import Vue from 'vue';
+const SearchCategory = function (source, callBack) {
+  var init = function (data) {
+    var rtn = {
+      showLabel:true,
+      get value() {
+        if(!data.code1){
+            return rtn.segmentValue[0].code;
+        }
+        return data.code1;
+      },
+      set value(v) {
+        data.code1 = v;
+      },
+      get segmentValue() {
+        return data.selectItems1;
+      },
+      optionAttrs: {
+        value: 'code',
+        label: 'name',
+        actionType: 'actionType',
+        flagDeleted: 'flagDeleted'
+      }
+    };
+    rtn = base.copy(Base(data), rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+  }
+  if (typeof source === 'string') {
+    Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:{} }).then(
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var rtn = init(response.content.fields[0]);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+      }
+    );
+  }
+  else {
+    return init(source);
+  }
+}
+export default SearchCategory;

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

@@ -0,0 +1,65 @@
+import base from '../../index';
+import Base from './Base';
+import Vue from 'vue';
+import common from '../../../common';
+import Enum from './lib/Enum';
+
+const SensitiveEye = function (source) {
+  var rtn = {
+    get labelValue() {
+      if (source.name1)
+        return source.name1;
+      else
+        return '';
+    },
+    set labelValue(v) {
+         source.name1=v;
+    },
+    get labelValue1() {
+      if (source.code1)
+        return source.code1;
+      else
+        return '';
+    },
+    set labelValue1(v) {
+      source.code1 = v;
+    },
+    get paramAction() {
+      if (source.paramAction1)
+        return source.paramAction1;
+      else
+        return '';
+    },
+    apiParams: {
+      paramName: 'k',
+      parentName: 'pk',
+      parentValue: 'pv',
+      search: 't'
+    },
+    getOptions(paramsAction, extraData) {
+      var self = this;
+      var apiAddrs = paramsAction || this.api;
+      console.log(extraData);
+      if (extraData=="") {
+        extraData = rtn.getFormRefFieldPara();
+      } 
+      var params = {
+        action: apiAddrs,
+        para: {
+          paramName: self.paramName,
+          parentValue: rtn.getFormParentFieldPara(),
+          extraData: extraData
+        }
+      };
+      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          self.labelValue1 = response.content;
+        }
+      });
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+
+export default SensitiveEye;

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -27,6 +27,7 @@ import GM from '../GM';
 import File from '../File';
 import HyperLink from '../HyperLink';
 import PlaceHolder from '../PlaceHolder';
+import SensitiveEye from '../SensitiveEye';
 
 const LibFunction = {
   install(Vue) {
@@ -289,6 +290,10 @@ const LibFunction = {
         item = PlaceHolder(field);
         item.is = 'ct-ph';
         break;
+      case Enum.ControlType.SensitiveEye://敏感数据小眼睛控
+        item = SensitiveEye(field);
+        item.is = 'ct-sensitiveeye';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';

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

@@ -28,6 +28,7 @@ const loader = {
   L: require("./ctl/L.js").default,
   File: require("./ctl/File.js").default,
   Tree: require("./ctl/Tree.js").default,
+  SearchCategory: require("./ctl/SearchCategory.js").default,
 };
 
 export default loader;

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;