eoss-ui 0.7.24 → 0.7.25

package/lib/input-number.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/input.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/login.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/main.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq
@@ -4599,8 +4602,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=7cb3c8cc&scoped=true&
-var simplicityvue_type_template_id_7cb3c8cc_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=2bfc5645&scoped=true&
+var simplicityvue_type_template_id_2bfc5645_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5160,12 +5163,21 @@ var simplicityvue_type_template_id_7cb3c8cc_scoped_true_render = function () {
                       )
                     : _vm.isIE || item.method == "iframe"
                     ? _c("iframe", {
+                        directives: [
+                          {
+                            name: "loading",
+                            rawName: "v-loading",
+                            value: item.loading,
+                            expression: "item.loading",
+                          },
+                        ],
                         attrs: {
-                          id: _vm.activeName == item.id ? _vm.iframeId : "",
-                          name: _vm.activeName == item.id ? _vm.iframeId : "",
                           frameborder: "0",
                           width: "100%",
                           height: "100%",
+                          id: _vm.activeName == item.id ? _vm.iframeId : "",
+                          name: _vm.activeName == item.id ? _vm.iframeId : "",
+                          onload: _vm.handleLoadIframe(item),
                           src: item.url,
                         },
                       })
@@ -5294,11 +5306,11 @@ var simplicityvue_type_template_id_7cb3c8cc_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_7cb3c8cc_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_7cb3c8cc_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_2bfc5645_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_2bfc5645_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=7cb3c8cc&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=2bfc5645&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 () {
@@ -11111,6 +11123,8 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
 
 
 
@@ -12788,6 +12802,9 @@ var events = [function (tabs, index, that) {
       if (parent.name === '菜单') {
         this.handlerClickApp(res);
       }
+    },
+    handleLoadIframe: function handleLoadIframe(item) {
+      this.$set(item, 'loading', false);
     }
   },
   beforeDestroy: function beforeDestroy() {
@@ -12810,11 +12827,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_7cb3c8cc_scoped_true_render,
-  simplicityvue_type_template_id_7cb3c8cc_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_2bfc5645_scoped_true_render,
+  simplicityvue_type_template_id_2bfc5645_scoped_true_staticRenderFns,
   false,
   null,
-  "7cb3c8cc",
+  "2bfc5645",
   null
   
 )

package/lib/nav.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/page.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/pagination.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/player.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/qr-code.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/radio-group.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/retrial-auth.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/select-ganged.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/select.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/selector-panel.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/selector.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/sizer.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/steps.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/switch.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/table-form.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/tabs.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/tips.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/toolbar.js

@@ -305,13 +305,13 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       }
       this.$emit('search', _extends({}, data, other));
     },
-    handleChange: function handleChange(key, value, data, item) {
+    handleChange: function handleChange(key, value, data, values, items) {
       var obj = {};
       obj[key] = value;
-      if (item.changeSearch) {
-        this.$emit('search', obj);
+      if (items.changeSearch) {
+        this.$emit('search', values);
       }
-      this.$emit('change', key, value, data);
+      this.$emit('change', key, value, data, values);
     },
     hanleSubmit: function hanleSubmit(data) {
       if (this.close) {

package/lib/tree-group.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/tree.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/upload.js

@@ -2286,7 +2286,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/utils/util.js

@@ -2203,7 +2203,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/wujie.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/lib/wxlogin.js

@@ -2287,7 +2287,10 @@ var isLogined = function () {
                   loginPage = pathname + loginPage.replace('./', '');
                 }
               }
+            } else {
+              loginPage = getStorage('login') || getStorage('loginPage');
             }
+
             token = getStorage('token') || getStorage('Authorization');
             // const logined = getStorage('logined');
             // eslint-disable-next-line eqeqeq

package/package.json

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

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

@@ -273,11 +273,13 @@
           ></router-page>
           <iframe
             v-else-if="isIE || item.method == 'iframe'"
-            :id="activeName == item.id ? iframeId : ''"
-            :name="activeName == item.id ? iframeId : ''"
+            v-loading="item.loading"
             frameborder="0"
             width="100%"
             height="100%"
+            :id="activeName == item.id ? iframeId : ''"
+            :name="activeName == item.id ? iframeId : ''"
+            :onload="handleLoadIframe(item)"
             :src="item.url"
           ></iframe>
           <es-wujie
@@ -2110,6 +2112,9 @@ export default {
       if (parent.name === '菜单') {
         this.handlerClickApp(res);
       }
+    },
+    handleLoadIframe(item) {
+      this.$set(item, 'loading', false);
     }
   },
   beforeDestroy() {

package/packages/toolbar/src/main.vue

@@ -97,13 +97,13 @@ export default {
       }
       this.$emit('search', { ...data, ...other });
     },
-    handleChange(key, value, data, item) {
+    handleChange(key, value, data, values, items) {
       let obj = {};
       obj[key] = value;
-      if (item.changeSearch) {
-        this.$emit('search', obj);
+      if (items.changeSearch) {
+        this.$emit('search', values);
       }
-      this.$emit('change', key, value, data);
+      this.$emit('change', key, value, data, values);
     },
     hanleSubmit(data) {
       if (this.close) {

package/src/index.js

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

package/src/utils/util.js

@@ -2230,7 +2230,10 @@ const isLogined = async function ({
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
+  } else {
+    loginPage = getStorage('login') || getStorage('loginPage');
   }
+
   const token = getStorage('token') || getStorage('Authorization');
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq