centaline-data-driven 1.3.95 → 1.3.96

package/package.json

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

package/src/centaline/css/common.css

@@ -828,7 +828,9 @@ html {
   float: none;
   display: inline-block;
 }
-
+.inputHighlights .el-textarea__inner{
+  background-color: transparent !important;
+}
 .ml10{
   margin-left: 10px;
 }

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

@@ -6,7 +6,7 @@
     </ct-tableStats>
 
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading && model && model.buttons"
-                     :buttons="model.buttons"
+                     :buttons="model.buttons" :key="model.toolbarKey"
                      @click="toolbarClickHandler($event)" @importComplete="importComplete"
                      :optionApi="model.optionApi" :searchModel="model.searchModel">
     </ct-tabletoolbar>

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

@@ -8,12 +8,13 @@
         <span>{{model.label}}</span>
       </div>
       <div ref="highlights" v-if="model.firbiddenWords" class="backdrop" :style="{width:firbiddenWordsWidth+'px',height:firbiddenWordsHeight+'px',left:firbiddenWordsLeft+'px',top:firbiddenWordsTop+'px'}">
-        <div class="highlights">{{model.value}}</div>
+        <div  class="highlights" v-html="firbiddenWordsValue"></div>
       </div>
       <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"
+                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.firbiddenWords?'inputHighlights':'']" 
+                :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()" style="z-index: 3;">
+                @keyup.enter.native="search()" style="z-index: 3;background-color: transparent;">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
 
         <span slot="suffix" class="el-input__suffix el-input--mini is-show-Span" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
@@ -28,8 +29,8 @@
       
       <div v-if="model.moreActionRouter && !model.lock">
         <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" 
-          :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"  @click="popupSearchListHandle"/>
-        <el-button v-else  size="mini" type="primary" class="h26" @click="popupSearchListHandle">
+          :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"  @click="popupSearchListHandle($event)"/>
+        <el-button v-else  size="mini" type="primary" class="h26" @click="popupSearchListHandle($event)">
           {{model.moreActionRouter.label}}
         </el-button>
       </div>
@@ -59,6 +60,7 @@
         showClear: false,
         minText:'',
         minTextLeft:0,
+        firbiddenWordsValue:'',
         firbiddenWordsWidth:0,
         firbiddenWordsHeight:0,
         firbiddenWordsLeft:0,
@@ -89,6 +91,7 @@
         this.firbiddenWordsHeight=this.$refs.input.$el.offsetHeight;
         this.firbiddenWordsLeft=this.$refs.input.$el.offsetLeft;
         this.firbiddenWordsTop=this.$refs.input.$el.offsetTop;
+        this.$refs.input.$el.addEventListener('scroll',this.scrollHandler,true);
       }
     },
     methods: {
@@ -135,7 +138,7 @@
         }
         this.search();
       },
-      popupSearchListHandle: function () {
+      popupSearchListHandle: function (e) {
         var self = this;
         self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
@@ -146,12 +149,37 @@
             else {
               self.model.value=row[self.model.optionAttrs.label];
             }
+            self.inputHandler(e);
           });          
         });
       },
       inputHandler(e) {
+        this.applyHighlights();
         this.$emit('inputHandler',e);
-      }
+      },   
+      scrollHandler() {
+        var scrollTop = this.$refs.input.$el.children[0].scrollTop;
+        var scrollHeight = this.$refs.input.$el.children[0].scrollHeight;
+        var offsetHeight = this.$refs.input.$el.children[0].offsetHeight;
+        //   console.log(scrollTop)
+        //   console.log(scrollHeight)
+        //   console.log(offsetHeight)
+        // if(scrollTop+offsetHeight>=scrollHeight){
+        //   scrollTop=scrollTop-32;
+        // }
+        this.$refs.highlights.scrollTop=scrollTop;
+      },
+      applyHighlights() {
+        var self=this;
+        if(self.model.firbiddenWords){
+          self.firbiddenWordsValue=self.model.value;
+          let joinChar=self.model.joinChar || ',';
+          self.model.firbiddenWords.split(joinChar).forEach(w => {
+            let reg1=new RegExp(w,'g');
+            self.firbiddenWordsValue=self.firbiddenWordsValue.replace(reg1,'<span style="background-color: red;color: transparent;">'+w+'</span>');
+          });
+        }        
+      },   
     },
   }
 </script>
@@ -173,8 +201,8 @@
   z-index: 1;
   border: 1px solid #DCDFE6;
   background-color: #fff;
-  overflow: auto;
   pointer-events: none;
+  overflow-y: auto;
   border-radius: 4px;
   -webkit-transition: -webkit-transform 1s;
   transition: -webkit-transform 1s;
@@ -184,7 +212,15 @@
 .highlights {
   white-space: pre-wrap;
   word-wrap: break-word;
-  /* color: transparent; */
-  padding: 5px 15px;
+  color: transparent;
+  padding: 5px 15px 5px 15px;
+  line-height: 1.5;
+  /* overflow-y: auto;
+  width: 100%;
+  height: 100%;
+  border-radius: 4px;
+  resize: vertical;
+  box-sizing: border-box;
+  transition: border-color .2s cubic-bezier(.645,.045,.355,1); */
 }
 </style>

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

