centaline-data-driven 1.2.18 → 1.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.18",
+  "version": "1.2.21",
   "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/css/max.css

@@ -47,6 +47,7 @@
     height: 26px;
     background: #EE6B6B;
     border-color:#EE6B6B;
+    width: 85px;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }

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

@@ -30,25 +30,28 @@
               <div>
                 <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
-                <component class="max-report" 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>
+                <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px">
+                <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"
+                :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"
-                v-if="model.actionRoutersMoreList !== null">
+                <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
+                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>
@@ -264,7 +267,7 @@
                   <div class="t-item">
                     <span class="i">{{col.operationName}}</span>
                   </div>
-                  <div class="t-item"><span class="i">{{col.desc}}</span></div>
+                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
                   <div class="t-item" style="height: 50px;">
                     <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
                   </div>
@@ -698,9 +701,17 @@
   }
 </script>
 <style lang="scss" scoped>
+.operation0{
+  color: #000000;
+}
+.operation1{
+  color: #388cd3;
+}
+.operation2{
+  color: #388cd3;
+}
 .main{
-  background: #ECEFF2;
-  
+  background: #ECEFF2;  
 }
 .rel{
   position: relative;
@@ -709,6 +720,8 @@
     overflow-y: auto;
     overflow-x: auto;
 }
+.w64{width: 64px!important}
+.w93{width: 93px!important}
 .w300 {
   width: 300px;
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div style="width:100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size?'ct-checkbox-'+model.attrs.size:'']">
-    <el-upload :class="model.lock?'ct-upload-display-none':''"
+    <el-upload :class="disableUpload?'ct-upload-display-none':''"
                :disabled="model.lock"
                :accept="model.fileAccept"
                :on-change="handleChange"
@@ -14,9 +14,12 @@
                :before-upload="beforeUploadProcess"
                :on-success="handleAvatarSuccess"
                :on-progress="uploadProcess"
-               >
+               :limit="parseInt(model.max||999)"
+               :on-exceed="handleExceed">
       <i slot="default" class="el-icon-plus"></i>
-      <div slot="tip" class="el-upload__tip errorMessage" v-show="!imgValid">{{validMessage}}</div>
+      <!--<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">
           <el-image fit="fill" :src="file.url"
@@ -44,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>
@@ -66,7 +69,7 @@
     },
     data() {
       return {
-        imgValid:true,
+        disableUpload:false,
       };
     },
     computed: {
@@ -90,12 +93,18 @@
             self.load(data);
           });
         }
+        this.disableUpload=this.model.lock;
       });
     },
     methods: {
       load(data) {
         this.model = data;
       },
+      handleExceed()
+      {
+         this.validMessage = "附件数量最多" + this.model.max+ "张";
+         this.valid = false;
+      },
       //删除
       handleRemove(file) {
         this.$common.confirm("确定删除该附件？", "提示", {
@@ -104,6 +113,7 @@
           //type: 'warning'
         }).then(() => {
           this.model.deleteFile(file, false);
+          this.selfValidExcute('remove');
         }).catch(() => {
         });
       },
@@ -156,16 +166,19 @@
       //上传之前的钩子
       beforeUploadProcess(files) {
         let that=this;
-        if (this.model.max) {
-          if (this.model.getfileListLength() >= this.model.max) {
-            this.validMessage = "附件最多" + this.model.max + "个";
-            this.imgValid = false;
-            setTimeout(() => {
-              that.imgValid = true;
-             }, 3000) 
-            return false;
-          }
-        }
+      
+        // if (this.model.max) {
+        //    console.log('beforeUploadProcess') 
+        //   console.log(this.model.fileList) 
+        //   if (this.model.getfileListLength() >= this.model.max) {
+        //     this.validMessage = "附件最多" + this.model.max + "个";
+        //     this.valid = false;
+        //     setTimeout(() => {
+        //       that.valid = true;
+        //      }, 3000) 
+        //     return false;
+        //   }
+        // }
         return true;
       },
       //文件上传时的钩子
@@ -185,6 +198,7 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
+
         if (this.model.required) {
           if (this.model.getfileListLength() === 0) {
             this.validMessage = "必须上传附件";
@@ -194,16 +208,43 @@
         }
 
         if (this.model.max) {
-          if (this.model.getfileListLength() > this.model.max) {
-            this.validMessage = "附件最多" + this.model.max+ "个";
-            this.valid = false;
-            return false;
+          //change
+          if(this.model.getfileListLength() >= this.model.max)
+          {
+            this.disableUpload=true;
+          }else
+          {
+            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.min) {
           if (this.model.getfileListLength() < this.model.min) {
-            this.validMessage = "附件最少" + this.model.min + "个";
-            this.valid = false;
+            //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 = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
+               this.valid = false;
+            }else if(eventName=='remove')
+            {
+              this.valid = true;
+            }
+          
             return false;
           }
         }
@@ -286,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>

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

@@ -3,8 +3,8 @@
     <div class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div class="list-button max-btn-add">
-      <el-button v-if="model.create" type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+    <div class="list-button">
+      <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
         新增
       </el-button>
     </div>
@@ -349,7 +349,6 @@
   .ct-form-list .list-button {
     padding-bottom: 5px;
     text-align: right;
-    width: 45%;
     display: inline-table;
     float: right;
   }