eoss-ui 0.4.66 → 0.4.68

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 (85) hide show
  1. package/lib/button-group.js +11 -11
  2. package/lib/button.js +11 -11
  3. package/lib/card.js +2 -2
  4. package/lib/cascader.js +2 -2
  5. package/lib/checkbox-group.js +48 -19
  6. package/lib/clients.js +2 -2
  7. package/lib/data-table-form.js +11 -12
  8. package/lib/data-table.js +11 -12
  9. package/lib/date-picker.js +11 -11
  10. package/lib/dialog.js +10 -13
  11. package/lib/enterprise.js +2 -2
  12. package/lib/eoss-ui.common.js +729 -2699
  13. package/lib/error-page.js +2 -2
  14. package/lib/flow-group.js +17 -15
  15. package/lib/flow-list.js +377 -1358
  16. package/lib/flow.js +20 -36
  17. package/lib/form.js +46 -41
  18. package/lib/handle-user.js +12 -12
  19. package/lib/handler.js +12 -12
  20. package/lib/icons.js +4 -4
  21. package/lib/index.js +1 -1
  22. package/lib/input-number.js +18 -18
  23. package/lib/input.js +43 -43
  24. package/lib/label.js +2 -2
  25. package/lib/login.js +110 -101
  26. package/lib/main.js +131 -101
  27. package/lib/menu.js +12 -5
  28. package/lib/nav.js +14 -13
  29. package/lib/notify.js +4 -4
  30. package/lib/page.js +18 -18
  31. package/lib/pagination.js +2 -2
  32. package/lib/player.js +22 -22
  33. package/lib/qr-code.js +13 -13
  34. package/lib/radio-group.js +48 -19
  35. package/lib/retrial-auth.js +12 -12
  36. package/lib/select-ganged.js +36 -16
  37. package/lib/select.js +62 -22
  38. package/lib/selector-panel.js +66 -56
  39. package/lib/selector.js +14 -14
  40. package/lib/sizer.js +12 -12
  41. package/lib/steps.js +11 -11
  42. package/lib/switch.js +11 -11
  43. package/lib/table-form.js +36 -36
  44. package/lib/tabs-panel.js +2 -2
  45. package/lib/tabs.js +11 -11
  46. package/lib/theme-chalk/index.css +1 -1
  47. package/lib/theme-chalk/main.css +1 -1
  48. package/lib/tips.js +19 -19
  49. package/lib/toolbar.js +2 -2
  50. package/lib/tree-group.js +11 -11
  51. package/lib/tree.js +12 -12
  52. package/lib/upload.js +12 -12
  53. package/lib/wujie.js +11 -11
  54. package/lib/wxlogin.js +11 -11
  55. package/package.json +1 -1
  56. package/packages/checkbox-group/src/main.vue +47 -5
  57. package/packages/flow/src/processForm.vue +0 -3
  58. package/packages/flow-group/src/main.vue +4 -2
  59. package/packages/flow-list/src/main.vue +1 -99
  60. package/packages/form/src/main.vue +7 -2
  61. package/packages/main/src/main.vue +86 -54
  62. package/packages/main/src/message.vue +7 -8
  63. package/packages/main/src/userinfo.vue +12 -2
  64. package/packages/menu/src/main.vue +22 -3
  65. package/packages/nav/src/main.vue +1 -0
  66. package/packages/radio-group/src/main.vue +47 -5
  67. package/packages/select/src/main.vue +66 -21
  68. package/packages/select-ganged/src/main.vue +42 -18
  69. package/packages/theme-chalk/lib/index.css +1 -1
  70. package/packages/theme-chalk/lib/main.css +1 -1
  71. package/packages/theme-chalk/src/index.scss +0 -1
  72. package/packages/theme-chalk/src/main.scss +5 -1
  73. package/packages/theme-chalk/src/menu.scss +1 -1
  74. package/src/index.js +1 -4
  75. package/lib/editor.js +0 -1345
  76. package/lib/theme-chalk/editor.css +0 -1
  77. package/packages/editor/index.js +0 -5
  78. package/packages/editor/src/color.vue +0 -148
  79. package/packages/editor/src/editor.vue +0 -25
  80. package/packages/editor/src/main.vue +0 -114
  81. package/packages/editor/src/minx.js +0 -213
  82. package/packages/editor/src/toolbar.vue +0 -224
  83. package/packages/flow-list/src/flow-table.vue +0 -441
  84. package/packages/theme-chalk/lib/editor.css +0 -1
  85. package/packages/theme-chalk/src/editor.scss +0 -94
