centaline-data-driven 1.5.76 → 1.5.77

package/build/centaline/centaline.path.js

@@ -63,6 +63,7 @@ const paths = {
     "dynamicSearch": "./src/centaline/dynamicSearch/index.js", //查询条件
     "dynamicCalendar": "./src/centaline/dynamicCalendar/index.js", //日历控件
     "dynamicLH": "./src/centaline/dynamicLH/index.js", //html 标签
+    "dynamicImage": "./src/centaline/dynamicImage/index.js", //图片
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

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

package/release-log.md

@@ -1,3 +1,13 @@
+## v1.5.77
+2023-11-14
+优化
+
+多行文本只有1行时，违禁词显示优化
+
+多行文本选择后，自动计算文本最多字数
+
+多行文本参数2设置为0时，选择后覆盖文本内容，其他则追加文本内容
+
 ## v1.5.76
 2023-11-09
 bug修复

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/distribution/agent/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/SystemParameter/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "actionType":"2","pageStyle":"2","pageTitle":"新增分销项目","pageOnly":"true"
+          "paramID":"1723863642618859520","actionType":3
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -21,7 +21,7 @@
 
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
  
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -65,11 +65,11 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
+    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     

package/src/centaline/css/common.css

@@ -811,7 +811,11 @@ color: var(--centalinePlaceholder);
  .el-input--mini .el-input__inner{
   height: 26px;
   line-height: 26px;
- }
+ } 
+.inputHighlights .el-input__inner{
+  background-color: transparent;
+  font-family: monospace;
+}
 .ct-rich-text {
   min-height: 26px!important;
 }

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -601,6 +601,30 @@
               else if (field.isSeeVoice) {//看视频
                 self.$common.browseVideo(field, submitData)
               }
+              else if (field.isBrowseAttachment) {//浏览附件
+                var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
+                var MediaAlbum = [
+                  { albumName: self.model.title || "媒体", medias: [] },
+                ]; 
+                if (field.action) {
+                  var callback = function (data) {
+                    if(typeof data =='object'&&data.mediaAlbums){
+                      MediaAlbum = data.mediaAlbums;
+                    }
+                    else{
+                      MediaAlbum[0].medias = data;
+                    }
+                    self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
+                  }
+                  field.doAction(submitData, callback);
+                }
+                else {
+                  submitData.mediaData.forEach((v) => {
+                    MediaAlbum[0].medias.push(v);
+                  });
+                  self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
+                }
+              }
               else if (field.isExport || field.flagAsync) {
                 submitData = field.getActionPara(submitData).para;
                 if (field.flagAsync) {

package/src/centaline/dynamicImage/index.js

@@ -0,0 +1,11 @@
+import dynamicImage from './src/dynamicImage';
+
+dynamicImage.install = function (Vue) {
+  Vue.component(dynamicImage.name, dynamicImage);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicImage);
+}
+
+export default dynamicImage;

package/src/centaline/dynamicImage/src/dynamicImage.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="field-top">
+    <div class="ct-image" style="width:100%;text-align: center" v-if="model !== null">
+      <el-image :src="model.code1||require('../../../assets/none.png')" 
+        :style="{'width': model.min? model.min+'px':null,'height': model.max? model.max+'px':null,'border-radius':(model.width1 || 0)+'px'}">
+      </el-image>
+    </div>
+  </div>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-image',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object
+    },
+    data() {
+      return {
+	    }
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.LH(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.model.self=this;
+    },
+	  methods: {
+	  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%" class="ct-searchtable" ref="searchTable"
-       :style="{ 'margin-top': isMarginTop ? '0' : '10px', padding: isLayout ? '0' : '' }">
+       :style="{ 'margin-top': (isMarginTop || from=='detail') ? '0' : '10px', padding: isLayout ? '0' : '' }">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header" v-if="!isLoading && model && searchStatsApi"
                    :api="searchStatsApi" @searchStats="searchStats" @setTableHeight="setTableHeight" :flagDisabled="disabledStats"
                    :searchModel="model.searchModel">
@@ -300,7 +300,7 @@ export default {
       theadTitleLeft:0,
       theadTitleWidth:0,
       updateTableColumnsKey:0,
-       backgroundColor: "#ecf5ff",
+      backgroundColor: "#ecf5ff",
     };
   },
   deactivated(){

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

@@ -32,14 +32,16 @@
       </el-popover>
 
       <div v-else class="textarea-box" ref="input">
-        <div ref="highlights" v-if="model.forbiddenWords" class="backdrop hoverColor" :style="{width:forbiddenWordsWidth+'px',height:forbiddenWordsHeight+'px',left:forbiddenWordsLeft+'px',top:forbiddenWordsTop+'px'}">
-          <div class="highlights" v-html="forbiddenWordsValue"></div>
+        <div ref="highlights" v-if="model.forbiddenWords" class="backdrop hoverColor" 
+          :style="{'width':forbiddenWordsWidth+'px','height':forbiddenWordsHeight+'px','left':forbiddenWordsLeft+'px','top':forbiddenWordsTop+'px','overflow-y': model.rows===1?'hidden':'auto','overflow-x':'hidden'}">
+          <div class="highlights" :style="{'line-height':model.rows===1?1:1.5,'white-space': model.rows===1?'nowrap':'pre-wrap'}" v-html="forbiddenWordsValue"></div>
         </div>
-        <el-input ref="inputText"  :title="model.lock?model.value:''" :type="model.rows==1 ? '':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.forbiddenWords?'inputHighlights':'']" 
-                :disabled="model.lock" :rows="model.rows" 
-                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max"
-                @keyup.enter.native="search()" style="z-index: 3;background-color: transparent;">
+        <el-input ref="inputText"  :title="model.lock?model.value:''" :type="model.rows===1 ? 'text':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.forbiddenWords?'inputHighlights':'']" 
+          :disabled="model.lock" :rows="model.rows" 
+          :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max"
+          @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'">
@@ -132,6 +134,7 @@
         this.forbiddenWordsLeft=this.$refs.inputText.$el.offsetLeft;
         this.forbiddenWordsTop=this.$refs.inputText.$el.offsetTop;
         this.$refs.inputText.$el.addEventListener('scroll',this.scrollHandler,true);
+        this.applyHighlights();
       }
     },
     methods: {
@@ -197,12 +200,27 @@
       },
       quickSelect(value,label) {
         if(this.model.type===3){
-          this.model.value=this.model.value+label;
+          if(this.model.paramName2 && this.model.paramName2=='0'){
+            this.model.value=label;
+          }
+          else{
+            this.model.value=this.model.value+label;
+          }
+          if(this.model.max>0 && this.model.value.length>this.model.max){
+            this.$message({
+              message: '输入内容已达最大值，超出部分已被截取！',
+              type: 'warning',
+              showClose:true,
+            });
+            this.model.value=this.model.value.substr(0,this.model.max)
+          }
           this.validExcute();
         }
         else{
           this.model.value=label;
         }
+        this.inputHandler();
+        this.applyHighlights();
         this.search();
       },
       popupSearchListHandle: function (e) {
@@ -211,11 +229,24 @@
         self.$emit('popupSearchList', self.model.type===3?false:true, self.model, self.model.moreActionRouter, (optionArr) => {
           optionArr.forEach(row => {
             if(self.model.type===3){
-              self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];
+              if(self.model.paramName2 && self.model.paramName2=='0'){
+                self.model.value=row[self.model.optionAttrs.label];
+              }
+              else{
+                self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];
+              }
             }
             else {
               self.model.value=row[self.model.optionAttrs.label];
-            }            
+            }
+            if(self.model.max>0 && self.model.value.length>self.model.max){
+              self.$message({
+                message: '输入内容已达最大值，超出部分已被截取！',
+                type: 'warning',
+                showClose:true,
+              });
+              self.model.value=self.model.value.substr(0,self.model.max)
+            }
             self.inputHandler(e);
             self.applyHighlights();
           });          
@@ -224,6 +255,10 @@
       scrollHandler() {
         var scrollTop = this.$refs.inputText.$el.children[0].scrollTop;
         this.$refs.highlights.scrollTop=scrollTop;
+        if(this.model.rows===1){
+          var scrollLeft = this.$refs.inputText.$el.children[0].scrollLeft;
+          this.$refs.highlights.scrollLeft=scrollLeft;
+        }
       },
       applyHighlights() {
         var self=this;
@@ -254,6 +289,9 @@
           if(char===appoint){
             self.forbiddenWordsValue=self.forbiddenWordsValue+' ';
           }
+          if(this.model.rows===1){
+            self.forbiddenWordsValue=self.forbiddenWordsValue+'&nbsp;&nbsp;&nbsp;&nbsp;'
+          }
         }        
       },
       //不能共用的数据校验
