@mptw/skylens-ui 1.4.67 → 1.4.69

package/.env.local

@@ -0,0 +1 @@
+NUXT_PUBLIC_ICO_URL=https://skylens-mng-dev-1087511617183.asia-east1.run.app

package/.env.stage

@@ -0,0 +1 @@
+NUXT_PUBLIC_ICO_URL=https://skylens-mng-dev-1087511617183.asia-east1.run.app

package/nuxt.config.ts

@@ -10,6 +10,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       defaultMobileEndDateBeforeNow: 4,
+      icoUrl: 'https://skylens-mng-dev-1087511617183.asia-east1.run.app',
     },
   },
   components: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mptw/skylens-ui",
   "type": "module",
-  "version": "1.4.67",
+  "version": "1.4.69",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/utils/generateSheet.ts

@@ -7,6 +7,8 @@ export default ({
   additionalRows = [],
   headerCols = [],
   rows = [],
+  dateRangeTitle = '數據區間',
+  compareDateRangeTitle = '前期數據區間',
 }: {
   name: string,
   project?: string,
@@ -16,11 +18,13 @@ export default ({
   additionalRows?: Array<Array<string | number>>,
   headerCols?: Array<string>,
   rows?: Array<Array<string | number>>,
+  dateRangeTitle?: string,
+  compareDateRangeTitle?: string,
 }) => {
   const data = [];
   if (project) data.push(['專案名稱', project]);
-  if (dateRangeString) data.push(['數據區間', dateRangeString]);
-  if (compareDateRangeString) data.push(['前期數據區間', compareDateRangeString]);
+  if (dateRangeString) data.push([dateRangeTitle, dateRangeString]);
+  if (compareDateRangeString) data.push([compareDateRangeTitle, compareDateRangeString]);
   if (sources?.length > 0) data.push(['數據來源', sources.join(',')]);
   if (additionalRows?.length > 0) data.push(...additionalRows);
 

package/utils/index.ts

@@ -486,11 +486,10 @@ export const ga4ev = ({ category, action, label, value, cb }: {
 };
 
 export const getWebsiteFavico = (domain: string): Promise<{ domain: string; icoUrl: string; }> => {
+  const runtimeConfig = useRuntimeConfig();
+
   return new Promise((resolve) => {
-    const icoUrl = `https://storage.googleapis.com/domains-favicon/${domain.replaceAll(
-      '.',
-      '_'
-    )}.ico`;
+    const icoUrl = `${runtimeConfig.public.icoUrl}/api/4.0/domain_ico?domain=${domain}`;
     const canvas = document.createElement('canvas');
     canvas.width = 26;
     canvas.height = 26;
@@ -513,9 +512,6 @@ export const getWebsiteFavico = (domain: string): Promise<{ domain: string; icoU
 
       resolve({ domain, icoUrl: canvas.toDataURL('image/png', 1.0) });
     };
-    image.onerror = () => {
-      image.src = `${window.location.protocol}//${window.location.host}/assets/images/commons/default-favico.png`;
-    };
     image.src = icoUrl;
   });
 };