eoss-ui 0.8.1 → 0.8.2

package/lib/main.js

@@ -19595,8 +19595,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=b6763862&
-var defaultvue_type_template_id_b6763862_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=96a9ec3e&
+var defaultvue_type_template_id_96a9ec3e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -20147,11 +20147,11 @@ var defaultvue_type_template_id_b6763862_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_b6763862_staticRenderFns = []
-defaultvue_type_template_id_b6763862_render._withStripped = true
+var defaultvue_type_template_id_96a9ec3e_staticRenderFns = []
+defaultvue_type_template_id_96a9ec3e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=b6763862&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=96a9ec3e&
 
 // 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=7e14e68e&
 var userinfovue_type_template_id_7e14e68e_render = function () {
@@ -22751,7 +22751,10 @@ 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 });
+            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;
@@ -23603,8 +23606,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_b6763862_render,
-  defaultvue_type_template_id_b6763862_staticRenderFns,
+  defaultvue_type_template_id_96a9ec3e_render,
+  defaultvue_type_template_id_96a9ec3e_staticRenderFns,
   false,
   null,
   null,

package/lib/select.js

@@ -5136,16 +5136,20 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             return value;
           }
           if (Array.isArray(data) && data.length) {
+            var tempLabel = '';
             for (var i = 0; i < data.length; i++) {
               var _val = this.getLabel(value, data[i]);
               if (_val) {
+                tempLabel = _val;
                 return _val;
               }
             }
+            if (!tempLabel) {
+              return value;
+            }
           }
         }
       }
-      return value;
     },
     reload: function reload() {
       this.getData.apply(this, arguments);
@@ -5274,7 +5278,6 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           dom = [_label2 !== null ? _label2 : models];
         }
         console.log('dom', dom);
-        console.log('dom.join(this.symbol)', dom.join(this.symbol));
         return h('div', {
           class: [{
             'es-plain': this.plain,

package/lib/tree-group.js

@@ -4626,7 +4626,7 @@ module.exports = require("json-bigint");
 // 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/tree-group/src/main.vue?vue&type=template&id=340aa9f8&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=744e07c8&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4994,7 +4994,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=340aa9f8&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=744e07c8&
 
 // EXTERNAL MODULE: ./src/utils/util.js + 1 modules
 var util = __webpack_require__(0);
@@ -5388,20 +5388,24 @@ var systemMode = util["a" /* default */].getWinTopProperty('systemMode', 'defaul
           var params = {};
           if (Array.isArray(this.checkeds)) {
             if (this.syncKeys && util["a" /* default */].isObject(this.syncKeys)) {
-              var _loop = function _loop(i) {
-                params[i] = _this.checkeds.map(function (item) {
-                  if (Object.prototype.hasOwnProperty.call(item, _this.syncKeys[i])) {
-                    return item[_this.syncKeys[i]];
-                  } else {
-                    var data = JSON.parse(item.data.objdata);
-                    return data[_this.syncKeys[i]];
-                  }
-                }).join(',');
-              };
+              (function () {
+                var syncKeys = _this.tabs && _this.tabs.length ? _this.syncKeys[Number(_this.active)] || _this.syncKeys : _this.syncKeys;
+
+                var _loop = function _loop(i) {
+                  params[i] = _this.checkeds.map(function (item) {
+                    if (Object.prototype.hasOwnProperty.call(item, syncKeys[i])) {
+                      return item[syncKeys[i]];
+                    } else {
+                      var data = JSON.parse(item.data.objdata);
+                      return data[syncKeys[i]];
+                    }
+                  }).join(',');
+                };
 
-              for (var i in this.syncKeys) {
-                _loop(i);
-              }
+                for (var i in syncKeys) {
+                  _loop(i);
+                }
+              })();
             } else {
               params.id = this.checkeds.map(function (item) {
                 return item.id;
@@ -5409,8 +5413,9 @@ var systemMode = util["a" /* default */].getWinTopProperty('systemMode', 'defaul
             }
           } else {
             if (this.syncKeys && util["a" /* default */].isObject(this.syncKeys)) {
-              for (var i in this.syncKeys) {
-                params[i] = this.checkeds[this.syncKeys[i]];
+              var syncKeys = this.tabs && this.tabs.length ? this.syncKeys[Number(this.active)] || this.syncKeys : this.syncKeys;
+              for (var i in syncKeys) {
+                params[i] = this.checkeds[syncKeys[i]];
               }
             } else {
               params.id = this.checkeds.id;

package/package.json

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

package/packages/flow/src/main.vue

@@ -513,6 +513,7 @@
                   prop="nextCurrentOrgObj"
                   :label="currentOrgName ? currentOrgName : '本单位'"
                 >
+                <!-- :radioList="radioList" -->
                   <SelectUser
                     :nextUser="nextCurrentOrgObjSelect"
                     multiple

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

@@ -1403,7 +1403,10 @@ export default {
           } else {
             this.menu = res[0].children;
             this.title = res[0].text;
-            this.$emit('getOriginParentMenu', {title: res[0].text, id: res[0].id});
+            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;
@@ -1923,7 +1926,7 @@ export default {
     //跳转页面
     handleJump(page, type, res, param) {
       this.navIds = this.getId(this.menus, page);
-      console.log('handleJump page ',page);
+      console.log('handleJump page ', page);
       let prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {

package/packages/select/src/main.vue

@@ -524,16 +524,20 @@ export default {
             return value;
           }
           if (Array.isArray(data) && data.length) {
+            let tempLabel = '';
             for (let i = 0; i < data.length; i++) {
               let val = this.getLabel(value, data[i]);
               if (val) {
+                tempLabel = val;
                 return val;
               }
             }
+            if (!tempLabel) {
+              return value;
+            }
           }
         }
       }
-      return value;
     },
     reload() {
       this.getData(...arguments);
@@ -671,7 +675,6 @@ export default {
           dom = [label !== null ? label : models];
         }
         console.log('dom', dom);
-        console.log('dom.join(this.symbol)', dom.join(this.symbol));
         return h(
           'div',
           {

package/packages/tree-group/src/main.vue

@@ -393,19 +393,20 @@ export default {
           let params = {};
           if (Array.isArray(this.checkeds)) {
             if (this.syncKeys && util.isObject(this.syncKeys)) {
-              for (let i in this.syncKeys) {
+              const syncKeys =
+                this.tabs && this.tabs.length
+                  ? this.syncKeys[Number(this.active)] || this.syncKeys
+                  : this.syncKeys;
+              for (let i in syncKeys) {
                 params[i] = this.checkeds
                   .map((item) => {
                     if (
-                      Object.prototype.hasOwnProperty.call(
-                        item,
-                        this.syncKeys[i]
-                      )
+                      Object.prototype.hasOwnProperty.call(item, syncKeys[i])
                     ) {
-                      return item[this.syncKeys[i]];
+                      return item[syncKeys[i]];
                     } else {
                       let data = JSON.parse(item.data.objdata);
-                      return data[this.syncKeys[i]];
+                      return data[syncKeys[i]];
                     }
                   })
                   .join(',');
@@ -419,8 +420,12 @@ export default {
             }
           } else {
             if (this.syncKeys && util.isObject(this.syncKeys)) {
-              for (let i in this.syncKeys) {
-                params[i] = this.checkeds[this.syncKeys[i]];
+              const syncKeys =
+                this.tabs && this.tabs.length
+                  ? this.syncKeys[Number(this.active)] || this.syncKeys
+                  : this.syncKeys;
+              for (let i in syncKeys) {
+                params[i] = this.checkeds[syncKeys[i]];
               }
             } else {
               params.id = this.checkeds.id;

package/src/index.js

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