centaline-data-driven 1.3.91 → 1.3.93

package/package.json

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

package/src/SearchList.vue

@@ -12,8 +12,8 @@
     </ct-searchlist> -->
 
     <!-- <ct-searchlist 
-      :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'" 
-      :searchDataApi="'/customermanage/MyCustomerList/getList'">
+      :searchConditionApi="'/report/monthly/region/layout'" 
+      :searchDataApi="'/report/monthly/region/list'">
     </ct-searchlist> -->
 
     <ct-searchlist 

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

@@ -25,7 +25,7 @@
       </div>
       <div slot="file" slot-scope="{ file }" :title="file.fileName">
         <div class="cover-list-item">
-          <el-image fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
+          <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
           </el-image>
           <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
             <i>

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

@@ -125,7 +125,7 @@
                 </div>
                 <div v-else-if="typeof column.template === 'undefined'"
                      :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :style="column.style ? column.style : ''">
-                  {{ row[column.id] }}
+                  {{ $common.getDataOfUpperLower(row,column.id) }}
                 </div>
 
                 <!--模版列(启用)-->
@@ -305,7 +305,7 @@
               self.$forceUpdate();
               self.$nextTick(() => {
                 if (!self.isLayout) {
-                  if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
+                  if (self.$refs.tableParent && self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
                     self.tableLoading = true;
                     self.model.nextPage(next);
                   }
@@ -413,7 +413,7 @@
           if (rtn) {
             self.$forceUpdate();
             self.$nextTick(() => {
-              if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
+              if (self.$refs.tableParent && self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
                 self.tableLoading = true;
                 self.model.nextPage(next);
               }
@@ -999,35 +999,8 @@
                       on: {
                         submit(ev) {
                           if (ev.responseData.notification == 24) {
-                            //更新列
-                            self.model.selectIndex = 0;
-                            if (self.currentRow !== null) {
-                              for (var i = 0; i < self.currentRow.children.length; i++) {
-                                self.currentRow.children[i].classList.remove("select");
-                              }
-                            }
-                            if (typeof self.$refs.tableParent !== "undefined") {
-                              self.$refs.tableParent.scrollTop = 0;
-                              self.$refs.tableParent.scrollLeft = 0;
-                              self.scrollTop = 0;
-                              self.scrollLeft = 0;
-                            }
-                            self.$forceUpdate();
-                            self.$nextTick(() => {
-                              if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
-                                self.tableLoading = true;
-                                self.model.nextPage(next);
-                              }
-                              else {
-                                self.tableLoading = false;
-                                self.rowColorChange();
-                                self.resetScroll();
-                                self.calculatingRowHeight();
-                                self.getScrollAttr();
-                              }
-                              self.setfixedSize();
-                            });
-                            self.loaderObj.SearchTable(self.api, self.load, self.model.searchModel, true);
+                            //更新列                            
+                            self.refreshTableColumns();
                             self.$common.closeDialog(dialogOption.dialog);
                           }
                           else {
@@ -1580,6 +1553,27 @@
           self.updateCurrentRow(field, data);
         }
       },
+      refreshTableColumns(data) {
+        var self=this;
+        self.model.selectIndex = 0;
+        if (self.currentRow !== null) {
+          for (var i = 0; i < self.currentRow.children.length; i++) {
+            self.currentRow.children[i].classList.remove("select");
+          }
+        }
+        if (typeof self.$refs.tableParent !== "undefined") {
+          self.$refs.tableParent.scrollTop = 0;
+          self.$refs.tableParent.scrollLeft = 0;
+          self.scrollTop = 0;
+          self.scrollLeft = 0;
+        }        
+        if(data){
+          self.loaderObj.SearchTable(data,self.load, self.model.searchModel, true,false,null,self.api)
+        }
+        else{
+          self.loaderObj.SearchTable(self.api, self.load, self.model.searchModel, true);
+        }        
+      },
       popupClickHandler() {
         var tempListData = this.model.getSelectRowData({isMulti:this.model.isMulti});
         if (tempListData != null && tempListData.length>0) {

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -7,7 +7,7 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-      <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
+      <el-input ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
                 class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
                 @keyup.enter.native="search()">
@@ -19,7 +19,7 @@
           </span>
         </span>
       </el-input>
-
+      <span v-if="this.minText" :style="{left: minTextLeft+'px'}" style="color: #909399;background: #FFF;position: absolute;font-size: 12px;bottom: 5px;">{{this.minText}}</span>
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
       <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>      
       
@@ -54,6 +54,8 @@
     data() {
       return {
         showClear: false,
+        minText:'',
+        minTextLeft:0,
       }
     },
     created() {
@@ -65,6 +67,17 @@
       }
       this.model.self=this;
     },
+    mounted() {
+      if(this.model.inputType === 'textarea' && this.model.min && this.model.min > 0){
+        if(this.model.max && this.model.max>0){
+          this.minText='需要'+this.model.min+'-'+this.model.max+'个字';
+        }
+        else{
+          this.minText='至少需要'+this.model.min+'个字';
+        }
+        this.minTextLeft=this.$refs.input.$el.offsetLeft+10;
+      }
+    },
     methods: {
       mouseOverHandle: function () {
         if (this.model.value !== '' && this.model.clearable) {

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

@@ -4,7 +4,7 @@ import Router from './Router';
 import Vue from 'vue';
 import Enum from './lib/Enum';
 import formData from '../../../formData';
-const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSearchData, postThenHandler) {
+const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSearchData, postThenHandler,action) {
   var init = function (source) {
     var rtn = {
       $vue: null,
@@ -16,6 +16,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       pageIndex: 1,
       selectIndex: 0,
       selectAll: 0,
+      searchAction:action?action:data,
       get title() {
         return source.content.title;
       },
@@ -486,7 +487,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var newSearchModel = this.getSearchData();
 
         Vue.prototype.$api.postHandler(common.globalUri(), {
-            action: data,
+            action: self.searchAction,
             para: {
               searchFields: newSearchModel ? newSearchModel : {},
               pageAttribute: this.pageData,
@@ -520,12 +521,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.page.flagMoreData !== 'undefined') {
                 self.flagMoreData = response.page.flagMoreData;
               }
-              if (typeof response.content.updateTableColumns !== 'undefined' && response.content.updateTableColumns === '1') {
+              if (response.content.updateTableColumns) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;
                   tempLoader.init(self);
                 }
+                else{
+                  self.$vue.refreshTableColumns(response);
+                }
               }
               if (typeof callback !== 'undefined') {
                 if (response.content.rows.length > 0) {
@@ -535,7 +539,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   callback(false);
                 }
               }
-            } else {
+            } 
+            else {
               callback(false);
             }
 
@@ -581,7 +586,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
-            action: data,
+            action: self.searchAction,
             para: {
               searchFields: searchFields,
               pageAttribute: {
@@ -925,7 +930,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
     );
   } 
   else {
-    return init(data);
+    var rtn =  init(data);
+    if (callBack) {
+      callBack(rtn);
+    }
   }
 }
 

package/src/centaline/mixins/dynamicElement.js

@@ -59,8 +59,8 @@ export default {
         if (this.model.validating) {
           let validtemp = this.model.validating('input', self.inputOld, self.inputOld1);
           self.valid = validtemp.valid;
-          if (!self.valid) {
-            self.validMessage = validtemp.message;
+          if (!self.valid) {            
+            self.validExcuteMessage(validtemp);
             return false;
           }
         }
@@ -93,8 +93,8 @@ export default {
           if (this.model.validating) {
             let validtemp = this.model.validating('change', self.inputOld, self.inputOld1);
             self.valid = validtemp.valid;
-            if (!self.valid) {
-              self.validMessage = validtemp.message;
+            if (!self.valid) {              
+              self.validExcuteMessage(validtemp);
               return false;
             }
           }
@@ -131,7 +131,7 @@ export default {
         let validtemp = this.model.validating();
         self.valid = validtemp.valid;
         if (!self.valid) {
-          self.validMessage = validtemp.message;
+          self.validExcuteMessage(validtemp);
           return false;
         }
       }
@@ -145,6 +145,16 @@ export default {
 
       self.valid = true;
       return true;
-    }
+    },
+
+    validExcuteMessage(validtemp){
+      var self = this;
+      if(validtemp.type=='validateLenMin'){
+        self.validMessage= '至少需要'+this.model.min+'个字';
+      }
+      else{
+        self.validMessage = validtemp.message;
+      }
+    },
   }
 }

package/src/centaline/validate/index.js

@@ -144,6 +144,14 @@ const actions = {
       return true;
     }
   },
+  validateLenMin(model) {
+    if (model.value && model.value.length<model.min) {
+      return false;
+    }
+    else {
+      return true;
+    }
+  },
 };
 
 const valid = {
@@ -210,6 +218,12 @@ const valid = {
     message: '输入文字不能超过最大长度',
     ticker: 'input'
   },
+  validateLenMin: {
+    action: actions.validateLenMin,
+    message: 'validateLenMin',
+    type: 'validateLenMin',
+    ticker: 'input'
+  },
   Init(model) {
     return {
       //废弃 todo 删除
@@ -281,6 +295,9 @@ const valid = {
             if(model.max){
               rtnValidate.push(valid.validateLen);
             }
+            if(model.min && model.min>0){
+              rtnValidate.push(valid.validateLenMin);
+            }
             break;
           default:
             break;

package/src/main.js

@@ -15,7 +15,7 @@ Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
-  // baseUrl: "http://10.88.22.40:8080/", 
+  // baseUrl: "http://10.88.22.39:8080/api/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMws8PsLJ0u2HgIIrgkWBmBRGO8uxqho_cVr3jN_08Y5xZK8Au4oZUmLOCGVhoiCZ60xl3wEUXFoVE0jKJRDlXt4r6CDNL9CiWpqpfC5SGD4TT9ghYWvmEe0-2YHv84d5mGz6wzJm65R9flhNJxwLYXxs6YkybLz2bwegMAAP__.kXabWRcQeD3SN72lRH5vYtNPDARnnOR7ZJd9joFcSyE',
+        oldToken: '823894f8-bbf3-4d54-b3fb-4c697801c5c4',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbKxuu1nQ6c0HCIyDi2FCqUjwRC3B0QSZeeKaaY5r0nTMsFajAruKONzq3gjjY6InaGpMWDMx5ZWKElb9GzeD41rfLHBgpI9xvUJCJW6bKsChjC_AuGrXzDMqXxnB7_OHedh89srKwKiRNGyoystUMbdMDYu6wcK8l9Ca83AAAA__8.s6pi7lVXnHN8PrRW8crQvoQxsihCtMLBQfkSAkOe7oA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',