Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev

This commit is contained in:
Xu Chang 2023-04-05 14:22:28 +08:00
parent 43bdaeb51b fa30041f86
commit 3dda0abe2f
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/components/extraFile/gallery/index.js
View File

@ -135,6 +135,10 @@ exports.default = OakComponent({
type: Boolean,
value: false,
},
disabled: { // web独有
type: Boolean,
value: false,
},
type: String,
origin: String,
tag1: String,

2
lib/context/BackendRuntimeContext.js
View File

@ -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();

6
src/components/extraFile/gallery/index.ts
View File

@ -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) {},

2
src/context/BackendRuntimeContext.ts
View File

@ -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,