eoss-ui 0.5.27 → 0.5.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/main.js CHANGED
@@ -3653,7 +3653,7 @@ module.exports = require("runtime-import");
3653
3653
  // ESM COMPAT FLAG
3654
3654
  __webpack_require__.r(__webpack_exports__);
3655
3655
 
3656
- // 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=ca091d5e&
3656
+ // 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=f53c488c&
3657
3657
  var render = function () {
3658
3658
  var _vm = this
3659
3659
  var _h = _vm.$createElement
@@ -4083,7 +4083,7 @@ var staticRenderFns = []
4083
4083
  render._withStripped = true
4084
4084
 
4085
4085
 
4086
- // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=ca091d5e&
4086
+ // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=f53c488c&
4087
4087
 
4088
4088
  // 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&
4089
4089
  var userinfovue_type_template_id_799780ee_render = function () {
@@ -6767,6 +6767,9 @@ var log = util["a" /* default */].getParams('console');
6767
6767
  if (i === 'subsystemName') {
6768
6768
  document.title = results[i];
6769
6769
  }
6770
+ if (i === 'loginPage' && results[i]) {
6771
+ util["a" /* default */].setStorage('loginPage', results[i]);
6772
+ }
6770
6773
  if (i === 'sysLogoIco' && results[i]) {
6771
6774
  sessionStorage.setItem('sysLogoIco', results[i]);
6772
6775
  util["a" /* default */].setFavicon(results[i]);
@@ -6778,6 +6781,10 @@ var log = util["a" /* default */].getParams('console');
6778
6781
  util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
6779
6782
  util["a" /* default */].watermark(results[i].webPageWatermark);
6780
6783
  }
6784
+
6785
+ if (i === 'subsystemExtend' && results[i].loginPage) {
6786
+ util["a" /* default */].setStorage('loginPage', results[i].loginPage);
6787
+ }
6781
6788
  store["a" /* default */].set(i, results[i]);
6782
6789
  }
6783
6790
  this.userModel = results.userModel;
@@ -3624,7 +3624,7 @@ module.exports = require("sortablejs");
3624
3624
  // ESM COMPAT FLAG
3625
3625
  __webpack_require__.r(__webpack_exports__);
3626
3626
 
3627
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=3b8fb8f5&
3627
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=6d73abc3&
3628
3628
  var render = function () {
3629
3629
  var _vm = this
3630
3630
  var _h = _vm.$createElement
@@ -3667,130 +3667,139 @@ var render = function () {
3667
3667
  "div",
3668
3668
  { staticClass: "es-selector-selection" },
3669
3669
  [
3670
- _c(
3671
- "el-form",
3672
- {
3673
- ref: "form",
3674
- refInFor: true,
3675
- staticClass: "es-selector-selection-toolbar",
3676
- attrs: { inline: true, model: _vm.form },
3677
- nativeOn: {
3678
- submit: function ($event) {
3679
- $event.preventDefault()
3670
+ _vm.multiple || _vm.isShowTree
3671
+ ? _c(
3672
+ "el-form",
3673
+ {
3674
+ ref: "form",
3675
+ refInFor: true,
3676
+ staticClass: "es-selector-selection-toolbar",
3677
+ attrs: { inline: true, model: _vm.form },
3678
+ nativeOn: {
3679
+ submit: function ($event) {
3680
+ $event.preventDefault()
3681
+ },
3682
+ },
3680
3683
  },
3681
- },
3682
- },
3683
- [
3684
- _c(
3685
- "el-form-item",
3686
3684
  [
3687
- _c(
3688
- "el-checkbox",
3689
- {
3690
- directives: [
3691
- {
3692
- name: "show",
3693
- rawName: "v-show",
3694
- value: _vm.multiple && !_vm.max,
3695
- expression: "multiple && !max",
3696
- },
3697
- ],
3698
- on: { change: _vm.handleCheckAll },
3699
- model: {
3700
- value: _vm.checkAll,
3701
- callback: function ($$v) {
3702
- _vm.checkAll = $$v
3703
- },
3704
- expression: "checkAll",
3705
- },
3706
- },
3707
- [_vm._v("\n 全选\n ")]
3708
- ),
3709
- ],
3710
- 1
3711
- ),
3712
- _c(
3713
- "div",
3714
- { staticClass: "es-float-right" },
3715
- [
3716
- _vm.showSelect && _vm.activeName == "enterprise"
3717
- ? _c(
3718
- "el-form-item",
3719
- [
3720
- _c(
3721
- "es-select",
3722
- {
3723
- attrs: { placeholder: "请选择" },
3724
- on: { change: _vm.handleSelect },
3725
- model: {
3726
- value: _vm.selectValue,
3727
- callback: function ($$v) {
3728
- _vm.selectValue = $$v
3729
- },
3730
- expression: "selectValue",
3731
- },
3732
- },
3733
- _vm._l(
3734
- _vm.filtrate.options,
3735
- function (item) {
3736
- return _c("el-option", {
3737
- key: item.value,
3738
- attrs: {
3739
- label: item.name,
3740
- value: item.value,
3741
- },
3742
- })
3743
- }
3744
- ),
3745
- 1
3746
- ),
3747
- ],
3748
- 1
3749
- )
3750
- : _vm._e(),
3751
3685
  _c(
3752
3686
  "el-form-item",
3753
3687
  [
3754
3688
  _c(
3755
- "el-input",
3689
+ "el-checkbox",
3756
3690
  {
3757
- attrs: { placeholder: "请输入搜索关键字" },
3758
- on: { change: _vm.handleChangeSearch },
3691
+ directives: [
3692
+ {
3693
+ name: "show",
3694
+ rawName: "v-show",
3695
+ value: _vm.multiple && !_vm.max,
3696
+ expression: "multiple && !max",
3697
+ },
3698
+ ],
3699
+ on: { change: _vm.handleCheckAll },
3759
3700
  model: {
3760
- value: _vm.search,
3701
+ value: _vm.checkAll,
3761
3702
  callback: function ($$v) {
3762
- _vm.search = $$v
3703
+ _vm.checkAll = $$v
3763
3704
  },
3764
- expression: "search",
3705
+ expression: "checkAll",
3765
3706
  },
3766
3707
  },
3708
+ [_vm._v("\n 全选\n ")]
3709
+ ),
3710
+ ],
3711
+ 1
3712
+ ),
3713
+ _vm.isShowTree
3714
+ ? _c(
3715
+ "div",
3716
+ { staticClass: "es-float-right" },
3767
3717
  [
3718
+ _vm.showSelect &&
3719
+ _vm.activeName == "enterprise"
3720
+ ? _c(
3721
+ "el-form-item",
3722
+ [
3723
+ _c(
3724
+ "es-select",
3725
+ {
3726
+ attrs: { placeholder: "请选择" },
3727
+ on: { change: _vm.handleSelect },
3728
+ model: {
3729
+ value: _vm.selectValue,
3730
+ callback: function ($$v) {
3731
+ _vm.selectValue = $$v
3732
+ },
3733
+ expression: "selectValue",
3734
+ },
3735
+ },
3736
+ _vm._l(
3737
+ _vm.filtrate.options,
3738
+ function (item) {
3739
+ return _c("el-option", {
3740
+ key: item.value,
3741
+ attrs: {
3742
+ label: item.name,
3743
+ value: item.value,
3744
+ },
3745
+ })
3746
+ }
3747
+ ),
3748
+ 1
3749
+ ),
3750
+ ],
3751
+ 1
3752
+ )
3753
+ : _vm._e(),
3768
3754
  _c(
3769
- "template",
3770
- { slot: "append" },
3755
+ "el-form-item",
3771
3756
  [
3772
- _c("el-button", {
3773
- attrs: {
3774
- icon: "el-icon-search",
3775
- type: "primary",
3757
+ _c(
3758
+ "el-input",
3759
+ {
3760
+ attrs: {
3761
+ placeholder: "请输入搜索关键字",
3762
+ },
3763
+ on: {
3764
+ change: _vm.handleChangeSearch,
3765
+ },
3766
+ model: {
3767
+ value: _vm.search,
3768
+ callback: function ($$v) {
3769
+ _vm.search = $$v
3770
+ },
3771
+ expression: "search",
3772
+ },
3776
3773
  },
3777
- on: { click: _vm.handleSearch },
3778
- }),
3774
+ [
3775
+ _c(
3776
+ "template",
3777
+ { slot: "append" },
3778
+ [
3779
+ _c("el-button", {
3780
+ attrs: {
3781
+ icon: "el-icon-search",
3782
+ type: "primary",
3783
+ },
3784
+ on: { click: _vm.handleSearch },
3785
+ }),
3786
+ ],
3787
+ 1
3788
+ ),
3789
+ ],
3790
+ 2
3791
+ ),
3779
3792
  ],
3780
3793
  1
3781
3794
  ),
3782
3795
  ],
3783
- 2
3784
- ),
3785
- ],
3786
- 1
3787
- ),
3796
+ 1
3797
+ )
3798
+ : _vm._e(),
3788
3799
  ],
3789
3800
  1
3790
- ),
3791
- ],
3792
- 1
3793
- ),
3801
+ )
3802
+ : _vm._e(),
3794
3803
  _c("selection", {
3795
3804
  attrs: {
3796
3805
  data: _vm.checkboxs,
@@ -3865,7 +3874,7 @@ var staticRenderFns = []
3865
3874
  render._withStripped = true
3866
3875
 
3867
3876
 
3868
- // CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=3b8fb8f5&
3877
+ // CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=6d73abc3&
3869
3878
 
3870
3879
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/tree.vue?vue&type=template&id=24ad732a&
3871
3880
  var treevue_type_template_id_24ad732a_render = function () {
@@ -4590,6 +4599,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
4590
4599
  //
4591
4600
  //
4592
4601
  //
4602
+ //
4593
4603
 
4594
4604
 
4595
4605
 
package/lib/selector.js CHANGED
@@ -3462,7 +3462,7 @@ module.exports = require("axios");
3462
3462
  // ESM COMPAT FLAG
3463
3463
  __webpack_require__.r(__webpack_exports__);
3464
3464
 
3465
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=4a397202&
3465
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=935f17e4&
3466
3466
  var render = function () {
3467
3467
  var _vm = this
3468
3468
  var _h = _vm.$createElement
@@ -3687,21 +3687,6 @@ var render = function () {
3687
3687
  dblclick: function ($event) {
3688
3688
  return _vm.openDialog($event)
3689
3689
  },
3690
- keyup: function ($event) {
3691
- if (
3692
- !("button" in $event) &&
3693
- _vm._k(
3694
- $event.keyCode,
3695
- "enter",
3696
- 13,
3697
- $event.key,
3698
- "Enter"
3699
- )
3700
- ) {
3701
- return null
3702
- }
3703
- return _vm.handleSearch($event)
3704
- },
3705
3690
  },
3706
3691
  model: {
3707
3692
  value: _vm.words,
@@ -3789,21 +3774,6 @@ var render = function () {
3789
3774
  dblclick: function ($event) {
3790
3775
  return _vm.openDialog($event)
3791
3776
  },
3792
- keyup: function ($event) {
3793
- if (
3794
- !("button" in $event) &&
3795
- _vm._k(
3796
- $event.keyCode,
3797
- "enter",
3798
- 13,
3799
- $event.key,
3800
- "Enter"
3801
- )
3802
- ) {
3803
- return null
3804
- }
3805
- return _vm.handleSearch($event)
3806
- },
3807
3777
  },
3808
3778
  model: {
3809
3779
  value: _vm.selectedLabel,
@@ -3980,7 +3950,7 @@ var staticRenderFns = []
3980
3950
  render._withStripped = true
3981
3951
 
3982
3952
 
3983
- // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=4a397202&
3953
+ // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=935f17e4&
3984
3954
 
3985
3955
  // EXTERNAL MODULE: ./src/utils/util.js
3986
3956
  var util = __webpack_require__(0);
@@ -4200,8 +4170,6 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
4200
4170
  //
4201
4171
  //
4202
4172
  //
4203
- //
4204
- //
4205
4173
 
4206
4174
 
4207
4175
 
@@ -4424,6 +4392,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
4424
4392
  this.$nextTick(function () {
4425
4393
  _this2.$refs.reference && (_this2.minWidth = _this2.$refs.reference.$el.children[0].offsetWidth);
4426
4394
  });
4395
+ this.$el.addEventListener('keyup', this.doSearch);
4427
4396
  }
4428
4397
  if (this.$refs.openDialog) {
4429
4398
  this.$refs.openDialog.$el.parentNode.addEventListener('click', function () {
@@ -4433,6 +4402,16 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
4433
4402
  },
4434
4403
 
4435
4404
  methods: {
4405
+ doSearch: function doSearch(e) {
4406
+ if (util["a" /* default */].win.event == undefined) {
4407
+ var key = e.keyCode;
4408
+ } else {
4409
+ var key = util["a" /* default */].win.event.keyCode;
4410
+ }
4411
+ if (key == 13) {
4412
+ this.handleSearch();
4413
+ }
4414
+ },
4436
4415
  isObject: function isObject(obj) {
4437
4416
  return util["a" /* default */].isObject(obj);
4438
4417
  },
@@ -4595,6 +4574,9 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
4595
4574
  }
4596
4575
  return tag + (res[this.labelKey] ? res[this.labelKey] : res.label || res[this.valueKey]);
4597
4576
  }
4577
+ },
4578
+ beforeDestroy: function beforeDestroy() {
4579
+ this.$el.removeEventListener('keyup', this.doSearch);
4598
4580
  }
4599
4581
  });
4600
4582
  // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=script&lang=js&
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.5.27",
3
+ "version": "0.5.28",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
@@ -1309,7 +1309,6 @@ export default {
1309
1309
  });
1310
1310
  },
1311
1311
  validate(callback) {
1312
- console.log(this);
1313
1312
  if (this.form) {
1314
1313
  let form = this.elForm || this.$children[0];
1315
1314
  form.validate((valid) => {
@@ -927,6 +927,9 @@ export default {
927
927
  if (i === 'subsystemName') {
928
928
  document.title = results[i];
929
929
  }
930
+ if (i === 'loginPage' && results[i]) {
931
+ util.setStorage('loginPage', results[i]);
932
+ }
930
933
  if (i === 'sysLogoIco' && results[i]) {
931
934
  sessionStorage.setItem('sysLogoIco', results[i]);
932
935
  util.setFavicon(results[i]);
@@ -938,6 +941,10 @@ export default {
938
941
  util.win.top.webPageWatermark = results[i].webPageWatermark;
939
942
  util.watermark(results[i].webPageWatermark);
940
943
  }
944
+
945
+ if (i === 'subsystemExtend' && results[i].loginPage) {
946
+ util.setStorage('loginPage', results[i].loginPage);
947
+ }
941
948
  store.set(i, results[i]);
942
949
  }
943
950
  this.userModel = results.userModel;
@@ -88,7 +88,6 @@
88
88
  :tabindex="multiple ? '-1' : null"
89
89
  v-popover:popover
90
90
  @dblclick.native="openDialog"
91
- @keyup.enter.native="handleSearch"
92
91
  @focus="handleFocus"
93
92
  @blur="handleBlur"
94
93
  >
@@ -131,7 +130,6 @@
131
130
  }"
132
131
  :tabindex="multiple ? '-1' : null"
133
132
  @dblclick.native="openDialog"
134
- @keyup.enter.native="handleSearch"
135
133
  @clear="handleClear"
136
134
  >
137
135
  <template slot="append">
@@ -426,6 +424,7 @@ export default {
426
424
  this.$refs.reference &&
427
425
  (this.minWidth = this.$refs.reference.$el.children[0].offsetWidth);
428
426
  });
427
+ this.$el.addEventListener('keyup', this.doSearch);
429
428
  }
430
429
  if (this.$refs.openDialog) {
431
430
  this.$refs.openDialog.$el.parentNode.addEventListener('click', () => {
@@ -434,6 +433,16 @@ export default {
434
433
  }
435
434
  },
436
435
  methods: {
436
+ doSearch(e) {
437
+ if (util.win.event == undefined) {
438
+ var key = e.keyCode;
439
+ } else {
440
+ var key = util.win.event.keyCode;
441
+ }
442
+ if (key == 13) {
443
+ this.handleSearch();
444
+ }
445
+ },
437
446
  isObject(obj) {
438
447
  return util.isObject(obj);
439
448
  },
@@ -611,6 +620,9 @@ export default {
611
620
  : res.label || res[this.valueKey])
612
621
  );
613
622
  }
623
+ },
624
+ beforeDestroy() {
625
+ this.$el.removeEventListener('keyup', this.doSearch);
614
626
  }
615
627
  };
616
628
  </script>
@@ -28,6 +28,7 @@
28
28
  :inline="true"
29
29
  :model="form"
30
30
  class="es-selector-selection-toolbar"
31
+ v-if="multiple || isShowTree"
31
32
  >
32
33
  <el-form-item>
33
34
  <el-checkbox
@@ -38,7 +39,7 @@
38
39
  全选
39
40
  </el-checkbox>
40
41
  </el-form-item>
41
- <div class="es-float-right">
42
+ <div class="es-float-right" v-if="isShowTree">
42
43
  <el-form-item v-if="showSelect && activeName == 'enterprise'">
43
44
  <es-select
44
45
  v-model="selectValue"
package/src/index.js CHANGED
@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
117
117
  }
118
118
 
119
119
  export default {
120
- version: '0.5.27',
120
+ version: '0.5.28',
121
121
  install,
122
122
  Button,
123
123
  ButtonGroup,