package/lib/main.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 29);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 28);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ([
@@ -90,14 +90,14 @@ module.exports =
90
90
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
91
91
 
92
92
  "use strict";
93
- /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
93
+ /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
94
94
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
95
95
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
96
96
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
97
97
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
98
98
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
100
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
100
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
101
101
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
102
102
  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
103
103
 
@@ -2405,6 +2405,12 @@ var watermark = function watermark(option) {
2405
2405
 
2406
2406
  /***/ }),
2407
2407
  /* 1 */
2408
+ /***/ (function(module, exports) {
2409
+
2410
+ module.exports = require("eoss-element");
2411
+
2412
+ /***/ }),
2413
+ /* 2 */
2408
2414
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2409
2415
 
2410
2416
  "use strict";
@@ -2742,12 +2748,6 @@ var sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
2742
2748
  // 表单结构
2743
2749
  var formContents = '/config/admin/online/onlineForm/render';
2744
2750
 
2745
- /***/ }),
2746
- /* 2 */
2747
- /***/ (function(module, exports) {
2748
-
2749
- module.exports = require("eoss-element");
2750
-
2751
2751
  /***/ }),
2752
2752
  /* 3 */
2753
2753
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -2917,41 +2917,40 @@ module.exports = require("babel-runtime/regenerator");
2917
2917
  /* 14 */,
2918
2918
  /* 15 */,
2919
2919
  /* 16 */,
2920
- /* 17 */,
2921
- /* 18 */,
2922
- /* 19 */
2920
+ /* 17 */
2923
2921
  /***/ (function(module, exports) {
2924
2922
 
2925
2923
  module.exports = require("runtime-import");
2926
2924
 
2927
2925
  /***/ }),
2928
- /* 20 */
2926
+ /* 18 */
2929
2927
  /***/ (function(module, exports) {
2930
2928
 
2931
2929
  module.exports = require("sockjs-client");
2932
2930
 
2933
2931
  /***/ }),
2934
- /* 21 */
2932
+ /* 19 */
2935
2933
  /***/ (function(module, exports) {
2936
2934
 
2937
2935
  module.exports = require("stompjs");
2938
2936
 
2939
2937
  /***/ }),
2938
+ /* 20 */,
2939
+ /* 21 */,
2940
2940
  /* 22 */,
2941
2941
  /* 23 */,
2942
2942
  /* 24 */,
2943
2943
  /* 25 */,
2944
2944
  /* 26 */,
2945
2945
  /* 27 */,
2946
- /* 28 */,
2947
- /* 29 */
2946
+ /* 28 */
2948
2947
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2949
2948
 
2950
2949
  "use strict";
2951
2950
  // ESM COMPAT FLAG
2952
2951
  __webpack_require__.r(__webpack_exports__);
2953
2952
 
