eoss-ui 0.7.98 → 0.8.0

package/packages/select/src/main.vue

@@ -500,6 +500,8 @@ export default {
       }
     },
     getLabel(value, data) {
+      console.log('value', value);
+      console.log('data', data);
       if ((value || value === 0) && data) {
         if (util.isObject(data)) {
           if (value === data[this.valKey]) {
@@ -511,8 +513,8 @@ export default {
             data.children &&
             data.children.length
           ) {
-            let val = this.getLabel(value, data.children);
-            if (val) {
+            const val = this.getLabel(value, data.children);
+            if (val !== null) {
               return val;
             }
           }
@@ -525,15 +527,15 @@ export default {
           }
           if (Array.isArray(data) && data.length) {
             for (let i = 0; i < data.length; i++) {
-              let val = this.getLabel(value, data[i]);
-              if (val) {
+              const val = this.getLabel(value, data[i]);
+              if (val !== null) {
                 return val;
               }
             }
           }
         }
       }
-      return value;
+      return null;
     },
     reload() {
       this.getData(...arguments);
@@ -640,7 +642,7 @@ export default {
     if (!this.hide) {
       if (this.readonly) {
         let dom = [];
-        let models = this.models ? JSON.parse(JSON.stringify(this.models)) : '';
+        let models = this.models || this.models == 0 ? JSON.parse(JSON.stringify(this.models)) : '';
         if (typeof models === 'string' && models.includes(',')) {
           models = models.split(',');
         }
@@ -648,22 +650,27 @@ export default {
           dom = models.map((item) => {
             if (util.isObject(item)) {
               if (!item[this.label] && !item.label) {
-                return this.getLabel(value[this.valKey], data);
+                const label = this.getLabel(value[this.valKey], data);
+                return label !== null ? label : value[this.valKey];
               }
               return item[this.label] || item.label;
             }
-            return this.getLabel(item, this.results);
+            const label = this.getLabel(item, this.results);
+            return label !== null ? label : item;
           });
         } else if (util.isObject(models)) {
           if (!models[this.label] && !models.label) {
-            dom = [this.getLabel(models[this.valKey], this.results)];
+            const label = this.getLabel(models[this.valKey], this.results);
+            dom = [label !== null ? label : models[this.valKey]];
           } else {
             dom = [models[this.label] || models.label];
           }
         } else {
-          dom = [this.getLabel(models, this.results)];
+          const label = this.getLabel(models, this.results);
+          dom = [label !== null ? label : models];
         }
         console.log('dom', dom);
+        console.log('dom.join(this.symbol)', dom.join(this.symbol));
         return h(
           'div',
           {

package/packages/select-ganged/index.js

@@ -1,5 +1,5 @@
-import EsSelectGanged from './src/main';
-
-EsSelectGanged.install = Vue => Vue.component(EsSelectGanged.name, EsSelectGanged);
-
-export default EsSelectGanged;
+import EsSelectGanged from './src/main';
+
+EsSelectGanged.install = Vue => Vue.component(EsSelectGanged.name, EsSelectGanged);
+
+export default EsSelectGanged;