doway-coms 2.10.23 → 2.10.25

package/package.json

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

package/packages/BasePictureCard/src/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div style="display: inline-block">
+  <div style="display: inline-block;width:100%" >
+    <input type="file" accept style="display: none;" ref="updateLoadContentView"/>
+    <!-- <div  tabindex="0" style="position:absolute;left:-9999px;" ref="updateLoadContentView"> &nbsp;黏贴</div> -->
     <div class="file-card" :class="isStyle? 'currentHeight' : ''">
       <div
         class="attach-wrapper"
@@ -95,31 +97,29 @@
           </div>
         </template>
       </div>
-      <a-upload
+        <div v-show="edit===true" @click="selectClick" ref="updateLoadContentView"
+          style="border: 1px solid #d9d9d9; border-radius: 6px"
+          :style="{ width: width, height: height, lineHeight: height,borderColor:currentSelectId==='empty'?'blue':null }"
+        >
+        <span style="cursor: default;">&nbsp;</span>
+        <a-upload
         class="avatar-uploader"
         :headers="uploadHeaders"
         :action="uploadData.picAction"
         :data="uploadData"
-        v-if="edit === true"
         @change="handleAvatarSuccess"
         :showUploadList="false"
         :fileList="uploadFileList"
         :before-upload="beforeAvatarUpload"
       >
-        <div
-          style="border: 1px solid #d9d9d9; border-radius: 6px"
-          :style="{ width: width, height: height, lineHeight: height }"
-        >
           <a-icon
             type="plus"
             class="avatar-uploader-icon"
-            style="text-align: center"
-            :style="{ width: width, height: height, lineHeight: height }"
+            style="text-align: center;width:50px;height: 50px;line-height:50px;"
           />
-          
-        </div>
+       
       </a-upload>
-      <span @click="pasteFileClick">黏贴</span>
+    </div>
       <div v-if="edit !== true && showEmptyText && internalRows.length === 0">
         没有附件信息哦，请编辑添加附件信息
       </div>
@@ -167,6 +167,7 @@ export default {
   },
   data() {
     return {
+      currentSelectId:null,
       uploadFileList:[],
       demo1: "",
       demo2: "",
@@ -290,6 +291,12 @@ export default {
     this.uploadData.resId = this.resId;
     this.uploadData.picAction = this.internalServiceUrl + "/UploadAttach";
     this.getAttachInfo(this.rows);
+
+    this.$refs.updateLoadContentView.addEventListener('paste', async (e) => {
+      e.preventDefault();
+      await this.pasteFileClick(e)
+    })
+
   },
   methods: {
     getCurrentToken() {
@@ -458,31 +465,41 @@ export default {
     /**
      * 黏贴附件
      */
-     async pasteFileClick(){
-      console.debug('navigator')
-      console.debug('navigator.clipboard',navigator.clipboard)
-      const items = await navigator.clipboard.read();
+     async pasteFileClick(e){
+      console.debug('e',e)
+      const items = e.clipboardData.files;
       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);
-            }
-          }
+          // if (item.type.startsWith('image/') || item.type.startsWith('application/')) {
+            //  this.pasteFile  = URL.createObjectURL(item)
+            //'复制文件'+this.$store.getters.newId() +'.png'
+            // let type = item.type
+            this.pasteFile =item //new File([item],`复制文件${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);
+          // }
         }
     },
+    selectClick(event){
+      this.currentSelectId = 'empty'
+      console.debug('selectClick')
+      document.execCommand('paste');
+      // this.$refs.updateLoadContentView.focus()
+        // console.debug('selectClick',event)
+        // event.target.addEventListener('paste', async (e) => {
+        //     e.preventDefault();
+        //     await this.pasteFileClick(e)
+        //   })
+        // this.$refs.updateLoadContentView.focus()
+    },
     uploadPasteFile(){
       const formData = new FormData();
       formData.append('file', this.pasteFile)

package/packages/directive/clickoutside.js

@@ -0,0 +1,44 @@
+const clickoutsideContext = '@@clickoutsideContext'
+
+export default {
+  /*
+   @param el 指令所绑定的元素
+   @param binding {Object} 
+   @param vnode vue编译生成的虚拟节点
+   */
+  bind(el, binding, vnode) {
+    const documentHandler = function(e) {
+      //   console.log(el)
+      //   console.log(e.target);
+      //   console.log(vnode);
+      //   console.log(binding);
+
+      if (!vnode.context || el.contains(e.target)) {
+        return false
+      }
+      if (binding.expression) {
+        vnode.context[el[clickoutsideContext].methodName](e)
+      } else {
+        el[clickoutsideContext].bindingFn(e)
+      }
+    }
+    el[clickoutsideContext] = {
+      documentHandler,
+      methodName: binding.expression,
+      bindingFn: binding.value
+    }
+    setTimeout(() => {
+      document.addEventListener('click', documentHandler)
+    }, 0)
+  },
+  update(el, binding) {
+    el[clickoutsideContext].methodName = binding.expression
+    el[clickoutsideContext].bindingFn = binding.value
+  },
+  unbind(el) {
+    document.removeEventListener(
+      'click',
+      el[clickoutsideContext].documentHandler
+    )
+  }
+}