centaline-data-driven 1.3.93 → 1.3.94

package/package.json

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

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1133,6 +1133,7 @@ export default {
         border: 1px solid #e0e0e0;
         border-radius: 6px;
         font-size: 12px;
+        z-index: 1;
       }
       .max-report:hover .report-cont {
         display: block;

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -1125,6 +1125,7 @@ export default {
         border: 1px solid #e0e0e0;
         border-radius: 6px;
         font-size: 12px;
+        z-index: 1;
       }
       .max-report:hover .report-cont {
         display: block;

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

@@ -7,10 +7,13 @@
       <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">{{model.value}}</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"
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
-                @keyup.enter.native="search()">
+                @keyup.enter.native="search()" style="z-index: 3;">
         <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'">
@@ -19,7 +22,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="this.minText" :style="{left: minTextLeft+'px'}" style="color: #909399;background: #FFF;position: absolute;font-size: 12px;bottom: 5px;z-index: 3;">{{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>      
       
@@ -56,6 +59,10 @@
         showClear: false,
         minText:'',
         minTextLeft:0,
+        firbiddenWordsWidth:0,
+        firbiddenWordsHeight:0,
+        firbiddenWordsLeft:0,
+        firbiddenWordsTop:0,
       }
     },
     created() {
@@ -77,6 +84,12 @@
         }
         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;
+      }
     },
     methods: {
       mouseOverHandle: function () {
@@ -136,6 +149,9 @@
           });          
         });
       },
+      inputHandler(e) {
+        this.$emit('inputHandler',e);
+      }
     },
   }
 </script>
@@ -143,16 +159,32 @@
 .errorMessageMarginLeft {
   margin-left: 108px;
 }
-
 .hoverColor:hover {
   border-color: #409EFF;
 }
-
 .is-show-Span {
   display: none;
 }
-
 .hoverColor:hover .is-show-Span {
   display: inline-block;
 }
+.backdrop {
+  position: absolute;
+  z-index: 1;
+  border: 1px solid #DCDFE6;
+  background-color: #fff;
+  overflow: auto;
+  pointer-events: none;
+  border-radius: 4px;
+  -webkit-transition: -webkit-transform 1s;
+  transition: -webkit-transform 1s;
+  transition: transform 1s;
+  transition: transform 1s, -webkit-transform 1s;
+}
+.highlights {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  /* color: transparent; */
+  padding: 5px 15px;
+}
 </style>

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

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

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

@@ -2,7 +2,7 @@ import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
 import Axios from 'axios';
-import common from '../../../common'; 
+import common from '../../../common';
 import Vue from 'vue';
 const RichText = function (source, router) {
   var rtn = {
@@ -14,11 +14,24 @@ const RichText = function (source, router) {
       source.code1 = v;
     },
     get action() {
-      return router &&router.action ? router.action : "";//上传完整地址
+      return router && router.action ? router.action : "";//上传完整地址
     },
     set action(v) {
       source.action = v;
     },
+    getFormObj() {
+      var rtnFormObj = {};
+      var self = this;
+      
+      Object.defineProperty(rtnFormObj, source.fieldName1, {
+        get: function () {
+          return encodeURIComponent(self.value);;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      return rtnFormObj;
+    } 
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '823894f8-bbf3-4d54-b3fb-4c697801c5c4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbKxuu1nQ6c0HCIyDi2FCqUjwRC3B0QSZeeKaaY5r0nTMsFajAruKONzq3gjjY6InaGpMWDMx5ZWKElb9GzeD41rfLHBgpI9xvUJCJW6bKsChjC_AuGrXzDMqXxnB7_OHedh89srKwKiRNGyoystUMbdMDYu6wcK8l9Ca83AAAA__8.s6pi7lVXnHN8PrRW8crQvoQxsihCtMLBQfkSAkOe7oA',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZh2XXvlk4PbPwIcsAVWBmBRGP8dzFCR-8rpphkMu8F49xCCW4Fd2KjsRXciY2GSMyR1ng0F1BUGD0Fj0E0yLmqOZwqyCA9blCSqlrBwnkGQ5x-hWeXf4t5TPdLev5D7joNyy2laBRbh7w4obAWGPtl0RkXvu2lO5iD9wcAAP__.VJjQX8G1teWA34Y7jETg4iNhSUkxtB1tiqkyl--zbZU',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',