eoss-ui 0.5.78 → 0.5.80

package/packages/form/src/main.vue

@@ -54,10 +54,12 @@
                 class="es-collapse-item"
                 v-if="!items.hide"
                 v-show="items.show !== false"
+                v-bind="items.config"
                 :class="{
                   'es-collapse-readonly': accordion ? false : !collapse,
                   'es-collapse-caption': items.caption
                 }"
+                :show-title="items.showTitle"
                 :name="items.name || String(indexs)"
                 :key="indexs"
                 :readonly="accordion ? false : !collapse"
@@ -591,7 +593,10 @@
                         v-else-if="item.type === 'component'"
                         v-model="models[item.name]"
                         v-bind="
-                          handleExclAttribute({ data: item, attrs: ['value'] })
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['value', 'type']
+                          })
                         "
                         v-on="item.events"
                       ></component>
@@ -657,6 +662,7 @@
                               </div>
                               <el-form-item
                                 label-width="0"
+                                :class="{ 'fixed-width': inline.width }"
                                 :prop="inline.name"
                                 :rules="getRules(inline)"
                               >
@@ -845,7 +851,7 @@
                                   v-bind="
                                     handleExclAttribute({
                                       data: inline,
-                                      attrs: ['value']
+                                      attrs: ['value', 'type']
                                     })
                                   "
                                   v-on="inline.events"
@@ -900,6 +906,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': item.inline.width }"
                             :prop="item.inline.name"
                             :rules="getRules(item.inline)"
                           >
@@ -1093,7 +1100,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1549,7 +1556,7 @@
                     v-bind="
                       handleExclAttribute({
                         data: item,
-                        attrs: ['value']
+                        attrs: ['value', 'type']
                       })
                     "
                     v-on="item.events"
@@ -1609,6 +1616,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': inline.width }"
                             :prop="inline.name"
                             :rules="getRules(inline)"
                           >
@@ -1776,7 +1784,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1824,6 +1832,7 @@
                       </div>
                       <el-form-item
                         label-width="0"
+                        :class="{ 'fixed-width': item.inline.width }"
                         :prop="item.inline.name"
                         :rules="getRules(item.inline)"
                       >
@@ -1983,7 +1992,7 @@
                           v-bind="
                             handleExclAttribute({
                               data: item.inline,
-                              attrs: ['value']
+                              attrs: ['value', 'type']
                             })
                           "
                           v-on="item.inline.events"
@@ -2554,7 +2563,7 @@
                       v-bind="
                         handleExclAttribute({
                           data: item,
-                          attrs: ['value']
+                          attrs: ['value', 'type']
                         })
                       "
                       v-on="item.events"
@@ -2618,6 +2627,7 @@
                             </div>
                             <el-form-item
                               label-width="0"
+                              :class="{ 'fixed-width': inline.width }"
                               :prop="inline.name"
                               :rules="getRules(inline)"
                             >
@@ -2805,7 +2815,7 @@
                                 v-bind="
                                   handleExclAttribute({
                                     data: inline,
-                                    attrs: ['value']
+                                    attrs: ['value', 'type']
                                   })
                                 "
                                 v-on="inline.events"
@@ -2860,6 +2870,7 @@
                         </div>
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': item.inline.width }"
                           :prop="item.inline.name"
                           :rules="getRules(item.inline)"
                         >
@@ -3034,7 +3045,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: item.inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="item.inline.events"
@@ -3468,7 +3479,7 @@
                   v-bind="
                     handleExclAttribute({
                       data: item,
-                      attrs: ['value']
+                      attrs: ['value', 'type']
                     })
                   "
                   v-on="item.events"
@@ -3544,6 +3555,7 @@
                         >
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': inline.width }"
                           :prop="inline.name"
                           :rules="getRules(inline)"
                         >
@@ -3711,7 +3723,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="inline.events"
@@ -3759,6 +3771,7 @@
                     </div>
                     <el-form-item
                       label-width="0"
+                      :class="{ 'fixed-width': item.inline.width }"
                       :prop="item.inline.name"
                       :rules="getRules(item.inline)"
                     >
