diff --git a/mobile-h5/scripts/check-oa-app-icons.js b/mobile-h5/scripts/check-oa-app-icons.js index 9e77b2df..6b09e63a 100644 --- a/mobile-h5/scripts/check-oa-app-icons.js +++ b/mobile-h5/scripts/check-oa-app-icons.js @@ -39,6 +39,10 @@ import assert from 'node:assert/strict' assert.strictEqual(img.kind, 'image') assert.strictEqual(img.src, 'https://cdn.example/a.png') + const legacy = resolveOaAppIcon('/oa-app-icons/doc-orange.svg') + assert.strictEqual(legacy.kind, 'image') + assert.strictEqual(legacy.src, '/static/oa-app-icons/doc-orange.svg') + const built = buildEpIconUrl('Wallet', '#fef3c7') assert.strictEqual(built, 'ep:Wallet|#fef3c7') const r = resolveOaAppIcon(built) diff --git a/mobile-h5/static/oa-app-icons/cart-rose.svg b/mobile-h5/static/oa-app-icons/cart-rose.svg new file mode 100644 index 00000000..a10c9ee8 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/cart-rose.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/check-teal.svg b/mobile-h5/static/oa-app-icons/check-teal.svg new file mode 100644 index 00000000..5c3c1f58 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/check-teal.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/clock-blue.svg b/mobile-h5/static/oa-app-icons/clock-blue.svg new file mode 100644 index 00000000..4e758d1f --- /dev/null +++ b/mobile-h5/static/oa-app-icons/clock-blue.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/doc-orange.svg b/mobile-h5/static/oa-app-icons/doc-orange.svg new file mode 100644 index 00000000..13278199 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/doc-orange.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/leave-mint.svg b/mobile-h5/static/oa-app-icons/leave-mint.svg new file mode 100644 index 00000000..889d9c75 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/leave-mint.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/mail-violet.svg b/mobile-h5/static/oa-app-icons/mail-violet.svg new file mode 100644 index 00000000..4185628c --- /dev/null +++ b/mobile-h5/static/oa-app-icons/mail-violet.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/tag-cyan.svg b/mobile-h5/static/oa-app-icons/tag-cyan.svg new file mode 100644 index 00000000..1040b112 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/tag-cyan.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/static/oa-app-icons/yen-amber.svg b/mobile-h5/static/oa-app-icons/yen-amber.svg new file mode 100644 index 00000000..508dd677 --- /dev/null +++ b/mobile-h5/static/oa-app-icons/yen-amber.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-h5/utils/oa-app-icons.js b/mobile-h5/utils/oa-app-icons.js index d9d72691..5ac23140 100644 --- a/mobile-h5/utils/oa-app-icons.js +++ b/mobile-h5/utils/oa-app-icons.js @@ -79,6 +79,23 @@ export function parseEpIconUrl(iconUrl) { return { icon, bg, fg: iconFgFromBg(bg) } } +/** + * 旧版静态图标存 `/oa-app-icons/*.svg`(web-admin/public)。 + * 小程序/H5 需走 `static/oa-app-icons/`,否则 5173 下 404。 + */ +export function resolveOaAppIconImageSrc(iconUrl) { + const u = String(iconUrl || '').trim() + if (!u || isEpIconUrl(u)) return '' + if (/^https?:\/\//i.test(u)) return u + if (u.startsWith('/oa-app-icons/')) { + return '/static' + u + } + if (u.startsWith('/static/')) return u + if (u.startsWith('/')) return u + // MinIO 相对 key:由调用方或 config 拼完整 URL;此处原样返回 + return u +} + export function resolveOaAppIcon(iconUrl) { const u = String(iconUrl || '').trim() if (!u) { @@ -89,10 +106,7 @@ export function resolveOaAppIcon(iconUrl) { const p = parseEpIconUrl(u) return { kind: 'ep', icon: p.icon, bg: p.bg, fg: p.fg } } - if (/^https?:\/\//i.test(u) || u.startsWith('/')) { - return { kind: 'image', src: u } - } - return { kind: 'image', src: u } + return { kind: 'image', src: resolveOaAppIconImageSrc(u) } } const EP_ICON_SVG_INNER = {