eoss-ui 0.5.71 → 0.5.72

package/lib/login.js

@@ -3843,7 +3843,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=5bc62799&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=249fae96&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4000,6 +4000,7 @@ var render = function () {
                                           size: "large",
                                           type: "text",
                                           name: "username",
+                                          tabindex: "1",
                                           exclude: "",
                                           placeholder: _vm.username.placeholder,
                                           focusShow: _vm.focusShow,
@@ -4048,6 +4049,7 @@ var render = function () {
                                         attrs: {
                                           size: "large",
                                           name: "password",
+                                          tabindex: "2",
                                           type: "password",
                                           placeholder: _vm.password.placeholder,
                                           autocomplete: "off",
@@ -4102,6 +4104,7 @@ var render = function () {
                                             attrs: {
                                               size: "large",
                                               name: "identifyingCode",
+                                              tabindex: "3",
                                               type: "text",
                                               placeholder: "请输入验证码",
                                               autocomplete: "off",
@@ -4449,6 +4452,7 @@ var render = function () {
                                           size: "large",
                                           type: "text",
                                           name: "target",
+                                          tabindex: "4",
                                           placeholder:
                                             _vm.active == 6
                                               ? _vm.phone.placeholder
@@ -4505,6 +4509,7 @@ var render = function () {
                                           type: "text",
                                           placeholder: "请输入验证码",
                                           autocomplete: "off",
+                                          tabindex: "5",
                                         },
                                         model: {
                                           value: _vm.formData.verificationCode,
@@ -4773,7 +4778,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5bc62799&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=249fae96&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -5696,6 +5701,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 

package/lib/main.js

@@ -3826,7 +3826,7 @@ module.exports = require("runtime-import");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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=098112dd&
+// 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=268dce6d&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3961,7 +3961,7 @@ var render = function () {
                   "div",
                   { staticClass: "es-main-left" },
                   [
-                    _vm.layout === "topside"
+                    _vm.layout === "topside" || _vm.layout === "side"
                       ? _c(
                           "div",
                           { staticClass: "es-main-side" },
@@ -4022,10 +4022,11 @@ var render = function () {
                       ? _c("es-nav", {
                           attrs: {
                             "is-top": _vm.layout == "topside",
+                            overlap: _vm.layout == "side",
                             data: _vm.menu,
                             "default-active": _vm.active,
                             width: _vm.navsWidth,
-                            "nav-width": _vm.navWidth,
+                            "nav-width": _vm._navWidth,
                             icons: _vm.icons,
                             "menu-icon": _vm.menuIcon,
                             "sub-icon": _vm.subIcon,
@@ -4268,7 +4269,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=098112dd&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=268dce6d&
 
 // 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&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -4761,8 +4762,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var userinfo = (component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=template&id=3c983b8c&
-var settingsvue_type_template_id_3c983b8c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=template&id=e1a47a4a&
+var settingsvue_type_template_id_e1a47a4a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4999,6 +5000,44 @@ var settingsvue_type_template_id_3c983b8c_render = function () {
                 ),
               ]
             ),
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "侧边菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  {
+                    staticClass: "es-setting-navs es-setting-side-navs",
+                    on: {
+                      click: function ($event) {
+                        $event.stopPropagation()
+                        _vm.handleLayout("side")
+                      },
+                    },
+                  },
+                  [
+                    _c("i", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.activeName == "side",
+                          expression: "activeName == 'side'",
+                        },
+                      ],
+                      staticClass: "es-icon-gou",
+                    }),
+                  ]
+                ),
+              ]
+            ),
           ],
           1
         ),
@@ -5006,11 +5045,11 @@ var settingsvue_type_template_id_3c983b8c_render = function () {
     ]
   )
 }
-var settingsvue_type_template_id_3c983b8c_staticRenderFns = []
-settingsvue_type_template_id_3c983b8c_render._withStripped = true
+var settingsvue_type_template_id_e1a47a4a_staticRenderFns = []
+settingsvue_type_template_id_e1a47a4a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=3c983b8c&
+// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=e1a47a4a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=script&lang=js&
 //
