eoss 0.1.0-alpha.37 → 0.1.0-alpha.39

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.
Files changed (64) hide show
  1. package/lib/account-login.js +3729 -3725
  2. package/lib/ca-login.js +18 -8
  3. package/lib/checkbox-group.js +4329 -4329
  4. package/lib/data-table.js +3582 -3584
  5. package/lib/email-login.js +3525 -3522
  6. package/lib/eoss.common.js +468 -352
  7. package/lib/flow.js +27361 -27357
  8. package/lib/flows.js +5612 -5612
  9. package/lib/form.js +8 -8
  10. package/lib/index.js +1 -1
  11. package/lib/login.js +5982 -5978
  12. package/lib/lowcode-view.js +5263 -5258
  13. package/lib/lowcode.js +16885 -16884
  14. package/lib/main.js +129 -61
  15. package/lib/menu-item-group.js +4 -4
  16. package/lib/menu.js +10 -10
  17. package/lib/phone-login.js +3542 -3538
  18. package/lib/process-config.js +4105 -4080
  19. package/lib/process-module.js +3555 -3541
  20. package/lib/process-rule.js +4707 -4688
  21. package/lib/qrcode-login.js +3290 -3290
  22. package/lib/radio-group.js +3466 -3466
  23. package/lib/retrial-auth.js +3516 -3516
  24. package/lib/select.js +9354 -9354
  25. package/lib/selector-panel.js +6280 -6280
  26. package/lib/selector.js +5320 -5320
  27. package/lib/submenu.js +4 -4
  28. package/lib/table.js +16094 -16094
  29. package/lib/tips.js +3309 -3309
  30. package/lib/tree.js +6666 -6661
  31. package/lib/upload.js +7994 -7989
  32. package/lib/wujie.js +9 -3
  33. package/package.json +1 -1
  34. package/packages/account-login/src/account-login.vue +9 -15
  35. package/packages/ca-login/src/ca-login.vue +5 -6
  36. package/packages/data-table/src/data-table.vue +1 -3
  37. package/packages/email-login/src/email-login.vue +10 -11
  38. package/packages/flow/src/form.vue +2 -2
  39. package/packages/login/src/download.vue +2 -2
  40. package/packages/login/src/login.vue +3 -4
  41. package/packages/login/src/resetPassword.vue +3 -3
  42. package/packages/lowcode/src/attribute.vue +10 -9
  43. package/packages/lowcode-view/src/view.vue +3 -2
  44. package/packages/main/src/components/message.vue +7 -7
  45. package/packages/main/src/components/notice.vue +3 -2
  46. package/packages/main/src/components/pages.vue +63 -6
  47. package/packages/main/src/components/router-page.vue +6 -1
  48. package/packages/main/src/minxs.js +14 -10
  49. package/packages/menu/src/menu.vue +1 -1
  50. package/packages/menu/src/mixins.js +4 -4
  51. package/packages/phone-login/src/phone-login.vue +4 -4
  52. package/packages/process-config/src/FormList.vue +14 -8
  53. package/packages/process-config/src/NodeConfig.vue +50 -37
  54. package/packages/process-config/src/NodeForm.vue +37 -32
  55. package/packages/process-config/src/main.vue +50 -37
  56. package/packages/process-module/src/FormList.vue +16 -11
  57. package/packages/process-module/src/main.vue +52 -39
  58. package/packages/process-rule/src/FormList.vue +120 -105
  59. package/packages/process-rule/src/companyReportDetail.vue +13 -8
  60. package/packages/process-rule/src/main.vue +71 -52
  61. package/packages/tree/src/tree.vue +6 -5
  62. package/packages/upload/src/index.vue +3 -2
  63. package/packages/wujie/src/wujie.vue +7 -1
  64. package/src/index.js +1 -1
package/lib/main.js CHANGED
@@ -5284,6 +5284,12 @@ module.exports = require("eoss/lib/message-box");
5284
5284
 
5285
5285
  /***/ }),
5286
5286
  /* 9 */
5287
+ /***/ (function(module, exports) {
5288
+
5289
+ module.exports = require("eoss/lib/message");
5290
+
5291
+ /***/ }),
5292
+ /* 10 */
5287
5293
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
5288
5294
 
