doway-coms 1.2.8 → 1.3.0

package/package.json

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

package/packages/BasePictureCard/src/index.vue

@@ -21,14 +21,9 @@
                 padding: 0;
               "
               :src="
-                `${internalServiceUrl}/GetAttachFile/${internalRow.attach.id}?accessToken=${$store.getters.token}`
+                `${internalServiceUrl}/GetAttachFile/${internalRow.attach.id}?accessToken=${store.getters.token}`
               "
             />
-            <!-- <i
-              class="el-icon-error attach-delete"
-              v-if="edit === true"
-              @click="removeAttach(internalRow.attach)"
-            ></i> -->
             <a-icon
               class="attach-delete"
               type="close-circle"
@@ -37,17 +32,9 @@
             />
             <a-icon
               class="attach-download"
-              type="vertical-align-bottom"
+              type="download"
               @click="downloadAttach(internalRow.attach)"
             />
-            <!-- <i
-              class="el-icon-download attach-download"
-              @click="downloadAttach(internalRow.attach)"
-            ></i> -->
-            <!-- <i
-              class="el-icon-view attach-view"
-              @click="viewAttach(internalRow.attach)"
-            ></i> -->
             <a-icon
               class="attach-view"
               type="zoom-in"
@@ -66,19 +53,22 @@
               class="o_image"
               :data-mimetype="internalRow.attach.contentType"
             />
-            <i
-              class="el-icon-error attach-delete"
+            <a-icon
+              class=" attach-delete"
+              type="close-circle"
               v-if="edit === true"
               @click="removeAttach(internalRow.attach)"
-            ></i>
-            <i
-              class="el-icon-download attach-download"
+            />
+            <a-icon
+              class="attach-download"
+              type="download"
               @click="downloadAttach(internalRow.attach)"
-            ></i>
-            <i
-              class="el-icon-view attach-view"
+            />
+            <a-icon
+              class="attach-view"
+              type="zoom-in"
               @click="viewAttach(internalRow.attach)"
-            ></i>
+            />
             <VxeCheckbox
               class="attach-circle"
               v-model="internalRow.isDefault"
@@ -113,11 +103,12 @@
           style="border: 1px solid #d9d9d9; border-radius: 6px"
           :style="{ width: width, height: height, lineHeight: height }"
         >
-          <i
-            class="el-icon-plus avatar-uploader-icon"
+          <a-icon
+            type="plus"
+            class="avatar-uploader-icon"
             style="text-align: center"
             :style="{ width: width, height: height, lineHeight: height }"
-          ></i>
+          />
         </div>
       </a-upload>
       <div v-if="edit !== true && showEmptyText && internalRows.length === 0">
@@ -131,6 +122,7 @@
       resize
       destroy-on-close
       :fullscreen="isFullscreen || dialogViewType == 'application/pdf'"
+      :z-index="999"
     >
       <!-- 添加普通图片全屏属性控制 -->
       <template #title>
@@ -141,14 +133,12 @@
           <!-- 全屏 -->
           <i
             v-if="!isFullscreen"
-            class="el-icon-full-screen"
             style="font-size: 19px; margin-right: 10px"
             @click="screenClick"
           ></i>
           <!-- 取消全屏 -->
           <i
             v-else
-            class="el-icon-connection"
             style="font-size: 19px; margin-right: 10px"
             @click="narrowClick"
           ></i>
@@ -373,7 +363,7 @@ export default {
           let tempValue = addRow
           tempField = this.cols[i].field
           if (this.cols[i].isAuto) {
-            tempValue[tempField] = this.$store.getters.newId() + ''
+            tempValue[tempField] = store.getters.newId() + ''
             continue
           }
           if (
@@ -436,18 +426,18 @@ export default {
       this.$emit('remove', attachFile.id)
     },
     downloadAttach(attachFile) {
-      window.open(this.internalServiceUrl + '/DownAttachFile/' + attachFile.id)
+      window.open(this.internalServiceUrl + '/DownAttachFile/' + attachFile.id+`?accessToken=${this.$store.getters.token}`)
     },
     /**
      * 查看附件
      */
     viewAttach(attachFile) {
       if (attachFile.contentType === 'application/pdf') {
-        this.dialogImageUrl = `${this.internalServiceUrl}/GetAttachFile/${attachFile.id}?accessToken=${this.$store.getters.token}`
+        this.dialogImageUrl = `${this.internalServiceUrl}/GetAttachFile/${attachFile.id}?accessToken=${store.getters.token}`
         this.dialogViewType = attachFile.contentType
         this.dialogVisible = true
       } else if (attachFile.content === 'image') {
-        this.dialogImageUrl = `${this.internalServiceUrl}/GetAttachFile/${attachFile.id}?accessToken=${this.$store.getters.token}`
+        this.dialogImageUrl = `${this.internalServiceUrl}/GetAttachFile/${attachFile.id}?accessToken=${store.getters.token}`
         this.dialogViewType = attachFile.contentType
         this.dialogVisible = true
       }
@@ -587,14 +577,4 @@ export default {
 .el-upload-list__item is-success {
   float: left;
 }
-
-.el-icon-connection:hover {
-  color: white;
-  cursor: pointer;
-}
-
-.el-icon-full-screen:hover {
-  color: white;
-  cursor: pointer;
-}
 </style>