@@ -5108,6 +5147,19 @@ settingsvue_type_template_id_3c983b8c_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var settingsvue_type_script_lang_js_ = ({
@@ -5200,8 +5252,8 @@ settingsvue_type_template_id_3c983b8c_render._withStripped = true
 
 var settings_component = Object(componentNormalizer["a" /* default */])(
   src_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_3c983b8c_render,
-  settingsvue_type_template_id_3c983b8c_staticRenderFns,
+  settingsvue_type_template_id_e1a47a4a_render,
+  settingsvue_type_template_id_e1a47a4a_staticRenderFns,
   false,
   null,
   null,
@@ -6362,9 +6414,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
-//
-//
-//
 
 
 
@@ -6532,6 +6581,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     appCode: String,
     //菜单左边距
     navPaddingLeft: Number,
+    navBoxWidth: {
+      type: String,
+      default: '230px'
+    },
     navWidth: String
   },
   computed: {
@@ -6560,10 +6613,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       return true;
     },
     navsWidth: function navsWidth() {
-      return this.layout === 'topside' ? '230px' : undefined;
+      return this.layout === 'topside' ? this.navBoxWidth : undefined;
+    },
+    _navWidth: function _navWidth() {
+      return this.layout === 'side' ? this.navBoxWidth : this.layout === 'subsystem' || this.layout === 'topside' ? '0' : this.navWidth;
     },
     showNavTitle: function showNavTitle() {
-      return this.layout !== 'topside';
+      return this.layout !== 'topside' && this.layout !== 'side';
     },
 
     //tabs菜单
@@ -6606,7 +6662,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         } else {
           return { set: !this.set, system: false };
         }
-      } else if (this.layout === 'topside') {
+      } else if (this.layout === 'topside' || this.layout === 'side') {
         if (this.hides && Object.keys(this.hides).length) {
           return mainvue_type_script_lang_js_extends({}, this.hides, {
             set: !this.set,
@@ -7407,6 +7463,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           }
         }
       } else {
+        this.tabs = [];
         this.handleJump(obj.url, obj.urlopenmode, obj);
       }
       return obj;

package/lib/nav.js

@@ -3628,7 +3628,7 @@ module.exports = require("axios");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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=04099294&
+// 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=3f63e2ce&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3645,12 +3645,24 @@ var render = function () {
       _vm.biserial
         ? _c(
             "div",
-            { staticClass: "es-nav-initial" },
+            {
+              staticClass: "es-nav-initial",
+              style: {
+                width: _vm._navWidth,
+                left:
+                  this.overlap && !this.subMenu.length
+                    ? "15px"
+                    : _vm.show
+                    ? "-" + _vm.boxWidth
+                    : "",
+              },
+            },
             [
               _c(
                 "es-menu",
                 _vm._b(
                   {
+                    class: { "es-nav-overlap": _vm.overlap },
                     attrs: {
                       "sub-nav": "",
                       data: _vm.menu,
@@ -3685,7 +3697,11 @@ var render = function () {
             },
           ],
           staticClass: "es-nav-main",
-          style: { width: _vm.biserial ? _vm.width : _vm.boxWidth },
+          class: { "es-nav-overlap": _vm.overlap },
+          style: {
+            width: _vm.biserial ? _vm.width : _vm.boxWidth,
+            left: _vm.show ? "15px" : _vm.navWidth,
+          },
           attrs: { biserial: _vm.biserial },
         },
         [
@@ -3772,6 +3788,29 @@ var render = function () {
         ],
         1
       ),
+      _c(
+        "div",
+        {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: _vm.show,
+              expression: "show",
+            },
+          ],
+          ref: "box",
+          staticClass: "es-sets-button",
+        },
+        [
+          _c("el-button", {
+            ref: "area",
+            staticClass: "es-icon-yingyonglan",
+            attrs: { round: "", type: "primary" },
+          }),
+        ],
+        1
+      ),
     ]
   )
 }