@@ -3918,7 +3931,7 @@
                         v-bind="
                           handleExclAttribute({
                             data: item.inline,
-                            attrs: ['value']
+                            attrs: ['value', 'type']
                           })
                         "
                         v-on="item.inline.events"
@@ -4524,7 +4537,8 @@ export default {
   mounted() {
     this.$nextTick(() => {
       !this.height && this.getHeight();
-      this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
+      this.$refs.esForm &&
+        this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
     });
   },
   methods: {

package/packages/input/src/main.vue

@@ -30,10 +30,6 @@ export default {
         return {};
       }
     },
-    autocomplete: {
-      type: [String, Boolean],
-      default: ''
-    },
     fetchSuggestions: Function,
     focusShow: {
       type: Boolean,

package/packages/login/src/main.vue

@@ -79,7 +79,6 @@
                   :focusShow="focusShow"
                   :data="users"
                   @select="handleBlur"
-                  :autocomplete="true"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>

package/packages/main/src/main.vue

@@ -131,7 +131,9 @@
           :sub-icon="subIcon"
           :biserial="biserial"
           :title="showNavTitle ? title : false"
-          :showCollapse="showNavTitle ? showCollapse : false"
+          :showCollapse="
+            showNavTitle ? (layout == 'side' ? false : showCollapse) : false
+          "
           :menu-tips="menuTips"
           :is-default="isDefault"
           :paddingLeft="navPaddingLeft"
@@ -488,7 +490,7 @@ export default {
     _navWidth() {
       return this.layout === 'side'
         ? this.navBoxWidth
-        : this.layout === 'subsystem' || this.layout === 'topside'
+        : this.layout === 'topside'
         ? '0'
         : this.navWidth;
     },
@@ -843,14 +845,14 @@ export default {
           var ids = this.getId(this.menus, applicationid);
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
           let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         } else if (util.win.location.hash) {
@@ -862,14 +864,14 @@ export default {
             let ids = this.getId(this.menus, util.win.location.hash);
             if (ids) {
               this.defaultActive = ids;
-              this.navIds = ids;
+              //this.navIds = ids;
               this.setTitle(ids[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
             let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (ids) {
               this.defaultActive = ids;
-              this.navIds = ids;
+              //this.navIds = ids;
               this.setTitle(ids[0]);
             }
           }
@@ -946,7 +948,7 @@ export default {
         if (i === 'initApplication' && results[i]) {
           this.results[i] = results[i].split(',');
         }
-        if (i === 'indexUrl' && this.loadHomePage) {
+        if (i === 'indexUrl' && results[i] && this.loadHomePage) {
           let applicationid =
             util.getParams('applicationid') || util.getParams('applicationId');
           let hash = util.win.location.hash;
@@ -983,7 +985,7 @@ export default {
         if (i === 'doorIndex' && results[i]) {
           window.open(results[i]);
         }
-        if (i === 'subsystemName') {
+        if (i === 'subsystemName' && results[i]) {
           document.title = results[i];
         }
         if (i === 'loginPage' && results[i]) {
@@ -993,32 +995,33 @@ export default {
           sessionStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
         }
-        if (i === 'subsystemExtend' && results[i].themeColor) {
-          this.color = unescape(results[i].themeColor).toLowerCase();
-        }
-        if (i === 'userStyle' && results[i].color) {
+        if (i === 'userStyle' && results[i] && results[i].color) {
           let color = unescape(results[i].color).toLowerCase();
           if (util.startWith(color, '#')) {
             this.color = color;
           }
         }
-        if (i === 'subsystemExtend' && results[i].userInfoContents) {
-          this.userInfoContents = results[i].userInfoContents;
-        }
-        if (i === 'subsystemExtend' && results[i].webPageWatermark) {
-          try {
-            util.win.top.webPageWatermark = results[i].webPageWatermark;
-            util.watermark(results[i].webPageWatermark);
-          } catch (error) {
-            util.win.postMessage(
-              { type: 2, content: results[i].webPageWatermark },
-              '*'
-            );
+        if (i === 'subsystemExtend' && results[i]) {
+          if (results[i].themeColor) {
+            this.color = unescape(results[i].themeColor).toLowerCase();
+          }
+          if (results[i].userInfoContents) {
+            this.userInfoContents = results[i].userInfoContents;
+          }
+          if (results[i].webPageWatermark) {
+            try {
+              util.win.top.webPageWatermark = results[i].webPageWatermark;
+              util.watermark(results[i].webPageWatermark);
+            } catch (error) {
+              util.win.postMessage(
+                { type: 2, content: results[i].webPageWatermark },
+                '*'
+              );
+            }
+          }
+          if (results[i].loginPage) {
+            util.setStorage('loginPage', results[i].loginPage);
           }
-        }
-
-        if (i === 'subsystemExtend' && results[i].loginPage) {
-          util.setStorage('loginPage', results[i].loginPage);
         }
         store.set(i, results[i]);
       }
@@ -1208,8 +1211,8 @@ export default {
           return item.id;
         } else {
           if (item.url) {
-            let url = new URL(item.url, window.location.origin);
-            if (url.hash == url) {
+            let _url = new URL(item.url, window.location.origin);
+            if (_url.hash == url) {
               return item.id;
             }
           }
@@ -1262,7 +1265,7 @@ export default {
           let ids = this.getId(this.menus, util.win.location.hash);
           if (ids) {
             this.defaultActive = ids;
-            this.navIds = ids;
+            //this.navIds = ids;
             this.setTitle(ids[0]);
           }
         }
@@ -1270,7 +1273,7 @@ export default {
         let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
         if (ids) {
           this.defaultActive = ids;
-          this.navIds = ids;
+          //this.navIds = ids;
           this.setTitle(ids[0]);
         }
       }
@@ -1597,7 +1600,7 @@ export default {
           //this.active = '';
           if (this.layout === 'topside') {
             if (this.title !== node.text) {
-              this.navIds = [node.id];
+              //this.navIds = [node.id];
               this.menu = node.children;
               this.active = node.id;
               this.title = node.text;
@@ -1606,21 +1609,21 @@ export default {
               let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [
-                  node.id,
-                  ...this.getId(node.children, subNode.url)
-                ];
+                // this.navIds = [
+                //   node.id,
+                //   ...this.getId(node.children, subNode.url)
+                // ];
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url);
+            //this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
           break;
         case 'sys':
           if (Number(node.urlopenmode) !== 1) {
-            this.navIds = [node.id];
+            //this.navIds = [node.id];
             this.tabs = [];
             this.menu = node.children;
             if (this.title !== node.text) {
@@ -1631,10 +1634,10 @@ export default {
               let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [
-                  node.id,
-                  ...this.getId(node.children, subNode.url)
-                ];
+                // this.navIds = [
+                //   node.id,
+                //   ...this.getId(node.children, subNode.url)
+                // ];
               }
             }
             this.isSide = true;
@@ -1642,7 +1645,7 @@ export default {
           break;
         case 'sub':
           this.hideSubMenu = false;
-          this.navIds = [node.id];
+          //this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
           }
@@ -1654,7 +1657,7 @@ export default {
             let subNode = this.getFirst(node);
             this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              this.navIds = this.getId(this.menus, subNode.url);
+              //this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1678,7 +1681,7 @@ export default {
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url);
+                  //this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 let tab = (node.fourthTabs || []).filter((item) => {
@@ -1687,9 +1690,9 @@ export default {
                 if (tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
-                  this.navIds = this.getId(this.menus, tab.url);
+                  //this.navIds = this.getId(this.menus, tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url);
+                  //this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -1701,7 +1704,7 @@ export default {
                   this.tabs[0].urlopenmode,
                   this.tabs[0]
                 );
-                this.navIds = this.getId(this.menus, this.tabs[0].url);
+                //this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -1714,14 +1717,14 @@ export default {
                 } else {
                   this.active = subNode.id;
                 }
-                this.navIds = this.getId(this.menus, subNode.url);
+                //this.navIds = this.getId(this.menus, subNode.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url);
+          //this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {
@@ -1822,6 +1825,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res, param) {
+      this.navIds = this.getId(this.menus, page);
       console.log(page);
       let prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);