eoss-ui 0.6.73 → 0.6.75

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=532a2b35&scoped=true&
+var simplicityvue_type_template_id_532a2b35_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_532a2b35_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_532a2b35_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=532a2b35&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 () {
@@ -11316,6 +11316,9 @@ var events = [function (tabs, index, that) {
               this.themeColor = color;
             }
           }
+          if (results[i].indexUrl) {
+            this.indexUrl = results[i].indexUrl;
+          }
           this.userStyle = results[i];
           this.notify = results[i].notify || '';
         }
@@ -11497,7 +11500,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',
@@ -11519,6 +11522,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;
@@ -11532,8 +11536,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);
@@ -11554,6 +11560,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];
@@ -11572,7 +11579,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;
         }
@@ -11651,7 +11658,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) {
@@ -11898,6 +11905,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);
@@ -11933,6 +11941,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) {
@@ -11940,7 +11949,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);
                 }
               }
             }
@@ -12405,6 +12414,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;
@@ -12498,18 +12508,18 @@ 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_532a2b35_scoped_true_render,
+  simplicityvue_type_template_id_532a2b35_scoped_true_staticRenderFns,
   false,
   null,
-  "a8c92006",
+  "532a2b35",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_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=51c8d794&
-var defaultvue_type_template_id_51c8d794_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=5f979f7b&
+var defaultvue_type_template_id_5f979f7b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13060,11 +13070,11 @@ var defaultvue_type_template_id_51c8d794_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_51c8d794_staticRenderFns = []
-defaultvue_type_template_id_51c8d794_render._withStripped = true
+var defaultvue_type_template_id_5f979f7b_staticRenderFns = []
+defaultvue_type_template_id_5f979f7b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=51c8d794&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=5f979f7b&
 
 // 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=516cb128&
 var userinfovue_type_template_id_516cb128_render = function () {
@@ -15268,6 +15278,9 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           if (util["a" /* default */].startWith(color, '#')) {
             this.color = color;
           }
+          if (results[i].indexUrl) {
+            this.indexUrl = results[i].indexUrl;
+          }
         }
         if (i === 'subsystemExtend' && results[i]) {
           if (results[i].singleLogout) {
@@ -16501,8 +16514,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_51c8d794_render,
-  defaultvue_type_template_id_51c8d794_staticRenderFns,
+  defaultvue_type_template_id_5f979f7b_render,
+  defaultvue_type_template_id_5f979f7b_staticRenderFns,
   false,
   null,
   null,

package/lib/upload.js

@@ -4315,8 +4315,8 @@ module.exports = require("js-base64");
 // 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/upload/src/main.vue?vue&type=template&id=1e0d1d4c&
-var mainvue_type_template_id_1e0d1d4c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
+var mainvue_type_template_id_8bdc905c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4697,10 +4697,10 @@ var mainvue_type_template_id_1e0d1d4c_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_1e0d1d4c_render._withStripped = true
+mainvue_type_template_id_8bdc905c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=1e0d1d4c&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5045,7 +5045,7 @@ var _props;
     showInfo: {
       type: Array,
       default: function _default() {
-        return [{ label: '上传时间', field: 'uploadTime', width: 160 }, { label: '大小', field: 'fileSize', width: 100 }, { label: '上传人', field: 'userName', width: 100 }];
+        return [{ label: '上传时间', field: 'uploadTime', width: 170 }, { label: '大小', field: 'fileSize', width: 100 }, { label: '上传人', field: 'userName', width: 100 }];
       }
     },
     // 上传地址
@@ -5179,6 +5179,7 @@ var _props;
         png: 'es-icon-picture',
         gif: 'es-icon-picture',
         jpg: 'es-icon-picture',
+        jpeg: 'es-icon-picture',
         xls: 'es-icon-excel',
         xlsx: 'es-icon-excel',
         docx: 'es-icon-word',
@@ -5877,7 +5878,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1e0d1d4c_render,
+  mainvue_type_template_id_8bdc905c_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.73",
+  "version": "0.6.75",
   "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/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/default/index.vue

@@ -998,6 +998,9 @@ export default {
           if (util.startWith(color, '#')) {
             this.color = color;
           }
+          if (results[i].indexUrl) {
+            this.indexUrl = results[i].indexUrl;
+          }
         }
         if (i === 'subsystemExtend' && results[i]) {
           if (results[i].singleLogout) {

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

@@ -865,6 +865,9 @@ export default {
               this.themeColor = color;
             }
           }
+          if (results[i].indexUrl) {
+            this.indexUrl = results[i].indexUrl;
+          }
           this.userStyle = results[i];
           this.notify = results[i].notify || '';
         }
@@ -1043,7 +1046,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 +1069,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 +1083,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 +1109,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 +1133,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 +1223,7 @@ export default {
           } else if (
             item.url === res ||
             item.id === res ||
-            (item.appCode && item.appCode === res)
+            item.appCode === res
           ) {
             return item;
           }
@@ -1480,6 +1487,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 +1526,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 +1534,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 +2011,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/upload/src/main.vue

@@ -316,7 +316,7 @@ export default {
       type: Array,
       default() {
         return [
-          { label: '上传时间', field: 'uploadTime', width: 160 },
+          { label: '上传时间', field: 'uploadTime', width: 170 },
           { label: '大小', field: 'fileSize', width: 100 },
           { label: '上传人', field: 'userName', width: 100 }
         ];
@@ -467,6 +467,7 @@ export default {
         png: 'es-icon-picture',
         gif: 'es-icon-picture',
         jpg: 'es-icon-picture',
+        jpeg: 'es-icon-picture',
         xls: 'es-icon-excel',
         xlsx: 'es-icon-excel',
         docx: 'es-icon-word',

package/src/index.js

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