@@ -3779,7 +3818,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=04099294&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=3f63e2ce&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3849,6 +3888,32 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3890,9 +3955,13 @@ var util = __webpack_require__(0);
     subIcon: {
       type: Boolean,
       default: true
-    }
+    },
+    overlap: Boolean
   },
   computed: {
+    show: function show() {
+      return this.overlap && this.subMenu.length;
+    },
     menu: function menu() {
       return this.data;
     },
@@ -3912,13 +3981,19 @@ var util = __webpack_require__(0);
     },
     boxWidth: function boxWidth() {
       if (!this.biserial) {
+        if (this.overlap) {
+          return this.navWidth;
+        }
         if (this.isShow) {
           return this.width;
         } else {
           return this.navWidth;
         }
       }
-      return this.subMenu && this.subMenu.length && this.isShow ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px' : this.navWidth;
+      return this.subMenu && this.subMenu.length && this.isShow && !this.overlap ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px' : this.navWidth;
+    },
+    _navWidth: function _navWidth() {
+      return this.overlap ? parseInt(this.navWidth, 10) - 30 + 'px' : this.navWidth;
     }
   },
   watch: {
@@ -4000,9 +4075,76 @@ var util = __webpack_require__(0);
   },
   mounted: function mounted() {
     this.resetHeight();
+    this.move();
   },
 
   methods: {
+    //设置按钮拖动
+    move: function move() {
+      var _this3 = this;
+
+      var area = this.$refs.area.$el;
+      var box = this.$refs.box;
+      var sTime = 0,
+          eTime = 0;
+
+      area.addEventListener('mousedown', function (e) {
+        sTime = new Date().getTime();
+        var downY = e.y,
+            downX = e.x;
+
+        var _document$body$getBou = document.body.getBoundingClientRect(),
+            winH = _document$body$getBou.height,
+            winW = _document$body$getBou.width;
+        //防止拖动期间选中和复制网页文本
+
+
+        document.body.onselectstart = document.body.oncontextmenu = function () {
+          return false;
+        };
+        document.onmousemove = function (eve) {
+          var size = 40;
+          var moveY = eve.y,
+              moveX = eve.x;
+
+          var _box$getBoundingClien = box.getBoundingClientRect(),
+              boxTop = _box$getBoundingClien.top,
+              boxLeft = _box$getBoundingClien.left;
+
+          boxTop += moveY - downY;
+          boxLeft += moveX - downX;
+          boxTop >= winH - size && (boxTop = winH - size);
+          boxTop <= -size && (boxTop = -size);
+          boxLeft >= winW - size && (boxLeft = winW - size);
+          boxLeft <= -size && (boxLeft = -size);
+          if (boxTop < 0) {
+            boxTop = 0;
+          }
+          if (boxLeft < 0) {
+            boxLeft = 0;
+          }
+          box.style.top = boxTop + 'px';
+          box.style.left = boxLeft + 'px';
+          downY = moveY;
+          downX = moveX;
+        };
+        document.onmouseup = function () {
+          eTime = new Date().getTime();
+          var isClick = eTime - sTime < 200;
+          if (isClick) {
+            var onArea = function onArea() {
+              _this3.subMenu = [];
+              area.removeEventListener('click', onArea);
+            };
+            area.addEventListener('click', onArea);
+          }
+          document.onmousemove = null;
+          document.body.onselectstart = document.body.oncontextmenu = function () {
+            return true;
+          };
+        };
+      });
+    },
     handleChange: function handleChange() {
       if (this.biserial) {
         this.isShow = !this.isShow;
@@ -4010,7 +4152,7 @@ var util = __webpack_require__(0);
         this.isCollapse = !this.isCollapse;
         if (this.isCollapse) {
           this.isShow = false;
-          this.menuWidth = '70px';
+          this.menuWidth = this.navWidth;
         } else {
           this.isShow = true;
           this.menuWidth = this.width;
@@ -4037,12 +4179,12 @@ var util = __webpack_require__(0);
       this.$emit('close', res);
     },
     resetHeight: function resetHeight() {
-      var _this3 = this;
+      var _this4 = this;
 
       this.$nextTick(function () {
-        var height = _this3.$refs.esNav.parentNode.offsetHeight;
-        Array.from(_this3.$refs.esNav.parentNode.children).forEach(function (item) {
-          if (item !== _this3.$refs.esNav) {
+        var height = _this4.$refs.esNav.parentNode.offsetHeight;
+        Array.from(_this4.$refs.esNav.parentNode.children).forEach(function (item) {
+          if (item !== _this4.$refs.esNav) {
             var mt = util["a" /* default */].getStyle(item, 'margin-top');
             var mb = util["a" /* default */].getStyle(item, 'margin-bottom');
             mt = mt ? parseInt(mt, 10) : 0;
@@ -4050,8 +4192,11 @@ var util = __webpack_require__(0);
             height -= item.offsetHeight + mt + mb;
           }
         });
-        _this3.height = height + 'px';
-        _this3.menuHeight = _this3.showTitle ? height - 49 + 'px' : height + 'px';
+        if (_this4.overlap) {
+          height -= 15;
+        }
+        _this4.height = height + 'px';
+        _this4.menuHeight = _this4.showTitle ? height - 49 + 'px' : height + 'px';
       });
     }
   }

package/lib/select.js

@@ -4040,7 +4040,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       immediate: true,
       handler: function handler(val, old) {
         if (val && val !== old) {
-          console.log(1);
           this.label = this.service ? 'label' : 'shortName';
           this.valKey = this.service ? 'value' : 'cciValue';
           var options = store["a" /* default */].get(val);
@@ -4062,7 +4061,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     param: {
       deep: true,
       handler: function handler(val, old) {
-        console.log(3);
         if (this.url && JSON.stringify(val) !== JSON.stringify(old)) {
           this.options = [];
           this.getData(this.sysCode);