doway-coms 1.4.38 → 1.4.40

package/package.json

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

package/packages/BasePictureCard/src/index.vue

@@ -13,10 +13,8 @@
           <div class="attach" v-if="internalRow.attach.content === 'image'">
             <img
               @click="attachFileClick(internalRow.attach)"
-              :style="{ height: height, lineHeight: height }"
+              :style="{ height: height, lineHeight: height, width: width }"
               style="
-                min-width: 100px;
-                width: 100%;
                 border: 1px solid #ccc;
                 border-radius: 6px;
                 overflow: hidden;
@@ -41,18 +39,11 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <!-- <VxeCheckbox
-              class="attach-circle"
-              v-model="internalRow.isDefault"
-              @change="circleAttach(internalRow.attach, internalRow)"
-              :disabled="formState == 'view'"
-            ></VxeCheckbox> -->
           </div>
           <div class="attach" v-else>
             <img
               @click="attachFileClick(internalRow.attach)"
-              class="o_image"
-              style="width: 100%"
+              :style="{ height: height, lineHeight: height, width: width }"
               :data-mimetype="internalRow.attach.contentType"
             />
             <a-icon
@@ -71,12 +62,6 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <!-- <VxeCheckbox
-              class="attach-circle"
-              v-model="internalRow.isDefault"
-              @change="circleAttach(internalRow.attach, internalRow)"
-              :disabled="formState == 'view'"
-            ></VxeCheckbox> -->
           </div>
           <div
             :style="{ width: width }"
@@ -125,28 +110,11 @@
       :height="550"
       :width="800"
       destroy-on-close
-      :fullscreen="isFullscreen || dialogViewType == 'application/pdf'"
+      :fullscreen="dialogViewType == 'application/pdf'"
       :z-index="999"
     >
-      <!-- 添加普通图片全屏属性控制 -->
       <template #title>
-        <div
-          v-if="dialogViewType !== 'application/pdf'"
-          style="text-align: right; margin-right: 15px; padding-top: 5px"
-        >
-          <!-- 全屏 -->
-          <i
-            v-if="!isFullscreen"
-            style="font-size: 19px; margin-right: 10px"
-            @click="screenClick"
-          ></i>
-          <!-- 取消全屏 -->
-          <i
-            v-else
-            style="font-size: 19px; margin-right: 10px"
-            @click="narrowClick"
-          ></i>
-        </div>
+        <span>{{ currentFileTitle }}</span>
       </template>
       <!-- pdf -->
       <embed
@@ -199,7 +167,7 @@ export default {
       uploadHeaders: {
         Authorization: null,
       },
-      isFullscreen: false,
+      currentFileTitle: ''
     };
   },
   props: {
@@ -457,20 +425,11 @@ export default {
         this.dialogViewType = attachFile.contentType;
         this.dialogVisible = true;
       }
+      this.currentFileTitle = attachFile.name
     },
     closePdf() {
       this.isShowPdf = false;
     },
-    // 放大
-    screenClick() {
-      this.isFullscreen = true;
-    },
-    // 局部展示
-    narrowClick() {
-      this.isFullscreen = false;
-    },
-    // 单选改变事件
-    // change
   },
 };
 </script>

package/packages/BasePrintPreview/src/index.vue

@@ -68,6 +68,8 @@ export default {
             companyids.value = companyId
             formExport.target = 'printFrame'
             formExport.appendChild(companyids)
+          } else {
+            companyId = null
           }
           formExport.appendChild(inputValue)
           document.body.appendChild(formExport)