doway-coms 2.10.21 → 2.10.23

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -160,7 +160,8 @@
       <template #default="scope">
         <div v-if="scope.column.params" class="grid-valid-display">
           <!-- {{ scope.row[scope.column.field] }} -->
-          {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          <!-- {{ gridDefaultValueDisplay(scope.row, scope.column) }} -->
+          <span :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}">{{ gridDefaultValueDisplay(scope.row, scope.column) }}</span>
           <!-- {{ defaultValueDisplay(scope.row, scope.column) }} -->
         </div>
       </template>
@@ -172,6 +173,7 @@
       <template #text_edit="scope">
         <div class="interceptor-class">
           <a-input
+            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
               v-if="scope.column.params.controlEdit === true"
             class="inner-cell-control"
             size="small"
@@ -201,6 +203,7 @@
           <a-input-number
               v-if="scope.column.params.controlEdit === true"
             class="inner-cell-control"
+            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             size="small"
             @change="cellValueChange(scope)"
             v-model="scope.row[scope.column.property]"
@@ -231,6 +234,7 @@
       <template #datetime_edit="scope">
         <div class="interceptor-class">
           <a-date-picker
+           :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             v-model="scope.row[scope.column.property]"
             format="YYYY-MM-DD  HH:mm:ss"
             size="small"
@@ -244,6 +248,7 @@
       <template #select_edit="scope">
         <div class="interceptor-class">
           <a-select
+           :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             :allowClear="scope.column.params.allowClear"
             show-search
              option-filter-prop="children"
@@ -264,6 +269,7 @@
       <template #multiSelect_edit="scope">
         <div class="interceptor-class">
           <a-select
+           :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             v-model="scope.row[scope.column.property]"
             @change="cellValueChange(scope)"
             mode="multiple"
@@ -283,6 +289,7 @@
       <template #time_edit="scope" class="interceptor-class">
         <div class="interceptor-class">
           <a-time-picker
+           :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             v-model="scope.row[scope.column.property]"
             format="HH:mm:ss"
             value-format="HH:mm:ss"
@@ -1953,6 +1960,9 @@ export default {
       if (originCol.cellEdit) {
         colParams['cellEdit'] = originCol.cellEdit
       }
+      if(originCol.fontColor){
+        colParams['fontColor'] = originCol.fontColor
+      }
       if (originCol.width) {
         colInfo.width = originCol.width
       } else {

package/packages/BasePictureCard/src/index.vue

@@ -103,6 +103,7 @@
         v-if="edit === true"
         @change="handleAvatarSuccess"
         :showUploadList="false"
+        :fileList="uploadFileList"
         :before-upload="beforeAvatarUpload"
       >
         <div
@@ -115,8 +116,10 @@
             style="text-align: center"
             :style="{ width: width, height: height, lineHeight: height }"
           />
+          
         </div>
       </a-upload>
+      <span @click="pasteFileClick">黏贴</span>
       <div v-if="edit !== true && showEmptyText && internalRows.length === 0">
         没有附件信息哦，请编辑添加附件信息
       </div>
@@ -154,7 +157,7 @@ import { notification, Upload } from "ant-design-vue";
 import { sysRowState } from "../../utils/enum";
 import { Checkbox, Modal } from "vxe-table";
 import { attachGetAttachUrlApi, attachSearchApi } from "../../utils/api";
-
+import request from '../../utils/request'
 export default {
   name: "BasePictureCard",
   components: {
@@ -164,6 +167,7 @@ export default {
   },
   data() {
     return {
+      uploadFileList:[],
       demo1: "",
       demo2: "",
       internalServiceUrl: "",
@@ -183,6 +187,7 @@ export default {
         picAction: "",
         resId: "",
       },
+      pasteFile:null,
       uploadHeaders: {
         Authorization: null,
       },
@@ -350,6 +355,7 @@ export default {
           sysRowState: sysRowState.add,
           attach: info.file.response.content,
         };
+        console.debug('addRow',addRow)
 
         this.internalRows.push(addRow);
         let tempField;
@@ -449,6 +455,46 @@ export default {
     closePdf() {
       this.isShowPdf = false;
     },
+    /**
+     * 黏贴附件
+     */
+     async pasteFileClick(){
+      console.debug('navigator')
+      console.debug('navigator.clipboard',navigator.clipboard)
+      const items = await navigator.clipboard.read();
+      console.debug('items',items)
+      for (const item of items) {
+          for (const type of item.types) {
+            if (type.startsWith('image/') || type.startsWith('application/')) {
+              const blob = await item.getType(type);
+              //'复制文件'+this.$store.getters.newId() +'.png'
+              this.pasteFile = new File([blob],`复制文件${this.$store.getters.newId()}.${type.split('/')[1]}` , { type });
+              this.uploadPasteFile()
+              return
+              // console.debug('file',file)
+              // this.uploadFileList = [file];
+              // const reader = new FileReader();
+              // reader.onload = (e) => {
+              //   console.debug(e)
+              //   // this.imageSrc = e.target.result;
+              // };
+              // reader.readAsDataURL(blob);
+            }
+          }
+        }
+    },
+    uploadPasteFile(){
+      const formData = new FormData();
+      formData.append('file', this.pasteFile)
+      formData.append('picType', this.uploadData.picType)
+      formData.append('resId', this.uploadData.resId)
+      request({url:this.uploadData.picAction,method:'post',data:formData,headers:{'Content-Type': 'multipart/form-data'}})
+      .then(res=>{
+          this.handleAvatarSuccess({file:{status:'done',response:res}})
+      }).catch(err=>{
+          console.debug(err)
+      })
+    }
   },
 };
 </script>

package/packages/BasePulldown/src/index.vue

@@ -1344,6 +1344,8 @@ export default {
 }
 
 .d-grid-control {
+  width: 100% !important;
+  min-width: unset !important;
   // height: 30px;
 }
 .interceptor-class {