5289
5295
  "use strict";
@@ -5312,7 +5318,7 @@ module.exports = require("eoss/lib/message-box");
5312
5318
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(6);
5313
5319
  /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(8);
5314
5320
  /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__);
5315
- /* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(10);
5321
+ /* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(9);
5316
5322
  /* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__);
5317
5323
  /* harmony import */ var eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(31);
5318
5324
  /* harmony import */ var eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10__);
@@ -6463,12 +6469,6 @@ var getTableData = function getTableData(_ref9) {
6463
6469
  });
6464
6470
  };
6465
6471
 
6466
- /***/ }),
6467
- /* 10 */
6468
- /***/ (function(module, exports) {
6469
-
6470
- module.exports = require("eoss/lib/message");
6471
-
6472
6472
  /***/ }),
6473
6473
  /* 11 */,
6474
6474
  /* 12 */
@@ -8331,7 +8331,7 @@ var util = __webpack_require__(1);
8331
8331
  var storage = __webpack_require__(0);
8332
8332
 
8333
8333
  // EXTERNAL MODULE: ./src/utils/ajax.js
8334
- var ajax = __webpack_require__(9);
8334
+ var ajax = __webpack_require__(10);
8335
8335
 
8336
8336
  // EXTERNAL MODULE: ./src/utils/sm.js
8337
8337
  var sm = __webpack_require__(20);
@@ -10533,7 +10533,7 @@ appsvue_type_template_id_4c1ec65b_scoped_true_render._withStripped = true
10533
10533
  // CONCATENATED MODULE: ./packages/main/src/components/apps.vue?vue&type=template&id=4c1ec65b&scoped=true&
10534
10534
 
10535
10535
  // EXTERNAL MODULE: ./src/utils/ajax.js
10536
- var utils_ajax = __webpack_require__(9);
10536
+ var utils_ajax = __webpack_require__(10);
10537
10537
 
10538
10538
  // EXTERNAL MODULE: external "throttle-debounce"
10539
10539
  var external_throttle_debounce_ = __webpack_require__(24);
@@ -13411,8 +13411,8 @@ var sub_menu_component = Object(componentNormalizer["a" /* default */])(
13411
13411
  // EXTERNAL MODULE: ./packages/main/src/components/user.vue + 9 modules
13412
13412
  var user = __webpack_require__(153);
13413
13413
 
13414
- // 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/message.vue?vue&type=template&id=40c299ed&
13415
- var messagevue_type_template_id_40c299ed_render = function () {
13414
+ // 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/message.vue?vue&type=template&id=0f856ca2&
13415
+ var messagevue_type_template_id_0f856ca2_render = function () {
13416
13416
  var _vm = this
13417
13417
  var _h = _vm.$createElement
13418
13418
  var _c = _vm._self._c || _h
@@ -13578,11 +13578,11 @@ var messagevue_type_template_id_40c299ed_render = function () {
13578
13578
  1
13579
13579
  )
13580
13580
  }
13581
- var messagevue_type_template_id_40c299ed_staticRenderFns = []
13582
- messagevue_type_template_id_40c299ed_render._withStripped = true
13581
+ var messagevue_type_template_id_0f856ca2_staticRenderFns = []
13582
+ messagevue_type_template_id_0f856ca2_render._withStripped = true
13583
13583
 
13584
13584
 
13585
- // CONCATENATED MODULE: ./packages/main/src/components/message.vue?vue&type=template&id=40c299ed&
13585
+ // CONCATENATED MODULE: ./packages/main/src/components/message.vue?vue&type=template&id=0f856ca2&
13586
13586
 
13587
13587
  // EXTERNAL MODULE: ./src/utils/util.js
13588
13588
  var util = __webpack_require__(1);
@@ -13591,6 +13591,10 @@ var util = __webpack_require__(1);
13591
13591
  var dialog_ = __webpack_require__(37);
13592
13592
  var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
13593
13593
 
13594
+ // EXTERNAL MODULE: external "eoss/lib/message"
13595
+ var message_ = __webpack_require__(9);
13596
+ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
13597
+
13594
13598
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/message.vue?vue&type=script&lang=js&
13595
13599
  var messagevue_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; };
13596
13600
 
@@ -13679,6 +13683,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13679
13683
 
13680
13684
 
13681
13685
 
13686
+
13682
13687
  /* harmony default export */ var messagevue_type_script_lang_js_ = ({
13683
13688
  name: 'Message',
13684
13689
  provide: function provide() {
@@ -13807,7 +13812,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13807
13812
  } else {
13808
13813
  _this.loading = false;
13809
13814
  var msg = res.msg || '系统错误,请联系管理员!';
13810
- Object(util["m" /* error */])(msg);
13815
+ message_default.a.error(msg);
13811
13816
  }
13812
13817
  }).catch(function () {
13813
13818
  _this.loading = false;
@@ -13835,7 +13840,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13835
13840
  _this2.msgs.splice(index, 1);
13836
13841
  } else {
13837
13842
  var msg = res.msg || '系统错误,请联系管理员!';
13838
- Object(util["m" /* error */])(msg);
13843
+ message_default.a.error(msg);
13839
13844
  }
13840
13845
  });
