From 25e797bb101b972536f7255fb84483fa8d807d68 Mon Sep 17 00:00:00 2001
From: wenjiarui <wenjiarui1@126.com>
Date: Mon, 3 Apr 2023 10:39:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E5=BD=93=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8F=96buffer?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8E=BB=E8=B0=83=E7=94=A8=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/context/BackendRuntimeContext.js | 2 +-
 src/context/BackendRuntimeContext.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/context/BackendRuntimeContext.js b/lib/context/BackendRuntimeContext.js
index f6c0842e6..5ca814e93 100644
--- a/lib/context/BackendRuntimeContext.js
+++ b/lib/context/BackendRuntimeContext.js
@@ -51,7 +51,7 @@ var BackendRuntimeContext = /** @class */ (function (_super) {
                         if (!(_g < _e.length)) return [3 /*break*/, 6];
                         id = _e[_g];
                         wechatQrCodeData = wechatQrCodeListObj[id];
-                        if (!(wechatQrCodeData.type === 'wechatMpWxaCode')) return [3 /*break*/, 5];
+                        if (!(wechatQrCodeData.hasOwnProperty('buffer') && wechatQrCodeData.type === 'wechatMpWxaCode')) return [3 /*break*/, 5];
                         return [4 /*yield*/, (0, wechatQrCode_1.getMpUnlimitWxaCode)(id, this)];
                     case 4:
                         buffer = _j.sent();
diff --git a/src/context/BackendRuntimeContext.ts b/src/context/BackendRuntimeContext.ts
index 71692ed58..41081e9f5 100644
--- a/src/context/BackendRuntimeContext.ts
+++ b/src/context/BackendRuntimeContext.ts
@@ -32,7 +32,7 @@ export class BackendRuntimeContext<ED extends EntityDict> extends AsyncContext<E
                         const wechatQrCodeListObj = d[entity];
                         for (const id in wechatQrCodeListObj) {
                             const wechatQrCodeData = wechatQrCodeListObj[id] as Partial<EntityDict['wechatQrCode']['OpSchema']>;
-                            if (wechatQrCodeData.type === 'wechatMpWxaCode') {
+                            if (wechatQrCodeData.hasOwnProperty('buffer') && wechatQrCodeData.type === 'wechatMpWxaCode') {
                                 const buffer = await getMpUnlimitWxaCode<ED, keyof ED, BackendRuntimeContext<ED>>(
                                     id,
                                     this,

From fa30041f866335188d9e9911ada28c27256e7cfb Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Tue, 4 Apr 2023 12:40:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?extraFile=20disabled=E7=94=B3=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/components/extraFile/gallery/index.js | 4 ++++
 src/components/extraFile/gallery/index.ts | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/components/extraFile/gallery/index.js b/lib/components/extraFile/gallery/index.js
index 14da94912..1a643b27a 100644
--- a/lib/components/extraFile/gallery/index.js
+++ b/lib/components/extraFile/gallery/index.js
@@ -135,6 +135,10 @@ exports.default = OakComponent({
             type: Boolean,
             value: false,
         },
+        disabled: { // web独有
+            type: Boolean,
+            value: false,
+        },
         type: String,
         origin: String,
         tag1: String,
diff --git a/src/components/extraFile/gallery/index.ts b/src/components/extraFile/gallery/index.ts
index 30c0bd4e6..49339f390 100644
--- a/src/components/extraFile/gallery/index.ts
+++ b/src/components/extraFile/gallery/index.ts
@@ -135,6 +135,10 @@ export default OakComponent({
             type: Boolean,
             value: false,
         },
+        disabled: { // web独有
+            type: Boolean,
+            value: false,
+        },
         type: String,
         origin: String,
         tag1: String,
@@ -469,7 +473,7 @@ export default OakComponent({
                     wx.hideLoading();
                     that.setMessage({
                         type: 'error',
-                        content: '下载文件失败'
+                        content: '下载文件失败',
                     });
                 },
                 complete: function (res) {},