eoss-ui 0.6.72 → 0.6.74

package/lib/login.js

@@ -4340,7 +4340,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // 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/login/src/main.vue?vue&type=template&id=7795d992&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=5a822b69&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5634,7 +5634,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=7795d992&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5a822b69&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -7186,10 +7186,6 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       downloadSetup: '',
       app: '',
       qrimg: '',
-      ios: '',
-      android: '',
-      pad: '',
-      ipad: '',
       interval: null,
       showResetPassword: false,
       operationCheckCode: '',

package/lib/main.js

@@ -4419,8 +4419,8 @@ render._withStripped = true
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(20);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=a8c92006&scoped=true&
-var simplicityvue_type_template_id_a8c92006_scoped_true_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/simplicity/index.vue?vue&type=template&id=7ecd2ea0&scoped=true&
+var simplicityvue_type_template_id_7ecd2ea0_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5086,11 +5086,11 @@ var simplicityvue_type_template_id_a8c92006_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_a8c92006_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_a8c92006_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_7ecd2ea0_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_7ecd2ea0_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=a8c92006&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=7ecd2ea0&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -7214,8 +7214,8 @@ var apps_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity_apps = (apps_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/simplicity/user.vue?vue&type=template&id=1d4b46d0&scoped=true&
-var uservue_type_template_id_1d4b46d0_scoped_true_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/simplicity/user.vue?vue&type=template&id=d789fc64&scoped=true&
+var uservue_type_template_id_d789fc64_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7280,9 +7280,9 @@ var uservue_type_template_id_1d4b46d0_scoped_true_render = function () {
               ]),
               _vm.user.postName
                 ? [
-                    _vm._v("\n        |"),
+                    _vm._v("\n        |\n        "),
                     _c("span", { staticClass: "es-simplicity-post-name" }, [
-                      _vm._v(_vm._s(_vm.user.postName)),
+                      _vm._v(_vm._s(_vm.user.position || _vm.user.postName)),
                     ]),
                   ]
                 : _vm._e(),
@@ -7376,11 +7376,11 @@ var uservue_type_template_id_1d4b46d0_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_1d4b46d0_scoped_true_staticRenderFns = []
-uservue_type_template_id_1d4b46d0_scoped_true_render._withStripped = true
+var uservue_type_template_id_d789fc64_scoped_true_staticRenderFns = []
+uservue_type_template_id_d789fc64_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=1d4b46d0&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=d789fc64&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=1c52f6d2&
 var userinfovue_type_template_id_1c52f6d2_render = function () {
@@ -7756,6 +7756,9 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
 
 
 
@@ -7944,11 +7947,11 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 
 var user_component = Object(componentNormalizer["a" /* default */])(
   simplicity_uservue_type_script_lang_js_,
-  uservue_type_template_id_1d4b46d0_scoped_true_render,
-  uservue_type_template_id_1d4b46d0_scoped_true_staticRenderFns,
+  uservue_type_template_id_d789fc64_scoped_true_render,
+  uservue_type_template_id_d789fc64_scoped_true_staticRenderFns,
   false,
   null,
-  "1d4b46d0",
+  "d789fc64",
   null
   
 )
@@ -11494,7 +11497,7 @@ var events = [function (tabs, index, that) {
       store["a" /* default */].set('nav', this.menus);
       if (this.indexUrl) {
         var obj = this.getMenu(this.menus, this.indexUrl);
-        obj = obj ? obj : {
+        obj = obj ? JSON.parse(JSON.stringify(obj)) : {
           url: this.indexUrl,
           text: '工作台',
           id: '0',
@@ -11516,6 +11519,7 @@ var events = [function (tabs, index, that) {
           if (app.url) {
             var _obj = this.getMenu(this.menus, app.url);
             if (_obj) {
+              _obj = JSON.parse(JSON.stringify(_obj));
               var tab = this.setIframeType(_obj);
               this.tabs = [tab];
               this.activeName = tab.id;
@@ -11529,8 +11533,10 @@ var events = [function (tabs, index, that) {
           if (subMenus) {
             var _obj2 = this.getMenu(this.menus, this.appCode, 'appCode');
             if (_obj2) {
-              if (!_obj2.url) {
-                _obj2 = this.getFirst(_obj2);
+              if (_obj2.url) {
+                _obj2 = JSON.parse(JSON.stringify(_obj2));
+              } else {
+                _obj2 = JSON.parse(JSON.stringify(this.getFirst(_obj2)));
               }
               this.subActive = _obj2.id;
               var _tab = this.setIframeType(_obj2);
@@ -11551,6 +11557,7 @@ var events = [function (tabs, index, that) {
             if (this.tabs.length == 0) {
               var _obj3 = this.getFirst(_subMenus);
               if (_obj3) {
+                _obj3 = JSON.parse(JSON.stringify(_obj3));
                 this.subActive = _obj3.id;
                 var _tab2 = this.setIframeType(_obj3);
                 this.tabs = [_tab2];
@@ -11569,7 +11576,7 @@ var events = [function (tabs, index, that) {
       } else if (this.initApps && this.initApps.length && !this.indexUrl) {
         var _obj4 = this.getMenu(this.menus, this.initApps[this.initApps.length - 1]);
         if (_obj4) {
-          var _tab3 = this.setIframeType(_obj4);
+          var _tab3 = this.setIframeType(JSON.parse(JSON.stringify(_obj4)));
           this.tabs.push(_tab3);
           this.activeName = _tab3.id;
         }
@@ -11648,7 +11655,7 @@ var events = [function (tabs, index, that) {
             if (item[key] === res) {
               return item;
             }
-          } else if (item.url === res || item.id === res || item.appCode && item.appCode === res) {
+          } else if (item.url === res || item.id === res || item.appCode === res) {
             return item;
           }
           if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
@@ -11895,6 +11902,7 @@ var events = [function (tabs, index, that) {
             if (i == -1) {
               var obj = res.code ? this.getMenu(this.menus, res.code, 'appCode') : null;
               if (obj) {
+                obj = JSON.parse(JSON.stringify(obj));
                 var n = util["a" /* default */].indexOfObj(this.tabs, obj, 'id');
                 if (n == -1) {
                   var tab = this.setIframeType(obj);
@@ -11930,6 +11938,7 @@ var events = [function (tabs, index, that) {
             this.showMenu = subMenus ? subMenus.children && subMenus.children.length > 0 || subMenus.fourthTabs && subMenus.fourthTabs.length > 0 : false;
             this.showApps = false;
             if (subMenus && subMenus.url) {
+              subMenus = JSON.parse(JSON.stringify(subMenus));
               var _i = util["a" /* default */].indexOfObj(this.tabs, subMenus, 'id');
               this.activeName = subMenus.id;
               if (_i == -1) {
@@ -11937,7 +11946,7 @@ var events = [function (tabs, index, that) {
                 this.tabs.push(_tab5);
               } else {
                 if (subMenus.method == 'iframe') {
-                  subMenus.url = util["a" /* default */].handlerUrl(subMenus.url);
+                  this.tabs[_i].url = util["a" /* default */].handlerUrl(subMenus.url);
                 }
               }
             }
@@ -12402,6 +12411,7 @@ var events = [function (tabs, index, that) {
       }
       var obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
+        obj = JSON.parse(JSON.stringify(obj));
         var i = util["a" /* default */].indexOfObj(this.tabs, obj, 'id,code,appCode');
         var n = util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
         var old = this.activeName;
@@ -12495,11 +12505,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_a8c92006_scoped_true_render,
-  simplicityvue_type_template_id_a8c92006_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_7ecd2ea0_scoped_true_render,
+  simplicityvue_type_template_id_7ecd2ea0_scoped_true_staticRenderFns,
   false,
   null,
-  "a8c92006",
+  "7ecd2ea0",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.72",
+  "version": "0.6.74",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -99,7 +99,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.47",
+    "eoss-element": "^0.3.48",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -356,7 +356,7 @@ export default {
     // 无数据时显示的文本
     emptyText: {
       type: String,
-      default: ''
+      default: '暂无数据'
     },
     // 是否开启合计行区域
     total: {

package/packages/login/src/main.vue

@@ -990,10 +990,6 @@ export default {
       downloadSetup: '',
       app: '',
       qrimg: '',
-      ios: '',
-      android: '',
-      pad: '',
-      ipad: '',
       interval: null,
       showResetPassword: false,
       operationCheckCode: '',

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

@@ -1043,7 +1043,7 @@ export default {
       if (this.indexUrl) {
         let obj = this.getMenu(this.menus, this.indexUrl);
         obj = obj
-          ? obj
+          ? JSON.parse(JSON.stringify(obj))
           : {
               url: this.indexUrl,
               text: '工作台',
@@ -1066,6 +1066,7 @@ export default {
           if (app.url) {
             let obj = this.getMenu(this.menus, app.url);
             if (obj) {
+              obj = JSON.parse(JSON.stringify(obj));
               let tab = this.setIframeType(obj);
               this.tabs = [tab];
               this.activeName = tab.id;
@@ -1079,8 +1080,10 @@ export default {
           if (subMenus) {
             let obj = this.getMenu(this.menus, this.appCode, 'appCode');
             if (obj) {
-              if (!obj.url) {
-                obj = this.getFirst(obj);
+              if (obj.url) {
+                obj = JSON.parse(JSON.stringify(obj));
+              } else {
+                obj = JSON.parse(JSON.stringify(this.getFirst(obj)));
               }
               this.subActive = obj.id;
               let tab = this.setIframeType(obj);
@@ -1103,6 +1106,7 @@ export default {
             if (this.tabs.length == 0) {
               let obj = this.getFirst(subMenus);
               if (obj) {
+                obj = JSON.parse(JSON.stringify(obj));
                 this.subActive = obj.id;
                 let tab = this.setIframeType(obj);
                 this.tabs = [tab];
@@ -1126,7 +1130,7 @@ export default {
           this.initApps[this.initApps.length - 1]
         );
         if (obj) {
-          let tab = this.setIframeType(obj);
+          let tab = this.setIframeType(JSON.parse(JSON.stringify(obj)));
           this.tabs.push(tab);
           this.activeName = tab.id;
         }
@@ -1216,7 +1220,7 @@ export default {
           } else if (
             item.url === res ||
             item.id === res ||
-            (item.appCode && item.appCode === res)
+            item.appCode === res
           ) {
             return item;
           }
@@ -1480,6 +1484,7 @@ export default {
                 ? this.getMenu(this.menus, res.code, 'appCode')
                 : null;
               if (obj) {
+                obj = JSON.parse(JSON.stringify(obj));
                 let n = util.indexOfObj(this.tabs, obj, 'id');
                 if (n == -1) {
                   let tab = this.setIframeType(obj);
@@ -1518,6 +1523,7 @@ export default {
               : false;
             this.showApps = false;
             if (subMenus && subMenus.url) {
+              subMenus = JSON.parse(JSON.stringify(subMenus));
               let i = util.indexOfObj(this.tabs, subMenus, 'id');
               this.activeName = subMenus.id;
               if (i == -1) {
@@ -1525,7 +1531,7 @@ export default {
                 this.tabs.push(tab);
               } else {
                 if (subMenus.method == 'iframe') {
-                  subMenus.url = util.handlerUrl(subMenus.url);
+                  this.tabs[i].url = util.handlerUrl(subMenus.url);
                 }
               }
             }
@@ -2002,6 +2008,7 @@ export default {
       }
       let obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
+        obj = JSON.parse(JSON.stringify(obj));
         let i = util.indexOfObj(this.tabs, obj, 'id,code,appCode');
         let n = util.indexOfObj(this.tabs, this.activeName, 'id');
         let old = this.activeName;

package/packages/main/src/simplicity/user.vue

@@ -27,7 +27,10 @@
       <div class="es-simplicity-dep-post">
         <span class="es-simplicity-dep-name"> {{ user.depName }}</span>
         <template v-if="user.postName">
-          |<span class="es-simplicity-post-name">{{ user.postName }}</span>
+          |
+          <span class="es-simplicity-post-name">{{
+            user.position || user.postName
+          }}</span>
         </template>
       </div>
 

package/src/index.js

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