Merge remote-tracking branch 'origin/master'

dist/yvan-ext-mobile.js

@@ -37752,6 +37752,7 @@ define(['exports'], function (exports) { 'use strict';
       function Scope(_a) {
           var model = _a.model, vjson = _a.vjson;
           this.scopeTag = '';
+          this.allowBack = true;
           /**
            * 业务模块的唯一编号
            */
@@ -37765,6 +37766,17 @@ define(['exports'], function (exports) { 'use strict';
           this.vjson = this.originalVjson; // this.buildVjson()
       }
       /**
+       * 活动回调
+       */
+      Scope.prototype.activate = function () {
+          var _a;
+          // @ts-ignore
+          if ((_a = window === null || window === void 0 ? void 0 : window.JSInterface) === null || _a === void 0 ? void 0 : _a.setWebViewCanBack) {
+              // @ts-ignore
+              window.JSInterface.setWebViewCanBack(this.allowBack);
+          }
+      };
+      /**
        * 模块载入完成之后的回调
        */
       Scope.prototype.onLoad = function () {
@@ -37844,6 +37856,12 @@ define(['exports'], function (exports) { 'use strict';
                   dataOption: {}
               });
               var allowBack = option.allowBack, vjsonOption = option.vjsonOption, dataOption = option.dataOption;
+              lodash.defaults(vjsonOption, {
+                  listeners: {}
+              });
+              lodash.defaults(vjsonOption['listeners'], {
+                  activate: "scope.activate"
+              });
               this._vjsonOption = vjsonOption;
               this._dataOption = dataOption;
               var vmodel = lodash.defaultsDeep({
@@ -37859,6 +37877,7 @@ define(['exports'], function (exports) { 'use strict';
               }, vjsonOption, that.vjson, {
                   xtype: 'panel',
               });
+              that.allowBack = allowBack;
               if (allowBack) {
                   var configNew = lodash.defaultsDeep({
                       iconCls: 'x-fa fa-angle-left',
@@ -37923,6 +37942,9 @@ define(['exports'], function (exports) { 'use strict';
                   console.error('errorAt onLoad', e);
               }
           }
+          Ext.Viewport.activeItem = function () {
+              debugger;
+          };
           Ext.Viewport.add(that._handle);
           // if ((window as any).mainWindow === that || (window as any).loginWindow === that) {
           //     Scope.SHOW_PAGE_STACK.length = 0