eoss-ui 0.5.61 → 0.5.63

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 (87) hide show
  1. package/lib/button-group.js +147 -129
  2. package/lib/button.js +14 -8
  3. package/lib/checkbox-group.js +14 -8
  4. package/lib/data-table-form.js +14 -8
  5. package/lib/data-table.js +129 -104
  6. package/lib/date-picker.js +14 -8
  7. package/lib/dialog.js +17 -11
  8. package/lib/eoss-ui.common.js +688 -545
  9. package/lib/flow-group.js +14 -8
  10. package/lib/flow-list.js +14 -8
  11. package/lib/flow.js +17 -11
  12. package/lib/form.js +14 -8
  13. package/lib/handle-user.js +14 -8
  14. package/lib/handler.js +17 -11
  15. package/lib/icon.js +19 -15
  16. package/lib/icons.js +2 -2
  17. package/lib/index.js +1 -1
  18. package/lib/input-number.js +14 -8
  19. package/lib/input.js +14 -8
  20. package/lib/label.js +2 -2
  21. package/lib/login.js +139 -68
  22. package/lib/main.js +208 -164
  23. package/lib/menu.js +2 -2
  24. package/lib/nav.js +14 -8
  25. package/lib/page.js +14 -8
  26. package/lib/player.js +18 -12
  27. package/lib/qr-code.js +16 -10
  28. package/lib/radio-group.js +14 -8
  29. package/lib/retrial-auth.js +14 -8
  30. package/lib/select-ganged.js +14 -8
  31. package/lib/select.js +14 -8
  32. package/lib/selector-panel.js +17 -11
  33. package/lib/selector.js +18 -23
  34. package/lib/sizer.js +14 -8
  35. package/lib/steps.js +14 -8
  36. package/lib/switch.js +14 -8
  37. package/lib/table-form.js +14 -8
  38. package/lib/tabs.js +14 -8
  39. package/lib/theme-chalk/base.css +1 -1
  40. package/lib/theme-chalk/card.css +1 -1
  41. package/lib/theme-chalk/form.css +1 -1
  42. package/lib/theme-chalk/icon.css +1 -1
  43. package/lib/theme-chalk/index.css +1 -1
  44. package/lib/theme-chalk/login.css +1 -1
  45. package/lib/theme-chalk/main.css +1 -1
  46. package/lib/theme-chalk/menu.css +1 -1
  47. package/lib/theme-chalk/sizer.css +1 -1
  48. package/lib/theme-chalk/upload.css +1 -1
  49. package/lib/tips.js +14 -8
  50. package/lib/toolbar.js +4 -1
  51. package/lib/tree-group.js +28 -11
  52. package/lib/tree.js +14 -8
  53. package/lib/upload.js +17 -11
  54. package/lib/utils/util.js +14 -8
  55. package/lib/wujie.js +14 -8
  56. package/lib/wxlogin.js +14 -8
  57. package/package.json +3 -2
  58. package/packages/button-group/src/main.vue +71 -58
  59. package/packages/data-table/src/main.vue +11 -2
  60. package/packages/flow/src/main.vue +1 -1
  61. package/packages/handler/src/main.vue +1 -1
  62. package/packages/icon/src/main.vue +2 -2
  63. package/packages/label/src/main.vue +2 -2
  64. package/packages/login/src/main.vue +63 -35
  65. package/packages/main/src/main.vue +19 -11
  66. package/packages/main/src/userinfo.vue +165 -150
  67. package/packages/menu/src/main.vue +2 -2
  68. package/packages/selector/src/main.vue +0 -1
  69. package/packages/theme-chalk/lib/base.css +1 -1
  70. package/packages/theme-chalk/lib/card.css +1 -1
  71. package/packages/theme-chalk/lib/form.css +1 -1
  72. package/packages/theme-chalk/lib/icon.css +1 -1
  73. package/packages/theme-chalk/lib/index.css +1 -1
  74. package/packages/theme-chalk/lib/login.css +1 -1
  75. package/packages/theme-chalk/lib/main.css +1 -1
  76. package/packages/theme-chalk/lib/menu.css +1 -1
  77. package/packages/theme-chalk/lib/sizer.css +1 -1
  78. package/packages/theme-chalk/lib/upload.css +1 -1
  79. package/packages/theme-chalk/src/card.scss +2 -2
  80. package/packages/theme-chalk/src/form.scss +5 -3
  81. package/packages/theme-chalk/src/icon.scss +3 -3
  82. package/packages/theme-chalk/src/login.scss +6 -0
  83. package/packages/theme-chalk/src/menu.scss +1 -1
  84. package/packages/toolbar/src/main.vue +4 -1
  85. package/packages/tree-group/src/main.vue +12 -1
  86. package/src/index.js +1 -1
  87. package/src/utils/util.js +14 -9
