eoss-ui 0.4.65 → 0.4.67

package/packages/input/src/main.vue

@@ -48,9 +48,18 @@ export default {
     scope: {},
     exclude: Boolean
   },
+  watch: {
+    data: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.results = val;
+      }
+    }
+  },
   data() {
     return {
-      results: this.data
+      results: []
     };
   },
   computed: {
@@ -120,7 +129,7 @@ export default {
   },
   mounted() {},
   methods: {
-    getData(query, callback) {
+    getData(query, callback, isChange) {
       if (typeof this.url && this.results.length === 0) {
         util
           .ajax({
@@ -145,17 +154,21 @@ export default {
           });
       } else {
         let results = query
-          ? this.results.filter(this.searchFilter(query))
+          ? this.results.filter(this.searchFilter(query, isChange))
           : this.results;
         callback(results);
       }
     },
-    searchFilter(query) {
+    searchFilter(query, isChange) {
       return (state) => {
-        if (this.exclude) {
-          return state.value.toLowerCase().indexOf(query.toLowerCase()) === -1;
+        if (isChange) {
+          return state.value.indexOf(query) > -1;
         } else {
-          return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+          if (this.exclude) {
+            return state.value !== query;
+          } else {
+            return state.value === query;
+          }
         }
       };
     },

package/packages/login/src/main.vue

@@ -65,7 +65,7 @@
                   :focusShow="focusShow"
                   :data="users"
                   @select="handleBlur"
-                  autocomplete="off"
+                  :autocomplete="true"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>
@@ -849,10 +849,8 @@ export default {
         }
       }
     },
-    handleBlur() {
-      if (this.formData.username && !this.formData.password) {
-        this.getRemember(this.formData.username);
-      }
+    handleBlur(res) {
+      this.getRemember(res.value);
     },
     handleRemember() {
       let values = localStorage.getItem('unpd');

package/packages/main/src/main.vue

@@ -707,13 +707,16 @@ export default {
       }
     },
     setTitle(id) {
+      let node;
       for (let i = 0; i < this.menus.length; i++) {
         let item = this.menus[i];
         if (item.id == id) {
           this.title = item.text;
-          return item;
+          node = item;
+          break;
         }
       }
+      return node;
     },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
@@ -1224,6 +1227,7 @@ export default {
     },
     //设置默认导航页面
     setDefault(res, active) {
+      this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
@@ -1335,18 +1339,7 @@ export default {
     },
     //应用导航交互
     handleSelect(res, type, open) {
-      console.log(type, 11);
       const { node, fourthTabs } = res;
-      let openIdex = 0;
-      if (
-        node.extendData &&
-        (node.extendData.subDefOpenIndex || node.extendData.subDefOpen)
-      ) {
-        openIdex = parseInt(
-          node.extendData.subDefOpenIndex || node.extendData.subDefOpen,
-          10
-        );
-      }
       if (!open) {
         if (
           node.extendData &&
@@ -1364,13 +1357,16 @@ 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.children[openIdex]);
+              let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
                 this.navIds = [
@@ -1381,7 +1377,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;
@@ -1390,9 +1386,19 @@ 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) {
-              this.active = this.getFirst(node.children[openIdex]).id;
+              let subNode = this.getFirst(node);
+              if (subNode) {
+                this.active = subNode.id;
+                this.navIds = [
+                  node.id,
+                  ...this.getId(node.children, subNode.url, true)
+                ];
+              }
             }
             this.isSide = true;
           }
@@ -1402,6 +1408,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];
@@ -1414,48 +1424,61 @@ export default {
         case 'menu':
           if (!open) {
             this.tabs = [];
-            if (this.setFirstAsDefault) {
-              if (this.biserial) {
-                this.$set(this.active, 1, node.id);
-              } else {
-                this.active = node.id;
-              }
+            if (this.biserial) {
+              this.$set(this.active, 1, node.id);
+            } else {
+              this.active = node.id;
             }
-          }
-          if (node.url) {
-            if (node.children && node.children.length) {
-              let tab = node.children.filter((item) => {
-                return item.url === node.url;
-              })[0];
-              if (tab) {
-                if (this.biserial) {
-                  this.$set(this.active, 1, tab.id);
+            if (node.url) {
+              if (node.children && node.children.length) {
+                let tab = node.children.filter((item) => {
+                  return item.url === node.url;
+                })[0];
+                if (tab) {
+                  if (this.biserial) {
+                    this.$set(this.active, 1, tab.id);
+                  } else {
+                    this.active = tab.id;
+                  }
+                  this.navIds = this.getId(this.menus, tab.url, true);
+                }
+              } else {
+                let tab = (node.fourthTabs || []).filter((item) => {
+                  return item.url === node.url;
+                })[0];
+                if (tab) {
+                  this.tabs = node.fourthTabs;
+                  this.tabsId = tab.id;
+                  this.navIds = this.getId(this.menus, tab.url, true);
                 } else {
-                  this.active = tab.id;
+                  this.navIds = this.getId(this.menus, node.url, true);
                 }
-                this.navIds = this.getId(this.menus, tab.url, true);
               }
             } else {
-              let tab = (node.fourthTabs || []).filter((item) => {
-                return item.url === node.url;
-              })[0];
-              if (tab) {
+              if (node.fourthTabs.length) {
                 this.tabs = node.fourthTabs;
-                this.tabsId = tab.id;
-                this.navIds = this.getId(this.menus, tab.url, true);
-              } else {
-                this.navIds = this.getId(this.menus, node.url, true);
+                this.tabsId = this.tabs[0].id;
+                this.handleJump(
+                  this.tabs[0].url,
+                  this.tabs[0].urlopenmode,
+                  this.tabs[0]
+                );
+                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;
+                }
+                this.navIds = this.getId(this.menus, subNode.url, true);
               }
             }
-          } else if (node.fourthTabs.length) {
-            this.tabs = node.fourthTabs;
-            this.tabsId = this.tabs[0].id;
-            this.handleJump(
-              this.tabs[0].url,
-              this.tabs[0].urlopenmode,
-              this.tabs[0]
-            );
-            this.navIds = this.getId(this.menus, this.tabs[0].url, true);
           }
           break;
         case 'tabs':
@@ -1671,13 +1694,8 @@ export default {
           }
         }
       } else {
-        if (menus.fourthTabs && menus.fourthTabs.length) {
-          for (let i = 0; i < menus.fourthTabs.length; i++) {
-            let item = menus.fourthTabs[i];
-            if (item.id === id) {
-              return item;
-            }
-          }
+        if (menus.fourthTabs && menus.fourthTabs.length && menus.id === id) {
+          return menus;
         }
         if (menus.children && menus.children.length) {
           for (let i = 0; i < menus.children.length; i++) {
@@ -1691,6 +1709,9 @@ export default {
       return false;
     },
     handleLayout(res, old) {
+      if (res == old) {
+        return;
+      }
       this.layout = res;
       switch (res) {
         case 'topnav':

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 {
@@ -232,7 +235,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 +273,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 +424,7 @@ export default {
             ],
             ref: 'menu',
             props: {
+              defaultOpeneds: this.defaultOpeneds,
               defaultActive: this.active,
               collapse: this.collapse,
               mode: this.mode,

package/packages/nav/src/main.vue

@@ -107,7 +107,7 @@ export default {
     },
     menuActive() {
       let active =
-        this.defaultActive === 'string'
+        typeof this.defaultActive === 'string'
           ? this.defaultActive
           : this.defaultActive.length
           ? this.defaultActive[this.defaultActive.length - 1]
@@ -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) => {