13841
13846
  },
@@ -13920,7 +13925,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13920
13925
  var safeUrl = this.validateUrl(timestampUrl);
13921
13926
 
13922
13927
  if (!safeUrl) {
13923
- Object(util["m" /* error */])('无效的URL地址');
13928
+ message_default.a.error('无效的URL地址');
13924
13929
  return;
13925
13930
  }
13926
13931
 
@@ -13952,7 +13957,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13952
13957
  var safeUrl = this.validateUrl(item.timestampUrl);
13953
13958
 
13954
13959
  if (!safeUrl) {
13955
- Object(util["m" /* error */])('无效的URL地址');
13960
+ message_default.a.error('无效的URL地址');
13956
13961
  return;
13957
13962
  }
13958
13963
 
@@ -13976,8 +13981,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
13976
13981
  this.windowIntervals.push(timer);
13977
13982
  }
13978
13983
  } catch (e) {
13979
- console.error('窗口打开失败:', e);
13980
- Object(util["m" /* error */])('窗口打开失败');
13984
+ message_default.a.error('窗口打开失败');
13981
13985
  }
13982
13986
  } else {
13983
13987
  this.dialog = {
@@ -14084,8 +14088,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
14084
14088
 
14085
14089
  var message_component = Object(componentNormalizer["a" /* default */])(
14086
14090
  components_messagevue_type_script_lang_js_,
14087
- messagevue_type_template_id_40c299ed_render,
14088
- messagevue_type_template_id_40c299ed_staticRenderFns,
14091
+ messagevue_type_template_id_0f856ca2_render,
14092
+ messagevue_type_template_id_0f856ca2_staticRenderFns,
14089
14093
  false,
14090
14094
  null,
14091
14095
  null,
@@ -14094,8 +14098,8 @@ var message_component = Object(componentNormalizer["a" /* default */])(
14094
14098
  )
14095
14099
 
14096
14100
  /* harmony default export */ var message = (message_component.exports);
14097
- // 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/notice.vue?vue&type=template&id=6f87fd2f&
14098
- var noticevue_type_template_id_6f87fd2f_render = function () {
14101
+ // 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/notice.vue?vue&type=template&id=186169dd&
14102
+ var noticevue_type_template_id_186169dd_render = function () {
14099
14103
  var _vm = this
14100
14104
  var _h = _vm.$createElement
14101
14105
  var _c = _vm._self._c || _h
@@ -14234,11 +14238,11 @@ var noticevue_type_template_id_6f87fd2f_render = function () {
14234
14238
  ]
14235
14239
  )
14236
14240
  }
14237
- var noticevue_type_template_id_6f87fd2f_staticRenderFns = []
14238
- noticevue_type_template_id_6f87fd2f_render._withStripped = true
14241
+ var noticevue_type_template_id_186169dd_staticRenderFns = []
14242
+ noticevue_type_template_id_186169dd_render._withStripped = true
14239
14243
 
14240
14244
 
14241
- // CONCATENATED MODULE: ./packages/main/src/components/notice.vue?vue&type=template&id=6f87fd2f&
14245
+ // CONCATENATED MODULE: ./packages/main/src/components/notice.vue?vue&type=template&id=186169dd&
14242
14246
 
14243
14247
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/notice.vue?vue&type=script&lang=js&
14244
14248
  var noticevue_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; };
@@ -14312,6 +14316,7 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
14312
14316
 
14313
14317
 
14314
14318
 
14319
+
14315
14320
  /* harmony default export */ var noticevue_type_script_lang_js_ = ({
14316
14321
  name: 'Notice',
14317
14322
  provide: function provide() {
@@ -14385,7 +14390,7 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
14385
14390
  _this.msgs.splice(i, 1);
14386
14391
  } else {
14387
14392
  var msg = res.msg || '系统错误,请联系管理员!';
14388
- Object(util["m" /* error */])(msg);
14393
+ message_default.a.error(msg);
14389
14394
  }
14390
14395
  });
14391
14396
  },
@@ -14479,8 +14484,8 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
14479
14484
 
14480
14485
  var notice_component = Object(componentNormalizer["a" /* default */])(
14481
14486
  components_noticevue_type_script_lang_js_,
14482
- noticevue_type_template_id_6f87fd2f_render,
14483
- noticevue_type_template_id_6f87fd2f_staticRenderFns,
14487
+ noticevue_type_template_id_186169dd_render,
14488
+ noticevue_type_template_id_186169dd_staticRenderFns,
14484
14489
  false,
14485
14490
  null,
14486
14491
  null,
@@ -14489,8 +14494,8 @@ var notice_component = Object(componentNormalizer["a" /* default */])(
14489
14494
  )
14490
14495
 
14491
14496
  /* harmony default export */ var notice = (notice_component.exports);
14492
- // 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=35e35b04&scoped=true&
14493
- var pagesvue_type_template_id_35e35b04_scoped_true_render = function () {
14497
+ // 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=2c5ae8c0&scoped=true&
14498
+ var pagesvue_type_template_id_2c5ae8c0_scoped_true_render = function () {
14494
14499
  var _vm = this
14495
14500
  var _h = _vm.$createElement
14496
14501
  var _c = _vm._self._c || _h
@@ -14670,10 +14675,11 @@ var pagesvue_type_template_id_35e35b04_scoped_true_render = function () {
14670
14675
  : item.method === "wujie"
14671
14676
  ? _c("wujie", {
14672
14677
  attrs: {
14673
- name: item.appCode || item.code || item.id,
14678
+ name: _vm.wujieName(item),
14674
14679
  host: _vm.host,
14675
14680
  url: item.url,
14676
14681
  keys: item.keys,
14682
+ alive: "",
14677
14683
  },
14678
14684
  on: {
14679
14685
  "load-error": function ($event) {
@@ -14720,14 +14726,14 @@ var pagesvue_type_template_id_35e35b04_scoped_true_render = function () {
14720
14726
  1
14721
14727
  )
14722
14728
  }
14723
- var pagesvue_type_template_id_35e35b04_scoped_true_staticRenderFns = []
14724
- pagesvue_type_template_id_35e35b04_scoped_true_render._withStripped = true
14729
+ var pagesvue_type_template_id_2c5ae8c0_scoped_true_staticRenderFns = []
14730
+ pagesvue_type_template_id_2c5ae8c0_scoped_true_render._withStripped = true
14725
14731
 
14726
14732
 
14727
- // CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=35e35b04&scoped=true&
14733
+ // CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=2c5ae8c0&scoped=true&
14728
14734
 
14729
- // 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=bcc739f0&
14730
- var router_pagevue_type_template_id_bcc739f0_render = function () {
14735
+ // 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=e8ad868a&
14736
+ var router_pagevue_type_template_id_e8ad868a_render = function () {
14731
14737
  var _vm = this
14732
14738
  var _h = _vm.$createElement
14733
14739
  var _c = _vm._self._c || _h
@@ -14742,11 +14748,11 @@ var router_pagevue_type_template_id_bcc739f0_render = function () {
14742
14748
  1
14743
14749
  )
14744
14750
  }
14745
- var router_pagevue_type_template_id_bcc739f0_staticRenderFns = []
14746
- router_pagevue_type_template_id_bcc739f0_render._withStripped = true
14751
+ var router_pagevue_type_template_id_e8ad868a_staticRenderFns = []
14752
+ router_pagevue_type_template_id_e8ad868a_render._withStripped = true
14747
14753
 
14748
14754
 
14749
- // CONCATENATED MODULE: ./packages/main/src/components/router-page.vue?vue&type=template&id=bcc739f0&
14755
+ // CONCATENATED MODULE: ./packages/main/src/components/router-page.vue?vue&type=template&id=e8ad868a&
14750
14756
 
14751
14757
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=script&lang=js&
14752
14758
  var router_pagevue_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; };
@@ -14807,8 +14813,13 @@ var router_pagevue_type_script_lang_js_extends = Object.assign || function (targ
14807
14813
 
14808
14814
 
14809
14815
  computed: {
14816
+ /**
14817
+ * 组件 key 只由 appCode/path + refreshTrigger 组成,不包含 keys:
14818
+ * keys 变化已由 watcher 走 doRefresh() 重建一次,
14819
+ * 若再拼进 key 会导致同一次 keys 变化重建两次(页面加载两次)
14820
+ */
14810
14821
  componentKey: function componentKey() {
14811
- return (this.keys || this.appCode) + (this.refreshTrigger ? '_r' : '');
14822
+ return (this.appCode || this.path) + (this.refreshTrigger ? '_r' : '');
14812
14823
  }
14813
14824
  },
14814
14825
 
@@ -14909,8 +14920,8 @@ var router_pagevue_type_script_lang_js_extends = Object.assign || function (targ
14909
14920
 
14910
14921
  var router_page_component = Object(componentNormalizer["a" /* default */])(
14911
14922
  components_router_pagevue_type_script_lang_js_,
14912
- router_pagevue_type_template_id_bcc739f0_render,
14913
- router_pagevue_type_template_id_bcc739f0_staticRenderFns,
14923
+ router_pagevue_type_template_id_e8ad868a_render,
14924
+ router_pagevue_type_template_id_e8ad868a_staticRenderFns,
14914
14925
  false,
14915
14926
  null,
14916
14927
  null,
@@ -15063,6 +15074,8 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15063
15074
  //
15064
15075
  //
15065
15076
  //
15077
+ //
15078
+
15066
15079
 
15067
15080
 
15068
15081
 
@@ -15073,6 +15086,19 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15073
15086
 
15074
15087
 
15075
15088
 
15089
+ /**
15090
+ * @desc: Unicode 安全的 base64 编码,兼容中文等非 Latin1 字符
15091
+ * @param {any} val 任意值,null/undefined 返回空串
15092
+ * @return {string}
15093
+ **/
15094
+ var base64 = function base64(val) {
15095
+ if (val === null || val === undefined) return '';
15096
+ try {
15097
+ return window.btoa(unescape(encodeURIComponent(String(val))));
15098
+ } catch (e) {
15099
+ return '';
15100
+ }
15101
+ };
15076
15102
  /* harmony default export */ var pagesvue_type_script_lang_js_ = ({
15077
15103
  name: 'Pages',
15078
15104
 
@@ -15201,12 +15227,34 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15201
15227
  * @date 2024年9月7日
15202
15228
  **/
15203
15229
  renderUrl: function renderUrl(url) {
15230
+ if (!url || typeof url !== 'string') return url;
15204
15231
  var userInfo = this.$main.userInfo || this.$main.userModel || {};
15205
- for (var key in userInfo) {
15206
- url = url.replace(new RegExp('{' + key + '}', 'g'), userInfo[key]);
15207
- }
15232
+ Object.keys(userInfo).forEach(function (key) {
15233
+ var val = userInfo[key];
15234
+ if (val === null || val === undefined) return;
15235
+ var safeKey = Object(util["n" /* escapeRegexpString */])(key);
15236
+ var rawVal = String(val);
15237
+ var b64Val = base64(rawVal);
15238
+ // {base64-xxx} 与 {xxx} 两种占位符都要替换;
15239
+ // 使用函数式 replacement,避免值中的 $& / $1 等被特殊解释
15240
+ url = url.replace(new RegExp('\\{base64-' + safeKey + '\\}', 'g'), function () {
15241
+ return b64Val;
15242
+ });
15243
+ url = url.replace(new RegExp('\\{' + safeKey + '\\}', 'g'), function () {
15244
+ return rawVal;
15245
+ });
15246
+ });
15208
15247
  return url;
15209
15248
  },
15249
+
15250
+
15251
+ /**
15252
+ * @desc:wujie 沙箱名按页签唯一,避免同一子应用多个菜单共用 name 时
15253
+ * 互相 destroy/recreate 沙箱导致子应用重复启动
15254
+ **/
15255
+ wujieName: function wujieName(item) {
15256
+ return (item.appCode || item.code || item.id) + '__' + item.id;
15257
+ },
15210
15258
  handleSelect: function handleSelect(res, index) {
15211
15259
  var node = res.node;
15212
15260
 
@@ -15219,7 +15267,15 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15219
15267
  }
15220
15268
 
15221
15269
  var updatedTabs = [].concat(this.newTabs);
15222
- updatedTabs[index].url = node.url;
15270
+ var tab = updatedTabs[index];
15271
+ if (tab.method === 'iframe') {
15272
+ // iframe 走 url 变化刷新:加时间戳保证重复点击同一菜单也会重载
15273
+ tab.url = Object(util["T" /* timestampUrl */])(node.url);
15274
+ } else {
15275
+ // router/wujie 走 keys 变化刷新(url 单独变化不触发重建)
15276
+ tab.url = node.url;
15277
+ this.$set(tab, 'keys', Object(util["Y" /* uuid */])());
15278
+ }
15223
15279
  this.$main.tabs = updatedTabs;
15224
15280
  },
15225
15281
 
@@ -15322,10 +15378,21 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15322
15378
 
15323
15379
  /**
15324
15380
  * @desc:wujie 加载失败,降级为 iframe 加载(重定向/登录跳转等服务端页面无法被 wujie 的 fetch 加载)
15381
+ * 降级结果必须写回 $main.tabs 源页签对象:isFourthTabs 下 newTabs 是副本,
15382
+ * 只改副本会在下次 tabs 同步时回滚成 wujie,造成 wujie/iframe 反复重建(页面加载两次)
15325
15383
  **/
15326
15384
  handleWujieLoadError: function handleWujieLoadError(item) {
15385
+ if (item.method === 'iframe') {
15386
+ return;
15387
+ }
15327
15388
  this.$set(item, 'loading', true);
15328
15389
  this.$set(item, 'method', 'iframe');
15390
+ var source = (this.$main.tabs || []).find(function (t) {
15391
+ return t.id === item.id;
15392
+ });
15393
+ if (source && source !== item) {
15394
+ this.$set(source, 'method', 'iframe');
15395
+ }
15329
15396
  },
15330
15397
 
15331
15398
  /**
@@ -15450,11 +15517,11 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
15450
15517
 
15451
15518
  var pages_component = Object(componentNormalizer["a" /* default */])(
15452
15519
  components_pagesvue_type_script_lang_js_,
15453
- pagesvue_type_template_id_35e35b04_scoped_true_render,
15454
- pagesvue_type_template_id_35e35b04_scoped_true_staticRenderFns,
15520
+ pagesvue_type_template_id_2c5ae8c0_scoped_true_render,
15521
+ pagesvue_type_template_id_2c5ae8c0_scoped_true_staticRenderFns,
15455
15522
  false,
15456
15523
  null,
15457
- "35e35b04",
15524
+ "2c5ae8c0",
15458
15525
  null
15459
15526
 
15460
15527
  )
@@ -18744,13 +18811,13 @@ var appid = Object(util["s" /* getParams */])('applicationId');
18744
18811
  _this10.setTips(_this10.business);
18745
18812
  _this10.setTips(_this10.systems);
18746
18813
  } else {
18747
- _this10.$message.error('未分配应用菜单权限,请联系管理员!');
18814
+ message.error('未分配应用菜单权限,请联系管理员!');
18748
18815
  }
18749
18816
  _this10.getMenus(loadingInstance);
18750
18817
  } else {
18751
18818
  loadingInstance.close();
18752
18819
  var msg = res.msg || '系统错误,请联系管理员!';
18753
- _this10.$message.error(msg);
18820
+ message.error(msg);
18754
18821
  }
18755
18822
  }).catch(function () {
18756
18823
  loadingInstance.close();
@@ -18777,11 +18844,11 @@ var appid = Object(util["s" /* getParams */])('applicationId');
18777
18844
  _this11.menus = res.results;
18778
18845
  _this11.renderMenus(_this11.menus);
18779
18846
  } else {
18780
- _this11.$message.error('未分配菜单权限,请联系管理员!');
18847
+ message.error('未分配菜单权限,请联系管理员!');
18781
18848
  }
18782
18849
  } else {
18783
18850
  var msg = res.msg || '系统错误,请联系管理员!';
18784
- _this11.$message.error(msg);
18851
+ message.error(msg);
18785
18852
  }
18786
18853
  }).catch(function () {
18787
18854
  loadingInstance.close();
@@ -18839,10 +18906,10 @@ var appid = Object(util["s" /* getParams */])('applicationId');
18839
18906
  }
18840
18907
  } else {
18841
18908
  var msg = res.msg || '系统错误,请联系管理员!';
18842
- _this12.$message.error(msg);
18909
+ message.error(msg);
18843
18910
  }
18844
18911
  }).catch(function () {
18845
- _this12.$message.error('系统错误,请联系管理员!');
18912
+ message.error('系统错误,请联系管理员!');
18846
18913
  });
18847
18914
  },
18848
18915
 
@@ -18943,7 +19010,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
18943
19010
  } else {
18944
19011
  this.subMenus = null;
18945
19012
  this.showMenu = false;
18946
- this.$message.error('未分配菜单权限,请联系管理员!');
19013
+ message.error('未分配菜单权限,请联系管理员!');
18947
19014
  }
