eoss-ui 0.4.66 → 0.4.68

package/packages/main/src/main.vue

@@ -365,7 +365,10 @@ export default {
       type: String,
       default: '/main'
     },
-    setFirstAsDefault: Boolean,
+    setFirstAsDefault: {
+      type: Boolean,
+      default: true
+    },
     pathUrl: {
       type: String,
       default: '/primary'
@@ -641,8 +644,10 @@ export default {
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
-      this.customMenu = res;
-      this.setMenu(res);
+      if (res && res.length) {
+        this.customMenu = res;
+        this.setMenu(res);
+      }
     },
     //获取主题模板JSON
     getMainDetail(id) {
@@ -682,8 +687,10 @@ export default {
           if (_that.showDefault && _that.data === undefined) {
             _that.getMenu();
           } else if (_that.showDefault) {
-            _that.menus = JSON.parse(JSON.stringify(_that.data));
-            _that.setMenu(_that.data);
+            if (_that.data && _that.data.length) {
+              _that.menus = JSON.parse(JSON.stringify(_that.data));
+              _that.setMenu(_that.data);
+            }
           }
         })
         .catch((err) => {
@@ -838,7 +845,7 @@ export default {
         if (i === 'indexUrl') {
           this.homePage = results[i];
           if (this.isHomePage) {
-            if (this.menus) {
+            if (this.menus && this.menus.length) {
               let ids = null;
               this.homePage && (ids = this.getId(this.menus, this.homePage));
               if (ids) {
@@ -995,26 +1002,43 @@ export default {
         .ajax({ url: this.action, params: this.param ? this.param : {} })
         .then((res) => {
           if (res.rCode === 0) {
-            this.menus = JSON.parse(JSON.stringify(res.results));
-            let applicationid =
-              util.getParams('applicationid') ||
-              util.getParams('applicationId');
-            if (applicationid) {
-              let ids = this.getId(this.menus, applicationid);
-              if (ids) {
-                this.defaultActive = ids;
-              }
-            } else if (util.win.location.hash) {
-              let hash = util.win.location.hash;
-              if (hash) {
-                hash = hash.split('?')[0];
-              }
-              if (hash !== '#/' && hash !== '#/main') {
-                let ids = this.getId(this.menus, util.win.location.hash, true);
+            if (res.results && res.results.length) {
+              this.menus = JSON.parse(JSON.stringify(res.results));
+              let applicationid =
+                util.getParams('applicationid') ||
+                util.getParams('applicationId');
+              if (applicationid) {
+                let ids = this.getId(this.menus, applicationid);
                 if (ids) {
                   this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
+                }
+              } else if (util.win.location.hash) {
+                let hash = util.win.location.hash;
+                if (hash) {
+                  hash = hash.split('?')[0];
+                }
+                if (hash !== '#/' && hash !== '#/main') {
+                  let ids = this.getId(
+                    this.menus,
+                    util.win.location.hash,
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
+                } else if (sessionStorage.getItem('jump') && this.history) {
+                  let ids = this.getId(
+                    this.menus,
+                    sessionStorage.getItem('jump'),
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
                 }
               } else if (sessionStorage.getItem('jump') && this.history) {
                 let ids = this.getId(
@@ -1028,21 +1052,12 @@ export default {
                   this.setTitle(ids[0]);
                 }
               }
-            } else if (sessionStorage.getItem('jump') && this.history) {
-              let ids = this.getId(
-                this.menus,
-                sessionStorage.getItem('jump'),
-                true
-              );
-              if (ids) {
-                this.defaultActive = ids;
-                this.navIds = ids;
-                this.setTitle(ids[0]);
-              }
+              this.setTips(this.menus);
+              store.set('nav', this.menus);
+              this.setMenu(this.menus);
+            } else {
+              this.$message.error('未分配菜单权限，请联系管理员！');
             }
-            this.setTips(this.menus);
-            store.set('nav', this.menus);
-            this.setMenu(this.menus);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
@@ -1357,11 +1372,14 @@ export default {
       switch (type) {
         case 'nav':
           this.tabs = [];
-          this.active = '';
+          //this.active = '';
           if (this.layout === 'topside') {
-            this.navIds = [node.id];
-            this.menu = node.children;
-            this.title = node.text;
+            if (this.title !== node.text) {
+              this.navIds = [node.id];
+              this.menu = node.children;
+              this.active = node.id;
+              this.title = node.text;
+            }
             if (this.setFirstAsDefault) {
               let subNode = this.getFirst(node);
               if (subNode) {
@@ -1374,7 +1392,7 @@ export default {
             }
           } else {
             this.navIds = this.getId(this.menus, node.url, true);
-            this.setTitle(ids[0]);
+            this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
           break;
@@ -1383,7 +1401,10 @@ export default {
             this.navIds = [node.id];
             this.tabs = [];
             this.menu = node.children;
-            this.title = node.text;
+            if (this.title !== node.text) {
+              this.active = '';
+              this.title = node.text;
+            }
             if (this.setFirstAsDefault) {
               let subNode = this.getFirst(node);
               if (subNode) {
@@ -1402,6 +1423,10 @@ export default {
           if (node.url) {
             this.tabs = [];
           }
+          if (this.title !== node.text) {
+            this.active = [node.id];
+            this.title = node.text;
+          }
           if (this.setFirstAsDefault) {
             let subNode = this.getFirst(node);
             this.active = [node.id];
@@ -1456,16 +1481,18 @@ export default {
                 this.navIds = this.getId(this.menus, this.tabs[0].url, true);
               }
             }
-          } else if (this.setFirstAsDefault) {
-            this.tabs = [];
-            let subNode = this.getFirst(node);
-            if (subNode) {
-              if (this.biserial) {
-                this.$set(this.active, 1, subNode.id);
-              } else {
-                this.active = subNode.id;
+          } else {
+            if (this.setFirstAsDefault) {
+              this.tabs = [];
+              let subNode = this.getFirst(node);
+              if (subNode) {
+                if (this.biserial) {
+                  this.$set(this.active, 1, subNode.id);
+                } else {
+                  this.active = subNode.id;
+                }
+                this.navIds = this.getId(this.menus, subNode.url, true);
               }
-              this.navIds = this.getId(this.menus, subNode.url, true);
             }
           }
           break;
@@ -1529,7 +1556,9 @@ export default {
           this.active = [];
           this.defaultActive = [];
           this.tabs = [];
-          this.setMenu(this.menus);
+          if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
+          }
           this.$nextTick(() => {
             this.reset = true;
           });
@@ -1697,6 +1726,9 @@ export default {
       return false;
     },
     handleLayout(res, old) {
+      if (res == old) {
+        return;
+      }
       this.layout = res;
       switch (res) {
         case 'topnav':

package/packages/main/src/message.vue

@@ -38,9 +38,7 @@
               </div>
             </el-card>
             <p class="es-msg-tips" v-if="loading">加载中...</p>
-            <p class="es-msg-tips" v-if="noMore && count > 0">
-              没有更多了
-            </p>
+            <p class="es-msg-tips" v-if="noMore && count > 0">没有更多了</p>
           </div>
         </el-scrollbar>
       </div>
@@ -100,6 +98,7 @@ export default {
       return this.msgs.length >= this.count;
     },
     disabled() {
+      console.log(this.loading, this.noMore);
       return this.loading || this.noMore;
     }
   },
@@ -145,7 +144,7 @@ export default {
               pageSize: this.pageSize
             }
           })
-          .then(res => {
+          .then((res) => {
             if (res && res.rCode === 0) {
               this.pageCount = res.results.pageCount;
               this.loading = false;
@@ -160,7 +159,7 @@ export default {
               this.$message.error(msg);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.loading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -177,7 +176,7 @@ export default {
             id: res.id
           }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode == 0) {
             this.count -= 1;
             this.msgs.splice(i, 1);
@@ -193,12 +192,12 @@ export default {
         .ajax({
           url: ignoreAllSysMsg
         })
-        .then(res => {
+        .then((res) => {
           this.count = 0;
           this.msgs = [];
           this.$emit('ignore', { type: 'ignore', value: 'all' });
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }

package/packages/main/src/userinfo.vue

@@ -28,6 +28,10 @@ export default {
     showNotify: {
       type: Boolean,
       default: true
+    },
+    secret: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -351,14 +355,20 @@ export default {
             officeTel: this.values.officetel,
             phone: this.values.phone,
             oldPassword:
-              initLogin && initLogin.secret && this.values.oldpassword
+              this.secret &&
+              initLogin &&
+              initLogin.secret &&
+              this.values.oldpassword
                 ? util.esmEncrypt({
                     data: this.values.oldpassword,
                     key: initLogin.secret
                   })
                 : this.values.oldpassword,
             password:
-              initLogin && initLogin.secret && this.values.password
+              this.secret &&
+              initLogin &&
+              initLogin.secret &&
+              this.values.password
                 ? util.esmEncrypt({
                     data: this.values.password,
                     key: initLogin.secret

package/packages/menu/src/main.vue

@@ -88,7 +88,9 @@ export default {
     return {
       maxH: '',
       maxW: '',
-      menuId: null
+      menuId: null,
+      defaultOpeneds: [],
+      isChange: false
     };
   },
   mounted() {},
@@ -110,6 +112,7 @@ export default {
       }
     },
     handleSelect(key, keyPath, item) {
+      this.isChange = true;
       if (this.menuId !== null && keyPath.indexOf(this.menuId) == -1) {
         this.$refs.menu.close(this.menuId);
       } else {
@@ -193,6 +196,9 @@ export default {
                     'es-dot-right': item.tips && typeof item.tips === 'boolean'
                   }
                 ],
+                attrs:{
+                  title: item.text.length > 18 ? item.text : undefined,
+                },
                 props:
                   typeof item.tips === 'boolean' && item.tips
                     ? {
@@ -232,7 +238,13 @@ export default {
           h(
             'el-submenu',
             {
-              class: ['es-submenu', `es-submenu-${this.mode}`],
+              class: [
+                'es-submenu',
+                `es-submenu-${this.mode}`,
+                item.id === this.active && !this.isChange
+                  ? 'es-menu-item-focus'
+                  : ''
+              ],
               props: {
                 popperClass: popper,
                 popperAppendToBody: true,
@@ -264,7 +276,13 @@ export default {
           h(
             'el-submenu',
             {
-              class: ['es-submenu', `es-submenu-${this.mode}`],
+              class: [
+                'es-submenu',
+                `es-submenu-${this.mode}`,
+                item.id === this.active && !this.isChange
+                  ? 'es-menu-item-focus'
+                  : ''
+              ],
               props: {
                 popperClass: popper,
                 popperAppendToBody: true,
@@ -409,6 +427,7 @@ export default {
             ],
             ref: 'menu',
             props: {
+              defaultOpeneds: this.defaultOpeneds,
               defaultActive: this.active,
               collapse: this.collapse,
               mode: this.mode,

package/packages/nav/src/main.vue

@@ -140,6 +140,7 @@ export default {
     biserial: {
       handler(val) {
         this.isShow = !val;
+        this.resetHeight();
       }
     },
     defaultActive: {

package/packages/radio-group/src/main.vue

@@ -60,6 +60,14 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsRadioGroup',
   inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    },
+    sysCodes: {
+      default: ''
+    }
+  },
   props: {
     method: {
       type: String,
@@ -121,11 +129,13 @@ export default {
     isNoParamRequest: {
       type: Boolean,
       default: true
-    }
+    },
+    dataKey: String
   },
   data() {
     return {
-      options: null
+      options: null,
+      canceled: false
     };
   },
   computed: {
@@ -214,6 +224,27 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
+    },
+    sysCodes: {
+      deep: true,
+      handler(val) {
+        if (
+          this.canceled &&
+          val &&
+          ((this.sysCode && val[this.sysCode]) ||
+            (this.dataKey && val[this.dataKey]))
+        ) {
+          if (this.parseData) {
+            this.options = this.parseData(
+              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
+            );
+          } else {
+            this.options = JSON.parse(
+              JSON.stringify(val[this.sysCode || this.dataKey])
+            );
+          }
+        }
+      }
     }
   },
   created() {},
@@ -246,17 +277,28 @@ export default {
         })
         .then((res) => {
           this.loading = false;
+          this.canceled = false;
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
-            if (sysCode) {
+            if (sysCode || this.dataKey) {
+              this.esForm &&
+                this.esForm.setSysCodes(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           }
         })
         .catch((err) => {
           this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
+          if (err.message) {
+            if (err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+            if (err.message === 'canceled' && sysCode) {
+              this.canceled = true;
+            }
           }
         });
     },

package/packages/select/src/main.vue

@@ -2,6 +2,7 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
+import { string } from 'slate';
 export default {
   name: 'EsSelect',
   componentName: 'EsSelect',
@@ -11,6 +12,14 @@ export default {
       esSelect: this
     };
   },
+  inject: {
+    esForm: {
+      default: ''
+    },
+    sysCodes: {
+      default: ''
+    }
+  },
   props: {
     value: [String, Array, Object, Number],
     method: {
@@ -119,7 +128,8 @@ export default {
     isNoParamRequest: {
       type: Boolean,
       default: true
-    }
+    },
+    dataKey: String
   },
   data() {
     return {
@@ -127,7 +137,8 @@ export default {
       options: '',
       valKey: this.valueKey,
       label: this.labelKey,
-      hidden: false
+      hidden: false,
+      canceled: false
     };
   },
   computed: {
@@ -214,6 +225,27 @@ export default {
           this.getData(this.sysCode);
         }
       }
+    },
+    sysCodes: {
+      deep: true,
+      handler(val) {
+        if (
+          this.canceled &&
+          val &&
+          ((this.sysCode && val[this.sysCode]) ||
+            (this.dataKey && val[this.dataKey]))
+        ) {
+          if (this.parseData) {
+            this.options = this.parseData(
+              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
+            );
+          } else {
+            this.options = JSON.parse(
+              JSON.stringify(val[this.sysCode || this.dataKey])
+            );
+          }
+        }
+      }
     }
   },
   mounted() {
@@ -321,13 +353,21 @@ export default {
         })
         .then((res) => {
           this.loading = false;
+          this.canceled = false;
           if (res.rCode === 0) {
             if (this.parseData) {
-              this.options = this.parseData(res.results);
+              this.options = this.parseData(
+                JSON.parse(JSON.stringify(res.results))
+              );
             } else {
               this.options = JSON.parse(JSON.stringify(res.results));
             }
-            if (sysCode) {
+            if (sysCode || this.dataKey) {
+              this.esForm &&
+                this.esForm.setSysCodes(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
           } else {
@@ -336,14 +376,19 @@ export default {
         })
         .catch((err) => {
           this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
+          if (err.message) {
+            if (err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+            if (err.message === 'canceled' && sysCode) {
+              this.canceled = true;
+            }
           }
         });
     },
     search(query) {
-      if (query !== '') {
-        if (this.url !== '') {
+      if (query && query !== '') {
+        if (this.url && this.url !== '') {
           this.loading = true;
           let params = {};
           params[this.remoteKey] = query;
@@ -358,19 +403,7 @@ export default {
             .then((res) => {
               this.loading = false;
               if (res.rCode === 0) {
-                this.options = res.results.filter((item) => {
-                  if (item[this.label]) {
-                    return (
-                      item[this.label]
-                        .toLowerCase()
-                        .indexOf(query.toLowerCase()) > -1
-                    );
-                  } else {
-                    return (
-                      item.label.toLowerCase().indexOf(query.toLowerCase()) > -1
-                    );
-                  }
-                });
+                this.options = JSON.parse(JSON.stringify(res.results));
               }
             })
             .catch((err) => {
@@ -509,6 +542,12 @@ export default {
             .then((res) => {
               this.loading = false;
               this.$set(data, 'children', JSON.parse(JSON.stringify(res)));
+              if (this.dataKey && this.esForm) {
+                this.esForm.setSysCodes(
+                  this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
+              }
             })
             .catch((e) => {
               this.loading = false;
@@ -536,6 +575,12 @@ export default {
                 } else {
                   console.error('tree数据格式错误');
                 }
+                if (this.dataKey && this.esForm) {
+                  this.esForm.setSysCodes(
+                    this.dataKey,
+                    JSON.parse(JSON.stringify(this.options))
+                  );
+                }
               }
             })
             .catch((err) => {