@zscreate/zhxy-app-component 1.0.342 → 1.0.344

package/components/evan-form-item/evan-form-item.vue

@@ -51,9 +51,11 @@
         <view class="option-font-size" v-if="widget.options.defaultValue.length === 0">暂无模板</view>
       </view>
       <view class="evan-form-item-container__main download_moban" style="display: flex" :style="mContentStyle" v-else>
+        <!-- #ifdef H5 -->
         <view class="download_item" @click.prevent.native="uploadFileQYS" style="margin-right: 10px;color: #007AFF;">
           文件下载
         </view>
+        <!-- #endif -->
         <view class="download_item" @click.prevent.native="uploadFileQYS('perview')" style="margin-right: 20px;color: #007AFF;">
           预览
         </view>
@@ -1507,92 +1509,143 @@ export default {
     },
     // 锲约锁模版下载
     uploadFileQYS(type) {
-      if(this.widget.options.disabled) return
-      if (type === 'perview') {
+      if (this.widget.options.disabled) return;
+      if (type === "perview") {
         if (!this.dataObj().config.applyId) {
           uni.showToast({
-            title: '当前状态不支持文件预览',
+            title: "当前状态不支持文件预览",
             icon: "none",
             duration: 1500,
-          })
-          return
+          });
+          return;
         }
-        this.$u.get('/form/qiyuesuo/viewQiyuesuoDoc', { applyId: this.dataObj().config.applyId }).then((res) => {
-          if (res.success && res.result) {
-            // #ifdef H5
-            window.open(res.result, '_blank')
-            // #endif
-            // #ifdef MP
-            uni.setClipboardData({
-              data: res.result,
-              success: () =>
-									uni.showToast({
-										title: '链接已复制,请通过浏览器预览'
-									})
-            });
-            // #endif
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
+        this.$u
+          .get("/form/qiyuesuo/viewQiyuesuoDoc", {
+            applyId: this.dataObj().config.applyId,
+          })
+          .then((res) => {
+            if (res.success && res.result) {
+              // #ifdef H5
+              window.open(res.result, "_blank");
+              // #endif
+              // #ifdef MP
+              // uni.setClipboardData({
+              //   data: res.result,
+              //   success: () =>
+              // 			uni.showToast({
+              // 				title: '链接已复制,请通过浏览器预览'
+              // 			})
+              // });
+              this.$u.http
+                .request({
+                  url: "/form/qiyuesuo/download",
+                  method: "GET",
+                  header: {},
+                  responseType: "arraybuffer",
+                  dataType: "binary",
+                  originalData: true,
+                  data: { applyId: this.dataObj().config.applyId },
+                })
+                .then((res) => {
+                  let data = res.data;
+                  if (data instanceof String) {
+                    console.log(data);
+                    uni.showToast({
+                      title: "导出失败！",
+                      icon: "none",
+                      duration: 1500,
+                    });
+                    return;
+                  }
+                  const fs = uni.getFileSystemManager(); //全局唯一的文件管理器
+                  const filePath =
+                    wx.env.USER_DATA_PATH +
+                    `/${this.dataObj().config.formName || "文件下载"}.pdf`;
+                  fs.writeFile({
+                    filePath, //这里填文件的名字
+                    data,
+                    encoding: "binary",
+                    success(res) {
+                      uni.openDocument({
+                        showMenu: true,
+                        filePath,
+                        success: function (res) {
+                          console.log("打开文档成功");
+                        },
+                      });
+                    },
+                  });
+                });
+              // #endif
+            } else {
+              this.$message.warning(res.message);
+            }
+          });
       } else {
         if (!this.dataObj().config.applyId) {
           uni.showToast({
-            title: '当前状态不支持文件下载',
+            title: "当前状态不支持文件下载",
             icon: "none",
             duration: 1500,
-          })
-          return
+          });
+          return;
         }
-        this.$u.http.request({
-          url: '/form/qiyuesuo/download',
-          method: 'GET',
-          header: {},
-          responseType: 'arraybuffer',
-          dataType: 'binary',
-          originalData: true,
-          data: { applyId: this.dataObj().config.applyId }
-        }).then(res => {
-          let data = res.data
-          if (data instanceof String) {
-            console.log(data)
-            uni.showToast({
-              title: '导出失败！',
-              icon: "none",
-              duration: 1500,
-            })
-            return
-          }
-          //#ifdef MP
-          const fs = uni.getFileSystemManager(); //全局唯一的文件管理器
-          const filePath = wx.env.USER_DATA_PATH + `/${(this.dataObj().config.formName || '文件下载')}.pdf`
-          fs.writeFile({
-            filePath,   //这里填文件的名字
-            data,
-            encoding: "binary",
-            success(res) {
-              uni.openDocument({
-                showMenu: true,
-                filePath,
-                success: function (res) {
-                  console.log('打开文档成功');
-                }
+        this.$u.http
+          .request({
+            url: "/form/qiyuesuo/download",
+            method: "GET",
+            header: {},
+            responseType: "arraybuffer",
+            dataType: "binary",
+            originalData: true,
+            data: { applyId: this.dataObj().config.applyId },
+          })
+          .then((res) => {
+            let data = res.data;
+            if (data instanceof String) {
+              console.log(data);
+              uni.showToast({
+                title: "导出失败！",
+                icon: "none",
+                duration: 1500,
               });
+              return;
             }
-          })
-          //#endif
-          //#ifdef H5
-          let url = window.URL.createObjectURL(new Blob([data]));
-          let link = document.createElement("a");
-          link.style.display = "none";
-          link.href = url;
-          link.setAttribute("download", (this.dataObj().config.formName || '文件下载') + ".pdf");
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-          //#endif
-        })
+            //#ifdef MP
+            const fs = uni.getFileSystemManager(); //全局唯一的文件管理器
+            const filePath =
+              wx.env.USER_DATA_PATH +
+              `/${this.dataObj().config.formName || "文件下载"}.pdf`;
+            fs.writeFile({
+              filePath, //这里填文件的名字
+              data,
+              encoding: "binary",
+              success(res) {
+                uni.openDocument({
+                  showMenu: true,
+                  filePath,
+                  success: function (res) {
+                    console.log("打开文档成功");
+                  },
+                });
+              },
+            });
+            //#endif
+            //#ifdef H5
+            let url = window.URL.createObjectURL(new Blob([data]));
+            let link = document.createElement("a");
+            link.style.display = "none";
+            link.href = url;
+            link.setAttribute(
+              "download",
+              (this.dataObj().config.formName || "文件下载") + ".pdf"
+            );
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+            //#endif
+          });
       }
     },
     /**纠错**/
@@ -2110,8 +2163,14 @@ export default {
       let departId = -1
       let departName = ""
       if (this.widget.options.departRelation) {
-        const userInfo = uni.getStorageSync('userinfo')
-        console.log("userInfo: ", userInfo)
+        let userInfo = uni.getStorageSync('userinfo')
+        if (typeof userinfo === 'string') {
+          try {
+            userinfo = JSON.parse(userinfo);
+          } catch (e) {
+            userinfo = {};
+          }
+        }
         departId = this.widget.options.departId || userInfo.departId || userInfo.depart_id
         departName = this.widget.options.departName || userInfo.departName || userInfo.depart_name
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.342",
+	"version": "1.0.344",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",