centaline-data-driven 1.2.19 → 1.2.20

package/package.json

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

package/src/centaline/css/common.css

@@ -309,7 +309,7 @@ html {
  
  .errorMessage {
    font-size: 12px;
-   color: #ff5b5b;
+   color: #ff5b5b !important;
    padding: 3px 5px;
    white-space: nowrap;
  }

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

@@ -34,23 +34,24 @@
                 <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px">
               </div>
               <div class="mt5">
-                  <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
+                <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
                 :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
                 <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
                 :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[1],$event)"></component>                
               </div>
               <div class="mt5">
                 <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
-                v-if="model.actionRoutersMoreList !== null">
+                v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length>0">
                   <img src="../../../assets/dian.png" alt="" class="report">
                   <ul class="report-cont">
                       <li v-for="(col, index) in model.actionRoutersMoreList" :key="index"  v-if="col.show !== false">
                         <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
                       </li>
                   </ul>
-                </button> 
-                 <component v-else-if="model.actionRouters!==null && model.actionRouters[2]!==null" class="max-report"
-                :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)"></component>   
+                </button>
+                <component v-else-if="model.actionRouters!==null && model.actionRouters.legth===3" class="max-report"
+                :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
+                </component>
               </div>
             </div>
         </div>
@@ -704,7 +705,7 @@
   color: #000000;
 }
 .operation1{
-  color: #ff503f;
+  color: #388cd3;
 }
 .operation2{
   color: #388cd3;

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

@@ -15,9 +15,10 @@
                :on-success="handleAvatarSuccess"
                :on-progress="uploadProcess"
                :limit="parseInt(model.max||999)"
-               :on-exceed="handleExceed"
-               >
+               :on-exceed="handleExceed">
       <i slot="default" class="el-icon-plus"></i>
+      <!--<i slot="default" class="el-icon-plus" style="position: relative;"><div @click="testss($event)" class="max-ewmsc"></div></i>-->
+
       <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">{{validMessage}}</div>
       <div slot="file" slot-scope="{file}" :title="file.fileName">
         <div class="cover-list-item">
@@ -46,7 +47,7 @@
               </span>
               <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
                 <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
-                {{option[model.optionModel.optionAttrs.label]}}
+                  {{option[model.optionModel.optionAttrs.label]}}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -101,7 +102,7 @@
       },
       handleExceed()
       {
-         this.validMessage = "附件数量最多" + this.model.max+ "个";
+         this.validMessage = "附件数量最多" + this.model.max+ "张";
          this.valid = false;
       },
       //删除
@@ -112,7 +113,7 @@
           //type: 'warning'
         }).then(() => {
           this.model.deleteFile(file, false);
-          this.selfValidExcute();
+          this.selfValidExcute('remove');
         }).catch(() => {
         });
       },
@@ -207,7 +208,7 @@
         }
 
         if (this.model.max) {
-
+          //change
           if(this.model.getfileListLength() >= this.model.max)
           {
             this.disableUpload=true;
@@ -216,25 +217,34 @@
             this.disableUpload=false;
           }
 
-          if (this.model.getfileListLength() > this.model.max) {
-            this.validMessage = "附件数量";
-            if(this.model.min)
-            {
-              this.validMessage += "最少" + this.model.min + "个"+",";
-            }
-            this.validMessage += "最多" + this.model.max+ "个";
-            this.valid = false;
-            return false;
-          }
+          // if (this.model.getfileListLength() > this.model.max) {
+          //   this.validMessage = "附件数量";
+          //   if(this.model.min)
+          //   {
+          //     this.validMessage += "最少" + this.model.min + "个"+",";
+          //   }
+          //   // this.validMessage += "最多" + this.model.max+ "个";
+          //   this.valid = false;
+          //   return false;
+          // }
         }
         if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
-            this.validMessage = "附件数量最少" + this.model.min + "个";
-            if(this.model.max)
+            //change时需要判断有没有上传图片如果没有图片则不提示
+
+            if(eventName=='change' && this.model.getfileListLength()>0)
+            {
+               this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
+               this.valid = false;
+            }else if(eventName=='valid')
             {
-               this.validMessage += ",最多" + this.model.max + "个"+"";
+               this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
+               this.valid = false;
+            }else if(eventName=='remove')
+            {
+              this.valid = true;
             }
-            this.valid = false;
+          
             return false;
           }
         }
@@ -317,4 +327,16 @@
     width: 100px;
     height: 100px;
   }
+  .el-upload .max-ewmsc {
+    background: url("../../../assets/ewm.png") no-repeat;
+    content: '';
+    display: block;
+    width: 30px;
+    height: 30px;
+    font-size: 30px;
+    background-size: 30px;
+    position: absolute;
+    top: -35px;
+    left: 35px;
+  }
 </style>