package/lib/main.js CHANGED
@@ -369,7 +369,7 @@ var ajax = function ajax(_ref) {
369
369
  error.message = '未授权,请重新登录';
370
370
  break;
371
371
  case 403:
372
- error.message = '登录过期,请重新登录';
372
+ error.message = '服务器错误';
373
373
  break;
374
374
  case 404:
375
375
  error.message = '网络请求不存在';
@@ -381,7 +381,7 @@ var ajax = function ajax(_ref) {
381
381
  error.message = '请求超时';
382
382
  break;
383
383
  case 500:
384
- error.message = '服务器端出错';
384
+ error.message = '服务器错误';
385
385
  break;
386
386
  case 501:
387
387
  error.message = '网络未实现';
@@ -737,18 +737,23 @@ var dayOfMonth = function dayOfMonth(date) {
737
737
  * @desc:添加js内容
738
738
  * @author huangbo
739
739
  * @date 2022年5月7日
740
- * @param {Function} [fn] - 函数
740
+ * @param {Function} [callback] - 函数
741
741
  * @param {Number} [wait] - 延迟毫秒数
742
742
  * @param {Boolean} [immediate] - 是否首次触发执行
743
743
  **/
744
744
 
745
- var debounce = function debounce(callback, delay) {
746
- var timeout = null;
745
+ var debounce = function debounce(callback, wait) {
746
+ var timeout = void 0;
747
747
  return function () {
748
- clearTimeout(timeout);
749
- timeout = setTimeout(callback, delay ? delay : 500);
748
+ var context = this;
749
+ var args = arguments;
750
+ if (timeout) clearTimeout(timeout);
751
+ timeout = setTimeout(function () {
752
+ callback.apply(context, args);
753
+ }, wait || 500);
750
754
  };
751
755
  };
756
+
752
757
  /**
753
758
  * delUrlParam
754
759
  * @desc:删除url指定参数
@@ -2885,7 +2890,8 @@ var toFunction = function toFunction(str) {
2885
2890
  * @param {string} [$color] - 颜色值
2886
2891
  **/
2887
2892
  var updateTheme = function updateTheme(color, send) {
2888
- color = color ? color : '#409eff';
2893
+ color = color && startWith(color, '#') ? color : '#409eff';
2894
+
2889
2895
  if (send === undefined) {
2890
2896
  send = true;
2891
2897
  }
@@ -3798,13 +3804,13 @@ module.exports = require("babel-runtime/regenerator");
3798
3804
  /* 18 */,
3799
3805
  /* 19 */,
3800
3806
  /* 20 */,
3801
- /* 21 */
3807
+ /* 21 */,
3808
+ /* 22 */
3802
3809
  /***/ (function(module, exports) {
3803
3810
 
3804
3811
  module.exports = require("runtime-import");
3805
3812
 
3806
3813
  /***/ }),
3807
- /* 22 */,
3808
3814
  /* 23 */,
3809
3815
  /* 24 */,
3810
3816
  /* 25 */,
@@ -3820,7 +3826,7 @@ module.exports = require("runtime-import");
3820
3826
  // ESM COMPAT FLAG
3821
3827
  __webpack_require__.r(__webpack_exports__);
3822
3828
 
3823
- // 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=a07f27f8&
3829
+ // 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=8fa53c9e&
3824
3830
  var render = function () {
3825
3831
  var _vm = this
3826
3832
  var _h = _vm.$createElement
@@ -4222,6 +4228,7 @@ var render = function () {
4222
4228
  "userinfo",
4223
4229
  _vm._b(
4224
4230
  {
4231
+ attrs: { contents: _vm.userInfoContents },
4225
4232
  on: {
4226
4233
  change: _vm.handleUserModel,
4227
4234
  reGetConfig: _vm.reGetConfig,
@@ -4251,10 +4258,10 @@ var staticRenderFns = []
4251
4258
  render._withStripped = true
4252
4259
 
4253
4260
 
4254
- // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a07f27f8&
4261
+ // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=8fa53c9e&
4255
4262
 
4256
- // 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=fc09aaf8&
4257
- var userinfovue_type_template_id_fc09aaf8_render = function () {
4263
+ // 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=75d533de&
4264
+ var userinfovue_type_template_id_75d533de_render = function () {
4258
4265
  var _vm = this
4259
4266
  var _h = _vm.$createElement
4260
4267
  var _c = _vm._self._c || _h
@@ -4270,11 +4277,11 @@ var userinfovue_type_template_id_fc09aaf8_render = function () {
4270
4277
  2
4271
4278
  )
4272
4279
  }
4273
- var userinfovue_type_template_id_fc09aaf8_staticRenderFns = []
4274
- userinfovue_type_template_id_fc09aaf8_render._withStripped = true
4280
+ var userinfovue_type_template_id_75d533de_staticRenderFns = []
4281
+ userinfovue_type_template_id_75d533de_render._withStripped = true
4275
4282
 
4276
4283
 
4277
- // CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
4284
+ // CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
4278
4285
 
4279
4286
  // EXTERNAL MODULE: ./src/config/api.js
4280
4287
  var api = __webpack_require__(1);
@@ -4286,6 +4293,8 @@ var store = __webpack_require__(11);
4286
4293
  var util = __webpack_require__(0);
4287
4294
 
4288
4295
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
4296
+ var _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; };
4297
+
4289
4298
  //
4290
4299
  //
4291
4300
  //
@@ -4314,6 +4323,102 @@ var util = __webpack_require__(0);
4314
4323
  secret: {
4315
4324
  type: Boolean,
4316
4325
  default: true
4326
+ },
4327
+ contents: {
4328
+ type: Array,
4329
+ default: function _default() {
4330
+ return [{
4331
+ title: '用户信息',
4332
+ contents: [{
4333
+ type: 'upload',
4334
+ name: 'userHeadUrl',
4335
+ label: '头像',
4336
+ portrait: true,
4337
+ code: 'USER_IMG',
4338
+ col: 12,
4339
+ weixinQrcode: true,
4340
+ class: 'es-flex-none'
4341
+ }, {
4342
+ type: 'select',
4343
+ name: 'job',
4344
+ label: '切换职务',
4345
+ valueType: 'object',
4346
+ class: 'es-user-info-job',
4347
+ row: true,
4348
+ col: 12
4349
+ }, {
4350
+ name: 'orgName',
4351
+ label: '所属机构',
4352
+ type: 'text',
4353
+ disabled: true,
4354
+ col: 6
4355
+ }, {
4356
+ name: 'depName',
4357
+ label: '所属部门',
4358
+ type: 'text',
4359
+ disabled: true,
4360
+ col: 6
4361
+ }, {
4362
+ name: 'idCard',
4363
+ label: '身份证号',
4364
+ type: 'text',
4365
+ disabled: true,
4366
+ col: 6
4367
+ }, {
4368
+ name: 'outCode',
4369
+ label: '工号',
4370
+ type: 'text',
4371
+ disabled: true,
4372
+ col: 6
4373
+ }, {
4374
+ name: 'phone',
4375
+ placeholder: '联系电话',
4376
+ label: '联系电话',
4377
+ type: 'text',
4378
+ col: 6
4379
+ }, {
4380
+ name: 'email',
4381
+ placeholder: '电子邮箱',
4382
+ label: '电子邮箱',
4383
+ type: 'text',
4384
+ rules: {
4385
+ type: 'email',
4386
+ message: '请输入正确的邮箱地址',
4387
+ trigger: 'blur'
4388
+ },
4389
+ col: 6
4390
+ }, {
4391
+ name: 'officetel',
4392
+ placeholder: '座机号',
4393
+ label: '座机号',
4394
+ type: 'text',
4395
+ rules: {
4396
+ type: 'telephone'
4397
+ //message: '请输入正确的邮箱地址',
4398
+ //trigger: 'blur'
4399
+ },
4400
+ col: 6
4401
+ }, {
4402
+ name: 'oldpassword',
4403
+ placeholder: '旧密码',
4404
+ label: '旧密码',
4405
+ type: 'text',
4406
+ col: 6
4407
+ }, {
4408
+ name: 'password',
4409
+ placeholder: '新密码',
4410
+ label: '新密码',
4411
+ type: 'text',
4412
+ col: 6
4413
+ }, {
4414
+ name: 'repassword',
4415
+ placeholder: '确认新密码',
4416
+ label: '确认新密码',
4417
+ type: 'text',
4418
+ col: 6
4419
+ }]
4420
+ }];
4421
+ }
4317
4422
  }
4318
4423
  },
4319
4424
  data: function data() {
@@ -4342,123 +4447,52 @@ var util = __webpack_require__(0);
4342
4447
 
4343
4448
  computed: {
4344
4449
  forms: function forms() {
4345
- var page = [{
4346
- title: '用户信息',
4347
- contents: [{
4348
- type: 'upload',
4349
- name: 'userHeadUrl',
4350
- label: '头像',
4351
- portrait: true,
4352
- code: 'USER_IMG',
4353
- ownId: store["a" /* default */].get('userModel').personId,
4354
- onSuccess: this.handleUploadSuccess,
4355
- col: 12,
4356
- class: 'es-flex-none',
4357
- inline: this.qrcode ? {
4358
- range: false,
4359
- class: 'weixinQrcode',
4360
- type: 'image',
4361
- url: this.qrcode,
4362
- event: this.getQrcode
4363
- } : ''
4364
- },
4365
- // {
4366
- // type: 'upload',
4367
- // name: 'userQrcode',
4368
- // // label: '微信二维码',
4369
- // portrait: true,
4370
- // code: 'USER_IMG',
4371
- // ownId: 'ddd',
4372
- // class: 'es-qrcode',
4373
- // col: 12
4374
- // },
4375
- {
4376
- type: 'select',
4377
- name: 'job',
4378
- label: '切换职务',
4379
- valueType: 'object',
4380
- data: store["a" /* default */].get('userModel').identityList,
4381
- class: 'es-user-info-job',
4382
- row: true,
4383
- col: 12
4384
- }, {
4385
- name: 'orgName',
4386
- label: '所属机构',
4387
- type: 'text',
4388
- disabled: true,
4389
- col: 6
4390
- }, {
4391
- name: 'depName',
4392
- label: '所属部门',
4393
- type: 'text',
4394
- disabled: true,
4395
- col: 6
4396
- }, {
4397
- name: 'idCard',
4398
- label: '身份证号',
4399
- type: 'text',
4400
- disabled: true,
4401
- row: true,
4402
- col: 12
4403
- }, {
4404
- name: 'phone',
4405
- placeholder: '联系电话',
4406
- label: '联系电话',
4407
- type: 'text',
4408
- col: 6
4409
- }, {
4410
- name: 'email',
4411
- placeholder: '电子邮箱',
4412
- label: '电子邮箱',
4413
- type: 'text',
4414
- rules: {
4415
- type: 'email',
4416
- message: '请输入正确的邮箱地址',
4417
- trigger: 'blur'
4418
- },
4419
- col: 6
4420
- }, {
4421
- name: 'officetel',
4422
- placeholder: '座机号',
4423
- label: '座机号',
4424
- type: 'text',
4425
- rules: {
4426
- type: 'telephone'
4427
- //message: '请输入正确的邮箱地址',
4428
- //trigger: 'blur'
4429
- },
4430
- col: 6
4431
- }, {
4432
- name: 'oldpassword',
4433
- placeholder: '旧密码',
4434
- label: '旧密码',
4435
- rules: this.values.password ? { required: true, message: '请输入旧密码' } : {},
4436
- type: 'text',
4437
- col: 6
4438
- }, {
4439
- name: 'password',
4440
- placeholder: '新密码',
4441
- label: '新密码',
4442
- type: 'text',
4443
- rules: [this.checkPassword ? {
4444
- pattern: this.checkPassword,
4445
- message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
4446
- trigger: 'blur'
4447
- } : {}],
4448
- col: 6
4449
- }, {
4450
- name: 'repassword',
4451
- placeholder: '确认新密码',
4452
- label: '确认新密码',
4453
- type: 'text',
4454
- rules: [this.checkPassword ? {
4455
- pattern: this.checkPassword,
4456
- message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
4457
- trigger: 'blur'
4458
- } : {}, { validator: this.repassword, trigger: 'blur' }],
4459
- col: 6
4460
- }]
4461
- }];
4450
+ var page = JSON.parse(JSON.stringify(this.contents));
4451
+ for (var i = 0; i < page.length; i++) {
4452
+ for (var x = 0; x < page[i].contents.length; x++) {
4453
+ var item = page[i].contents[x];
4454
+ if (item.name == 'userHeadUrl') {
4455
+ page[i].contents[x].ownId = store["a" /* default */].get('userModel').personId;
4456
+ page[i].contents[x].onSuccess = this.handleUploadSuccess;
4457
+ if (item.weixinQrcode && this.qrcode) {
4458
+ page[i].contents[x].inline = {
4459
+ range: false,
4460
+ class: 'weixinQrcode',
4461
+ type: 'image',
4462
+ url: this.qrcode,
4463
+ event: this.getQrcode
4464
+ };
4465
+ }
4466
+ }
4467
+ if (item.name == 'job') {
4468
+ page[i].contents[x].data = store["a" /* default */].get('userModel').identityList;
4469
+ }
4470
+ if (item.name == 'oldpassword') {
4471
+ page[i].contents[x].rules = {
4472
+ required: true,
4473
+ message: '请输入旧密码'
4474
+ };
4475
+ }
4476
+ if (item.name == 'password' && this.checkPassword) {
4477
+ page[i].contents[x].rules = {
4478
+ pattern: this.checkPassword,
4479
+ message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
4480
+ trigger: 'blur'
4481
+ };
4482
+ }
4483
+ if (item.name == 'repassword') {
4484
+ var rules = [{ validator: this.repassword, trigger: 'blur' }];
4485
+ if (this.checkPassword) {
4486
+ rules.push({
4487
+ pattern: this.checkPassword,
4488
+ message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
4489
+ trigger: 'blur'
4490
+ });
4491
+ }
4492
+ page[i].contents[x].rules = rules;
4493
+ }
4494
+ }
4495
+ }
4462
4496
  if (this.showNotify) {
4463
4497
  page.push({
4464
4498
  title: '接收消息类型',
@@ -4516,12 +4550,13 @@ var util = __webpack_require__(0);
4516
4550
  _this2.checkPasswordMsg = results.checkPasswordMsg;
4517
4551
  }
4518
4552
  _this2.results = results.simpleUserInfo;
4519
- _this2.values.orgName = results.simpleUserInfo.orgName;
4520
- _this2.values.depName = results.simpleUserInfo.depName;
4521
- _this2.values.idCard = results.simpleUserInfo.idCard;
4522
- _this2.values.phone = results.simpleUserInfo.phone;
4523
- _this2.values.email = results.simpleUserInfo.email;
4524
- _this2.values.officeTel = results.simpleUserInfo.officeTel;
4553
+ _this2.values = _extends({}, _this2.values, results.simpleUserInfo);
4554
+ // this.values.orgName = results.simpleUserInfo.orgName;
4555
+ // this.values.depName = results.simpleUserInfo.depName;
4556
+ // this.values.idCard = results.simpleUserInfo.idCard;
4557
+ // this.values.phone = results.simpleUserInfo.phone;
4558
+ // this.values.email = results.simpleUserInfo.email;
4559
+ // this.values.officeTel = results.simpleUserInfo.officeTel;
4525
4560
  if (results.userScanBindImgUrl) {
4526
4561
  _this2.userScanBindImgUrl = results.userScanBindImgUrl;
4527
4562
  _this2.qrcode = util["a" /* default */].getStorage('host') + results.userScanBindImgUrl;
@@ -4706,8 +4741,8 @@ var componentNormalizer = __webpack_require__(3);
4706
4741
 
4707
4742
  var component = Object(componentNormalizer["a" /* default */])(
4708
4743
  src_userinfovue_type_script_lang_js_,
4709
- userinfovue_type_template_id_fc09aaf8_render,
4710
- userinfovue_type_template_id_fc09aaf8_staticRenderFns,
4744
+ userinfovue_type_template_id_75d533de_render,
4745
+ userinfovue_type_template_id_75d533de_staticRenderFns,
4711
4746
  false,
4712
4747
  null,
4713
4748
  null,
@@ -5906,7 +5941,7 @@ var regenerator_ = __webpack_require__(12);
5906
5941
  var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
5907
5942
 
5908
5943
  // EXTERNAL MODULE: external "runtime-import"
5909
- var external_runtime_import_ = __webpack_require__(21);
5944
+ var external_runtime_import_ = __webpack_require__(22);
5910
5945
 
5911
5946
  // 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&
5912
5947
 
@@ -6060,7 +6095,7 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
6060
6095
 
6061
6096
  /* harmony default export */ var async_component = (async_component_component.exports);
6062
6097
  // 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&
6063
- var _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; };
6098
+ var mainvue_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; };
6064
6099
 
6065
6100
  //
6066
6101
  //
@@ -6311,6 +6346,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
6311
6346
  //
6312
6347
  //
6313
6348
  //
6349
+ //
6314
6350
 
6315
6351
 
6316
6352
 
@@ -6539,21 +6575,21 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
6539
6575
  }
6540
6576
  if (this.layout === 'subsystem' || this.application) {
6541
6577
  if (this.hides && Object.keys(this.hides).length) {
6542
- return _extends({}, this.hides, { set: !this.set, system: false });
6578
+ return mainvue_type_script_lang_js_extends({}, this.hides, { set: !this.set, system: false });
6543
6579
  } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
6544
- return _extends({}, topRightToolHide, { set: !this.set, system: false });
6580
+ return mainvue_type_script_lang_js_extends({}, topRightToolHide, { set: !this.set, system: false });
6545
6581
  } else {
6546
6582
  return { set: !this.set, system: false };
6547
6583
  }
6548
6584
  } else if (this.layout === 'topside') {
6549
6585
  if (this.hides && Object.keys(this.hides).length) {
6550
- return _extends({}, this.hides, {
6586
+ return mainvue_type_script_lang_js_extends({}, this.hides, {
6551
6587
  set: !this.set,
6552
6588
  system: true,
6553
6589
  user: true
6554
6590
  });
6555
6591
  } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
6556
- return _extends({}, topRightToolHide, {
6592
+ return mainvue_type_script_lang_js_extends({}, topRightToolHide, {
6557
6593
  set: !this.set,
6558
6594
  system: true,
6559
6595
  user: true
@@ -6563,13 +6599,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
6563
6599
  }
6564
6600
  } else {
6565
6601
  if (this.hides && Object.keys(this.hides).length) {
6566
- return _extends({}, this.hides, {
6602
+ return mainvue_type_script_lang_js_extends({}, this.hides, {
6567
6603
  set: !this.set,
6568
6604
  system: true,
6569
6605
  user: true
6570
6606
  });
6571
6607
  } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
6572
- return _extends({}, topRightToolHide, {
6608
+ return mainvue_type_script_lang_js_extends({}, topRightToolHide, {
6573
6609
  set: !this.set,
6574
6610
  system: true,
6575
6611
  user: true
@@ -6688,6 +6724,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
6688
6724
  color: util["a" /* default */].getStorage('theme') ? util["a" /* default */].getStorage('theme') : this.theme,
6689
6725
  //显示用户信息
6690
6726
  showUserInfo: false,
6727
+ userInfoContents: undefined,
6691
6728
  //是否展示侧边导航
6692
6729
  showMenu: true,
6693
6730
  props: {},
@@ -6968,7 +7005,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
6968
7005
  this.color = unescape(results[i].themeColor).toLowerCase();
6969
7006
  }
6970
7007
  if (i === 'userStyle' && results[i].color) {
6971
- this.color = unescape(results[i].color).toLowerCase();
7008
+ var color = unescape(results[i].color).toLowerCase();
7009
+ if (util["a" /* default */].startWith(color, '#')) {
7010
+ this.color = color;
7011
+ }
7012
+ }
7013
+ if (i === 'subsystemExtend' && results[i].userInfoContents) {
7014
+ this.userInfoContents = results[i].userInfoContents;
6972
7015
  }
6973
7016
  if (i === 'subsystemExtend' && results[i].webPageWatermark) {
6974
7017
  try {
@@ -7042,7 +7085,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
7042
7085
  jumpMenu: function jumpMenu(res, flag, param) {
7043
7086
  var option = { url: res, flag: flag, param: param };
7044
7087
  if (util["a" /* default */].isObject(res)) {
7045
- option = _extends({}, option, res);
7088
+ option = mainvue_type_script_lang_js_extends({}, option, res);
7046
7089
  }
7047
7090
  var ids = void 0;
7048
7091
  if (typeof option.url === 'string') {
@@ -7111,7 +7154,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
7111
7154
  var _this5 = this;
7112
7155
 
7113
7156
  var param = this.menuCode ? { menuCode: this.menuCode } : {};
7114
- var params = _extends({}, this.param, param);
7157
+ var params = mainvue_type_script_lang_js_extends({}, this.param, param);
7115
7158
  util["a" /* default */].ajax({ url: this.action, params: params }).then(function (res) {
7116
7159
  if (res.rCode === 0) {
7117
7160
  if (res.results && res.results.length) {
@@ -7629,13 +7672,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
7629
7672
  case 'user':
7630
7673
  this.showUserInfo = true;
7631
7674
  break;
7632
- case 'online':
7633
- this.dialog = {
7634
- title: '查看在线人员',
7635
- show: true,
7636
- url: '/main/sysuseronline/list.dhtml'
7637
- };
7638
- break;
7675
+ // case 'online':
7676
+ // this.dialog = {
7677
+ // title: '查看在线人员',
7678
+ // show: true,
7679
+ // url: '/main/sysuseronline/list.dhtml'
7680
+ // };
7681
+ // break;
7639
7682
  case 'notice':
7640
7683
  this.showMsg = !this.showMsg;
7641
7684
  break;
@@ -7715,7 +7758,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
7715
7758
  if (path) {
7716
7759
  var params = util["a" /* default */].getParams({ url: page });
7717
7760
  if (param) {
7718
- params = _extends({}, params, param);
7761
+ params = mainvue_type_script_lang_js_extends({}, params, param);
7719
7762
  }
7720
7763
  if (res) {
7721
7764
  this.routerKey = res.id;
@@ -7940,9 +7983,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
7940
7983
  clearTimeout(this.sysMsgOut);
7941
7984
  }
7942
7985
  },
7943
- handleDialog: function handleDialog(obj) {
7944
- this.dialog = obj;
7945
- },
7986
+
7987
+ // handleDialog(obj) {
7988
+ // this.dialog = obj;
7989
+ // },
7946
7990
  handleUserModel: function handleUserModel(name, val) {
7947
7991
  this.$set(this.userModel, name, val);
7948
7992
  },
package/lib/menu.js CHANGED
@@ -411,7 +411,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
411
411
  popper = this.popperClass !== undefined ? this.popperClass : ' es-menu-popper-' + this.mode;
412
412
  }
413
413
  var title = [h('i', {
414
- class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
414
+ class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
415
415
  domProps: item.icons === '' || this.unicode(item.icons) ? {} : { innerHTML: item.icons }
416
416
  }), h('div', {
417
417
  class: ['es-menu-title-text es-menu-title-' + this.mode]
@@ -502,7 +502,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
502
502
  doms = doms.concat(_this5.getSub(item, h, 'es-sub-menu'));
503
503
  } else {
504
504
  var title = [h('i', {
505
- class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
505
+ class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
506
506
  domProps: item.icons === '' || _this5.unicode(item.icons) ? {} : { innerHTML: item.icons }
507
507
  }), h('div', {
508
508
  class: ['es-menu-title-text es-menu-title-' + _this5.mode]
package/lib/nav.js CHANGED
@@ -370,7 +370,7 @@ var ajax = function ajax(_ref) {
370
370
  error.message = '未授权,请重新登录';
371
371
  break;
372
372
  case 403:
373
- error.message = '登录过期,请重新登录';
373
+ error.message = '服务器错误';
374
374
  break;
375
375
  case 404:
376
376
  error.message = '网络请求不存在';
@@ -382,7 +382,7 @@ var ajax = function ajax(_ref) {
382
382
  error.message = '请求超时';
383
383
  break;
384
384
  case 500:
385
- error.message = '服务器端出错';
385
+ error.message = '服务器错误';
386
386
  break;
387
387
  case 501:
388
388
  error.message = '网络未实现';
@@ -738,18 +738,23 @@ var dayOfMonth = function dayOfMonth(date) {
738
738
  * @desc:添加js内容
739
739
  * @author huangbo
740
740
  * @date 2022年5月7日
741
- * @param {Function} [fn] - 函数
741
+ * @param {Function} [callback] - 函数
742
742
  * @param {Number} [wait] - 延迟毫秒数
743
743
  * @param {Boolean} [immediate] - 是否首次触发执行
744
744
  **/
745
745
 
746
- var debounce = function debounce(callback, delay) {
747
- var timeout = null;
746
+ var debounce = function debounce(callback, wait) {
747
+ var timeout = void 0;
748
748
  return function () {
749
- clearTimeout(timeout);
750
- timeout = setTimeout(callback, delay ? delay : 500);
749
+ var context = this;
750
+ var args = arguments;
751
+ if (timeout) clearTimeout(timeout);
752
+ timeout = setTimeout(function () {
753
+ callback.apply(context, args);
754
+ }, wait || 500);
751
755
  };
752
756
  };
757
+
753
758
  /**
754
759
  * delUrlParam
755
760
  * @desc:删除url指定参数
@@ -2886,7 +2891,8 @@ var toFunction = function toFunction(str) {
2886
2891
  * @param {string} [$color] - 颜色值
2887
2892
  **/
2888
2893
  var updateTheme = function updateTheme(color, send) {
2889
- color = color ? color : '#409eff';
2894
+ color = color && startWith(color, '#') ? color : '#409eff';
2895
+
2890
2896
  if (send === undefined) {
2891
2897
  send = true;
2892
2898
  }