eoss-ui 0.7.87 → 0.7.89

package/lib/main.js

@@ -5261,7 +5261,7 @@ module.exports = function (css) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=48272c28&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=d38ebb62&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5331,6 +5331,9 @@ var render = function () {
                       on: {
                         "chang-layout": _vm.changLayout,
                         "bus-emit": _vm.busEmit,
+                        getOriginParentMenu: function ($event) {
+                          _vm.$emit("getOriginParentMenu", $event)
+                        },
                       },
                     },
                     "main-default",
@@ -5409,7 +5412,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=48272c28&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=d38ebb62&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(19);
@@ -19508,8 +19511,8 @@ var simplicityTop_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicityTop = (simplicityTop_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=0c452dea&
-var defaultvue_type_template_id_0c452dea_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=b6763862&
+var defaultvue_type_template_id_b6763862_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -20060,11 +20063,11 @@ var defaultvue_type_template_id_0c452dea_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_0c452dea_staticRenderFns = []
-defaultvue_type_template_id_0c452dea_render._withStripped = true
+var defaultvue_type_template_id_b6763862_staticRenderFns = []
+defaultvue_type_template_id_b6763862_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=0c452dea&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=b6763862&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=4160a4c1&
 var userinfovue_type_template_id_4160a4c1_render = function () {
@@ -22064,12 +22067,12 @@ var log = util["a" /* default */].getParams('console');
       this.isLoadHomePage = false;
     }
     this.isHeader = params.header;
-
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted: function mounted() {
     this.handleListener();
     util["a" /* default */].win.addEventListener('popstate', this.stateHandle, false);
+    // this.
   },
 
   methods: {
@@ -22655,6 +22658,7 @@ var log = util["a" /* default */].getParams('console');
           } 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;
@@ -23148,7 +23152,7 @@ var log = util["a" /* default */].getParams('console');
       var _this9 = this;
 
       this.navIds = this.getId(this.menus, page);
-      console.log(page);
+      console.log('handleJump page ', page);
       var prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -23506,8 +23510,8 @@ var log = util["a" /* default */].getParams('console');
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_0c452dea_render,
-  defaultvue_type_template_id_0c452dea_staticRenderFns,
+  defaultvue_type_template_id_b6763862_render,
+  defaultvue_type_template_id_b6763862_staticRenderFns,
   false,
   null,
   null,
@@ -23596,6 +23600,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 //
 //
 //
+//
 
 
 

package/lib/select.js

@@ -4716,7 +4716,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
     symbol: {
       type: String,
-      default: '，'
+      default: ','
     },
     plain: Boolean,
     where: Object,
@@ -5185,8 +5185,12 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     if (!this.hide) {
       if (this.readonly) {
         var dom = [];
-        if (Array.isArray(this.models)) {
-          dom = this.models.map(function (item) {
+        var models = JSON.parse(JSON.stringify(this.models));
+        if (models.includes(',')) {
+          models = models.split(',');
+        }
+        if (Array.isArray(models)) {
+          dom = models.map(function (item) {
             if (util["a" /* default */].isObject(item)) {
               if (!item[_this8.label] && !item.label) {
                 return _this8.getLabel(value[_this8.valKey], data);
@@ -5195,15 +5199,16 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             }
             return _this8.getLabel(item, _this8.results);
           });
-        } else if (util["a" /* default */].isObject(this.models)) {
-          if (!this.models[this.label] && !this.models.label) {
-            dom = [this.getLabel(this.models[this.valKey], this.results)];
+        } else if (util["a" /* default */].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', {
           class: [{
             'es-plain': this.plain,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.87",
+  "version": "0.7.89",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/column.vue

@@ -660,6 +660,7 @@ export default {
     },
     isForm() {
       let type = this.type ? this.type.toLowerCase() : '';
+      console.log('type', type);
       let flag =
         (this.form &&
           [
@@ -799,6 +800,7 @@ export default {
       return Array.isArray(types) ? types.includes(type) : type == types;
     },
     getOptions(config) {
+      console.log('getOptions config', config);
       let option = config && config[this.field || this.prop];
       return option && typeof option == 'object'
         ? { ...this.formOption, ...option }
@@ -816,14 +818,19 @@ export default {
       const field = this.field || this.prop;
       let data = this.option;
       let str = '';
-      if (util.isObject(rows[field])) {
+      console.log('rows[field]', rows[field]);
+      let column = rows[field]?JSON.parse(JSON.stringify(rows[field])):'';
+      if(column.includes(',')){
+        column = column.split(',');
+      }
+      if (util.isObject(column)) {
         str =
-          rows[field][this.labelKey] ||
-          rows[field]['name'] ||
-          rows[field]['label'] ||
-          rows[field]['shortName'];
-      } else if (Array.isArray(rows[field])) {
-        const vals = rows[field].map((item) => {
+          column[this.labelKey] ||
+          column['name'] ||
+          column['label'] ||
+          column['shortName'];
+      } else if (Array.isArray(column)) {
+        const vals = column.map((item) => {
           if (util.isObject(item)) {
             return (
               item[this.labelKey] ||
@@ -838,21 +845,21 @@ export default {
             return item;
           }
         });
-        str = vals.join(this.symbol ? this.symbol : '-');
+        str = vals.join(this.symbol ? this.symbol : ',');
       } else {
         if (this.valueToString) {
-          const vals = rows[field].split(',').map((item) => {
+          const vals = column.split(',').map((item) => {
             if (data && data.length && util.isObject(data[0])) {
               return this.getLabel(data, item);
             }
             return item;
           });
-          str = vals.join(this.symbol ? this.symbol : '-');
+          str = vals.join(this.symbol ? this.symbol : ',');
         } else {
           if (data && data.length && util.isObject(data[0])) {
-            str = this.getLabel(data, rows[field]);
+            str = this.getLabel(data, column);
           } else {
-            str = rows[field];
+            str = column;
           }
         }
       }