eoss-ui 0.4.66 → 0.4.67

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

@@ -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) => {

package/packages/select-ganged/src/main.vue

@@ -9,6 +9,14 @@ export default {
       ganged: this
     };
   },
+  inject: {
+    esForm: {
+      default: ''
+    },
+    sysCodes: {
+      default: ''
+    }
+  },
   props: {
     method: {
       type: String,
@@ -38,7 +46,7 @@ export default {
     valueType: {
       type: String,
       default: 'object',
-      validator: function(value) {
+      validator: function (value) {
         return ['string', 'object'].includes(value);
       }
     },
@@ -102,7 +110,8 @@ export default {
       type: String,
       default: 'hasSub'
     },
-    defaultValue: Boolean
+    defaultValue: Boolean,
+    dataKey: String
   },
   data() {
     return {
@@ -114,7 +123,8 @@ export default {
       wheres: [{}],
       first: true,
       height: undefined,
-      gangedNum: null
+      gangedNum: null,
+      canceled: false
     };
   },
   computed: {
@@ -154,7 +164,7 @@ export default {
         }
         let multiples = [];
         if (this.multiple === undefined && this.value.length) {
-          multiples = this.value.map(item => {
+          multiples = this.value.map((item) => {
             return Array.isArray(item);
           });
         } else if (Array.isArray(this.multiple) && this.multiple.length) {
@@ -234,15 +244,29 @@ export default {
           params: this.param,
           data: this.param
         })
-        .then(res => {
+        .then((res) => {
+          this.canceled = false;
           if (res.rCode === 0) {
             this.lists = res.results;
             this.getChildren(this.results, this.values);
+            if (sysCode || this.dataKey) {
+              this.esForm &&
+                this.esForm.setSysCodes(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.lists))
+                );
+              store.set(sysCode, JSON.parse(JSON.stringify(this.lists)));
+            }
           }
         })
-        .catch(e => {
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
+        .catch((err) => {
+          if (err.message) {
+            if (err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+            if (err.message === 'canceled' && sysCode) {
+              this.canceled = true;
+            }
           }
         });
     },
@@ -301,7 +325,7 @@ export default {
             if (this.queryKey !== undefined) {
               if (typeof this.queryKey === 'string') {
                 if (Array.isArray(values[i])) {
-                  params[this.queryKey] = values[i].map(item => {
+                  params[this.queryKey] = values[i].map((item) => {
                     return item[this.queryKey];
                   });
                 } else {
@@ -310,7 +334,7 @@ export default {
               } else {
                 for (let x in this.queryKey) {
                   if (Array.isArray(values[i])) {
-                    params[x] = values[i].map(item => {
+                    params[x] = values[i].map((item) => {
                       return item[this.queryKey[x]];
                     });
                   } else {
@@ -431,14 +455,14 @@ export default {
         if (this.queryKey !== undefined) {
           if (typeof this.queryKey === 'string') {
             params[this.queryKey] = Array.isArray(val)
-              ? val.map(item => {
+              ? val.map((item) => {
                   return item[this.queryKey];
                 })
               : val[this.queryKey];
           } else {
             for (let i in this.queryKey) {
               params[i] = Array.isArray(val)
-                ? val.map(item => {
+                ? val.map((item) => {
                     return item[this.queryKey[i]];
                   })
                 : val[this.queryKey[i]];
@@ -446,7 +470,7 @@ export default {
           }
         } else {
           params.id = Array.isArray(val)
-            ? val.map(item => {
+            ? val.map((item) => {
                 return item[this.valueKey];
               })
             : val[this.valueKey];
@@ -459,8 +483,8 @@ export default {
       for (let i = key + 1; i < this.gangedNum; i++) {
         if (this.multiples[i - 1]) {
           let newVal = [];
-          this.values[i - 1].forEach(element => {
-            this.values[i].forEach(itemVal => {
+          this.values[i - 1].forEach((element) => {
+            this.values[i].forEach((itemVal) => {
               if (element[this.valueKey] === itemVal[this.filtrateKey]) {
                 newVal.push(itemVal);
               }
@@ -524,7 +548,7 @@ export default {
             let values = [];
             this.value.forEach((item, index) => {
               if (Array.isArray(item)) {
-                item.forEach(ele => {
+                item.forEach((ele) => {
                   let obj = ele;
                   if (!ele[this.filtrateKey]) {
                     obj = this.getLabel(ele[this.valueKey] || ele, index);
@@ -658,10 +682,10 @@ export default {
               defaultValue: i === 0 ? this.defaultValue : false
             },
             on: {
-              change: val => {
+              change: (val) => {
                 this.handeChange(val, i);
               },
-              resetInputHeight: val => {
+              resetInputHeight: (val) => {
                 this.height = val;
               }
             }