From 5a709b29e5a5bcab66a6784371a1a3d93d767d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 24 Jul 2022 00:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DateField/index.vue      | 37 +++++++++++++++++++++++--
 src/components/DateRangeField/index.vue | 10 ++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/components/DateField/index.vue b/src/components/DateField/index.vue
index 5b307a45..0ff4c642 100644
--- a/src/components/DateField/index.vue
+++ b/src/components/DateField/index.vue
@@ -1,11 +1,12 @@
 <template>    
     
 						<div class="field-box">  
-							<el-avatar class="avater" :icon="getMyIcon(myVal)" :style="{backgroundColor:getMyColor(myVal)}">{{getMyAvaterInfo(myVal)}}</el-avatar> 
+							<el-avatar class="avater" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
 							
               <div class="field-info">
-                <slot name="field-info" :value="myVal">
-								<span class="field-value">{{myVal?formatDate( new Date(myVal),format):'' }} </span>
+                <slot name="field-info" :value="dateRange">
+								<span class="field-value" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span> 
+								<span class="field-value" v-else><span class="label-font-color">无</span></span> 
                 <slot name="label">
 								  <span class="field-label">{{label}}</span> 
                   <div v-if="disabled!==true" class="my-select" name="select" :value="myVal">
@@ -26,6 +27,36 @@
     name: 'date-field',
     components: {   },
     computed: { 
+      
+      avaterCpd(){ 
+         
+        var isEmpty=!this.myVal
+        var date=isEmpty?"":this.formatDate(new Date(this.myVal),this.format)
+        var obj={isNull:isEmpty,icon:'el-icon-date',color:'#E4E7ED',innerText:date} 
+          if(this.getColor||this.color){
+            if(this.getColor){
+               obj.color= this.getColor(this.myVal)
+            }else{
+              obj.color=this.color
+            }
+           
+          }else{
+            if(!isEmpty){ 
+                 obj.color= util.getColor(this.myVal) 
+            } 
+          } 
+          if(this.getIcon||this.icon){
+            if(this.getIcon){
+              obj.icon= this.getIcon(this.myVal )
+            }else if(this.icon){
+             obj.icon=this.icon
+            }
+          } 
+          if(isEmpty){
+            obj.innerText=''
+          }  
+        return obj;
+      }
     },
     data(){
         return {
diff --git a/src/components/DateRangeField/index.vue b/src/components/DateRangeField/index.vue
index dc581365..99ac1926 100644
--- a/src/components/DateRangeField/index.vue
+++ b/src/components/DateRangeField/index.vue
@@ -34,9 +34,9 @@ export default {
   components: {   },
   computed: {
      avaterCpd(){  
-        var isEmpty=this.isEmpty(this.dateRange)
-        var formatDate=this.formatDateRange(this.dateRange);
-        var obj={isNull:isEmpty,icon:'el-icon-full-screen',color:'#E4E7ED',innerText:formatDate} 
+        var isEmpty=this.dateRange==null ||this.dateRange.length==0
+        var formatDate=isEmpty?"":this.formatDateRange(this.dateRange);
+        var obj={isNull:isEmpty,icon:'el-icon-date',color:'#E4E7ED',innerText:formatDate} 
           if(this.getColor||this.color){
             if(this.getColor){
                obj.color= this.getColor(this.dateRange)
@@ -55,10 +55,6 @@ export default {
             }else if(this.icon){
              obj.icon=this.icon
             }
-          }else {
-            if(!isEmpty){ 
-                obj.icon='' 
-            } 
           } 
             
         return obj;