eoss 0.1.0-alpha.28 → 0.1.0-alpha.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/dialog.js +25 -7
- package/lib/eoss.common.js +105 -79
- package/lib/index.js +1 -1
- package/lib/main.js +47 -38
- package/lib/menu.js +13 -8
- package/lib/submenu.js +3 -3
- package/lib/wujie.js +2 -8
- package/package.json +1 -1
- package/packages/dialog/src/dialog.vue +18 -4
- package/packages/main/src/components/pages.vue +1 -1
- package/packages/main/src/components/sub-menu.vue +3 -2
- package/packages/main/src/gzw.vue +1 -0
- package/packages/main/src/minxs.js +19 -13
- package/packages/menu/src/menu.vue +5 -0
- package/packages/menu/src/submenu.vue +1 -1
- package/packages/wujie/src/wujie.vue +0 -6
- package/src/index.js +1 -1
package/lib/main.js
CHANGED
|
@@ -13083,8 +13083,8 @@ var handler_component = Object(componentNormalizer["a" /* default */])(
|
|
|
13083
13083
|
)
|
|
13084
13084
|
|
|
13085
13085
|
/* harmony default export */ var handler = (handler_component.exports);
|
|
13086
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/sub-menu.vue?vue&type=template&id=
|
|
13087
|
-
var
|
|
13086
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/sub-menu.vue?vue&type=template&id=e62b4e72&
|
|
13087
|
+
var sub_menuvue_type_template_id_e62b4e72_render = function () {
|
|
13088
13088
|
var _vm = this
|
|
13089
13089
|
var _h = _vm.$createElement
|
|
13090
13090
|
var _c = _vm._self._c || _h
|
|
@@ -13165,7 +13165,6 @@ var sub_menuvue_type_template_id_3c0713e7_render = function () {
|
|
|
13165
13165
|
),
|
|
13166
13166
|
_c("es-menu", {
|
|
13167
13167
|
attrs: {
|
|
13168
|
-
icon: "es-icon-yingyong",
|
|
13169
13168
|
"menu-class": _vm.fold
|
|
13170
13169
|
? "es-simplicity_menus es-simplicity_menus-fold"
|
|
13171
13170
|
: "es-simplicity_menus",
|
|
@@ -13173,7 +13172,8 @@ var sub_menuvue_type_template_id_3c0713e7_render = function () {
|
|
|
13173
13172
|
isFourthTabs: _vm.showFourthTabs,
|
|
13174
13173
|
"icon-position": _vm.iconPosition,
|
|
13175
13174
|
contents: _vm.menus,
|
|
13176
|
-
|
|
13175
|
+
"parent-menu-icon": _vm.parentMenuIcon,
|
|
13176
|
+
icon: _vm.menuIcon,
|
|
13177
13177
|
color: _vm.color,
|
|
13178
13178
|
iconColors: _vm.backgroundColor,
|
|
13179
13179
|
"show-title": false,
|
|
@@ -13185,11 +13185,11 @@ var sub_menuvue_type_template_id_3c0713e7_render = function () {
|
|
|
13185
13185
|
1
|
|
13186
13186
|
)
|
|
13187
13187
|
}
|
|
13188
|
-
var
|
|
13189
|
-
|
|
13188
|
+
var sub_menuvue_type_template_id_e62b4e72_staticRenderFns = []
|
|
13189
|
+
sub_menuvue_type_template_id_e62b4e72_render._withStripped = true
|
|
13190
13190
|
|
|
13191
13191
|
|
|
13192
|
-
// CONCATENATED MODULE: ./packages/main/src/components/sub-menu.vue?vue&type=template&id=
|
|
13192
|
+
// CONCATENATED MODULE: ./packages/main/src/components/sub-menu.vue?vue&type=template&id=e62b4e72&
|
|
13193
13193
|
|
|
13194
13194
|
// EXTERNAL MODULE: external "eoss/lib/menu"
|
|
13195
13195
|
var menu_ = __webpack_require__(120);
|
|
@@ -13280,6 +13280,7 @@ var menu_default = /*#__PURE__*/__webpack_require__.n(menu_);
|
|
|
13280
13280
|
}
|
|
13281
13281
|
},
|
|
13282
13282
|
text: String,
|
|
13283
|
+
parentMenuIcon: String,
|
|
13283
13284
|
menuIcon: String,
|
|
13284
13285
|
children: {
|
|
13285
13286
|
type: Array,
|
|
@@ -13365,8 +13366,8 @@ var menu_default = /*#__PURE__*/__webpack_require__.n(menu_);
|
|
|
13365
13366
|
|
|
13366
13367
|
var sub_menu_component = Object(componentNormalizer["a" /* default */])(
|
|
13367
13368
|
components_sub_menuvue_type_script_lang_js_,
|
|
13368
|
-
|
|
13369
|
-
|
|
13369
|
+
sub_menuvue_type_template_id_e62b4e72_render,
|
|
13370
|
+
sub_menuvue_type_template_id_e62b4e72_staticRenderFns,
|
|
13370
13371
|
false,
|
|
13371
13372
|
null,
|
|
13372
13373
|
null,
|
|
@@ -14456,8 +14457,8 @@ var notice_component = Object(componentNormalizer["a" /* default */])(
|
|
|
14456
14457
|
)
|
|
14457
14458
|
|
|
14458
14459
|
/* harmony default export */ var notice = (notice_component.exports);
|
|
14459
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=
|
|
14460
|
-
var
|
|
14460
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=248d6c8e&scoped=true&
|
|
14461
|
+
var pagesvue_type_template_id_248d6c8e_scoped_true_render = function () {
|
|
14461
14462
|
var _vm = this
|
|
14462
14463
|
var _h = _vm.$createElement
|
|
14463
14464
|
var _c = _vm._self._c || _h
|
|
@@ -14687,11 +14688,11 @@ var pagesvue_type_template_id_593ecce0_scoped_true_render = function () {
|
|
|
14687
14688
|
1
|
|
14688
14689
|
)
|
|
14689
14690
|
}
|
|
14690
|
-
var
|
|
14691
|
-
|
|
14691
|
+
var pagesvue_type_template_id_248d6c8e_scoped_true_staticRenderFns = []
|
|
14692
|
+
pagesvue_type_template_id_248d6c8e_scoped_true_render._withStripped = true
|
|
14692
14693
|
|
|
14693
14694
|
|
|
14694
|
-
// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=
|
|
14695
|
+
// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=248d6c8e&scoped=true&
|
|
14695
14696
|
|
|
14696
14697
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=template&id=256bd9c9&
|
|
14697
14698
|
var router_pagevue_type_template_id_256bd9c9_render = function () {
|
|
@@ -15296,7 +15297,7 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
|
|
|
15296
15297
|
this.activeName = activeTab.id;
|
|
15297
15298
|
}
|
|
15298
15299
|
}
|
|
15299
|
-
this.newTabs.splice(
|
|
15300
|
+
this.newTabs.splice(this.index, 1);
|
|
15300
15301
|
this.operate = false;
|
|
15301
15302
|
window.removeEventListener('click', this.closeTabsEvents);
|
|
15302
15303
|
this.$emit('tab-change', this.newTabs, removeTab, activeTab);
|
|
@@ -15377,11 +15378,11 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
|
|
|
15377
15378
|
|
|
15378
15379
|
var pages_component = Object(componentNormalizer["a" /* default */])(
|
|
15379
15380
|
components_pagesvue_type_script_lang_js_,
|
|
15380
|
-
|
|
15381
|
-
|
|
15381
|
+
pagesvue_type_template_id_248d6c8e_scoped_true_render,
|
|
15382
|
+
pagesvue_type_template_id_248d6c8e_scoped_true_staticRenderFns,
|
|
15382
15383
|
false,
|
|
15383
15384
|
null,
|
|
15384
|
-
"
|
|
15385
|
+
"248d6c8e",
|
|
15385
15386
|
null
|
|
15386
15387
|
|
|
15387
15388
|
)
|
|
@@ -17387,15 +17388,6 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
17387
17388
|
* @type {String}
|
|
17388
17389
|
*/
|
|
17389
17390
|
logo: String,
|
|
17390
|
-
/**
|
|
17391
|
-
* 菜单、应用默认图标
|
|
17392
|
-
* @type {String}
|
|
17393
|
-
* @default 'es-icon-application'
|
|
17394
|
-
*/
|
|
17395
|
-
menuIcon: {
|
|
17396
|
-
type: String,
|
|
17397
|
-
default: 'es-icon-application'
|
|
17398
|
-
},
|
|
17399
17391
|
/**
|
|
17400
17392
|
* 菜单数据
|
|
17401
17393
|
* @type {Array}
|
|
@@ -17583,12 +17575,12 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
17583
17575
|
* 1. 地址(含 /):地址包含该规则即命中,如 '/sso2/authCenter/authorize';
|
|
17584
17576
|
* 2. 参数名(如 redirectUri):地址携带该参数且有值即命中。
|
|
17585
17577
|
* @type {Array}
|
|
17586
|
-
* @default [
|
|
17578
|
+
* @default []
|
|
17587
17579
|
*/
|
|
17588
|
-
|
|
17580
|
+
excludeUrl: {
|
|
17589
17581
|
type: Array,
|
|
17590
17582
|
default: function _default() {
|
|
17591
|
-
return [
|
|
17583
|
+
return [];
|
|
17592
17584
|
}
|
|
17593
17585
|
}
|
|
17594
17586
|
},
|
|
@@ -17669,6 +17661,9 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
17669
17661
|
},
|
|
17670
17662
|
menuApps: function menuApps() {
|
|
17671
17663
|
return Array.isArray(this.customMenus) && this.customMenus.length ? this.customMenus : this.userApps.length ? this.userApps : this.menuData || this.menus;
|
|
17664
|
+
},
|
|
17665
|
+
excludes: function excludes() {
|
|
17666
|
+
return ['redirectUri', 'redirectUrl'].concat(this.excludeUrl, this.excludeUrls);
|
|
17672
17667
|
}
|
|
17673
17668
|
},
|
|
17674
17669
|
watch: {
|
|
@@ -17721,6 +17716,10 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
17721
17716
|
newApps: [],
|
|
17722
17717
|
// 所有菜单
|
|
17723
17718
|
menus: this.menuData,
|
|
17719
|
+
// 父菜单图标
|
|
17720
|
+
parentMenuIcon: 'es-icon-shu-bumen',
|
|
17721
|
+
// 菜单、应用默认图标
|
|
17722
|
+
menuIcon: 'es-icon-application',
|
|
17724
17723
|
// 子菜单
|
|
17725
17724
|
subMenus: null,
|
|
17726
17725
|
// 展示菜单导航
|
|
@@ -17840,7 +17839,9 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
17840
17839
|
// 历史记录最大数量
|
|
17841
17840
|
historyMenusMax: 20,
|
|
17842
17841
|
// 自定义应用编辑数
|
|
17843
|
-
editNum: 7
|
|
17842
|
+
editNum: 7,
|
|
17843
|
+
// 不走wujie的url
|
|
17844
|
+
excludeUrls: []
|
|
17844
17845
|
};
|
|
17845
17846
|
},
|
|
17846
17847
|
created: function created() {},
|
|
@@ -18854,6 +18855,12 @@ var appid = Object(util["s" /* getParams */])('applicationId');
|
|
|
18854
18855
|
if (rule.indexOf('/') > -1) {
|
|
18855
18856
|
return url.indexOf(rule) > -1;
|
|
18856
18857
|
}
|
|
18858
|
+
if (rule.endsWith('*')) {
|
|
18859
|
+
var prefix = rule.slice(0, -1);
|
|
18860
|
+
// 或者去掉协议和域名
|
|
18861
|
+
var path = urls[0].replace(/^https?:\/\/[^\/]+/, '');
|
|
18862
|
+
return path.indexOf(prefix) === 0;
|
|
18863
|
+
}
|
|
18857
18864
|
if (!urls[1]) {
|
|
18858
18865
|
return false;
|
|
18859
18866
|
}
|
|
@@ -20099,8 +20106,8 @@ var early_component = Object(componentNormalizer["a" /* default */])(
|
|
|
20099
20106
|
)
|
|
20100
20107
|
|
|
20101
20108
|
/* harmony default export */ var early = (early_component.exports);
|
|
20102
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/gzw.vue?vue&type=template&id=
|
|
20103
|
-
var
|
|
20109
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/gzw.vue?vue&type=template&id=332a24d9&
|
|
20110
|
+
var gzwvue_type_template_id_332a24d9_render = function () {
|
|
20104
20111
|
var _vm = this
|
|
20105
20112
|
var _h = _vm.$createElement
|
|
20106
20113
|
var _c = _vm._self._c || _h
|
|
@@ -20189,6 +20196,7 @@ var gzwvue_type_template_id_5f3247a8_render = function () {
|
|
|
20189
20196
|
closed: _vm.fold,
|
|
20190
20197
|
color: _vm.menuColor,
|
|
20191
20198
|
backgroundColor: _vm.menuBackgroundColor,
|
|
20199
|
+
"parent-menu-icon": _vm.parentMenuIcon,
|
|
20192
20200
|
"menu-icon": _vm.menuIcon,
|
|
20193
20201
|
active: _vm.subActive,
|
|
20194
20202
|
},
|
|
@@ -20426,11 +20434,11 @@ var gzwvue_type_template_id_5f3247a8_render = function () {
|
|
|
20426
20434
|
1
|
|
20427
20435
|
)
|
|
20428
20436
|
}
|
|
20429
|
-
var
|
|
20430
|
-
|
|
20437
|
+
var gzwvue_type_template_id_332a24d9_staticRenderFns = []
|
|
20438
|
+
gzwvue_type_template_id_332a24d9_render._withStripped = true
|
|
20431
20439
|
|
|
20432
20440
|
|
|
20433
|
-
// CONCATENATED MODULE: ./packages/main/src/gzw.vue?vue&type=template&id=
|
|
20441
|
+
// CONCATENATED MODULE: ./packages/main/src/gzw.vue?vue&type=template&id=332a24d9&
|
|
20434
20442
|
|
|
20435
20443
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/gzw.vue?vue&type=script&lang=js&
|
|
20436
20444
|
var gzwvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
|
|
@@ -20613,6 +20621,7 @@ var gzwvue_type_script_lang_js_extends = Object.assign || function (target) { fo
|
|
|
20613
20621
|
//
|
|
20614
20622
|
//
|
|
20615
20623
|
//
|
|
20624
|
+
//
|
|
20616
20625
|
|
|
20617
20626
|
|
|
20618
20627
|
|
|
@@ -20830,8 +20839,8 @@ var gzwvue_type_script_lang_js_extends = Object.assign || function (target) { fo
|
|
|
20830
20839
|
|
|
20831
20840
|
var gzw_component = Object(componentNormalizer["a" /* default */])(
|
|
20832
20841
|
src_gzwvue_type_script_lang_js_,
|
|
20833
|
-
|
|
20834
|
-
|
|
20842
|
+
gzwvue_type_template_id_332a24d9_render,
|
|
20843
|
+
gzwvue_type_template_id_332a24d9_staticRenderFns,
|
|
20835
20844
|
false,
|
|
20836
20845
|
null,
|
|
20837
20846
|
null,
|
package/lib/menu.js
CHANGED
|
@@ -3279,7 +3279,7 @@ var warning = function warning(content, _callback3) {
|
|
|
3279
3279
|
|
|
3280
3280
|
"use strict";
|
|
3281
3281
|
|
|
3282
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=
|
|
3282
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=6068d727&
|
|
3283
3283
|
var render = function () {
|
|
3284
3284
|
var _vm = this
|
|
3285
3285
|
var _h = _vm.$createElement
|
|
@@ -3586,7 +3586,7 @@ var staticRenderFns = []
|
|
|
3586
3586
|
render._withStripped = true
|
|
3587
3587
|
|
|
3588
3588
|
|
|
3589
|
-
// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=
|
|
3589
|
+
// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=6068d727&
|
|
3590
3590
|
|
|
3591
3591
|
// EXTERNAL MODULE: ./src/utils/scrollbar.js
|
|
3592
3592
|
var scrollbar = __webpack_require__(20);
|
|
@@ -4019,7 +4019,7 @@ var poperMixins = {
|
|
|
4019
4019
|
return '-' + Object(scrollbar["b" /* getScrollbarWidth */])() + 'px';
|
|
4020
4020
|
},
|
|
4021
4021
|
iconClass: function iconClass() {
|
|
4022
|
-
return this.icon || this.rootMenu.icon;
|
|
4022
|
+
return this.icon || this.rootMenu.parentMenuIcon || this.rootMenu.icon;
|
|
4023
4023
|
},
|
|
4024
4024
|
_iconPosition: function _iconPosition() {
|
|
4025
4025
|
return this.iconPosition || this.rootMenu.iconPosition;
|
|
@@ -4683,8 +4683,8 @@ function scrollMove(wrap) {
|
|
|
4683
4683
|
// ESM COMPAT FLAG
|
|
4684
4684
|
__webpack_require__.r(__webpack_exports__);
|
|
4685
4685
|
|
|
4686
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=
|
|
4687
|
-
var
|
|
4686
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=73aea66a&
|
|
4687
|
+
var menuvue_type_template_id_73aea66a_render = function () {
|
|
4688
4688
|
var _vm = this
|
|
4689
4689
|
var _h = _vm.$createElement
|
|
4690
4690
|
var _c = _vm._self._c || _h
|
|
@@ -4780,10 +4780,10 @@ var menuvue_type_template_id_4c250a0b_render = function () {
|
|
|
4780
4780
|
)
|
|
4781
4781
|
}
|
|
4782
4782
|
var staticRenderFns = []
|
|
4783
|
-
|
|
4783
|
+
menuvue_type_template_id_73aea66a_render._withStripped = true
|
|
4784
4784
|
|
|
4785
4785
|
|
|
4786
|
-
// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=
|
|
4786
|
+
// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=73aea66a&
|
|
4787
4787
|
|
|
4788
4788
|
// EXTERNAL MODULE: ./packages/menu/src/mixins.js
|
|
4789
4789
|
var mixins = __webpack_require__(77);
|
|
@@ -5200,6 +5200,11 @@ var external_throttle_debounce_ = __webpack_require__(22);
|
|
|
5200
5200
|
* @type {String}
|
|
5201
5201
|
*/
|
|
5202
5202
|
icon: String,
|
|
5203
|
+
/**
|
|
5204
|
+
* 父菜单图标
|
|
5205
|
+
* @type {String}
|
|
5206
|
+
*/
|
|
5207
|
+
parentMenuIcon: String,
|
|
5203
5208
|
/**
|
|
5204
5209
|
* 菜单图标颜色集合
|
|
5205
5210
|
* @type {Array|String}
|
|
@@ -5628,7 +5633,7 @@ var componentNormalizer = __webpack_require__(4);
|
|
|
5628
5633
|
|
|
5629
5634
|
var component = Object(componentNormalizer["a" /* default */])(
|
|
5630
5635
|
src_menuvue_type_script_lang_js_,
|
|
5631
|
-
|
|
5636
|
+
menuvue_type_template_id_73aea66a_render,
|
|
5632
5637
|
staticRenderFns,
|
|
5633
5638
|
false,
|
|
5634
5639
|
null,
|
package/lib/submenu.js
CHANGED
|
@@ -92,7 +92,7 @@ module.exports =
|
|
|
92
92
|
|
|
93
93
|
"use strict";
|
|
94
94
|
|
|
95
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=
|
|
95
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=6068d727&
|
|
96
96
|
var render = function () {
|
|
97
97
|
var _vm = this
|
|
98
98
|
var _h = _vm.$createElement
|
|
@@ -399,7 +399,7 @@ var staticRenderFns = []
|
|
|
399
399
|
render._withStripped = true
|
|
400
400
|
|
|
401
401
|
|
|
402
|
-
// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=
|
|
402
|
+
// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=6068d727&
|
|
403
403
|
|
|
404
404
|
// EXTERNAL MODULE: ./src/utils/scrollbar.js
|
|
405
405
|
var scrollbar = __webpack_require__(20);
|
|
@@ -832,7 +832,7 @@ var poperMixins = {
|
|
|
832
832
|
return '-' + Object(scrollbar["b" /* getScrollbarWidth */])() + 'px';
|
|
833
833
|
},
|
|
834
834
|
iconClass: function iconClass() {
|
|
835
|
-
return this.icon || this.rootMenu.icon;
|
|
835
|
+
return this.icon || this.rootMenu.parentMenuIcon || this.rootMenu.icon;
|
|
836
836
|
},
|
|
837
837
|
_iconPosition: function _iconPosition() {
|
|
838
838
|
return this.iconPosition || this.rootMenu.iconPosition;
|
package/lib/wujie.js
CHANGED
|
@@ -3538,7 +3538,7 @@ __webpack_require__.d(__webpack_exports__, "preloadApp", function() { return /*
|
|
|
3538
3538
|
__webpack_require__.d(__webpack_exports__, "destroyApp", function() { return /* reexport */ destroyApp; });
|
|
3539
3539
|
__webpack_require__.d(__webpack_exports__, "refreshApp", function() { return /* reexport */ refreshApp; });
|
|
3540
3540
|
|
|
3541
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/wujie.vue?vue&type=template&id=
|
|
3541
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/wujie.vue?vue&type=template&id=dd6facc4&
|
|
3542
3542
|
var render = function () {
|
|
3543
3543
|
var _vm = this
|
|
3544
3544
|
var _h = _vm.$createElement
|
|
@@ -3590,7 +3590,7 @@ var staticRenderFns = []
|
|
|
3590
3590
|
render._withStripped = true
|
|
3591
3591
|
|
|
3592
3592
|
|
|
3593
|
-
// CONCATENATED MODULE: ./packages/wujie/src/wujie.vue?vue&type=template&id=
|
|
3593
|
+
// CONCATENATED MODULE: ./packages/wujie/src/wujie.vue?vue&type=template&id=dd6facc4&
|
|
3594
3594
|
|
|
3595
3595
|
// EXTERNAL MODULE: external "vue"
|
|
3596
3596
|
var external_vue_ = __webpack_require__(2);
|
|
@@ -3780,12 +3780,10 @@ var bus = external_wujie_vue2_default.a.bus,
|
|
|
3780
3780
|
handleBeforeLoad: function handleBeforeLoad(app) {
|
|
3781
3781
|
var _this2 = this;
|
|
3782
3782
|
|
|
3783
|
-
console.log('[wujie] beforeLoad', this.name);
|
|
3784
3783
|
this.loading = true;
|
|
3785
3784
|
// 安全超时:10 秒内未收到任何生命周期回调则关闭 loading,防止无限转圈
|
|
3786
3785
|
this._loadingTimer = setTimeout(function () {
|
|
3787
3786
|
if (_this2.loading) {
|
|
3788
|
-
console.warn('[wujie] 加载超时:', _this2.name);
|
|
3789
3787
|
_this2.loading = false;
|
|
3790
3788
|
_this2.$emit('load-timeout', _this2.name);
|
|
3791
3789
|
}
|
|
@@ -3795,13 +3793,11 @@ var bus = external_wujie_vue2_default.a.bus,
|
|
|
3795
3793
|
|
|
3796
3794
|
/** 挂载前 */
|
|
3797
3795
|
handleBeforeMount: function handleBeforeMount(app) {
|
|
3798
|
-
console.log('[wujie] beforeMount', this.name);
|
|
3799
3796
|
this.$emit('before-mount', app);
|
|
3800
3797
|
},
|
|
3801
3798
|
|
|
3802
3799
|
/** 挂载后 */
|
|
3803
3800
|
handleAfterMount: function handleAfterMount(app) {
|
|
3804
|
-
console.log('[wujie] afterMount', this.name);
|
|
3805
3801
|
this.loading = false;
|
|
3806
3802
|
this._clearTimer();
|
|
3807
3803
|
this.$emit('after-mount', app);
|
|
@@ -3822,7 +3818,6 @@ var bus = external_wujie_vue2_default.a.bus,
|
|
|
3822
3818
|
* 不会再次触发 afterMount,只走 activated,因此此处也要关闭 loading
|
|
3823
3819
|
*/
|
|
3824
3820
|
handleActivated: function handleActivated(app) {
|
|
3825
|
-
console.log('[wujie] activated', this.name);
|
|
3826
3821
|
this.loading = false;
|
|
3827
3822
|
this._clearTimer();
|
|
3828
3823
|
this.$emit('activated', app);
|
|
@@ -3838,7 +3833,6 @@ var bus = external_wujie_vue2_default.a.bus,
|
|
|
3838
3833
|
* 由使用方(如 pages.vue)决定是否降级为 iframe 加载
|
|
3839
3834
|
*/
|
|
3840
3835
|
handleLoadError: function handleLoadError(url) {
|
|
3841
|
-
console.log('[wujie] loadError', this.name, url);
|
|
3842
3836
|
this.loading = false;
|
|
3843
3837
|
this._clearTimer();
|
|
3844
3838
|
this.$emit('load-error', url);
|
package/package.json
CHANGED
|
@@ -361,12 +361,27 @@ export default {
|
|
|
361
361
|
},
|
|
362
362
|
|
|
363
363
|
methods: {
|
|
364
|
+
/**
|
|
365
|
+
* 获取定位基准矩形(视口)
|
|
366
|
+
* wujie 沙箱(非降级)下 document.body 为 shadowRoot.body,其 rect 只是子应用在主应用内的容器区域
|
|
367
|
+
* (扣除了主应用侧栏/顶栏),fixed 定位的 dialog 用它居中、定边界会整体偏移;
|
|
368
|
+
* documentElement 的尺寸已被 wujie-polyfill 的 DocElementRectPlugin 修正为主应用视口值,改用它做基准;
|
|
369
|
+
* 降级模式与非微前端环境保持原有 document.body 基准不变
|
|
370
|
+
*/
|
|
371
|
+
getViewportRect() {
|
|
372
|
+
if (window.__WUJIE && !window.__WUJIE.degrade) {
|
|
373
|
+
const { clientWidth: width, clientHeight: height } =
|
|
374
|
+
document.documentElement;
|
|
375
|
+
return { width, height, top: 0, left: 0 };
|
|
376
|
+
}
|
|
377
|
+
return document.body.getBoundingClientRect();
|
|
378
|
+
},
|
|
364
379
|
/**
|
|
365
380
|
* 初始化对话框样式
|
|
366
381
|
* @param {Object} values - 样式值对象
|
|
367
382
|
*/
|
|
368
383
|
initStyle(values) {
|
|
369
|
-
const rect =
|
|
384
|
+
const rect = this.getViewportRect();
|
|
370
385
|
const position = { height: 'top', width: 'left' };
|
|
371
386
|
let style = JSON.parse(JSON.stringify(this.styles));
|
|
372
387
|
for (let i in values) {
|
|
@@ -436,8 +451,7 @@ export default {
|
|
|
436
451
|
e.preventDefault();
|
|
437
452
|
sTime = new Date().getTime();
|
|
438
453
|
let { x: downX, y: downY } = e;
|
|
439
|
-
let { width: winW, height: winH } =
|
|
440
|
-
document.body.getBoundingClientRect();
|
|
454
|
+
let { width: winW, height: winH } = this.getViewportRect();
|
|
441
455
|
// 防止拖动期间选中和复制网页文本
|
|
442
456
|
document.body.onselectstart = document.body.oncontextmenu = () => {
|
|
443
457
|
return false;
|
|
@@ -575,7 +589,7 @@ export default {
|
|
|
575
589
|
// const topDocument = topWindow.document;
|
|
576
590
|
// if (topDocument && topDocument.body) {
|
|
577
591
|
// 使用getBoundingClientRect获取准确的尺寸
|
|
578
|
-
const bodyRect =
|
|
592
|
+
const bodyRect = this.getViewportRect();
|
|
579
593
|
availWidth = bodyRect.width - 96;
|
|
580
594
|
availHeight = bodyRect.height - 96;
|
|
581
595
|
|
|
@@ -410,7 +410,7 @@ export default {
|
|
|
410
410
|
this.activeName = activeTab.id;
|
|
411
411
|
}
|
|
412
412
|
}
|
|
413
|
-
this.newTabs.splice(
|
|
413
|
+
this.newTabs.splice(this.index, 1);
|
|
414
414
|
this.operate = false;
|
|
415
415
|
window.removeEventListener('click', this.closeTabsEvents);
|
|
416
416
|
this.$emit('tab-change', this.newTabs, removeTab, activeTab);
|
|
@@ -25,7 +25,6 @@
|
|
|
25
25
|
></i>
|
|
26
26
|
</div>
|
|
27
27
|
<es-menu
|
|
28
|
-
icon="es-icon-yingyong"
|
|
29
28
|
:menu-class="
|
|
30
29
|
fold
|
|
31
30
|
? 'es-simplicity_menus es-simplicity_menus-fold'
|
|
@@ -35,7 +34,8 @@
|
|
|
35
34
|
:isFourthTabs="showFourthTabs"
|
|
36
35
|
:icon-position="iconPosition"
|
|
37
36
|
:contents="menus"
|
|
38
|
-
:
|
|
37
|
+
:parent-menu-icon="parentMenuIcon"
|
|
38
|
+
:icon="menuIcon"
|
|
39
39
|
:color="color"
|
|
40
40
|
:iconColors="backgroundColor"
|
|
41
41
|
:show-title="false"
|
|
@@ -89,6 +89,7 @@ export default {
|
|
|
89
89
|
}
|
|
90
90
|
},
|
|
91
91
|
text: String,
|
|
92
|
+
parentMenuIcon: String,
|
|
92
93
|
menuIcon: String,
|
|
93
94
|
children: {
|
|
94
95
|
type: Array,
|
|
@@ -132,15 +132,6 @@ export default {
|
|
|
132
132
|
* @type {String}
|
|
133
133
|
*/
|
|
134
134
|
logo: String,
|
|
135
|
-
/**
|
|
136
|
-
* 菜单、应用默认图标
|
|
137
|
-
* @type {String}
|
|
138
|
-
* @default 'es-icon-application'
|
|
139
|
-
*/
|
|
140
|
-
menuIcon: {
|
|
141
|
-
type: String,
|
|
142
|
-
default: 'es-icon-application'
|
|
143
|
-
},
|
|
144
135
|
/**
|
|
145
136
|
* 菜单数据
|
|
146
137
|
* @type {Array}
|
|
@@ -337,11 +328,11 @@ export default {
|
|
|
337
328
|
* 1. 地址(含 /):地址包含该规则即命中,如 '/sso2/authCenter/authorize';
|
|
338
329
|
* 2. 参数名(如 redirectUri):地址携带该参数且有值即命中。
|
|
339
330
|
* @type {Array}
|
|
340
|
-
* @default [
|
|
331
|
+
* @default []
|
|
341
332
|
*/
|
|
342
|
-
|
|
333
|
+
excludeUrl: {
|
|
343
334
|
type: Array,
|
|
344
|
-
default: () => [
|
|
335
|
+
default: () => []
|
|
345
336
|
}
|
|
346
337
|
},
|
|
347
338
|
/**
|
|
@@ -428,6 +419,9 @@ export default {
|
|
|
428
419
|
},
|
|
429
420
|
menuApps() {
|
|
430
421
|
return Array.isArray(this.customMenus) && this.customMenus.length ? this.customMenus : this.userApps.length ? this.userApps : this.menuData || this.menus;
|
|
422
|
+
},
|
|
423
|
+
excludes() {
|
|
424
|
+
return ['redirectUri', 'redirectUrl', ...this.excludeUrl, ...this.excludeUrls];
|
|
431
425
|
}
|
|
432
426
|
},
|
|
433
427
|
watch: {
|
|
@@ -479,6 +473,10 @@ export default {
|
|
|
479
473
|
newApps: [],
|
|
480
474
|
// 所有菜单
|
|
481
475
|
menus: this.menuData,
|
|
476
|
+
// 父菜单图标
|
|
477
|
+
parentMenuIcon: 'es-icon-shu-bumen',
|
|
478
|
+
// 菜单、应用默认图标
|
|
479
|
+
menuIcon: 'es-icon-application',
|
|
482
480
|
// 子菜单
|
|
483
481
|
subMenus: null,
|
|
484
482
|
// 展示菜单导航
|
|
@@ -598,7 +596,9 @@ export default {
|
|
|
598
596
|
// 历史记录最大数量
|
|
599
597
|
historyMenusMax: 20,
|
|
600
598
|
// 自定义应用编辑数
|
|
601
|
-
editNum: 7
|
|
599
|
+
editNum: 7,
|
|
600
|
+
// 不走wujie的url
|
|
601
|
+
excludeUrls: []
|
|
602
602
|
};
|
|
603
603
|
},
|
|
604
604
|
created() {
|
|
@@ -1592,6 +1592,12 @@ export default {
|
|
|
1592
1592
|
if (rule.indexOf('/') > -1) {
|
|
1593
1593
|
return url.indexOf(rule) > -1;
|
|
1594
1594
|
}
|
|
1595
|
+
if (rule.endsWith('*')) {
|
|
1596
|
+
const prefix = rule.slice(0, -1);
|
|
1597
|
+
// 或者去掉协议和域名
|
|
1598
|
+
const path = urls[0].replace(/^https?:\/\/[^\/]+/, '');
|
|
1599
|
+
return path.indexOf(prefix) === 0;
|
|
1600
|
+
}
|
|
1595
1601
|
if (!urls[1]) {
|
|
1596
1602
|
return false;
|
|
1597
1603
|
}
|
|
@@ -403,7 +403,7 @@ export default {
|
|
|
403
403
|
return `-${getScrollbarWidth()}px`;
|
|
404
404
|
},
|
|
405
405
|
iconClass() {
|
|
406
|
-
return this.icon || this.rootMenu.icon;
|
|
406
|
+
return this.icon || this.rootMenu.parentMenuIcon || this.rootMenu.icon;
|
|
407
407
|
},
|
|
408
408
|
_iconPosition() {
|
|
409
409
|
return this.iconPosition || this.rootMenu.iconPosition;
|
|
@@ -161,12 +161,10 @@ export default {
|
|
|
161
161
|
methods: {
|
|
162
162
|
/** 加载前 */
|
|
163
163
|
handleBeforeLoad(app) {
|
|
164
|
-
console.log('[wujie] beforeLoad', this.name);
|
|
165
164
|
this.loading = true;
|
|
166
165
|
// 安全超时:10 秒内未收到任何生命周期回调则关闭 loading,防止无限转圈
|
|
167
166
|
this._loadingTimer = setTimeout(() => {
|
|
168
167
|
if (this.loading) {
|
|
169
|
-
console.warn('[wujie] 加载超时:', this.name);
|
|
170
168
|
this.loading = false;
|
|
171
169
|
this.$emit('load-timeout', this.name);
|
|
172
170
|
}
|
|
@@ -175,12 +173,10 @@ export default {
|
|
|
175
173
|
},
|
|
176
174
|
/** 挂载前 */
|
|
177
175
|
handleBeforeMount(app) {
|
|
178
|
-
console.log('[wujie] beforeMount', this.name);
|
|
179
176
|
this.$emit('before-mount', app);
|
|
180
177
|
},
|
|
181
178
|
/** 挂载后 */
|
|
182
179
|
handleAfterMount(app) {
|
|
183
|
-
console.log('[wujie] afterMount', this.name);
|
|
184
180
|
this.loading = false;
|
|
185
181
|
this._clearTimer();
|
|
186
182
|
this.$emit('after-mount', app);
|
|
@@ -198,7 +194,6 @@ export default {
|
|
|
198
194
|
* 不会再次触发 afterMount,只走 activated,因此此处也要关闭 loading
|
|
199
195
|
*/
|
|
200
196
|
handleActivated(app) {
|
|
201
|
-
console.log('[wujie] activated', this.name);
|
|
202
197
|
this.loading = false;
|
|
203
198
|
this._clearTimer();
|
|
204
199
|
this.$emit('activated', app);
|
|
@@ -212,7 +207,6 @@ export default {
|
|
|
212
207
|
* 由使用方(如 pages.vue)决定是否降级为 iframe 加载
|
|
213
208
|
*/
|
|
214
209
|
handleLoadError(url) {
|
|
215
|
-
console.log('[wujie] loadError', this.name, url);
|
|
216
210
|
this.loading = false;
|
|
217
211
|
this._clearTimer();
|
|
218
212
|
this.$emit('load-error', url);
|