@extscreen/es-core 1.1.25 → 1.1.28

package/dist/index.js

@@ -1701,45 +1701,46 @@ var ESDisplayManager$1 = new ESDisplayManager();
 class ESManager {
 
   _esSdkVersionCode = null;
+  _esSdkVersionName = null;
   _esSdkPackageName = null;
   _esMiniProgramPath = null;
+  _esKitVersionCode = -1;
+
+  _esSdkInfo = null;
+
 
   init() {
     return Promise.resolve()
-      .then(() => this.initESSdkVersionCodePromise())
-      .then(() => this.initESPackageNamePromise())
-      .then(() => this.initESMiniProgramPathPromise())
+      .then(() => this.initESInfoPromise())
   }
 
-
-  initESSdkVersionCodePromise() {
-    return ESModule$1.getESSDKVersionCode()
+  initESInfoPromise() {
+    return ESModule$1.getESSDKInfo()
       .then((result) => {
-          this._esSdkVersionCode = result;
+          this._esSdkInfo = result;
+          if (result) {
+            this._esSdkVersionCode = result.versionCode;
+            this._esSdkVersionName = result.versionName;
+            this._esSdkPackageName = result.packageName;
+            this._esMiniProgramPath = result.miniProgramPath;
+            if (result.eskit_ver_code) {
+              this._esKitVersionCode = result.eskit_ver_code;
+            }
+          }
           return Promise.resolve();
         }
       );
   }
 
-  initESPackageNamePromise() {
-    return ESModule$1.getESPackageName()
-      .then((result) => {
-          this._esSdkPackageName = result;
-          return Promise.resolve();
-        }
-      );
+  getESSDKInfo() {
+    return this._esSdkInfo;
   }
 
-  initESMiniProgramPathPromise() {
-    return ESModule$1.getESMiniProgramPath()
-      .then((result) => {
-          this._esMiniProgramPath = result;
-          return Promise.resolve();
-        }
-      );
+  getESSDKVersionCode() {
+    return this._esKitVersionCode;
   }
 
-  getESSDKVersionCode() {
+  getESVersionCode() {
     return this._esSdkVersionCode;
   }
 
@@ -1754,6 +1755,8 @@ class ESManager {
 
 var ESManager$1 = new ESManager();
 
+const ES_SDK_VERSION_21 = 2.1;
+
 /**
  *
  */
@@ -1763,42 +1766,49 @@ class ESLaunchManager {
 
   _ESRouter = null;
   _ESRouterEnabled = true;
+  _ESPageRouterViewEnabled = false;
   _launchLimit = 10;
 
   init(router) {
     try {
       this._ESRouter = router;
-      this._ESRouterEnabled = this.isESRouterSupported();
+      this._ESPageRouterViewEnabled = this.isESPageRouterViewSupported();
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         ESLog.d('ESRouter', '#------init--------->>' + '\n' +
-          '_ESRouterEnabled: ' + this._ESRouterEnabled + '\n' +
+          '_ESPageRouterViewEnabled: ' + this._ESPageRouterViewEnabled + '\n' +
           '_ESRouter: ' + this._ESRouter
         );
       }
     } catch (e) {
     }
     //
-    try {
-      this._ESRouter.setEnabled(this._ESRouterEnabled);
-    } catch (e) {
-    }
+    this._setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
     return Promise.resolve();
   }
 
-  setESRouterEnabled(enabled) {
-    this._ESRouterEnabled = enabled && this.isESRouterSupported();
+  //----------------------ESPageRouterView--------------------------
+  _setESPageRouterViewSupported(enabled) {
+    this._ESPageRouterViewEnabled = enabled;
     try {
-      this._ESRouter.setEnabled(this._ESRouterEnabled);
+      if (this._ESRouter) {
+        this._ESRouter.setESPageRouterViewSupported(this._ESPageRouterViewEnabled);
+      }
     } catch (e) {
     }
   }
 
+  isESPageRouterViewSupported() {
+    return ESManager$1.getESSDKVersionCode() >= ES_SDK_VERSION_21;
+  }
+
+  //---------------------------------------------------------
+
   isESRouterEnabled() {
-    return this._ESRouterEnabled && this.isESRouterSupported();
+    return this._ESRouterEnabled;
   }
 
-  isESRouterSupported() {
-    return ESManager$1.getESSDKVersionCode() > 800;
+  setESRouterEnabled(enabled) {
+    this._ESRouterEnabled = enabled;
   }
 
   setLaunchLimit(limit) {
@@ -1822,9 +1832,7 @@ class ESLaunchManager {
   }
 
   launchESPage(intent) {
-    //
-    if (this.isESRouterEnabled() && this._ESRouter
-      && this.isESRouterSupported()) {
+    if (this.isESRouterEnabled() && this._ESRouter) {
       this._ESRouter.push({
         name: intent.url,
         params: intent.params,
@@ -3157,6 +3165,13 @@ const ES_NETWORK_INFO_TYPE_ETHERNET = 9;
 
 var ESApplication = {
   mixins: [ESRouter],
+  data() {
+    return {
+      appInitProps: {},
+      appInitUrl: '',
+      appInitParams: {},
+    };
+  },
   mounted() {
     this._initES();
   },
@@ -3168,16 +3183,32 @@ var ESApplication = {
           })
         )
         .then((result) => {
-            this._initESApp();
+            this._initESAppParams();
           },
           error => {
-            this._initESApp();
+            this._initESAppParams();
           }
         );
     },
+    _initESAppParams() {
+      //
+      this.appInitProps = ESApp.$options.$superProps;
+      //
+      this.appInitUrl = ESApp.$options.$superProps.url;
+      this.appInitParams = ESApp.$options.$superProps.params;
+
+      if (!this.appInitUrl) {
+        this.appInitUrl = this.$router.options.main;
+      }
+      if (!(this._isRoutePathValid(this.appInitUrl) || this._isRouteNameValid(this.appInitUrl))) {
+        this.appInitUrl = this.$router.options.error;
+      }
+      //
+      this._initESApp();
+    },
     _initESApp() {
       if (this._isFunction(this.onESCreate)) {
-        let result = this.onESCreate();
+        let result = this.onESCreate(this.appInitProps);
         if (ESLog.isLoggable(ESLog.DEBUG)) {
           ESLog.d('ESApplication', '---------onESCreate---------->>>>', result);
         }
@@ -3210,14 +3241,9 @@ var ESApplication = {
       }
     },
     _initPage() {
-      let initUrl = ESApp.$options.$superProps.url;
-      let initParams = ESApp.$options.$superProps.params;
-      if (!initUrl) {
-        initUrl = this.$router.options.main;
-      }
       let route = {
-        name: initUrl,
-        params: initParams,
+        name: this.appInitUrl,
+        params: this.appInitParams,
       };
       if (ESLog.isLoggable(ESLog.DEBUG)) {
         console.log('ESApplication', '---------onESCreate---_initPage--push--->>>>', route);
@@ -3227,6 +3253,24 @@ var ESApplication = {
     _isFunction(func) {
       return Object.prototype.toString.call(func) === '[object Function]';
     },
+    _isRoutePathValid(path) {
+      if (path !== undefined && path !== '') {
+        let index = this.$router.options.routes.findIndex((item) => item.path === `/${path}`);
+        if (index !== -1) {
+          return true;
+        }
+      }
+      return false;
+    },
+    _isRouteNameValid(name) {
+      if (name !== undefined && name !== '') {
+        let index = this.$router.options.routes.findIndex((item) => item.path === `${name}`);
+        if (index !== -1) {
+          return true;
+        }
+      }
+      return false;
+    },
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extscreen/es-core",
-  "version": "1.1.25",
+  "version": "1.1.28",
   "description": "",
   "main": "dist/index.js",
   "scripts": {