eoss-ui 0.7.24 → 0.7.25

package/lib/button-group.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/button.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/calogin.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/checkbox-group.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/data-table-form.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/data-table.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/date-picker.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/dialog.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/eoss-ui.common.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
@@ -60533,8 +60536,8 @@ mainvue_type_template_id_d57cecee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=d57cecee&
 
-// 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
@@ -61094,12 +61097,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,
                         },
                       })
@@ -61228,11 +61240,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 () {
@@ -67030,6 +67042,8 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
 
 
 
@@ -68707,6 +68721,9 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
       if (parent.name === '菜单') {
         this.handlerClickApp(res);
       }
+    },
+    handleLoadIframe: function handleLoadIframe(item) {
+      this.$set(item, 'loading', false);
     }
   },
   beforeDestroy: function beforeDestroy() {
@@ -68729,11 +68746,11 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
 
 var simplicity_component = normalizeComponent(
   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
   
 )
@@ -87200,13 +87217,13 @@ function toolbar_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, ke
       }
       this.$emit('search', toolbar_src_mainvue_type_script_lang_js_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) {
@@ -93875,7 +93892,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.7.24',
+  version: '0.7.25',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.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/flow-list.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/flow.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/form.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/handle-user.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/handler.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/icon.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