2954
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=9f517a06&
2953
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=2cfa653a&
2955
2954
  var render = function () {
2956
2955
  var _vm = this
2957
2956
  var _h = _vm.$createElement
@@ -3377,10 +3376,10 @@ var staticRenderFns = []
3377
3376
  render._withStripped = true
3378
3377
 
3379
3378
 
3380
- // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=9f517a06&
3379
+ // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=2cfa653a&
3381
3380
 
3382
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=c2c69d4a&
3383
- var userinfovue_type_template_id_c2c69d4a_render = function () {
3381
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
3382
+ var userinfovue_type_template_id_799780ee_render = function () {
3384
3383
  var _vm = this
3385
3384
  var _h = _vm.$createElement
3386
3385
  var _c = _vm._self._c || _h
@@ -3396,14 +3395,14 @@ var userinfovue_type_template_id_c2c69d4a_render = function () {
3396
3395
  2
3397
3396
  )
3398
3397
  }
3399
- var userinfovue_type_template_id_c2c69d4a_staticRenderFns = []
3400
- userinfovue_type_template_id_c2c69d4a_render._withStripped = true
3398
+ var userinfovue_type_template_id_799780ee_staticRenderFns = []
3399
+ userinfovue_type_template_id_799780ee_render._withStripped = true
3401
3400
 
3402
3401
 
3403
- // CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=c2c69d4a&
3402
+ // CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
3404
3403
 
3405
3404
  // EXTERNAL MODULE: ./src/config/api.js
3406
- var api = __webpack_require__(1);
3405
+ var api = __webpack_require__(2);
3407
3406
 
3408
3407
  // EXTERNAL MODULE: ./src/utils/store.js
3409
3408
  var store = __webpack_require__(8);
@@ -3436,6 +3435,10 @@ var util = __webpack_require__(0);
3436
3435
  showNotify: {
3437
3436
  type: Boolean,
3438
3437
  default: true
3438
+ },
3439
+ secret: {
3440
+ type: Boolean,
3441
+ default: true
3439
3442
  }
3440
3443
  },
3441
3444
  data: function data() {
@@ -3720,11 +3723,11 @@ var util = __webpack_require__(0);
3720
3723
  email: this.values.email,
3721
3724
  officeTel: this.values.officetel,
3722
3725
  phone: this.values.phone,
3723
- oldPassword: initLogin && initLogin.secret && this.values.oldpassword ? util["a" /* default */].esmEncrypt({
3726
+ oldPassword: this.secret && initLogin && initLogin.secret && this.values.oldpassword ? util["a" /* default */].esmEncrypt({
3724
3727
  data: this.values.oldpassword,
3725
3728
  key: initLogin.secret
3726
3729
  }) : this.values.oldpassword,
3727
- password: initLogin && initLogin.secret && this.values.password ? util["a" /* default */].esmEncrypt({
3730
+ password: this.secret && initLogin && initLogin.secret && this.values.password ? util["a" /* default */].esmEncrypt({
3728
3731
  data: this.values.password,
3729
3732
  key: initLogin.secret
3730
3733
  }) : this.values.password
@@ -3823,8 +3826,8 @@ var componentNormalizer = __webpack_require__(3);
3823
3826
 
3824
3827
  var component = Object(componentNormalizer["a" /* default */])(
3825
3828
  src_userinfovue_type_script_lang_js_,
3826
- userinfovue_type_template_id_c2c69d4a_render,
3827
- userinfovue_type_template_id_c2c69d4a_staticRenderFns,
3829
+ userinfovue_type_template_id_799780ee_render,
3830
+ userinfovue_type_template_id_799780ee_staticRenderFns,
3828
3831
  false,
3829
3832
  null,
3830
3833
  null,
@@ -4282,8 +4285,8 @@ var settings_component = Object(componentNormalizer["a" /* default */])(
4282
4285
  )
4283
4286
 
4284
4287
  /* harmony default export */ var settings = (settings_component.exports);
4285
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/message.vue?vue&type=template&id=6b9d422c&
4286
- var messagevue_type_template_id_6b9d422c_render = function () {
4288
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/message.vue?vue&type=template&id=3f717098&
4289
+ var messagevue_type_template_id_3f717098_render = function () {
4287
4290
  var _vm = this
4288
4291
  var _h = _vm.$createElement
4289
4292
  var _c = _vm._self._c || _h
@@ -4386,7 +4389,7 @@ var messagevue_type_template_id_6b9d422c_render = function () {
4386
4389
  : _vm._e(),
4387
4390
  _vm.noMore && _vm.count > 0
4388
4391
  ? _c("p", { staticClass: "es-msg-tips" }, [
4389
- _vm._v("\n 没有更多了\n "),
4392
+ _vm._v("没有更多了"),
4390
4393
  ])
4391
4394
  : _vm._e(),
4392
4395
  ],
@@ -4420,11 +4423,11 @@ var messagevue_type_template_id_6b9d422c_render = function () {
4420
4423
  1
4421
4424
  )
4422
4425
  }
4423
- var messagevue_type_template_id_6b9d422c_staticRenderFns = []
4424
- messagevue_type_template_id_6b9d422c_render._withStripped = true
4426
+ var messagevue_type_template_id_3f717098_staticRenderFns = []
4427
+ messagevue_type_template_id_3f717098_render._withStripped = true
4425
4428
 
4426
4429
 
4427
- // CONCATENATED MODULE: ./packages/main/src/message.vue?vue&type=template&id=6b9d422c&
4430
+ // CONCATENATED MODULE: ./packages/main/src/message.vue?vue&type=template&id=3f717098&
4428
4431
 
4429
4432
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/message.vue?vue&type=script&lang=js&
4430
4433
  //
@@ -4484,8 +4487,6 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
4484
4487
  //
4485
4488
  //
4486
4489
  //
4487
- //
4488
- //
4489
4490
 
4490
4491
 
4491
4492
 
@@ -4526,6 +4527,7 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
4526
4527
  return this.msgs.length >= this.count;
4527
4528
  },
4528
4529
  disabled: function disabled() {
4530
+ console.log(this.loading, this.noMore);
4529
4531
  return this.loading || this.noMore;
4530
4532
  }
4531
4533
  },
@@ -4676,8 +4678,8 @@ messagevue_type_template_id_6b9d422c_render._withStripped = true
4676
4678
 
4677
4679
  var message_component = Object(componentNormalizer["a" /* default */])(
4678
4680
  src_messagevue_type_script_lang_js_,
4679
- messagevue_type_template_id_6b9d422c_render,
4680
- messagevue_type_template_id_6b9d422c_staticRenderFns,
4681
+ messagevue_type_template_id_3f717098_render,
4682
+ messagevue_type_template_id_3f717098_staticRenderFns,
4681
4683
  false,
4682
4684
  null,
4683
4685
  null,
@@ -5025,7 +5027,7 @@ var regenerator_ = __webpack_require__(9);
5025
5027
  var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
5026
5028
 
5027
5029
  // EXTERNAL MODULE: external "runtime-import"
5028
- var external_runtime_import_ = __webpack_require__(19);
5030
+ var external_runtime_import_ = __webpack_require__(17);
5029
5031
 
5030
5032
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
5031
5033
 
@@ -5177,11 +5179,11 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
5177
5179
 
5178
5180
  /* harmony default export */ var async_component = (async_component_component.exports);
5179
5181
  // EXTERNAL MODULE: external "sockjs-client"
5180
- var external_sockjs_client_ = __webpack_require__(20);
5182
+ var external_sockjs_client_ = __webpack_require__(18);
5181
5183
  var external_sockjs_client_default = /*#__PURE__*/__webpack_require__.n(external_sockjs_client_);
5182
5184
 
5183
5185
  // EXTERNAL MODULE: external "stompjs"
5184
- var external_stompjs_ = __webpack_require__(21);
5186
+ var external_stompjs_ = __webpack_require__(19);
5185
5187
  var external_stompjs_default = /*#__PURE__*/__webpack_require__.n(external_stompjs_);
5186
5188
 
5187
5189
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
@@ -5546,7 +5548,10 @@ var log = util["a" /* default */].getParams('console');
5546
5548
  type: String,
5547
5549
  default: '/main'
5548
5550
  },
5549
- setFirstAsDefault: Boolean,
5551
+ setFirstAsDefault: {
5552
+ type: Boolean,
5553
+ default: true
5554
+ },
5550
5555
  pathUrl: {
5551
5556
  type: String,
5552
5557
  default: '/primary'
@@ -5817,8 +5822,10 @@ var log = util["a" /* default */].getParams('console');
5817
5822
  menuSuccess: function menuSuccess(res) {
5818
5823
  // this.menus
5819
5824
  this.menuType = 'custom';
5820
- this.customMenu = res;
5821
- this.setMenu(res);
5825
+ if (res && res.length) {
5826
+ this.customMenu = res;
5827
+ this.setMenu(res);
5828
+ }
5822
5829
  },
5823
5830
 
5824
5831
  //获取主题模板JSON
@@ -5859,8 +5866,10 @@ var log = util["a" /* default */].getParams('console');
5859
5866
  if (_that.showDefault && _that.data === undefined) {
5860
5867
  _that.getMenu();
5861
5868
  } else if (_that.showDefault) {
5862
- _that.menus = JSON.parse(JSON.stringify(_that.data));
5863
- _that.setMenu(_that.data);
5869
+ if (_that.data && _that.data.length) {
5870
+ _that.menus = JSON.parse(JSON.stringify(_that.data));
5871
+ _that.setMenu(_that.data);
5872
+ }
5864
5873
  }
5865
5874
  }).catch(function (err) {
5866
5875
  if (err.message && err.message !== 'canceled') {
@@ -6002,11 +6011,11 @@ var log = util["a" /* default */].getParams('console');
6002
6011
  if (i === 'indexUrl') {
6003
6012
  this.homePage = results[i];
6004
6013
  if (this.isHomePage) {
6005
- if (this.menus) {
6006
- var _ids4 = null;
6007
- this.homePage && (_ids4 = this.getId(this.menus, this.homePage));
6008
- if (_ids4) {
6009
- this.defaultActive = _ids4;
6014
+ if (this.menus && this.menus.length) {
6015
+ var ids = null;
6016
+ this.homePage && (ids = this.getId(this.menus, this.homePage));
6017
+ if (ids) {
6018
+ this.defaultActive = ids;
6010
6019
  } else if (this.homePage) {
6011
6020
  this.handleJump(this.homePage);
6012
6021
  }
@@ -6153,44 +6162,48 @@ var log = util["a" /* default */].getParams('console');
6153
6162
 
6154
6163
  util["a" /* default */].ajax({ url: this.action, params: this.param ? this.param : {} }).then(function (res) {
6155
6164
  if (res.rCode === 0) {
6156
- _this5.menus = JSON.parse(JSON.stringify(res.results));
6157
- var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
6158
- if (applicationid) {
6159
- var _ids5 = _this5.getId(_this5.menus, applicationid);
6160
- if (_ids5) {
6161
- _this5.defaultActive = _ids5;
6162
- }
6163
- } else if (util["a" /* default */].win.location.hash) {
6164
- var hash = util["a" /* default */].win.location.hash;
6165
- if (hash) {
6166
- hash = hash.split('?')[0];
6167
- }
6168
- if (hash !== '#/' && hash !== '#/main') {
6169
- var _ids6 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
6165
+ if (res.results && res.results.length) {
6166
+ _this5.menus = JSON.parse(JSON.stringify(res.results));
6167
+ var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
6168
+ if (applicationid) {
6169
+ var ids = _this5.getId(_this5.menus, applicationid);
6170
+ if (ids) {
6171
+ _this5.defaultActive = ids;
6172
+ }
6173
+ } else if (util["a" /* default */].win.location.hash) {
6174
+ var hash = util["a" /* default */].win.location.hash;
6175
+ if (hash) {
6176
+ hash = hash.split('?')[0];
6177
+ }
6178
+ if (hash !== '#/' && hash !== '#/main') {
6179
+ var _ids4 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
6180
+ if (_ids4) {
6181
+ _this5.defaultActive = _ids4;
6182
+ _this5.navIds = _ids4;
6183
+ _this5.setTitle(_ids4[0]);
6184
+ }
6185
+ } else if (sessionStorage.getItem('jump') && _this5.history) {
6186
+ var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
6187
+ if (_ids5) {
6188
+ _this5.defaultActive = _ids5;
6189
+ _this5.navIds = _ids5;
6190
+ _this5.setTitle(_ids5[0]);
6191
+ }
6192
+ }
6193
+ } else if (sessionStorage.getItem('jump') && _this5.history) {
6194
+ var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
6170
6195
  if (_ids6) {
6171
6196
  _this5.defaultActive = _ids6;
6172
6197
  _this5.navIds = _ids6;
6173
6198
  _this5.setTitle(_ids6[0]);
6174
6199
  }
6175
- } else if (sessionStorage.getItem('jump') && _this5.history) {
6176
- var _ids7 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
6177
- if (_ids7) {
6178
- _this5.defaultActive = _ids7;
6179
- _this5.navIds = _ids7;
6180
- _this5.setTitle(_ids7[0]);
6181
- }
6182
- }
6183
- } else if (sessionStorage.getItem('jump') && _this5.history) {
6184
- var _ids8 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
6185
- if (_ids8) {
6186
- _this5.defaultActive = _ids8;
6187
- _this5.navIds = _ids8;
6188
- _this5.setTitle(_ids8[0]);
6189
6200
  }
6201
+ _this5.setTips(_this5.menus);
6202
+ store["a" /* default */].set('nav', _this5.menus);
6203
+ _this5.setMenu(_this5.menus);
6204
+ } else {
6205
+ _this5.$message.error('未分配菜单权限,请联系管理员!');
6190
6206
  }
6191
- _this5.setTips(_this5.menus);
6192
- store["a" /* default */].set('nav', _this5.menus);
6193
- _this5.setMenu(_this5.menus);
6194
6207
  } else {
6195
6208
  var msg = res.msg || '系统错误,请联系管理员!';
6196
6209
  _this5.$message.error(msg);
@@ -6211,9 +6224,9 @@ var log = util["a" /* default */].getParams('console');
6211
6224
  if (this.homePage || !util["a" /* default */].getStorage('mainConfig')) {
6212
6225
  this.isDefault = true;
6213
6226
  if (this.homePage && (!this.defaultActive || !this.defaultActive.length)) {
6214
- var _ids9 = this.getId(this.menus, this.homePage);
6215
- if (_ids9) {
6216
- this.defaultActive = _ids9;
6227
+ var ids = this.getId(this.menus, this.homePage);
6228
+ if (ids) {
6229
+ this.defaultActive = ids;
6217
6230
  this.isDefault = false;
6218
6231
  this.setDefault(res, this.defaultActive);
6219
6232
  return false;
@@ -6477,11 +6490,14 @@ var log = util["a" /* default */].getParams('console');
6477
6490
  switch (type) {
6478
6491
  case 'nav':
6479
6492
  this.tabs = [];
6480
- this.active = '';
6493
+ //this.active = '';
6481
6494
  if (this.layout === 'topside') {
6482
- this.navIds = [node.id];
6483
- this.menu = node.children;
6484
- this.title = node.text;
6495
+ if (this.title !== node.text) {
6496
+ this.navIds = [node.id];
6497
+ this.menu = node.children;
6498
+ this.active = node.id;
6499
+ this.title = node.text;
6500
+ }
6485
6501
  if (this.setFirstAsDefault) {
6486
6502
  var subNode = this.getFirst(node);
6487
6503
  if (subNode) {
@@ -6491,7 +6507,7 @@ var log = util["a" /* default */].getParams('console');
6491
6507
  }
6492
6508
  } else {
6493
6509
  this.navIds = this.getId(this.menus, node.url, true);
6494
- this.setTitle(ids[0]);
6510
+ this.setTitle(this.navIds[0]);
6495
6511
  this.tabsId = fourthTabs ? node.id : '';
6496
6512
  }
6497
6513
  break;
@@ -6500,7 +6516,10 @@ var log = util["a" /* default */].getParams('console');
6500
6516
  this.navIds = [node.id];
6501
6517
  this.tabs = [];
6502
6518
  this.menu = node.children;
6503
- this.title = node.text;
6519
+ if (this.title !== node.text) {
6520
+ this.active = '';
6521
+ this.title = node.text;
6522
+ }
6504
6523
  if (this.setFirstAsDefault) {
6505
6524
  var _subNode = this.getFirst(node);
6506
6525
  if (_subNode) {
@@ -6516,6 +6535,10 @@ var log = util["a" /* default */].getParams('console');
6516
6535
  if (node.url) {
6517
6536
  this.tabs = [];
6518
6537
  }
6538
+ if (this.title !== node.text) {
6539
+ this.active = [node.id];
6540
+ this.title = node.text;
6541
+ }
6519
6542
  if (this.setFirstAsDefault) {
6520
6543
  var _subNode2 = this.getFirst(node);
6521
6544
  this.active = [node.id];
@@ -6566,16 +6589,18 @@ var log = util["a" /* default */].getParams('console');
6566
6589
  this.navIds = this.getId(this.menus, this.tabs[0].url, true);
6567
6590
  }
6568
6591
  }
6569
- } else if (this.setFirstAsDefault) {
6570
- this.tabs = [];
6571
- var _subNode3 = this.getFirst(node);
6572
- if (_subNode3) {
6573
- if (this.biserial) {
6574
- this.$set(this.active, 1, _subNode3.id);
6575
- } else {
6576
- this.active = _subNode3.id;
6592
+ } else {
6593
+ if (this.setFirstAsDefault) {
6594
+ this.tabs = [];
6595
+ var _subNode3 = this.getFirst(node);
6596
+ if (_subNode3) {
6597
+ if (this.biserial) {
6598
+ this.$set(this.active, 1, _subNode3.id);
6599
+ } else {
6600
+ this.active = _subNode3.id;
6601
+ }
6602
+ this.navIds = this.getId(this.menus, _subNode3.url, true);
6577
6603
  }
6578
- this.navIds = this.getId(this.menus, _subNode3.url, true);
6579
6604
  }
6580
6605
  }
6581
6606
  break;
@@ -6641,7 +6666,9 @@ var log = util["a" /* default */].getParams('console');
6641
6666
  this.active = [];
6642
6667
  this.defaultActive = [];
6643
6668
  this.tabs = [];
6644
- this.setMenu(this.menus);
6669
+ if (this.menus && this.menus.length) {
6670
+ this.setMenu(this.menus);
6671
+ }
6645
6672
  this.$nextTick(function () {
6646
6673
  _this7.reset = true;
6647
6674
  });
@@ -6810,6 +6837,9 @@ var log = util["a" /* default */].getParams('console');
6810
6837
  return false;
6811
6838
  },
6812
6839
  handleLayout: function handleLayout(res, old) {
6840
+ if (res == old) {
6841
+ return;
6842
+ }
6813
6843
  this.layout = res;
6814
6844
  switch (res) {
6815
6845
  case 'topnav':
package/lib/menu.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 73);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 71);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 73:
195
+ /***/ 71:
196
196
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
197
197
 
198
198
  "use strict";
@@ -292,7 +292,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
292
292
  return {
293
293
  maxH: '',
294
294
  maxW: '',
295
- menuId: null
295
+ menuId: null,
296
+ defaultOpeneds: [],
297
+ isChange: false
296
298
  };
297
299
  },
298
300
  mounted: function mounted() {},
@@ -314,6 +316,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
314
316
  handleSelect: function handleSelect(key, keyPath, item) {
315
317
  var _this2 = this;
316
318
 
319
+ this.isChange = true;
317
320
  if (this.menuId !== null && keyPath.indexOf(this.menuId) == -1) {
318
321
  this.$refs.menu.close(this.menuId);
319
322
  } else {
@@ -371,6 +374,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
371
374
  'es-badge-right': item.tips && typeof item.tips !== 'boolean',
372
375
  'es-dot-right': item.tips && typeof item.tips === 'boolean'
373
376
  }],
377
+ attrs: {
378
+ title: item.text.length > 18 ? item.text : undefined
379
+ },
374
380
  props: typeof item.tips === 'boolean' && item.tips ? {
375
381
  isDot: true
376
382
  //hidden: item.tips
@@ -390,7 +396,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
390
396
  }
391
397
  }));
392
398
  return [h('el-submenu', {
393
- class: ['es-submenu', 'es-submenu-' + this.mode],
399
+ class: ['es-submenu', 'es-submenu-' + this.mode, item.id === this.active && !this.isChange ? 'es-menu-item-focus' : ''],
394
400
  props: {
395
401
  popperClass: popper,
396
402
  popperAppendToBody: true,
@@ -408,7 +414,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
408
414
  }
409
415
  }));
410
416
  return [h('el-submenu', {
411
- class: ['es-submenu', 'es-submenu-' + this.mode],
417
+ class: ['es-submenu', 'es-submenu-' + this.mode, item.id === this.active && !this.isChange ? 'es-menu-item-focus' : ''],
412
418
  props: {
413
419
  popperClass: popper,
414
420
  popperAppendToBody: true,
@@ -492,6 +498,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
492
498
  class: ['es-menu', 'es-menu-' + this.mode, { 'es-menu-collapse': this.collapse }, { 'es-menu-nav': this.subNav }],
493
499
  ref: 'menu',
494
500
  props: {
501
+ defaultOpeneds: this.defaultOpeneds,
495
502
  defaultActive: this.active,
496
503
  collapse: this.collapse,
497
504
  mode: this.mode,
package/lib/nav.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 48);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 46);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -91,14 +91,14 @@ module.exports =
91
91
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
92
92
 
93
93
  "use strict";
94
- /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
94
+ /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
95
95
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
96
96
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
97
97
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
98
98
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
100
100
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
101
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
101
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
102
102
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
103
103
  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
104
104
 
@@ -2407,6 +2407,13 @@ var watermark = function watermark(option) {
2407
2407
  /***/ }),
2408
2408
 
2409
2409
  /***/ 1:
2410
+ /***/ (function(module, exports) {
2411
+
2412
+ module.exports = require("eoss-element");
2413
+
2414
+ /***/ }),
2415
+
2416
+ /***/ 2:
2410
2417
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2411
2418
 
2412
2419
  "use strict";
@@ -2746,13 +2753,6 @@ var formContents = '/config/admin/online/onlineForm/render';
2746
2753
 
2747
2754
  /***/ }),
2748
2755
 
2749
- /***/ 2:
2750
- /***/ (function(module, exports) {
2751
-
2752
- module.exports = require("eoss-element");
2753
-
2754
- /***/ }),
2755
-
2756
2756
  /***/ 3:
2757
2757
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2758
2758
 
@@ -2865,14 +2865,14 @@ module.exports = require("qs");
2865
2865
 
2866
2866
  /***/ }),
2867
2867
 
2868
- /***/ 48:
2868
+ /***/ 46:
2869
2869
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2870
2870
 
2871
2871
  "use strict";
2872
2872
  // ESM COMPAT FLAG
2873
2873
  __webpack_require__.r(__webpack_exports__);
2874
2874
 
2875
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=57ae81a0&
2875
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=1e79807a&
2876
2876
  var render = function () {
2877
2877
  var _vm = this
2878
2878
  var _h = _vm.$createElement
@@ -3015,7 +3015,7 @@ var staticRenderFns = []
3015
3015
  render._withStripped = true
3016
3016
 
3017
3017
 
3018
- // CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=57ae81a0&
3018
+ // CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=1e79807a&
3019
3019
 
3020
3020
  // EXTERNAL MODULE: ./src/utils/util.js
3021
3021
  var util = __webpack_require__(0);
@@ -3152,6 +3152,7 @@ var util = __webpack_require__(0);
3152
3152
  biserial: {
3153
3153
  handler: function handler(val) {
3154
3154
  this.isShow = !val;
3155
+ this.resetHeight();
3155
3156
  }
3156
3157
  },
3157
3158
  defaultActive: {