eoss-ui 0.7.87 → 0.7.89

package/packages/main/src/default/index.vue

@@ -783,12 +783,12 @@ export default {
       this.isLoadHomePage = false;
     }
     this.isHeader = params.header;
-
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
     this.handleListener();
     util.win.addEventListener('popstate', this.stateHandle, false);
+    // this.
   },
   methods: {
     stateHandle() {
@@ -1403,6 +1403,7 @@ export default {
           } else {
             this.menu = res[0].children;
             this.title = res[0].text;
+            this.$emit('getOriginParentMenu', {title: res[0].text, id: res[0].id});
           }
           if (!this.isDefault || (this.isDefault && !this.homePage)) {
             this.active = this.getFirst(this.menu[0]).id;
@@ -1922,7 +1923,7 @@ export default {
     //跳转页面
     handleJump(page, type, res, param) {
       this.navIds = this.getId(this.menus, page);
-      console.log(page);
+      console.log('handleJump page ',page);
       let prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {

package/packages/main/src/main.vue

@@ -30,6 +30,7 @@
       v-on="$listeners"
       @chang-layout="changLayout"
       @bus-emit="busEmit"
+      @getOriginParentMenu="$emit('getOriginParentMenu', $event)"
     ></main-default>
 
     <!-- 公用弹窗 -->

package/packages/select/src/main.vue

@@ -88,7 +88,7 @@ export default {
     },
     symbol: {
       type: String,
-      default: '，'
+      default: ','
     },
     plain: Boolean,
     where: Object,
@@ -640,8 +640,12 @@ export default {
     if (!this.hide) {
       if (this.readonly) {
         let dom = [];
-        if (Array.isArray(this.models)) {
-          dom = this.models.map((item) => {
+        let models = JSON.parse(JSON.stringify(this.models));
+        if(models.includes(',')){
+          models = models.split(',');
+        }
+        if (Array.isArray(models)) {
+          dom = models.map((item) => {
             if (util.isObject(item)) {
               if (!item[this.label] && !item.label) {
                 return this.getLabel(value[this.valKey], data);
@@ -650,15 +654,16 @@ export default {
             }
             return this.getLabel(item, this.results);
           });
-        } else if (util.isObject(this.models)) {
-          if (!this.models[this.label] && !this.models.label) {
-            dom = [this.getLabel(this.models[this.valKey], this.results)];
+        } else if (util.isObject(models)) {
+          if (!models[this.label] && !models.label) {
+            dom = [this.getLabel(models[this.valKey], this.results)];
           } else {
-            dom = [this.models[this.label] || this.models.label];
+            dom = [models[this.label] || models.label];
           }
         } else {
-          dom = [this.getLabel(this.models, this.results)];
+          dom = [this.getLabel(models, this.results)];
         }
+        console.log('dom', dom);
         return h(
           'div',
           {

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.7.87',
+  version: '0.7.89',
   install,
   Button,
   ButtonGroup,