@@ -266,7 +304,7 @@
             flag=false;
             this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中"+res.length+"处包含违禁词"+this.forbiddenWordsReg;
           }
-          this.valid = flag;
+          if(this.valid) this.valid = flag;
         }        
         return flag;
       }, 

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

@@ -121,6 +121,12 @@ const Base = function (source) {
     set paramName(v) {
       source.paramName1 = v;
     },
+    get paramName2() {
+      return source.paramName2;
+    },
+    set paramName2(v) {
+      source.paramName2 = v;
+    },
     get click() {
       return source.onClick;
     },
@@ -181,6 +187,9 @@ const Base = function (source) {
     get width() {
       return source.width;
     },
+    get width1() {
+      return source.width1;
+    },
     get listBind() {
       let bind = {};
       bind = {

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

@@ -0,0 +1,11 @@
+import base from '../../index';
+import Base from './Base';
+const Image = function (source) {
+  var rtn = {
+    
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+
+export default Image;

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

@@ -271,6 +271,11 @@ const Enum = {
     /// </summary>
     HtmlLabel: 54,
 
+    /// <summary>
+    ///  图片控件
+    /// </summary>
+    Image: 55,
+
   },
 
   //返回状态码

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

@@ -38,6 +38,7 @@ import DragSort from '../DragSort';
 import Container from '../Container';
 import Contact from '../Contact';
 import LH from '../LH';
+import Image from '../Image';
 
 const LibFunction = {
   install(Vue) {},
@@ -335,6 +336,10 @@ const LibFunction = {
         item = PhotoSelect(field, files, router, source.parameterAction,files);
         item.is = 'ct-photoselect';
         break;
+      case Enum.ControlType.Image://图片
+          item = Image(field);
+          item.is = 'ct-image';
+          break;
       case Enum.ControlType.RichText: //富文本框
         var router = {};
         if (source.actionRouters) {

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

@@ -45,6 +45,7 @@ const loader = {
   Container: require("./ctl/Container.js").default,
   Canlendar: require("./ctl/Canlendar.js").default,
   LH: require("./ctl/LH.js").default,
+  Image: require("./ctl/Image.js").default,
 };
 
 export default loader;

package/src/main.js

@@ -15,8 +15,8 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
-  baseUrl: "http://10.88.22.13:6060/onecard-api/",
-  // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
+  // baseUrl: "http://10.88.22.13:6060/onecard-api/",
+  baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
@@ -24,7 +24,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
-  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
   flagRouterSelf: true,
   zindex: 999,
@@ -56,13 +56,13 @@ Vue.use(centaline, {
       return {
         oldToken: 'd411bad1-491a-4beb-9a96-4811fc20229d',
         // token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        // authObject: '{token:"16-1718866654626189312"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO-ydVbyZ22v08V20nCIKLYcKVSIJBIIcXeCBB09r5jiFTPzgHXP0ELiTlAcNMZeGaTkDHaDYwyRWQTlNAUe_Qf8EV9GKck7aXvsvItIljSyjIyRbKQh9TqGBA3U2wVa6YQQUgpFDSzTdgh7VCiyb7Gv9Xqq93-cO2_LMau5FGPmCY3milSKR_ZM6E3OdSZBM2V4vgAAAP__.U-_EIyQ35Ti1_oTUkXGpSl8xpsf6-ikHqlIB8kyeFYk"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         // EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
         // estateId: '201806071109550C867184E8BCA56EC3',
 
-        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"5ef835681759e8f03f1b0575f89b6395","token":"","random":"LXytrk","time":1699411683024,"sign":"58681c540225cca828714e80c27dee93"}',
+        // authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"5ef835681759e8f03f1b0575f89b6395","token":"","random":"LXytrk","time":1699411683024,"sign":"58681c540225cca828714e80c27dee93"}',
         AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImYyOTI5ZTRlLThhMTQtNDQ3MC1hOTg3LTkzMmQ3MDhhMmQ5MSJ9.OkwHos3cukPp7PxDLBL0rB_ETrmd7IOvrUOvckBixSwmI7uYPyKph-3QdQmaqSZv_0LZs-oFxvPAQE-Nh7j2Wg',
       };
     },