centaline-data-driven 1.5.62 → 1.5.64

package/package.json

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

package/release-log.md

@@ -1,3 +1,24 @@
+## v1.5.64
+2023-09-07
+
+优化
+
+修复a标签点击变红色
+## v1.5.63
+2023-09-05
+
+优化
+
+文本label超长溢出显示省略号，鼠标移上显示label
+
+优化文本域提示信息换行问题
+
+文件组件与分片上传组件 JS赋值
+
+文件预览组件支持类型名称
+
+多行文本最大最小值提示优化
+ 
 ## v1.5.62
 2023-09-04
 

package/src/centaline/css/common.css

@@ -420,6 +420,7 @@ html {
    justify-content: left;
    align-items: center;
    width: auto;
+   white-space: nowrap;
  }
  
  @media (max-width:480px) {

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -13,7 +13,7 @@
       <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span> -->
       <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
-          <div slot="prepend" class="" :class="[model.labelClass]">
+          <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
             {{model.label}}
           </div>
         </div>
@@ -22,7 +22,7 @@
             <span class="el-select__tags-text">{{item}}</span>
           </span>
         </span>
-        <div v-else style="display:flex">
+        <div v-else style="display:inline-flex">
           <!-- --计算占用宽度-- -->
           <div style="position: relative" v-if="isShowComput">
             <label class="ct-lable" style="position: absolute; left: -10000px">
@@ -30,7 +30,7 @@
             </label>
           </div>
           <!-- 展示 -->
-          <label class="ct-lable" :style="{ display: (model.labelValue ? 'flex' : '') }">
+          <label class="ct-lable" :style="{ display: (model.labelValue ? 'inline-flex' : '') }">
             <el-tooltip placement="top" effect="light" :disabled="isShowTooltip">
               <div slot="content" :style="{ 'width': (model.labelValue.length > 66 ? '400px' : 'auto') }">{{
                   model.labelValue
@@ -106,4 +106,8 @@
   display: flex;
   align-items: center;
 }
+.label-ellipsis{
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="model.routerKey&&model.visibility!='0'">
     <div v-if="model.rightRouter&&model.value!=''" class="wb" :style="model.styleObject">
-      <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
+      <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem" :class="cuttentColor">
         {{model.value}}
       </a>
     </div>
@@ -25,6 +25,7 @@
     },
     data() {
       return {
+        cuttentColor:'',
       }
     },
     created() {
@@ -34,6 +35,7 @@
     methods: {
       clickHandler(ev) {
         this.$emit('click', this.model.routerKey, this.rowindex, this.forname, this.forrowindex);
+        this.cuttentColor='centerRed';
       }
     },
     computed: {
@@ -64,7 +66,7 @@
   .wb {
     word-break: break-all;
   }
-  .mazarine {
-    color: #cb452f;
+  .centerRed {
+    color: #cb452f !important;
   }
 </style>

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

@@ -48,7 +48,7 @@
         </el-input>  
         <span v-if="this.minText" class="textarea-tip">{{this.minText}}</span> 
         <span v-if="model.showWordLimit" class="textarea-count">{{model.value.length}}/{{ model.max }}</span>
-        <span  v-if="!model.forbiddenWords" class="textarea-icon"></span>
+        <span v-if="!model.forbiddenWords" class="textarea-icon"></span>
       </div>   
       <!-- <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>
@@ -112,11 +112,14 @@
       this.model.self=this;
     },
     mounted() {
-      if(this.model.inputType === 'textarea' && this.model.min && this.model.min > 0){
-        if(this.model.max && this.model.max>0){
+      if(this.model.inputType === 'textarea'){
+        if(this.model.max && this.model.max>0 && this.model.min && this.model.min > 0){
           this.minText='需要'+this.model.min+'-'+this.model.max+'个字';
         }
-        else{
+        else if(this.model.max && this.model.max>0){
+          this.minText='至多'+this.model.max+'个字';
+        }
+        else if(this.model.min && this.model.min > 0){
           this.minText='至少需要'+this.model.min+'个字';
         }
         // this.minTextLeft=this.$refs.inputText.$el.offsetLeft+10;
@@ -265,7 +268,7 @@
           let res=this.forbiddenWordsValue.match(reg1);
           if(res && res.length>0){
             flag=false;
-            this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中包含"+res.length+"个违禁词"+this.forbiddenWordsReg;
+            this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中"+res.length+"处包含违禁词"+this.forbiddenWordsReg;
           }
           this.valid = flag;
         }        

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -37,24 +37,24 @@
              :style="{ height: displayAreaHeight - 78 + 'px' }"
              v-if="resultObject">
           <!--VR-->
-          <template v-if="itemFile.mediaTypeID == '1'">
+          <template v-if="itemFile.mediaTypeID == '1'||(itemFile.mediaTypeID+'').toLowerCase()=='vr'">
             <iframe :src="resultObject"
                     :height="displayAreaHeight - 80 + 'px'"
                     :width="displayAreaWidth + 'px'" style="border-width: 0px;">
             </iframe>
           </template>
           <!--Photo-->
-          <template v-else-if="itemFile.mediaTypeID == '2'">
+          <template v-else-if="itemFile.mediaTypeID == '2'||(itemFile.mediaTypeID+'').toLowerCase()=='photo'">
             <ct-viewerImage ref="viewerImage"
                             :imgUrl="resultObject+((!itemFile.flagUrl)?'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0':'')"
                             :rotate="rotate"></ct-viewerImage>
           </template>
           <!--ThreeDimensional-->
-          <template v-else-if="itemFile.mediaTypeID == '3'">
+          <template v-else-if="itemFile.mediaTypeID == '3'||(itemFile.mediaTypeID+'').toLowerCase()=='threedimensional'">
             暂不支持ThreeDimensional
           </template>
           <!--Video-->
-          <template v-else-if="itemFile.mediaTypeID == '4'">
+          <template v-else-if="itemFile.mediaTypeID == '4'||(itemFile.mediaTypeID+'').toLowerCase()=='video'">
             <div class="viewerContent">
               <template v-if="itemFile.thumbnailUrl"> 
                <video preload="none"  :poster="itemFile.thumbnailUrl"
@@ -81,7 +81,7 @@
             </div>
           </template>
           <!--Audio-->
-          <template v-else-if="itemFile.mediaTypeID == '5'">
+          <template v-else-if="itemFile.mediaTypeID == '5'||(itemFile.mediaTypeID+'').toLowerCase()=='audio'">
             <div class="viewerContent">
               <audio preload="none"
                      :src="resultObject"
@@ -94,7 +94,7 @@
             </div>
           </template>
           <!--File-->
-          <template v-else-if="itemFile.mediaTypeID == '6'">
+          <template v-else-if="itemFile.mediaTypeID == '6'||(itemFile.mediaTypeID+'').toLowerCase()=='file'">
             <template v-if="'pdf' .search(itemFile.fileExtension.toLowerCase())>-1 ">
               <ct-viewerPDF :pdfUrl="resultObject"
                             :displayAreaHeight="displayAreaHeight"
@@ -138,7 +138,7 @@
                                             class="magnify-btn el-icon-right"
                                             title="下一个"
                                             @click="jump(1)"></a>
-                <template v-if="itemFile.mediaTypeID == '2'">
+                <template v-if="itemFile.mediaTypeID == '2'||(itemFile.mediaTypeID+'').toLowerCase()=='photo'">
                   <a href="javascript:void(0)"
                      class="magnify-btn el-icon-refresh-left"
                      title="左旋转"
@@ -168,7 +168,7 @@
                 :download="(itemFile.mediaLabelName || itemFile.fileName)"
                 @click="handDownload(resultObject)"
                 ></a>-->
-                <a href="javascript:void(0)" v-if="itemFile.rightDownload&&itemFile.mediaTypeID !='1'"
+                <a href="javascript:void(0)" v-if="itemFile.rightDownload&&(itemFile.mediaTypeID !='1'&&(itemFile.mediaTypeID+'').toLowerCase()=='vr')"
                    class="magnify-btn el-icon-download"
                    title="下载"
                    @click="handDownload(resultObject)"></a>

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

@@ -387,6 +387,34 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
         }
         rtn.fileList.push(awaitfile);
       },
+      jsSetFile(data)
+      {
+        var photos = JSON.parse(data);
+      photos.forEach((v) => {
+        if(rtn.fileList.length<parseInt(rtn.max || 999)){
+            v.videoCoverFileName=v.videoCoverFileName||null;
+            v.thumbnailUrl=v.thumbnailUrl||'';
+            v.mediaSourceTypeID=v.mediaSourceTypeID||null;
+            v.mediaSourceID=v.mediaSourceID||null;
+            v.mediaPrintDesc=v.mediaPrintDesc||null;
+            v.mediaID=v.mediaID||null;
+            v.mediaFormData=v.mediaFormData||null;
+            v.mediaDescEN=v.mediaDescEN||null;
+            v.mediaDescCN=v.mediaDescCN||null;
+            v.mediaDataBase64=v.mediaDataBase64||null;
+            v.mediaCode=v.mediaCode||null;
+            v.groupID=v.groupID||null;
+            rtn.AddSourceList(v);
+            var FileData = rtn.getFileData(v);
+            FileData.uid=rtn.self.uploadguid();
+            FileData.width=v.width;
+            FileData.height=v.height;
+            rtn.fileList.push(FileData);
+            rtn.self.handleChange();
+            
+        }
+      });
+    },
        setByPieces(res, Progress, file) {
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联

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

@@ -230,12 +230,17 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           attrKey = this.common.initialsToLowerCase(attrKey);
           var rtn1 = this.fieldsDic[id];
           if (rtn1) {
-            if(attrKey=='code1' && rtn1.source.controlType===4 
-            && attrValue!=undefined && attrValue!=null && attrValue!=''){
-              if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
+            if (attrKey == 'code1' && rtn1.source.controlType === 4
+              && attrValue != undefined && attrValue != null && attrValue != '') {
+              if (rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1 > -1) {
                 attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
               }
             }
+            else if (attrKey == 'code1' && (rtn1.source.controlType === 25 || rtn1.source.controlType === 51)
+              && attrValue != undefined && attrValue != null && attrValue != '') {
+              rtn1.jsSetFile(attrValue);
+            }
+
             rtn1.source[attrKey] = attrValue;
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
 

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -149,6 +149,6 @@
     margin-top: 2px;
   }
   .mazarine {
-    color: #cb452f;
+    color: #cb452f !important;
   }
 </style>

package/src/main.js

@@ -58,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: 'aed9a1f3-c668-4d9e-aa6d-47ebe2b4eedb',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOifl7PP5nC62k4ZHRAk2ElSIJBII8XeCgI6eKaaYZveu5nVSjUrS1hR7A7HTFig5C23vBEIUqYN2hoIM_gP80JcBkbxD7qD1LgIxGRCMApE4Up86E0NSlSrXs2qQvRHHtdWVOo7LOzjx_ArrXC67cvvHudNy3GZZ70eTyYI7TAYIfYZJMgJKJi5c6s3q8QQAAP__.ufrQpM9yM_OKbLBN3IOjInFco7uijiTIijl57f2jdYE"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZYSx46dbk3SLhwCUdqhTIi2Eghxd4qAjZ03_OEt79_NvPamNkUbS7nzkFtkoCIMTScKKavahOIp6T5-gB_zZe8cRXGhhSZKBgrkQV1WyBQydaX1ORVTmfF6NrULkZwPrFiZ6bC8hWXrXmKdx8tuvP3j3GmZtix6GYQ4AqMqENsj9BgQ3FbkQVDGqObxBAAA__8.pCIZhcEs5Bzv-KXdue97bx7d1amTXmJihYo6-h3kcs8"}',
 
         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"}',