@@ -304,6 +304,9 @@ const Base = function (source) {
     // get firbiddenWords() {
     //   return source.description;
     // },
+    get joinChar() {
+      return source.joinChar;
+    },
   };
 
   return rtn;

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

@@ -367,6 +367,20 @@ const ContactList = function (source, para, callBack) {
                   self.doUpdate(response.content.rows, searchValue1);
                 }
               }
+              if(response.content.updateToolButtons){
+                if (response.content.toolButtons) {
+                  self._buttons=[];
+                  response.content.toolButtons.forEach((v) => {
+                    var button = Router(v);
+                    button.is = "ct-btn";
+                    button.attrs = {
+                      size: "mini",
+                      class: 'max-btn-gray'
+                    }
+                    self._buttons.push(button);
+                  });
+                }
+              }
             }
           })
           .catch((error) => {

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

@@ -16,6 +16,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       pageIndex: 1,
       selectIndex: 0,
       selectAll: 0,
+      toolbarKey:0,
       searchAction:action?action:data,
       get title() {
         return source.content.title;
@@ -324,7 +325,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get buttons() {
         if (rtn._buttons !== null) {
           return rtn._buttons;
-        } else {
+        } 
+        else {
           rtn._buttons = [];
           if (source.content.toolButtons) {
 
@@ -531,6 +533,22 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   self.$vue.refreshTableColumns(response);
                 }
               }
+              if(response.content.updateToolButtons){
+                if (response.content.toolButtons) {
+                  self._buttons=[];
+                  response.content.toolButtons.forEach((v) => {
+                    var button = Router(v);
+                    button.is = "ct-btn";
+                    button.attrs = {
+                      size: "mini",
+                      class: 'max-btn-gray'
+                    }
+                    self._buttons.push(button);
+                  });
+                  self.toolbarKey=self.toolbarKey+1;
+                  self.$vue.setTableHeight();
+                }
+              }
               if (typeof callback !== 'undefined') {
                 if (response.content.rows.length > 0) {
                   callback(true,response);

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

@@ -293,15 +293,17 @@ const LibFunction = {
           return v1.key === field.fieldName1;
         });
         var files = [];
-        source.medias.forEach((v, index) => {
-          if (v.GroupID) {
-            if (v.GroupID == field.fieldName1) {
+        if(source.medias && source.medias.length>0){
+          source.medias.forEach((v, index) => {
+            if (v.GroupID) {
+              if (v.GroupID == field.fieldName1) {
+                files.push(v);
+              }
+            } else {
               files.push(v);
             }
-          } else {
-            files.push(v);
-          }
-        })
+          })
+        }
         item = File(field, files, router, source.parameterAction);
         item.is = 'ct-file';
         break;
@@ -310,15 +312,17 @@ const LibFunction = {
           return v1.key === field.fieldName1;
         });
         var files = [];
-        source.medias.forEach((v, index) => {
-          if (v.GroupID) {
-            if (v.GroupID == field.fieldName1) {
+        if(source.medias && source.medias.length>0){
+          source.medias.forEach((v, index) => {
+            if (v.GroupID) {
+              if (v.GroupID == field.fieldName1) {
+                files.push(v);
+              }
+            } else {
               files.push(v);
             }
-          } else {
-            files.push(v);
-          }
-        })
+          })
+        }
         item = PhotoSelect(field, files, router, source.parameterAction);
         item.is = 'ct-photoselect';
         break;

package/src/centaline/validate/index.js

@@ -3,6 +3,11 @@ import Enum from '../loader/src/ctl/lib/Enum';
 
 const actions = {
   required(v, o) {
+    if(v.type===Enum.ControlType.TextBox || v.type===Enum.ControlType.MultiLineText){
+      if (v.value === undefined || v.value === null || v.value === '' || v.value.trim() === '') {
+        return false;
+      }
+    }
     if (v.value === undefined || v.value === null || v.value === '') {
       return false;
     }

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '823894f8-bbf3-4d54-b3fb-4c697801c5c4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laibZgdmZXTpdsPEjyK6sCVZGINEY_91HoKP3FKc4zb1PGOcENegCbmil8wu4oZWOiL2StLjzGpCFK3QUHAaWwIemrcK-gQLy_Qo1iagxymwLGOL0C-JLMt8wj_l2zI9_nLtMw2fWxZ6SV4tis0euJGI6O8IyUR8T5RMpw-sNAAD__w.Kj-DXXu0_dFUzNDItfwT2vTk9EA0Mxhszh4xBQqG7iY',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbC9rL2pgMnNBwicpxFChXKRwIh7g6IpEvPFFNM894TxrmFEvwCbmilkQXc0EpjDIk3XONBfERichhMDBiJI52q2sVjBQXo_QalYfaWhfe-gD5Nv2CCs98wjzqc9fGPc9ep_8zmJGJDzthaViQVxbQjwtSpdqSOLjbB6w0AAP__.nf7jF3ewbimJ8eNFZ72RKXS7qN0SgN5OnkZ0ZEk82Rc',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',