centaline-data-driven 1.5.61 → 1.5.62

package/package.json

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

package/release-log.md

@@ -1,9 +1,19 @@
+## v1.5.62
+2023-09-04
+
+优化
+
+违禁词提示优化
+
 ## v1.5.61
 2023-09-04
 
 优化
 
 更多下拉框组件新增鼠标移上变蓝色,文本框左边距调整
+
+违禁词修复
+
 ## v1.5.60
 2023-08-31
 

package/src/SearchList.vue

@@ -50,11 +50,7 @@
       :searchDataApi="'/RightValueList/getListOfSearchModel'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist 
-      :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
-      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
-      :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist> -->
+    <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -82,7 +78,7 @@
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
   
-    <ct-searchlist :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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

@@ -97,6 +97,7 @@
         forbiddenWordsHeight:0,
         forbiddenWordsLeft:0,
         forbiddenWordsTop:0,
+        forbiddenWordsReg:'',
         showDrop:false,
         searchText:'',
       }
@@ -121,11 +122,7 @@
         // this.minTextLeft=this.$refs.inputText.$el.offsetLeft+10;
       }
       if(this.model.forbiddenWords){
-        let inputTextWidth=this.$refs.inputText.$el.offsetWidth;
-        if(this.model.moreActionRouter && !this.model.lock){
-          inputTextWidth=inputTextWidth-42;
-        }
-        this.forbiddenWordsWidth=inputTextWidth;
+        this.forbiddenWordsWidth=this.$refs.inputText.$el.offsetWidth;
         this.forbiddenWordsHeight=this.$refs.inputText.$el.offsetHeight;
         this.forbiddenWordsLeft=this.$refs.inputText.$el.offsetLeft;
         this.forbiddenWordsTop=this.$refs.inputText.$el.offsetTop;
@@ -233,10 +230,21 @@
         if(self.model.forbiddenWords){
           self.forbiddenWordsValue=self.model.value;
           let joinChar=self.model.joinChar || ',';
+          this.forbiddenWordsReg='';
           self.model.forbiddenWords.split(joinChar).forEach(w => {
+            if(self.forbiddenWordsValue.indexOf(w)>-1){
+              if(this.forbiddenWordsReg==''){
+                this.forbiddenWordsReg+='（';
+                this.forbiddenWordsReg+=w;
+              }
+              else{
+                this.forbiddenWordsReg+=','+w;
+              }
+            }
             let reg1=new RegExp(w,'g');
             self.forbiddenWordsValue=self.forbiddenWordsValue.replace(reg1,'<span style="background-color: #ffff00;color: transparent;">'+w+'</span>');
           });
+          if(this.forbiddenWordsReg)this.forbiddenWordsReg+='）';
           // let h=this.$refs.input.$el.children[0].offsetHeight;
           // let hs=this.$refs.input.$el.children[0].scrollHeight;
           // let ht=this.$refs.input.$el.children[0].scrollTop;
@@ -254,10 +262,10 @@
         let flag=true;
         if(this.model.forbiddenWords && this.model.value){
           let reg1=new RegExp('#ffff00','g');
-          let res=this.forbiddenWordsValue.match(reg1)
+          let res=this.forbiddenWordsValue.match(reg1);
           if(res && res.length>0){
             flag=false;
-            this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中包含"+res.length+"个违禁词";
+            this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中包含"+res.length+"个违禁词"+this.forbiddenWordsReg;
           }
           this.valid = flag;
         }        

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -32670,6 +32670,7 @@ if (typeof window !== 'undefined' && window.Vue) {
       forbiddenWordsHeight: 0,
       forbiddenWordsLeft: 0,
       forbiddenWordsTop: 0,
+      forbiddenWordsReg: '',
       showDrop: false,
       searchText: ''
     };
@@ -32692,11 +32693,7 @@ if (typeof window !== 'undefined' && window.Vue) {
       // this.minTextLeft=this.$refs.inputText.$el.offsetLeft+10;
     }
     if (this.model.forbiddenWords) {
-      var inputTextWidth = this.$refs.inputText.$el.offsetWidth;
-      if (this.model.moreActionRouter && !this.model.lock) {
-        inputTextWidth = inputTextWidth - 42;
-      }
-      this.forbiddenWordsWidth = inputTextWidth;
+      this.forbiddenWordsWidth = this.$refs.inputText.$el.offsetWidth;
       this.forbiddenWordsHeight = this.$refs.inputText.$el.offsetHeight;
       this.forbiddenWordsLeft = this.$refs.inputText.$el.offsetLeft;
       this.forbiddenWordsTop = this.$refs.inputText.$el.offsetTop;
@@ -32796,14 +32793,26 @@ if (typeof window !== 'undefined' && window.Vue) {
       this.$refs.highlights.scrollTop = scrollTop;
     },
     applyHighlights: function applyHighlights() {
+      var _this = this;
+
       var self = this;
       if (self.model.forbiddenWords) {
         self.forbiddenWordsValue = self.model.value;
         var joinChar = self.model.joinChar || ',';
+        this.forbiddenWordsReg = '';
         self.model.forbiddenWords.split(joinChar).forEach(function (w) {
+          if (self.forbiddenWordsValue.indexOf(w) > -1) {
+            if (_this.forbiddenWordsReg == '') {
+              _this.forbiddenWordsReg += '（';
+              _this.forbiddenWordsReg += w;
+            } else {
+              _this.forbiddenWordsReg += ',' + w;
+            }
+          }
           var reg1 = new RegExp(w, 'g');
           self.forbiddenWordsValue = self.forbiddenWordsValue.replace(reg1, '<span style="background-color: #ffff00;color: transparent;">' + w + '</span>');
         });
+        if (this.forbiddenWordsReg) this.forbiddenWordsReg += '）';
         // let h=this.$refs.input.$el.children[0].offsetHeight;
         // let hs=this.$refs.input.$el.children[0].scrollHeight;
         // let ht=this.$refs.input.$el.children[0].scrollTop;
@@ -32825,7 +32834,7 @@ if (typeof window !== 'undefined' && window.Vue) {
         var res = this.forbiddenWordsValue.match(reg1);
         if (res && res.length > 0) {
           flag = false;
-          this.validMessage = (this.validMessage ? this.validMessage + "  " : "") + "输入文字中包含" + res.length + "个违禁词";
+          this.validMessage = (this.validMessage ? this.validMessage + "  " : "") + "输入文字中包含" + res.length + "个违禁词" + this.forbiddenWordsReg;
         }
         this.valid = flag;
       }
@@ -56285,7 +56294,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicT_vue__ = __webpack_require__(215);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4f0ed72e_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__ = __webpack_require__(568);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3a6fc9e9_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__ = __webpack_require__(568);
 function injectStyle (ssrContext) {
   __webpack_require__(561)
 }
@@ -56300,12 +56309,12 @@ var __vue_template_functional__ = false
 /* styles */
 var __vue_styles__ = injectStyle
 /* scopeId */
-var __vue_scopeId__ = "data-v-4f0ed72e"
+var __vue_scopeId__ = "data-v-3a6fc9e9"
 /* moduleIdentifier (server only) */
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicT_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4f0ed72e_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3a6fc9e9_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -56326,7 +56335,7 @@ var content = __webpack_require__(562);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("70071aec", content, true, {});
+var update = __webpack_require__(2)("df0b65f6", content, true, {});
 
 /***/ }),
 /* 562 */
@@ -56338,7 +56347,7 @@ exports = module.exports = __webpack_require__(1)(false);
 
 
 // module
-exports.push([module.i, ".errorMessageMarginLeft[data-v-4f0ed72e]{margin-left:108px}.hoverColor[data-v-4f0ed72e]:hover{border-color:var(--centalineBlue)}.is-show-Span[data-v-4f0ed72e]{display:none}.hoverColor:hover .is-show-Span[data-v-4f0ed72e]{display:inline-block}.backdrop[data-v-4f0ed72e]{position:absolute;z-index:1;border:none;background-color:#fff;pointer-events:none;overflow-y:auto;border-radius:4px;-webkit-transition:-webkit-transform 1s;transition:-webkit-transform 1s;transition:transform 1s;transition:transform 1s,-webkit-transform 1s}.highlights[data-v-4f0ed72e]{white-space:pre-wrap;word-wrap:break-word;color:transparent;padding:5px 15px 5px 5px;line-height:1.5;font-family:monospace}.autoFill[data-v-4f0ed72e]{width:100%}.textarea-box[data-v-4f0ed72e]{border:1px solid var(--bagGray);width:100%;position:relative;border-radius:4px}.textarea-box[data-v-4f0ed72e]:active,.textarea-box[data-v-4f0ed72e]:focus,.textarea-box[data-v-4f0ed72e]:hover{border-color:var(--centalineBlue)!important}.textarea-tip[data-v-4f0ed72e]{margin-left:5px;color:#606266}.textarea-count[data-v-4f0ed72e]{position:absolute;right:10px}.textarea-icon[data-v-4f0ed72e]{background:url(" + escape(__webpack_require__(563)) + ")no-repeat;background-size:100% 100%;width:12px;height:12px;display:inline-block;position:absolute;right:0;bottom:0}", ""]);
+exports.push([module.i, ".errorMessageMarginLeft[data-v-3a6fc9e9]{margin-left:108px}.hoverColor[data-v-3a6fc9e9]:hover{border-color:var(--centalineBlue)}.is-show-Span[data-v-3a6fc9e9]{display:none}.hoverColor:hover .is-show-Span[data-v-3a6fc9e9]{display:inline-block}.backdrop[data-v-3a6fc9e9]{position:absolute;z-index:1;border:none;background-color:#fff;pointer-events:none;overflow-y:auto;border-radius:4px;-webkit-transition:-webkit-transform 1s;transition:-webkit-transform 1s;transition:transform 1s;transition:transform 1s,-webkit-transform 1s}.highlights[data-v-3a6fc9e9]{white-space:pre-wrap;word-wrap:break-word;color:transparent;padding:5px 15px 5px 5px;line-height:1.5;font-family:monospace}.autoFill[data-v-3a6fc9e9]{width:100%}.textarea-box[data-v-3a6fc9e9]{border:1px solid var(--bagGray);width:100%;position:relative;border-radius:4px}.textarea-box[data-v-3a6fc9e9]:active,.textarea-box[data-v-3a6fc9e9]:focus,.textarea-box[data-v-3a6fc9e9]:hover{border-color:var(--centalineBlue)!important}.textarea-tip[data-v-3a6fc9e9]{margin-left:5px;color:#606266}.textarea-count[data-v-3a6fc9e9]{position:absolute;right:10px}.textarea-icon[data-v-3a6fc9e9]{background:url(" + escape(__webpack_require__(563)) + ")no-repeat;background-size:100% 100%;width:12px;height:12px;display:inline-block;position:absolute;right:0;bottom:0}", ""]);
 
 // exports