@ray-js/api 1.4.50-beta.1 → 1.4.51

package/lib/getCdnUrl/index.d.ts

@@ -1,2 +1,2 @@
-export default function getCdnUrl(path: string): string;
-export declare function getCdnUrlAsync(path: string): Promise<string>;
+export default function getCdnUrl(path: string, cdnMap?: Record<string, string>, region?: string): string;
+export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string>, region?: string): Promise<string>;

package/lib/getCdnUrl/index.js

@@ -1,8 +1,7 @@
 export default function getCdnUrl(path) {
-  // 暂未实现获取cdn方法，将直接返回path
   return path;
 }
-export function getCdnUrlAsync(path) {
+export async function getCdnUrlAsync(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return Promise.resolve(path);
 }

package/lib/getCdnUrl/index.wechat.d.ts

@@ -1,2 +1,2 @@
-export default function getCdnUrl(path: string): string;
-export declare function getCdnUrlAsync(path: string): Promise<string>;
+export default function getCdnUrl(path: string, cdnMap?: Record<string, string>, region?: string): string;
+export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string>, region?: string): Promise<string>;

package/lib/getCdnUrl/index.wechat.js

@@ -1,8 +1,7 @@
 export default function getCdnUrl(path) {
-  // 暂未实现获取cdn方法，将直接返回path
   return path;
 }
-export function getCdnUrlAsync(path) {
+export async function getCdnUrlAsync(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return Promise.resolve(path);
 }

package/lib/panel/i18n/index.d.ts

@@ -1,27 +1,28 @@
 type LanguageMap = {
     [key: string]: Record<string, string>;
 };
-export default class I18N {
+export declare const updateI18n: (data: LanguageMap) => void;
+export default class I18N<LanMap extends LanguageMap, Lan extends LanMap[keyof LanMap] = LanMap[keyof LanMap]> {
     [x: string]: any;
-    strings: LanguageMap;
+    strings: LanMap;
     defaultLang: string;
     __language: string;
-    constructor(props: LanguageMap);
+    constructor(props: LanMap);
     forceUpdateNetworkLang(productId: string): void;
-    mergeLanguage(L1: LanguageMap, L2: LanguageMap): LanguageMap;
+    mergeLanguage(L1: LanguageMap, L2: LanguageMap): any;
     isZh(language: string): boolean;
     setLanguage(language: string): void;
     buildLanguage(language: string): void;
     _getBestMatchingLanguage(language: string, props: LanguageMap): any;
     formatString(str: string, ...values: any[]): string;
-    formatValue(key: string, ...values: any[]): any;
+    formatValue(key: keyof Lan, ...values: any[]): any;
     _replaceAll(find: string, replace: string, str: string): string;
     getDpLang(code: string | number, value?: undefined | boolean | string): any;
     getDpName(code: string, defaultName: string): any;
     getDpsLang(key: {
         [key: string]: string;
     }): {};
-    getLang(key: string, defaultString?: string): any;
+    getLang(key: keyof Lan, defaultString?: string): any;
     /**
      *  获取picker标题
      * @param {*} dpCode

package/lib/panel/i18n/index.js

@@ -1,6 +1,21 @@
 import "core-js/modules/es.string.replace.js";
 import { requestCloud, getSystemInfoSync, THING } from '../..';
 import { getBitValue } from '../utils';
+
+/**
+ * I18n 智能小程序中用来获取多语言的对象
+ * 文档： https://developer.tuya.com/cn/miniapp/framework/app/i18n
+ */
+
+export const updateI18n = () => {
+  // 微信小程序中使用的方法，这里不需要实现
+};
+function hasKey(key) {
+  if (typeof I18n.has === 'function') {
+    return I18n.has(key);
+  }
+  return I18n.t(key) !== key;
+}
 export default class I18N {
   constructor(props) {
     this.strings = this.mergeLanguage(props, {});
@@ -107,7 +122,7 @@ export default class I18N {
     return res;
   }
   formatValue(key) {
-    let res = typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
+    let res = this.getLang(key);
     for (let i = 0; i < (arguments.length <= 1 ? 0 : arguments.length - 1); i++) {
       res = this._replaceAll("{".concat(i, "}"), i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
     }
@@ -129,30 +144,30 @@ export default class I18N {
     } else {
       key = "dp_".concat(code, "_").concat(value).toLowerCase();
     }
-    return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
+    return hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
   }
   getDpName(code, defaultName) {
     const key = "dp_".concat(code).toLowerCase();
-    return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : defaultName;
+    return hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : defaultName;
   }
   getDpsLang(key) {
     let strs = {};
     if (typeof key === 'object') {
       if (typeof key.strKey === 'string') {
-        strs = I18n.t(key.strKey) !== key.strKey ? I18n.t(key.strKey) : typeof this[key.strKey] !== 'undefined' ? this[key.strKey] : I18n.t(key.strKey);
+        strs = hasKey(key.strKey) ? I18n.t(key.strKey) : typeof this[key.strKey] !== 'undefined' ? this[key.strKey] : I18n.t(key.strKey);
       } else {
         Object.keys(key).map(i => {
-          strs[key[i]] = I18n.t(key[i]) !== key[i] ? I18n.t(key[i]) : typeof this[key[i]] !== 'undefined' ? this[key[i]] : I18n.t(key[i]);
+          strs[key[i]] = hasKey(key[i]) ? I18n.t(key[i]) : typeof this[key[i]] !== 'undefined' ? this[key[i]] : I18n.t(key[i]);
           return null;
         });
       }
     } else {
-      strs = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
+      strs = hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     }
     return strs;
   }
   getLang(key, defaultString) {
-    return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : typeof defaultString !== 'undefined' ? defaultString : I18n.t(key);
+    return hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : typeof defaultString !== 'undefined' ? defaultString : I18n.t(key);
   }
 
   /**
@@ -165,7 +180,7 @@ export default class I18N {
     const lists = schema.range;
     lists.map(v => {
       const key = "dp_".concat(dpCode, "_").concat(v).toLowerCase();
-      result[v] = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
+      result[v] = hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
       return null;
     });
     return result;
@@ -180,11 +195,11 @@ export default class I18N {
   parseCountdown(t, power) {
     const h = parseFloat("".concat(t / 3600));
     const m = parseFloat("".concat(t / 60 - h * 60));
-    const tHour = I18n.t('t_hour') !== 't_hour' ? I18n.t('t_hour') : typeof this.t_hour !== 'undefined' ? this.t_hour : I18n.t('t_hour');
-    const tMinute = I18n.t('t_minute') !== 't_minute' ? I18n.t('t_minute') : typeof this.t_minute !== 'undefined' ? this.t_minute : I18n.t('t_minute');
+    const tHour = hasKey('t_hour') ? I18n.t('t_hour') : typeof this.t_hour !== 'undefined' ? this.t_hour : I18n.t('t_hour');
+    const tMinute = hasKey('t_minute') ? I18n.t('t_minute') : typeof this.t_minute !== 'undefined' ? this.t_minute : I18n.t('t_minute');
     const time = h >= 1.0 ? "".concat(Math.round(h)).concat(tHour) : "".concat(Math.round(m)).concat(tMinute);
     const key = "countdown_".concat(power ? 'on' : 'off');
-    const str = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
+    const str = hasKey(key) ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     return this.formatString(str, time);
   }
   getFaultStrings(schema, faultCode, faultValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.4.50-beta.1",
+  "version": "1.4.51",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "^1.4.50-beta.1",
-    "@ray-js/router": "^1.4.50-beta.1",
+    "@ray-js/framework": "1.4.51",
+    "@ray-js/router": "1.4.51",
     "@ray-js/wechat": "^0.2.8",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.4.50-beta.1",
+    "@ray-js/cli": "1.4.51",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.2",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "7f7dda6601efd676ac4f0cbdf6dc05d5ae2df6af"
+  "gitHead": "ef52059911e6d19ffadedbcc1cebb2c1b8e843bc"
 }