doway-coms 2.11.87 → 2.11.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.87",
+  "version": "2.11.89",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -348,6 +348,7 @@
             :allowAutoClear="scope.column.params.allowAutoClear"
             @preSearch="(searchInfo,repeatRowInfo,row,api) => preSearch(searchInfo, scope,null,api)"
             @selectChanged="(selectedRowInfo)=>pulldownSelectChanged(scope,selectedRowInfo)"
+            @inputBlurEvent="()=>pulldownInputBlurEvent(scope)"
             @confirmMultiSelect="
               (pulldownView, selectRows) =>
                 pulldownMultiSelect(scope, pulldownView, selectRows)
@@ -3107,6 +3108,9 @@ export default {
         scope['pulldownSelectedRow'] = selectedRowInfo
         this.cellValueChange(scope)
     },
+    pulldownInputBlurEvent(scope){
+       this.$emit('inputBlurEvent', scope,this.dataName)
+    },
     cellValueChange(scope, e) {
       console.debug(scope.column.field + 'value change')
       if (

package/packages/BasePrintPreview/src/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+    show-footer
       ref="printModal"
       show-zoom
       append-to-body
@@ -17,6 +18,7 @@
       wrap-class-name="full-modal"
       @cancel="closeModal"
     >
+     <template #default>
       <iframe
         name="printFrame"
         id="printFrame"
@@ -28,15 +30,28 @@
         :src="url"
       >
       </iframe>
+      </template>
+      <template #footer>
+        <div v-if="sendEmailInfo.show===true"  class="email-controls">
+          <Checkbox  v-model="sendEmailInfo.self">抄送自己</Checkbox>
+          <Input  v-model="sendEmailInfo.to"  class="email-input"/>
+          <Button :loading="sendEmailInfo.loading"  type="primary" @click="sendEmail">发送电子邮件</Button>
+      </div>
+       </template>
     </vxe-modal>
   </div>
 </template>
 <script>
 import {Modal as VxeModal} from 'vxe-table'
+import { Checkbox,Input,Button } from 'ant-design-vue'
+import request from '../../utils/request'
 export default {
   name: 'BasePrintPreview',
   components:{
-    VxeModal
+    VxeModal,
+    Checkbox,
+    Input,
+    Button
   },
   props: {},
   data() {
@@ -46,6 +61,14 @@ export default {
       postData: '',
       requestToken: '',
       tempData: '',
+       sendEmailInfo:{
+         show:false,
+         to:null,
+         self:false,
+         cacheKey:null,
+         sendEmailUrl:null,
+         loading:false
+      }
     }
   },
   methods: {
@@ -69,14 +92,37 @@ export default {
           document.body.removeChild(formExport)
       })
     },
+   async sendEmail(){
+    this.sendEmailInfo.loading  = true
 
-    showPreview(url, data, isReplace, method, modalInfo) {
+    try{
+       await request({
+          url: this.sendEmailInfo.sendEmailUrl,
+          method: 'post',
+          data: {to:this.sendEmailInfo.to,self:this.sendEmailInfo.self,cacheKey:this.sendEmailInfo.cacheKey}
+        })
+        this.$antsuccess('发送成功')
+    }finally{ 
+      this.sendEmailInfo.loading  = false
+    }
+    },
+    showPreview(url, data, isReplace, method, modalInfo,contentInfo) {
       // modalInfo = {type: '', info: {}}
       this.$refs.printModal.maximize()
       this.isShow = true
       if (!modalInfo) {
         modalInfo = null
       }
+      
+      if(contentInfo){
+         //构造是否发送电子邮件信息
+         this.sendEmailInfo.show = contentInfo.sendEmail
+         this.sendEmailInfo.to = contentInfo.emailTo
+         this.sendEmailInfo.self = contentInfo.emailSelf
+         this.sendEmailInfo.cacheKey = contentInfo.cacheKey
+         this.sendEmailInfo.sendEmailUrl = contentInfo.sendEmailUrl
+      }
+     
       if (method == 'post') {
         this.isShow = true
         this.$nextTick(() => {
@@ -121,6 +167,9 @@ export default {
         } else {  // 其它
           this.url = url + '?token=' + this.$store.getters.token + '&ids=' + ids
         }
+         if(this.sendEmailInfo.cacheKey){
+            this.url = this.url + '&cacheKey=' + this.sendEmailInfo.cacheKey
+        }
       }
     },
     closeModal() {
@@ -147,4 +196,19 @@ export default {
     flex: 1;
   }
 }
+.email-controls {
+  right: 20px;
+  bottom: 20px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  background: white;
+  padding: 10px;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+.email-input {
+  width: 200px;
+}
 </style>

package/packages/BasePulldown/src/index.vue

@@ -669,7 +669,9 @@ export default {
       }
       this.$emit('inputChangeEvent', null)
     },
-    inputBlurEvent(event) {},
+    inputBlurEvent(event) {
+      this.$emit('inputBlurEvent', null)
+    },
     /**
      * 输入框获取焦点事件
      */