centaline-data-driven 1.2.18 → 1.2.19

package/package.json

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

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

@@ -30,15 +30,17 @@
               <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"
+                <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
                 v-if="model.actionRoutersMoreList !== null">
                   <img src="../../../assets/dian.png" alt="" class="report">
                   <ul class="report-cont">
@@ -264,7 +266,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 +700,17 @@
   }
 </script>
 <style lang="scss" scoped>
+.operation0{
+  color: #000000;
+}
+.operation1{
+  color: #ff503f;
+}
+.operation2{
+  color: #388cd3;
+}
 .main{
-  background: #ECEFF2;
-  
+  background: #ECEFF2;  
 }
 .rel{
   position: relative;
@@ -709,6 +719,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,11 @@
                :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>
+      <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"
@@ -66,7 +68,7 @@
     },
     data() {
       return {
-        imgValid:true,
+        disableUpload:false,
       };
     },
     computed: {
@@ -90,12 +92,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 +112,7 @@
           //type: 'warning'
         }).then(() => {
           this.model.deleteFile(file, false);
+          this.selfValidExcute();
         }).catch(() => {
         });
       },
@@ -156,16 +165,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 +197,7 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
+
         if (this.model.required) {
           if (this.model.getfileListLength() === 0) {
             this.validMessage = "必须上传附件";
@@ -194,15 +207,33 @@
         }
 
         if (this.model.max) {
+
+          if(this.model.getfileListLength() >= this.model.max)
+          {
+            this.disableUpload=true;
+          }else
+          {
+            this.disableUpload=false;
+          }
+
           if (this.model.getfileListLength() > this.model.max) {
-            this.validMessage = "附件最多" + 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.validMessage = "附件数量最少" + this.model.min + "个";
+            if(this.model.max)
+            {
+               this.validMessage += ",最多" + this.model.max + "个"+"";
+            }
             this.valid = false;
             return false;
           }

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

@@ -41,7 +41,10 @@ const box = function (source, fileSourceList, router, optionApi) {
         return rtn._fileList;
       },
       getfileListLength() {
-        return rtn.fileList.length;
+        let fileList = fileSourceList.filter(item=>{
+          return item.flagDeleted != true
+        })
+        return fileList.length;
       },
       optionModel: {
         options: [],
@@ -210,6 +213,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
+      
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -238,6 +242,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         }
       },
       deleteFile(file, forceDelete) {
+
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {
@@ -268,6 +273,7 @@ const box = function (source, fileSourceList, router, optionApi) {
             break;
           }
         }
+        console.log(rtn.fileList)
       },
       getFormObj() {
         var rtnFormObj = {};

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

@@ -218,7 +218,7 @@ const Enum = {
     /*带标签的超链接列表*/
     HyperlinkListWithLabel: 44,
     /// <summary>
-    /// 图片
+    /// 图片选择
     /// </summary>
     PhotoSelect: 45,
   },

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ct-quickInput">
 
-     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click">
+     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click" @show="searchInputHandle">
             <div>
               <div>
                 <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -42,7 +42,6 @@
       else {
         this.model = this.vmodel;
       }
-      this.searchInputHandle();
     },
     data() {
       return {

package/src/centaline/validate/index.js

@@ -125,7 +125,16 @@ const actions = {
     } else {
       return false;
     }
-  }
+  },
+  requiredFile(v, o) {
+    debugger
+    if (v.fileList === undefined || v.fileList === null || v.fileList === ''||v.getfileListLength()<=0) {
+      return false;
+    }
+    else {
+      return true;
+    }
+  },
 };
 
 const valid = {
@@ -162,6 +171,11 @@ const valid = {
     message: '值必须是数字',
     ticker:'input'
   },
+  requiredFile: {
+    action: actions.requiredFile,
+    message: '必须上传附件',
+    ticker: 'input'
+  },
   //numberDecimal: {
   //  action: actions.numberDecimal,
   //  message: '小数点位数错误',
@@ -232,6 +246,7 @@ const valid = {
         this._validate = v;
       },
       validating(ticker, old1, old2) {
+        debugger
         var rtnValidate = [];
         switch (model.type) {
           case Enum.ControlType.NumericTextBox:
@@ -262,6 +277,9 @@ const valid = {
             case Enum.ControlType.Address:
               rtnValidate.push(valid.requiredMultiCombo);
               break;
+             case Enum.ControlType.File:
+                rtnValidate.push(valid.requiredFile);
+                break;
             default:
               rtnValidate.push(valid.required);
               break;