From b4a93807b40897ad4b5140b91bb0419805e5ac6c Mon Sep 17 00:00:00 2001 From: wenjiarui Date: Wed, 25 Oct 2023 11:42:12 +0800 Subject: [PATCH] =?UTF-8?q?extraFileCommit=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/extraFile/commit/index.js | 14 +++++++++----- es/components/extraFile/commit/web.pc.js | 6 ++++-- es/triggers/index.d.ts | 2 +- es/triggers/index.js | 2 ++ lib/components/extraFile/commit/index.js | 14 +++++++++----- lib/triggers/index.d.ts | 2 +- lib/triggers/index.js | 2 ++ 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/es/components/extraFile/commit/index.js b/es/components/extraFile/commit/index.js index 34ca58470..d2c16d207 100644 --- a/es/components/extraFile/commit/index.js +++ b/es/components/extraFile/commit/index.js @@ -30,7 +30,7 @@ export default OakComponent({ beforeCommit: (() => true), }, methods: { - getEfIds() { + getEfIds(strict) { const { efPaths } = this.props; const { oakFullpath } = this.state; assert(efPaths && efPaths.length > 0); @@ -41,8 +41,10 @@ export default OakComponent({ ? `${oakFullpath}.${path}` : oakFullpath; const data = this.features.runningTree.getFreshValue(path2); - assert(data, `efPath为${path}的路径上取不到extraFile数据，请设置正确的相对路径`); - return data.map((ele) => ele.id); + if (strict) { + assert(data, `efPath为${path}的路径上取不到extraFile数据，请设置正确的相对路径`); + } + return data?.map((ele) => ele.id); }) .flat() .filter((ele) => !!ele); @@ -51,8 +53,10 @@ export default OakComponent({ return []; }, async upload() { - const ids = this.getEfIds(); - assert(ids.length > 0); + const ids = this.getEfIds(true); + if (ids.length === 0) { + return; + } const promises = []; ids.forEach((id) => { const fileState = this.features.extraFile2.getFileState(id); diff --git a/es/components/extraFile/commit/web.pc.js b/es/components/extraFile/commit/web.pc.js index d8232b615..c9cb8a5e6 100644 --- a/es/components/extraFile/commit/web.pc.js +++ b/es/components/extraFile/commit/web.pc.js @@ -18,7 +18,8 @@ export default function render(props) { text = t('upload'); } } - return (_jsx(Button, { type: type, size: size, block: block, disabled: disabled, onClick: async () => { + return (_jsx(Button, { + type: type, size: size, block: block, disabled: disabled, onClick: async () => { if (oakExecutable) { if (beforeCommit) { const beforeCommitResult = await beforeCommit(); @@ -38,5 +39,6 @@ export default function render(props) { afterCommit(); } } - }, ...buttonProps, children: text })); + }, ...buttonProps, children: text + })); } diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index be82a19f5..c0354eb3f 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/es/triggers/index.js b/es/triggers/index.js index cb5212f5f..38b02055b 100644 --- a/es/triggers/index.js +++ b/es/triggers/index.js @@ -13,7 +13,9 @@ import extraFileTriggers from './extraFile'; import sessionMessageTriggers from './sessionMessage'; import wechatMenuTriggers from './wechatMenu'; import wechatPublicTag from './wechatPublicTag'; +import accountTriggers from './account'; export default [ + ...accountTriggers, ...applicationTriggers, ...addressTriggers, ...userTriggers, diff --git a/lib/components/extraFile/commit/index.js b/lib/components/extraFile/commit/index.js index ed2ea56ac..11e735b3e 100644 --- a/lib/components/extraFile/commit/index.js +++ b/lib/components/extraFile/commit/index.js @@ -33,7 +33,7 @@ exports.default = OakComponent({ beforeCommit: (() => true), }, methods: { - getEfIds() { + getEfIds(strict) { const { efPaths } = this.props; const { oakFullpath } = this.state; (0, assert_1.default)(efPaths && efPaths.length > 0); @@ -44,8 +44,10 @@ exports.default = OakComponent({ ? `${oakFullpath}.${path}` : oakFullpath; const data = this.features.runningTree.getFreshValue(path2); - (0, assert_1.default)(data, `efPath为${path}的路径上取不到extraFile数据，请设置正确的相对路径`); - return data.map((ele) => ele.id); + if (strict) { + (0, assert_1.default)(data, `efPath为${path}的路径上取不到extraFile数据，请设置正确的相对路径`); + } + return data?.map((ele) => ele.id); }) .flat() .filter((ele) => !!ele); @@ -54,8 +56,10 @@ exports.default = OakComponent({ return []; }, async upload() { - const ids = this.getEfIds(); - (0, assert_1.default)(ids.length > 0); + const ids = this.getEfIds(true); + if (ids.length === 0) { + return; + } const promises = []; ids.forEach((id) => { const fileState = this.features.extraFile2.getFileState(id); diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index be82a19f5..c0354eb3f 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/lib/triggers/index.js b/lib/triggers/index.js index decd0024f..361eec36f 100644 --- a/lib/triggers/index.js +++ b/lib/triggers/index.js @@ -16,7 +16,9 @@ const extraFile_1 = tslib_1.__importDefault(require("./extraFile")); const sessionMessage_1 = tslib_1.__importDefault(require("./sessionMessage")); const wechatMenu_1 = tslib_1.__importDefault(require("./wechatMenu")); const wechatPublicTag_1 = tslib_1.__importDefault(require("./wechatPublicTag")); +const account_1 = tslib_1.__importDefault(require("./account")); exports.default = [ + ...account_1.default, ...application_1.default, ...address_1.default, ...user_1.default,