18948
19015
  } else {
18949
19016
  var _subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
@@ -18965,7 +19032,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
18965
19032
  } else {
18966
19033
  this.subMenus = null;
18967
19034
  this.showMenu = false;
18968
- this.$message.error('未分配菜单权限,请联系管理员!');
19035
+ message.error('未分配菜单权限,请联系管理员!');
18969
19036
  }
18970
19037
  }
18971
19038
  } else if (this.initApplication && this.initApplication.length && !this.indexUrl) {
@@ -19618,7 +19685,8 @@ var appid = Object(util["s" /* getParams */])('applicationId');
19618
19685
  if (tabs[i].method === 'iframe') {
19619
19686
  this.$set(this.tabs[i], 'url', Object(util["T" /* timestampUrl */])(this.tabs[i].url));
19620
19687
  }
19621
- if (this.tabs[i].method === 'router') {
19688
+ // router/wujie 统一走 keys 变化触发刷新(点菜单=刷新一次)
19689
+ if (this.tabs[i].method === 'router' || this.tabs[i].method === 'wujie') {
19622
19690
  this.$set(this.tabs[i], 'keys', Object(util["Y" /* uuid */])());
19623
19691
  }
19624
19692
  this.activeName = res.id;
@@ -20005,7 +20073,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
20005
20073
  }
20006
20074
  }
