centaline-data-driven 1.3.98 → 1.3.99

package/package.json

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

package/src/SearchList.vue

@@ -4,23 +4,23 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
+    <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist 
       :searchConditionApi="'/report/monthly/region/layout'" 
       :searchDataApi="'/report/monthly/region/list'">
     </ct-searchlist> -->
 
-    <ct-searchlist 
+    <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

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

@@ -7,12 +7,12 @@
       <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>
-      <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" v-html="firbiddenWordsValue"></div>
+      <div ref="highlights" v-if="model.forbiddenWords" class="backdrop" :style="{width:forbiddenWordsWidth+'px',height:forbiddenWordsHeight+'px',left:forbiddenWordsLeft+'px',top:forbiddenWordsTop+'px'}">
+        <div  class="highlights" v-html="forbiddenWordsValue"></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();applyHighlights()" @change="changeHandler($event)"
-                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.firbiddenWords?'inputHighlights':'']" 
-                :disabled="model.lock" :rows="model.rows" 
+                class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.forbiddenWords?'inputHighlights':'']" 
+                :disabled="model.lock" :rows="model.rows" :resize="model.forbiddenWords?'none':'vertical'"
                 :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;background-color: transparent;">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
@@ -60,11 +60,11 @@
         showClear: false,
         minText:'',
         minTextLeft:0,
-        firbiddenWordsValue:'',
-        firbiddenWordsWidth:0,
-        firbiddenWordsHeight:0,
-        firbiddenWordsLeft:0,
-        firbiddenWordsTop:0,
+        forbiddenWordsValue:'',
+        forbiddenWordsWidth:0,
+        forbiddenWordsHeight:0,
+        forbiddenWordsLeft:0,
+        forbiddenWordsTop:0,
       }
     },
     created() {
@@ -86,11 +86,11 @@
         }
         this.minTextLeft=this.$refs.input.$el.offsetLeft+10;
       }
-      if(this.model.firbiddenWords){
-        this.firbiddenWordsWidth=this.$refs.input.$el.offsetWidth;
-        this.firbiddenWordsHeight=this.$refs.input.$el.offsetHeight;
-        this.firbiddenWordsLeft=this.$refs.input.$el.offsetLeft;
-        this.firbiddenWordsTop=this.$refs.input.$el.offsetTop;
+      if(this.model.forbiddenWords){
+        this.forbiddenWordsWidth=this.$refs.input.$el.offsetWidth;
+        this.forbiddenWordsHeight=this.$refs.input.$el.offsetHeight;
+        this.forbiddenWordsLeft=this.$refs.input.$el.offsetLeft;
+        this.forbiddenWordsTop=this.$refs.input.$el.offsetTop;
         this.$refs.input.$el.addEventListener('scroll',this.scrollHandler,true);
       }
     },
@@ -155,25 +155,23 @@
       },
       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;
+        if(self.model.forbiddenWords){
+          self.forbiddenWordsValue=self.model.value;
           let joinChar=self.model.joinChar || ',';
-          self.model.firbiddenWords.split(joinChar).forEach(w => {
+          self.model.forbiddenWords.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>');
+            self.forbiddenWordsValue=self.forbiddenWordsValue.replace(reg1,'<span style="background-color: red;color: transparent;">'+w+'</span>');
           });
+          let appoint='\n';
+          let strat=self.forbiddenWordsValue.length-appoint.length;
+          let char=self.forbiddenWordsValue.substr(strat,appoint.length);
+          if(char===appoint){
+            self.forbiddenWordsValue=self.forbiddenWordsValue+' ';
+          }
         }        
       },   
     },
@@ -211,12 +209,5 @@
   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

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

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

@@ -10,7 +10,7 @@ const box = function (source, fileSourceList, router, optionApi) {
   var init = function (data) {
     var rtn = {
       get action() {
-        return router.action ? router.action : "";//上传完整地址
+        return router && router.action ? router.action : "";//上传完整地址
       },
       get sourceList() {
         return fileSourceList;

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

@@ -295,8 +295,8 @@ const LibFunction = {
         var files = [];
         if(source.medias && source.medias.length>0){
           source.medias.forEach((v, index) => {
-            if (v.GroupID) {
-              if (v.GroupID == field.fieldName1) {
+            if (v.groupID || v.GroupID) {
+              if (v.groupID == field.fieldName1 || v.GroupID == field.fieldName1) {
                 files.push(v);
               }
             } else {

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbC9rL2pgMnNBwicpxFChXKRwIh7g6IpEvPFFNM894TxrmFEvwCbmilkQXc0EpjDIk3XONBfERichhMDBiJI52q2sVjBQXo_QalYfaWhfe-gD5Nv2CCs98wjzqc9fGPc9ep_8zmJGJDzthaViQVxbQjwtSpdqSOLjbB6w0AAP__.nf7jF3ewbimJ8eNFZ72RKXS7qN0SgN5OnkZ0ZEk82Rc',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOgzAQRO-yNSt57fVn6YIhTQ6BjOyCVFEAKVGUu4co0NHnFaPRa2ZeMC0D1OA38CB2etnAg9jpiVg8uQ5P4iOyY4OBYsDILvK57UxsWqigPG5Qk3OeTWAJFYxp_gljtfqKZSr3S3n-49x1HtdZnYsOLmsUlSwyc0HhsDYaCqlkjM0K3h8AAAD__w.vh8oWP7eMmWyrQ2j2tNgrfOeMdX2ZHDJBbpM_6dfcyw',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',