@extscreen/es-core 1.1.25 → 1.1.27

package/dist/index.js

@@ -3157,6 +3157,13 @@ const ES_NETWORK_INFO_TYPE_ETHERNET = 9;
 
 var ESApplication = {
   mixins: [ESRouter],
+  data() {
+    return {
+      appInitProps: {},
+      appInitUrl: '',
+      appInitParams: {},
+    };
+  },
   mounted() {
     this._initES();
   },
@@ -3168,16 +3175,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 +3233,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 +3245,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.27",
   "description": "",
   "main": "dist/index.js",
   "scripts": {