20007
20075
  } else {
20008
- this.$message.error('没有此菜单!');
20076
+ message.error('没有此菜单!');
20009
20077
  }
20010
20078
  },
20011
20079
 
@@ -750,7 +750,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
750
750
  },
751
751
 
752
752
  // 获取菜单图标颜色
753
- getColor: function getColor(index) {
753
+ getColor: function getColor(index, item) {
754
754
  if (!this.iconColors) {
755
755
  return undefined;
756
756
  }
@@ -759,7 +759,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
759
759
  if (!this._colorCache) {
760
760
  this._colorCache = {};
761
761
  }
762
-
762
+ var isParentMenuIcon = item.children && item.children.length || this.isFourthTabs && item.fourthTabs && item.fourthTabs.length;
763
763
  var key = Array.isArray(this.iconColors) ? 'index_' + index % this.iconColors.length : 'single_color';
764
764
 
765
765
  if (!this._colorCache[key]) {
@@ -767,7 +767,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
767
767
  this._colorCache[key] = {
768
768
  '--icon-bg-color': bgColor,
769
769
  '--icon-color': '#fff',
770
- '--icon-font-size': '12px'
770
+ '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
771
771
  };
772
772
  }
773
773
 
@@ -793,7 +793,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
793
793
  extendData = item.extendData,
794
794
  rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
795
795
 
796
- var openStatus = open || Boolean(extendData.openStatus);
796
+ var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
797
797
  var props = void 0;
798
798
  if (this.isFourthTabs) {
799
799
  if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {
package/lib/menu.js CHANGED
@@ -4748,8 +4748,8 @@ module.exports = require("vue");
4748
4748
  // ESM COMPAT FLAG
4749
4749
  __webpack_require__.r(__webpack_exports__);
4750
4750
 
4751
- // 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=7ad225cf&
4752
- var menuvue_type_template_id_7ad225cf_render = function () {
4751
+ // 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=31887554&
4752
+ var menuvue_type_template_id_31887554_render = function () {
4753
4753
  var _vm = this
4754
4754
  var _h = _vm.$createElement
4755
4755
  var _c = _vm._self._c || _h
@@ -4805,7 +4805,7 @@ var menuvue_type_template_id_7ad225cf_render = function () {
4805
4805
  "open-icon": _vm.openIcon,
4806
4806
  "close-icon": _vm.closeIcon,
4807
4807
  isFourthTabs: _vm.isFourthTabs,
4808
- iconColor: _vm.getColor(index),
4808
+ iconColor: _vm.getColor(index, item),
4809
4809
  iconColors: _vm.iconColors,
4810
4810
  },
4811
4811
  },
@@ -4844,10 +4844,10 @@ var menuvue_type_template_id_7ad225cf_render = function () {
4844
4844
  )
4845
4845
  }
4846
4846
  var staticRenderFns = []
4847
- menuvue_type_template_id_7ad225cf_render._withStripped = true
4847
+ menuvue_type_template_id_31887554_render._withStripped = true
4848
4848
 
4849
4849
 
4850
- // CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=7ad225cf&
4850
+ // CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=31887554&
4851
4851
 
4852
4852
  // EXTERNAL MODULE: ./packages/menu/src/mixins.js
4853
4853
  var mixins = __webpack_require__(80);
@@ -5696,7 +5696,7 @@ var componentNormalizer = __webpack_require__(4);
5696
5696
 
5697
5697
  var component = Object(componentNormalizer["a" /* default */])(
5698
5698
  src_menuvue_type_script_lang_js_,
5699
- menuvue_type_template_id_7ad225cf_render,
5699
+ menuvue_type_template_id_31887554_render,
5700
5700
  staticRenderFns,
5701
5701
  false,
5702
5702
  null,
@@ -10499,7 +10499,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
10499
10499
  },
10500
10500
 
10501
10501
  // 获取菜单图标颜色
10502
- getColor: function getColor(index) {
10502
+ getColor: function getColor(index, item) {
10503
10503
  if (!this.iconColors) {
10504
10504
  return undefined;
10505
10505
  }
@@ -10508,7 +10508,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
10508
10508
  if (!this._colorCache) {
10509
10509
  this._colorCache = {};
10510
10510
  }
10511
-
10511
+ var isParentMenuIcon = item.children && item.children.length || this.isFourthTabs && item.fourthTabs && item.fourthTabs.length;
10512
10512
  var key = Array.isArray(this.iconColors) ? 'index_' + index % this.iconColors.length : 'single_color';
10513
10513
 
10514
10514
  if (!this._colorCache[key]) {
@@ -10516,7 +10516,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
10516
10516
  this._colorCache[key] = {
10517
10517
  '--icon-bg-color': bgColor,
10518
10518
  '--icon-color': '#fff',
10519
- '--icon-font-size': '12px'
10519
+ '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
10520
10520
  };
10521
10521
  }
10522
10522
 
@@ -10542,7 +10542,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
10542
10542
  extendData = item.extendData,
10543
10543
  rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
10544
10544
 
10545
- var openStatus = open || Boolean(extendData.openStatus);
10545
+ var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
10546
10546
  var props = void 0;
10547
10547
  if (this.isFourthTabs) {
10548
10548
  if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {