@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/lib/apis.js

@@ -2,7 +2,8 @@ const base = [
   'base64ToArrayBuffer',
   'arrayBufferToBase64',
   'addInterceptor',
-  'removeInterceptor'
+  'removeInterceptor',
+  'interceptors'
 ]
 
 const network = [
@@ -16,7 +17,8 @@ const network = [
   'onSocketMessage',
   'closeSocket',
   'onSocketClose',
-  'getUpdateManager'
+  'getUpdateManager',
+  'configMTLS'
 ]
 
 const route = [
@@ -181,7 +183,10 @@ const ui = [
   'getRightWindowStyle',
   'setTopWindowStyle',
   'setLeftWindowStyle',
-  'setRightWindowStyle'
+  'setRightWindowStyle',
+  'getLocale',
+  'setLocale',
+  'onLocaleChange'
 ]
 
 const event = [
@@ -214,8 +219,11 @@ const third = [
   'login',
   'checkSession',
   'getUserInfo',
+  'getUserProfile',
   'preLogin',
   'closeAuthView',
+  'getCheckBoxState',
+  'getUniverifyManager',
   'share',
   'shareWithSystem',
   'showShareMenu',
@@ -240,7 +248,9 @@ const third = [
 
 const ad = [
   'createRewardedVideoAd',
-  'createFullScreenVideoAd'
+  'createFullScreenVideoAd',
+  'createInterstitialAd',
+  'createInteractiveAd'
 ]
 
 const apis = [

package/lib/h5/uni.automator.js

@@ -1 +1 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var t=e(require("debug")),o=e(require("puppeteer")),a=e(require("postcss-selector-parser"));function n(e){e.walk(e=>{if("tag"===e.type){const t=e.value;e.value="page"===t?"uni-page-body":"uni-"+t}})}const s=["Page.getElement","Page.getElements","Element.getElement","Element.getElements"];const c=t("automator:devtool");let r,l;const i={"Tool.close":{reflect:async()=>{await r.close()}},"App.exit":{reflect:async()=>{}},"App.enableLog":{reflect:()=>Promise.resolve()},"App.captureScreenshot":{reflect:async(e,t)=>{const o=await l.screenshot({encoding:"base64",fullPage:!!t.fullPage});return c("App.captureScreenshot "+o.length),{data:o}}}};!function(e){s.forEach(t=>{e[t]=function(e){return{reflect:async(t,o)=>t(e,o,!1),params:e=>(e.selector&&(e.selector=a(n).processSync(e.selector)),e)}}(t)})}(i);const p={devtools:{name:"google chrome",paths:[],validate:async function(e){return e.options=e.options||{},e.executablePath&&!e.options.executablePath&&(e.options.executablePath=e.executablePath),e.options.defaultViewport=Object.assign({width:375,height:667,deviceScaleFactor:2,hasTouch:!0,isMobile:!0},e.options.defaultViewport||{}),e.teardown||(e.teardown=!1===e.options.headless?"disconnect":"close"),e},create:async function(e,t,a){r=await o.launch(t.options);const n=r.process();n?c("%s %o",n.spawnfile,t.options):c("%o",t.options),l=await r.newPage(),l.on("console",e=>{a.emit("App.logAdded",{type:e.type(),args:[e.text()]})}),l.on("pageerror",e=>{a.emit("App.exceptionThrown",e)}),await l.goto(t.url||e),await l.waitFor(1e3)}},shouldCompile:(e,t)=>!t.url,adapter:i};module.exports=p;
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var t=e(require("debug")),o=e(require("postcss-selector-parser"));const n=t("automator:devtool");function r(e){e.walk(e=>{if("tag"===e.type){const t=e.value;e.value="page"===t?"uni-page-body":"uni-"+t}})}const s=["Page.getElement","Page.getElements","Element.getElement","Element.getElements"];const i=["chromium","firefox","webkit"];let a=!1;try{a=!!require("playwright")}catch(e){}const c=new Map;function p(e="chromium"){const t=e&&i.includes(e)?e:i[0];let o=c.get(t);return o||(o=function(e){if("webkit"===e)return l("webkit");if("firefox"===e)return l("firefox");return a?l("chromium"):function(){const e=require("puppeteer");let t,o;return{type:"chromium",provider:"puppeteer",async open(r,s,i){t=await e.launch(s.options);const a=t.process();a?n("%s %o",a.spawnfile,s.options):n("%o",s.options),o=await t.newPage(),o.on("console",e=>{i.emit("App.logAdded",{type:e.type(),args:[e.text()]})}),o.on("pageerror",e=>{i.emit("App.exceptionThrown",e)}),await o.goto(s.url||r),await o.waitFor(1e3)},close:()=>t.close(),screenshot:(e=!1)=>o.screenshot({encoding:"base64",fullPage:e})}}()}(t),c.set(t,o)),o}function l(e){const t=require("playwright");let o,r;return{type:e,provider:"playwright",async open(s,i,a){o=await t[e].launch(i.options),"firefox"===e&&(i.contextOptions.isMobile=!1),n("browser.newContext "+JSON.stringify(i.contextOptions));const c=await o.newContext(i.contextOptions);r=await c.newPage(),r.on("console",e=>{a.emit("App.logAdded",{type:e.type(),args:[e.text()]})}),r.on("pageerror",e=>{a.emit("App.exceptionThrown",e)}),await r.goto(i.url||s),await r.waitForTimeout(1e3)},close:()=>o.close(),screenshot:(e=!1)=>r.screenshot({fullPage:e}).then(e=>e.toString("base64"))}}let u;const f={"Tool.close":{reflect:async()=>{await u.close()}},"App.exit":{reflect:async()=>{}},"App.enableLog":{reflect:()=>Promise.resolve()},"App.captureScreenshot":{reflect:async(e,t)=>{const o=await u.screenshot(!!t.fullPage);return n("App.captureScreenshot "+o.length),{data:o}}}};!function(e){s.forEach(t=>{e[t]=function(e){return{reflect:async(t,o)=>t(e,o,!1),params:e=>(e.selector&&(e.selector=o(r).processSync(e.selector)),e)}}(t)})}(f);const h={devtools:{name:"browser",paths:[],validate:async function(e){return e.options=e.options||{},e.executablePath&&!e.options.executablePath&&(e.options.executablePath=e.executablePath),e.contextOptions={viewport:Object.assign({width:375,height:667},e.options.defaultViewport||{}),hasTouch:!0,isMobile:!0,deviceScaleFactor:2},e.options.defaultViewport=Object.assign({width:375,height:667,deviceScaleFactor:2,hasTouch:!0,isMobile:!0},e.options.defaultViewport||{}),e.teardown||(e.teardown=!1===e.options.headless?"disconnect":"close"),e},create:async function(e,t,o){u=p(process.env.BROWSER),n("createDevtools "+(u.provider+" "+u.type+" "+JSON.stringify(t))),await u.open(e,t,o)}},shouldCompile:(e,t)=>!t.url,adapter:f};module.exports=h;

package/lib/modules.json

@@ -206,6 +206,7 @@
     "uni.login": true,
     "uni.checkSession": true,
     "uni.getUserInfo": true,
+    "uni.getUserProfile": true,
     "uni.share": true,
     "uni.showShareMenu": true,
     "uni.hideShareMenu": true,
@@ -223,6 +224,8 @@
   "title": "广告",
   "apiList": {
     "uni.createRewardedVideoAd": true,
-    "uni.createFullScreenVideoAd": true
+    "uni.createFullScreenVideoAd": true,
+    "uni.'createInterstitialAd'": true,
+    "uni.'createInteractiveAd'": true
   }
 }]

package/manifest.json

@@ -35,6 +35,10 @@
             ]
         ]
     ],
+    "interceptors": [
+        "/core/service/api/base/interceptor.js",
+        []
+    ],
     "request": [
         "/platforms/h5/service/api/network/request.js",
         [
@@ -235,6 +239,10 @@
             [
                 "/core/helpers/protocol/location/get-location.js",
                 "getLocation"
+            ],
+            [
+                "/platforms/h5/service/api/network/request.js",
+                "request"
             ]
         ]
     ],
@@ -257,6 +265,10 @@
                 "/core/view/components/scroll-view/index.vue",
                 "ScrollView"
             ],
+            [
+                "/platforms/h5/service/api/network/request.js",
+                "request"
+            ],
             [
                 "/platforms/h5/service/api/location/get-location.js",
                 "getLocation"
@@ -274,6 +286,18 @@
                 "/core/helpers/protocol/location/open-location.js",
                 "openLocation"
             ],
+            [
+                "/platforms/h5/view/components/map/index.vue",
+                "Map"
+            ],
+            [
+                "/platforms/h5/service/api/network/request.js",
+                "request"
+            ],
+            [
+                "/platforms/h5/service/api/location/get-location.js",
+                "getLocation"
+            ],
             [
                 "/platforms/h5/components/system-routes/open-location/index.vue",
                 "OpenLocation"
@@ -466,6 +490,19 @@
             ]
         ]
     ],
+    "setClipboardData": [
+        "/platforms/h5/service/api/device/clipboard.js",
+        [
+            [
+                "/core/helpers/protocol/device/set-clipboard-data.js",
+                "setClipboardData"
+            ]
+        ]
+    ],
+    "getClipboardData": [
+        "/platforms/h5/service/api/device/clipboard.js",
+        []
+    ],
     "vibrateLong": [
         "/platforms/h5/service/api/device/vibrate.js",
         []
@@ -824,6 +861,18 @@
         "/platforms/h5/service/api/ui/windows.js",
         []
     ],
+    "getLocale": [
+        "/core/service/api/ui/locale.js",
+        []
+    ],
+    "setLocale": [
+        "/core/service/api/ui/locale.js",
+        []
+    ],
+    "onLocaleChange": [
+        "/core/service/api/ui/locale.js",
+        []
+    ],
     "$emit": [
         "/platforms/h5/service/api/base/event-bus.js",
         [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.0",
+  "version": "2.0.1-32920211122002",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {
@@ -14,7 +14,6 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-i18n": "^0.0.3",
     "base64-arraybuffer": "^0.2.0",
     "intersection-observer": "^0.7.0",
     "pako": "^1.0.11",
@@ -25,5 +24,5 @@
     "title": "H5",
     "main": "lib/h5/uni.config.js"
   },
-  "gitHead": "b1bdfb4de3f518c1c0fbab242403ea05feced4e3"
+  "gitHead": "dc33ced4b2fff3063385d9eda8dd1f3539133a67"
 }

package/src/core/helpers/api.js

@@ -204,7 +204,7 @@ function createApiCallback (apiName, params = {}, extras = {}) {
     const errMsg = res.errMsg
 
     if (errMsg.indexOf(apiName + ':ok') === 0) {
-      isFn(beforeSuccess) && beforeSuccess(res)
+      isFn(beforeSuccess) && beforeSuccess(res, params)
 
       hasSuccess && success(res)
 

package/src/core/helpers/constants.js

@@ -2,3 +2,4 @@ export const NAVBAR_HEIGHT = 44
 export const TABBAR_HEIGHT = 50
 // 576:landscape phones,768:tablets,992:desktops,1200:large desktops
 export const RESPONSIVE_MIN_WIDTH = 768
+export const DC_LOCALE = '__DC_LOCALE'

package/src/core/helpers/i18n/en.json

@@ -12,7 +12,7 @@
   "uni.chooseVideo.cancel": "Cancel",
   "uni.chooseVideo.sourceType.album": "Album",
   "uni.chooseVideo.sourceType.camera": "Camera",
-  "uni.previewImage.cancel": "Cancel",
+  "uni.chooseFile.notUserActivation": "File chooser dialog can only be shown with a user activation",
   "uni.previewImage.button.save": "Save Image",
   "uni.previewImage.save.success": "Saved successfully",
   "uni.previewImage.save.fail": "Save failed",
@@ -28,5 +28,7 @@
   "uni.video.danmu": "Danmu",
   "uni.video.volume": "Volume",
   "uni.button.feedback.title": "feedback",
-  "uni.button.feedback.send": "send"
+  "uni.button.feedback.send": "send",
+  "uni.chooseLocation.search": "Find Place",
+  "uni.chooseLocation.cancel": "Cancel"
 }

package/src/core/helpers/i18n/es.json

@@ -12,6 +12,7 @@
   "uni.chooseVideo.cancel": "Cancelar",
   "uni.chooseVideo.sourceType.album": "Álbum",
   "uni.chooseVideo.sourceType.camera": "Cámara",
+  "uni.chooseFile.notUserActivation": "El cuadro de diálogo del selector de archivos solo se puede mostrar con la activación del usuario",
   "uni.previewImage.cancel": "Cancelar",
   "uni.previewImage.button.save": "Guardar imagen",
   "uni.previewImage.save.success": "Guardado exitosamente",
@@ -28,5 +29,7 @@
   "uni.video.danmu": "Danmu",
   "uni.video.volume": "Volumen",
   "uni.button.feedback.title": "realimentación",
-  "uni.button.feedback.send": "enviar"
+  "uni.button.feedback.send": "enviar",
+  "uni.chooseLocation.search": "Encontrar",
+  "uni.chooseLocation.cancel": "Cancelar"
 }

package/src/core/helpers/i18n/fr.json

@@ -12,6 +12,7 @@
   "uni.chooseVideo.cancel": "Annuler",
   "uni.chooseVideo.sourceType.album": "Album",
   "uni.chooseVideo.sourceType.camera": "Caméra",
+  "uni.chooseFile.notUserActivation": "La boîte de dialogue du sélecteur de fichier ne peut être affichée qu'avec une activation par l'utilisateur",
   "uni.previewImage.cancel": "Annuler",
   "uni.previewImage.button.save": "Guardar imagen",
   "uni.previewImage.save.success": "Enregistré avec succès",
@@ -28,5 +29,7 @@
   "uni.video.danmu": "Danmu",
   "uni.video.volume": "Le Volume",
   "uni.button.feedback.title": "retour d'information",
-  "uni.button.feedback.send": "envoyer"
+  "uni.button.feedback.send": "envoyer",
+  "uni.chooseLocation.search": "Trouve",
+  "uni.chooseLocation.cancel": "Annuler"
 }

package/src/core/helpers/i18n/index.js

@@ -1,6 +1,14 @@
 import {
-  initVueI18n
+  initVueI18n,
+  isI18nStr
 } from '@dcloudio/uni-i18n'
+import {
+  isStr
+} from 'uni-shared'
+
+import {
+  DC_LOCALE
+} from '../constants'
 
 import en from './en.json'
 import es from './es.json'
@@ -16,10 +24,153 @@ const messages = {
   'zh-Hant': zhHant
 }
 
-const fallbackLocale = 'en'
+let locale
+
+if (__PLATFORM__ === 'h5') {
+  locale = (window.localStorage && localStorage[DC_LOCALE]) || __uniConfig.locale || navigator.language
+} else if (__PLATFORM__ === 'app-plus') {
+  if (typeof weex === 'object') {
+    locale = weex.requireModule('plus').getLanguage()
+  } else {
+    locale = ''
+  }
+} else {
+  locale = __GLOBAL__.getSystemInfoSync().language
+}
 
-const i18n = initVueI18n(__PLATFORM__ === 'app-plus' || __PLATFORM__ === 'h5' ? messages : {}, fallbackLocale)
+export const i18n = initVueI18n(
+  locale,
+  __PLATFORM__ === 'app-plus' || __PLATFORM__ === 'h5' ? messages : {}
+)
 export const t = i18n.t
-export const i18nMixin = i18n.mixin
+export const i18nMixin = (i18n.mixin = {
+  beforeCreate () {
+    const unwatch = i18n.i18n.watchLocale(() => {
+      this.$forceUpdate()
+    })
+    this.$once('hook:beforeDestroy', function () {
+      unwatch()
+    })
+  },
+  methods: {
+    $$t (key, values) {
+      return t(key, values)
+    }
+  }
+})
 export const setLocale = i18n.setLocale
 export const getLocale = i18n.getLocale
+
+export function initAppLocale (Vue, appVm, locale) {
+  const state = Vue.observable({
+    locale: locale || i18n.getLocale()
+  })
+  const localeWatchers = []
+  appVm.$watchLocale = fn => {
+    localeWatchers.push(fn)
+  }
+  Object.defineProperty(appVm, '$locale', {
+    get () {
+      return state.locale
+    },
+    set (v) {
+      state.locale = v
+      localeWatchers.forEach(watch => watch(v))
+    }
+  })
+}
+
+export const I18N_JSON_DELIMITERS = ['%', '%']
+
+function getLocaleMessage () {
+  const locale = uni.getLocale()
+  const locales = __uniConfig.locales
+  return (
+    locales[locale] || locales[__uniConfig.fallbackLocale] || locales.en || {}
+  )
+}
+
+export function formatI18n (message) {
+  if (isI18nStr(message, I18N_JSON_DELIMITERS)) {
+    return i18n.f(message, getLocaleMessage(), I18N_JSON_DELIMITERS)
+  }
+  return message
+}
+
+function resolveJsonObj (jsonObj, names) {
+  if (names.length === 1) {
+    if (jsonObj) {
+      const value = jsonObj[names[0]]
+      if (isStr(value) && isI18nStr(value, I18N_JSON_DELIMITERS)) {
+        return jsonObj
+      }
+    }
+    return
+  }
+  const name = names.shift()
+  return resolveJsonObj(jsonObj && jsonObj[name], names)
+}
+
+export function defineI18nProperties (obj, names) {
+  return names.map(name => defineI18nProperty(obj, name))
+}
+
+export function defineI18nProperty (obj, names) {
+  const jsonObj = resolveJsonObj(obj, names)
+  if (!jsonObj) {
+    return false
+  }
+  const prop = names[names.length - 1]
+  let value = jsonObj[prop]
+  Object.defineProperty(jsonObj, prop, {
+    get () {
+      return formatI18n(value)
+    },
+    set (v) {
+      value = v
+    }
+  })
+  return true
+}
+
+function isEnableLocale () {
+  return __uniConfig.locales && !!Object.keys(__uniConfig.locales).length
+}
+
+export function initNavigationBarI18n (navigationBar) {
+  if (isEnableLocale()) {
+    return defineI18nProperties(navigationBar, [
+      ['titleText'],
+      ['searchInput', 'placeholder']
+    ])
+  }
+}
+
+export function initPullToRefreshI18n (pullToRefresh) {
+  if (isEnableLocale()) {
+    const CAPTION = 'caption'
+    return defineI18nProperties(pullToRefresh, [
+      ['contentdown', CAPTION],
+      ['contentover', CAPTION],
+      ['contentrefresh', CAPTION]
+    ])
+  }
+}
+
+export function initTabBarI18n (tabBar) {
+  if (isEnableLocale()) {
+    tabBar.list.forEach(item => {
+      defineI18nProperty(item, ['text'])
+    })
+  }
+  return tabBar
+}
+
+export function initI18n () {
+  const localeKeys = Object.keys(__uniConfig.locales || {})
+  if (localeKeys.length) {
+    localeKeys.forEach((locale) =>
+      i18n.add(locale, __uniConfig.locales[locale])
+    )
+  }
+}

package/src/core/helpers/i18n/zh-Hans.json

@@ -12,6 +12,7 @@
   "uni.chooseVideo.cancel": "取消",
   "uni.chooseVideo.sourceType.album": "从相册选择",
   "uni.chooseVideo.sourceType.camera": "拍摄",
+  "uni.chooseFile.notUserActivation": "文件选择器对话框只能在用户激活时显示",
   "uni.previewImage.cancel": "取消",
   "uni.previewImage.button.save": "保存图像",
   "uni.previewImage.save.success": "保存图像到相册成功",
@@ -28,5 +29,7 @@
   "uni.video.danmu": "弹幕",
   "uni.video.volume": "音量",
   "uni.button.feedback.title": "问题反馈",
-  "uni.button.feedback.send": "发送"
+  "uni.button.feedback.send": "发送",
+  "uni.chooseLocation.search": "搜索地点",
+  "uni.chooseLocation.cancel": "取消"
 }

package/src/core/helpers/i18n/zh-Hant.json

@@ -12,6 +12,7 @@
   "uni.chooseVideo.cancel": "取消",
   "uni.chooseVideo.sourceType.album": "從相冊選擇",
   "uni.chooseVideo.sourceType.camera": "拍攝",
+  "uni.chooseFile.notUserActivation": "文件選擇器對話框只能在用戶激活時顯示",
   "uni.previewImage.cancel": "取消",
   "uni.previewImage.button.save": "保存圖像",
   "uni.previewImage.save.success": "保存圖像到相冊成功",
@@ -28,5 +29,7 @@
   "uni.video.danmu": "彈幕",
   "uni.video.volume": "音量",
   "uni.button.feedback.title": "問題反饋",
-  "uni.button.feedback.send": "發送"
+  "uni.button.feedback.send": "發送",
+  "uni.chooseLocation.search": "搜索地點",
+  "uni.chooseLocation.cancel": "取消"
 }

package/src/core/helpers/index.js

@@ -45,7 +45,7 @@ export function getTargetDataset (target) {
     const $attrs = vm.$attrs
     for (const key in $attrs) {
       if (key.startsWith('data-')) {
-        const newKey = camelize(key.substr(5))
+        const newKey = camelize(key.substr(5).toLowerCase())
         const value = $attrs[key]
         dataset[newKey] = force ? value : dataset[newKey] || value
       }

package/src/core/helpers/interceptor.js

@@ -105,7 +105,7 @@ function queue (hooks, data) {
       }
       if (res === false) {
         return {
-          then () {}
+          then () { }
         }
       }
     }
@@ -153,15 +153,15 @@ function getApiInterceptorHooks (method) {
     if (hook !== 'returnValue') {
       interceptor[hook] = globalInterceptors[hook].slice()
     }
-  })
-  const scopedInterceptor = scopedInterceptors[method]
-  if (scopedInterceptor) {
-    Object.keys(scopedInterceptor).forEach(hook => {
-      if (hook !== 'returnValue') {
-        interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook])
-      }
-    })
-  }
+  })
+  const scopedInterceptor = scopedInterceptors[method]
+  if (scopedInterceptor) {
+    Object.keys(scopedInterceptor).forEach(hook => {
+      if (hook !== 'returnValue') {
+        interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook])
+      }
+    })
+  }
   return interceptor
 }
 
@@ -185,10 +185,14 @@ export const promiseInterceptor = {
     if (!isPromise(res)) {
       return res
     }
-    return res.then(res => {
-      return res[1]
-    }).catch(res => {
-      return res[0]
+    return new Promise((resolve, reject) => {
+      res.then(res => {
+        if (res[0]) {
+          reject(res[0])
+        } else {
+          resolve(res[1])
+        }
+      })
     })
   }
-}
+}

package/src/core/helpers/promise.js

@@ -8,7 +8,7 @@ import {
 } from './interceptor'
 
 const SYNC_API_RE =
-  /^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64/
+  /^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/
 
 const CONTEXT_API_RE = /^create|Manager$/
 

package/src/core/helpers/protocol/device/set-clipboard-data.js

@@ -3,11 +3,20 @@ import {
 } from 'uni-core/helpers/i18n'
 
 export const setClipboardData = {
-  beforeSuccess () {
+  data: {
+    type: String,
+    required: true
+  },
+  showToast: {
+    type: Boolean,
+    default: true
+  },
+  beforeSuccess (res, params) {
+    if (!params.showToast) return
     const title = t('uni.setClipboardData.success')
     if (title) {
       uni.showToast({
-        title: t('uni.setClipboardData.success'),
+        title,
         icon: 'success',
         mask: false,
         style: {

package/src/core/helpers/protocol/network/request.js

@@ -1,6 +1,7 @@
 import {
   hasOwn,
-  isPlainObject
+  isPlainObject,
+  toRawType
 } from 'uni-shared'
 
 const method = {
@@ -108,3 +109,15 @@ export const request = {
     type: Number
   }
 }
+
+export const configMTLS = {
+  certificates: {
+    type: Array,
+    required: true,
+    validator (value) {
+      if (value.some(item => toRawType(item.host) !== 'String')) {
+        return '参数配置错误，请确认后重试'
+      }
+    }
+  }
+}

package/src/core/helpers/protocol/network/upload-file.js

@@ -13,7 +13,7 @@ export const uploadFile = {
     type: String,
     validator (value, params) {
       if (value) {
-        params.type = getRealPath(value)
+        params.filePath = getRealPath(value)
       }
     }
   },

package/src/core/helpers/protocol/ui/popup.js

@@ -51,7 +51,7 @@ export const showToast = {
   icon: {
     default: 'success',
     validator (icon, params) {
-      if (['success', 'loading', 'none'].indexOf(icon) === -1) {
+      if (['success', 'loading', 'error', 'none'].indexOf(icon) === -1) {
         params.icon = 'success'
       }
     }
@@ -122,4 +122,4 @@ export const showActionSheet = {
   popover: {
     type: Object
   }
-}
+}

package/src/core/runtime/base.js

@@ -3,4 +3,6 @@ export {
 }
   from './upx2px'
 
+export * from './locale'
+
 export * from '../service/api/base/interceptor'

package/src/core/runtime/locale.js

@@ -0,0 +1,37 @@
+export function getLocale () {
+  // 优先使用 $locale
+  const app = getApp({
+    allowDefault: true
+  })
+  if (app && app.$vm) {
+    return app.$vm.$locale
+  }
+  return __GLOBAL__.getSystemInfoSync().language || 'zh-Hans'
+}
+
+export function setLocale (locale) {
+  const app = getApp()
+  if (!app) {
+    return false
+  }
+  const oldLocale = app.$vm.$locale
+  if (oldLocale !== locale) {
+    app.$vm.$locale = locale
+    onLocaleChangeCallbacks.forEach((fn) => fn({
+      locale
+    }))
+    return true
+  }
+  return false
+}
+
+const onLocaleChangeCallbacks = []
+export function onLocaleChange (fn) {
+  if (onLocaleChangeCallbacks.indexOf(fn) === -1) {
+    onLocaleChangeCallbacks.push(fn)
+  }
+}
+
+if (typeof global !== 'undefined') {
+  global.getLocale = getLocale
+}