centaline-data-driven 1.5.49 → 1.5.51

package/package.json

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

package/release-log.md

@@ -1,3 +1,38 @@
+## v1.5.51
+2023-08-18
+
+bug修复
+
+文件上传 官方上传方式，显示逻辑fileName改成url判断
+
+优化
+
+文本域输入被挡优化
+
+文本文字与数字对齐
+
+输入框左边距调整
+
+## v1.5.50
+2023-08-15
+
+bug修复
+
+表格计算高度没有判断对象是否存在
+
+## v1.5.49
+2023-08-15
+
+优化
+
+文本框支持高级查询
+
+错误提示时controlLabel有值就用controlLabel
+
+bug修复
+
+表格计算高度没有判断对象是否存在
+
 ## v1.5.48
 2023-08-10
 

package/src/centaline/css/common.css

@@ -44,7 +44,7 @@ html {
      font-size: inherit;
      line-height: 26px;
      outline: 0;
-     padding: 0 15px;
+     padding: 0 15px 0 5px;
      padding-right: 30px;
      -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
      transition: border-color .2s cubic-bezier(.645,.045,.355,1);
@@ -176,7 +176,7 @@ html {
   background-color: #ed745f;
  }
   .ct-dialog_content .ct-dialog_header span {
-    display: inline-block;
+    display: inline-block; 
     height: 20px;
     font-size: 18px;
     color: #fff;
@@ -285,7 +285,7 @@ html {
    font-size: inherit;
    line-height: 26px;
    outline: 0;
-   padding: 0 15px;
+   padding: 0 15px 0 5px;
    padding-right: 30px;
    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
@@ -401,6 +401,11 @@ html {
   .el-textarea .el-input__count {
   /* right: 24px; */
 }
+.textarea-box .el-textarea .el-textarea__inner,.textarea-box .el-input .el-input__inner{
+  padding: 5px 15px 5px 5px;
+  border: 0;
+  resize: none;
+}
 .ct-flex-div-input input.el-input__inner {
   /* width: 100%; */
 }
@@ -612,7 +617,7 @@ html {
   right: 3px;
 }
 .ct-unitnameLable {
-  line-height: 26px;
+  /* line-height: 21px; */
 }
 .ct-lable {
   height: 26px;

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -119,7 +119,7 @@
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div @click="viewerfile(file)">
-            <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" >
+            <el-image fit="fill" :src="file.url?file.url:file.mediaUrl?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" >
             </el-image></div>
             <span class="cover-list-item-span-Default" v-if="(model.lock&&file.flagDefault)||(model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2)">
               <i>

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -7,7 +7,7 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div inputNumbe-line-feed" :class="[model.labelClass]">
           {{model.label}}
         </div>
-        <div style="padding-left:15px;flex:1" v-bind="model.attrs" class="el-date-editor ct-input__inner">
+        <div style="flex:1" v-bind="model.attrs" class="el-date-editor ct-input__inner">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="onChangeHandler($event)" @input="onInputHandler($event);isShowClear()"
                  @blur="onBlurHandler($event)"
@@ -152,7 +152,7 @@
     display: inline-block;
     height: 26px;
     outline: 0;
-    padding: 0 15px;
+    padding: 0 15px 0 5px;
     -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
     transition: border-color .2s cubic-bezier(.645,.045,.355,1);
     width: 100%;

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

@@ -11,7 +11,7 @@
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
       </el-input>
       <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">
+      <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]">
             {{model.label}}
@@ -22,7 +22,7 @@
             <span class="el-select__tags-text">{{item}}</span>
           </span>
         </span>
-        <div v-else style="display:inline-block">
+        <div v-else style="display: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 ? 'inline-flex' : '') }">
+          <label class="ct-lable" :style="{ display: (model.labelValue ? 'flex' : '') }">
             <el-tooltip placement="top" effect="light" :disabled="isShowTooltip">
               <div slot="content" :style="{ 'width': (model.labelValue.length > 66 ? '400px' : 'auto') }">{{
                   model.labelValue
@@ -102,4 +102,8 @@
   -webkit-line-clamp: 1;
   word-break:break-all;
 }
+.text-justify{
+  display: flex;
+  align-items: center;
+}
 </style>

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -353,7 +353,7 @@
       font-size: inherit;
       line-height: 26px;
       outline: 0;
-      padding: 0 15px;
+      padding: 0 15px 0 5px;
       padding-right: 30px;
       -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
       transition: border-color .2s cubic-bezier(.645,.045,.355,1);

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

@@ -738,8 +738,11 @@ export default {
           && this.$parent.$parent 
           && this.$parent.$parent.$parent 
           && this.$parent.$parent.$parent.$children 
+          && this.$parent.$parent.$parent.$children.length > 0 
           && this.$parent.$parent.$parent.$children[0]
           && this.$parent.$parent.$parent.$children[0].$el
+          && this.$parent.$parent.$parent.$children[0].$el.classList
+          && this.$parent.$parent.$parent.$children[0].$el.classList.length > 0
           && this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
             h9 = 4
           }

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -265,7 +265,7 @@
       font-size: inherit;
       line-height: 26px;
       outline: 0;
-      padding: 0 15px;
+      padding: 0 15px 0 5px;
       padding-right: 30px;
       -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
       transition: border-color .2s cubic-bezier(.645,.045,.355,1);

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

@@ -29,13 +29,14 @@
               <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
             </span>
           </span>
-        </el-input>    
+        </el-input> 
       </el-popover>
 
-      <el-input v-else 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)"
+      <div v-else class="textarea-box" ref="input">
+        <el-input   :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" :resize="model.forbiddenWords?'none':'vertical'"
-                :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
+                :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>
 
@@ -44,8 +45,12 @@
             <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
           </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;z-index: 3;">{{this.minText}}</span>
+      </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>
+      </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>
       <ctQuickInputSos v-if="!model.lock && model.paramName && !model.autoFill" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" :textValue="model.value" @click="quickSelect"></ctQuickInputSos>      
       
@@ -57,6 +62,8 @@
         </el-button>
       </div>
     </div>
+   
+
     <transition name="el-fade-in" class="ct-flex-div-span">
      <span v-show="!valid" class="errorMessage" :class="{ 'errorMessageMarginLeft': model.inputType === 'textarea' }">
         {{validMessage}}
@@ -292,4 +299,31 @@
 .autoFill{
   width: 100%;
 }
+.textarea-box{
+  border: 1px solid #dcdfe6;
+  width: 100%;
+  position: relative;
+  border-radius: 4px;
+}
+.textarea-box:active,.textarea-box:focus,.textarea-box:hover{
+  border-color: #ff5b5b !important;
+}
+.textarea-tip{
+  margin-left: 5px;
+  color: #606266;
+}
+.textarea-count{
+  position: absolute;
+  right: 10px;
+}
+.textarea-icon{
+  background: url('../../../assets/icontext.png')no-repeat;
+  background-size: 100% 100%;
+  width: 12px;
+  height: 12px;
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
 </style>

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -431,7 +431,7 @@
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
       border-color: transparent;
-      margin: 2px 0 2px 6px;
+      margin: 2px 0 2px 1px;
       background-color: #f0f2f5;
     }