eoss-ui 0.7.32 → 0.7.34

package/lib/main.js

@@ -4527,7 +4527,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/main/src/main.vue?vue&type=template&id=1f0f487d&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=1439fd41&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4590,7 +4590,7 @@ var render = function () {
                 key: item.appCode || item.id || item.name || index,
                 attrs: {
                   visible: item.visible,
-                  title: item.name,
+                  title: item.name || item.title,
                   width: item.width,
                   height: item.height,
                   size: item.size,
@@ -4646,13 +4646,13 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=1f0f487d&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=1439fd41&
 
 // 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=772635c6&scoped=true&
-var simplicityvue_type_template_id_772635c6_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=2bc408e2&scoped=true&
+var simplicityvue_type_template_id_2bc408e2_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5362,11 +5362,11 @@ var simplicityvue_type_template_id_772635c6_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_772635c6_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_772635c6_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_2bc408e2_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_2bc408e2_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=772635c6&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=2bc408e2&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 () {
@@ -12480,32 +12480,29 @@ var events = [function (tabs, index, that) {
     handleRefresh: function handleRefresh(arg) {
       var i = arg && arg != true && arg !== 'pageData' ? util["a" /* default */].indexOfObj(this.tabs, arg, 'appCode,code,id,url') : util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
       var tab = this.tabs[i];
-      if (tab.method === 'iframe') {
-        tab.url = util["a" /* default */].handlerUrl(tab.url);
-      } else {
-        var _tab6 = this.tabs[i];
-        if (_tab6.method === 'iframe') {
-          if (arg && arg === 'pageData') {
-            var iframe = document.getElementById(_tab6.id || _tab6.appCode);
-            iframe.contentWindow.postMessage({ method: 'refresh' }, _tab6.url);
-          } else {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab6.url));
-          }
+      if (isIE || tab.method === 'iframe') {
+        if (arg && arg === 'pageData') {
+          var iframe = document.getElementById(tab.id || tab.appCode);
+          iframe.contentWindow.postMessage({ method: 'refresh' }, tab.url);
+        } else {
+          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(tab.url));
         }
-        if (_tab6.method === 'wujie' && _tab6.appCode) {
-          if (arg && arg === 'pageData') {
-            external_wujie_vue2_default.a.$emit('refresh', _tab6);
-          } else {
-            window.document.querySelector('iframe[name=' + _tab6.appCode + ']').contentWindow.location.reload(true);
-          }
+        return;
+      }
+      if (tab.method === 'wujie' && tab.appCode) {
+        if (arg && arg === 'pageData') {
+          external_wujie_vue2_default.a.$emit('refresh', tab);
+        } else {
+          window.document.querySelector('iframe[name=' + tab.appCode + ']').contentWindow.location.reload(true);
         }
-        if (_tab6.method === 'router') {
-          if (arg && arg === 'pageData') {
-            var bus = this.bus || this.$root.Bus;
-            bus.$emit('refresh', _tab6);
-          } else {
-            this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
-          }
+        return;
+      }
+      if (tab.method === 'router') {
+        if (arg && arg === 'pageData') {
+          var bus = this.bus || this.$root.Bus;
+          bus.$emit('refresh', tab);
+        } else {
+          this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
         }
       }
     },
@@ -12846,16 +12843,16 @@ var events = [function (tabs, index, that) {
           this.$set(tab, 'url', util["a" /* default */].handlerUrl(tab.url, param));
           this.tabs.splice(n + 1, 0, tab);
         } else {
-          var _tab7 = this.tabs[i];
-          if (_tab7.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url, param));
+          var _tab6 = this.tabs[i];
+          if (_tab6.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab6.url, param));
           }
-          if (_tab7.method === 'wujie' && _tab7.appCode) {
-            var url = param ? util["a" /* default */].handlerUrl(_tab7.url, param) : _tab7.url;
+          if (_tab6.method === 'wujie' && _tab6.appCode) {
+            var url = param ? util["a" /* default */].handlerUrl(_tab6.url, param) : _tab6.url;
             if (reload || param) {
-              _tab7.url = '';
+              _tab6.url = '';
               this.$nextTick(function () {
-                _tab7.url = url;
+                _tab6.url = url;
               });
             }
             // if (param) {
@@ -12868,8 +12865,8 @@ var events = [function (tabs, index, that) {
             //     .contentWindow.location.reload(true);
             // }
           }
-          if (_tab7.method === 'router') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url, param));
+          if (_tab6.method === 'router') {
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab6.url, param));
             this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
           }
         }
@@ -12933,11 +12930,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_772635c6_scoped_true_render,
-  simplicityvue_type_template_id_772635c6_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_2bc408e2_scoped_true_render,
+  simplicityvue_type_template_id_2bc408e2_scoped_true_staticRenderFns,
   false,
   null,
-  "772635c6",
+  "2bc408e2",
   null
   
 )
@@ -16950,6 +16947,8 @@ var default_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var src_default = (default_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
+var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 //
@@ -17290,7 +17289,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           height = _ref$height === undefined ? '100%' : _ref$height,
           appCode = _ref.appCode,
           id = _ref.id,
-          size = _ref.size;
+          size = _ref.size,
+          config = _objectWithoutProperties(_ref, ['url', 'name', 'width', 'height', 'appCode', 'id', 'size']);
 
       id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       var openModel = util["a" /* default */].getStorage('openModel');
@@ -17305,7 +17305,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         src = pathname + url.replace('./', '/');
       }
       if (openModel && openModel == 'dialog') {
-        var _dialog = {
+        var _dialog = mainvue_type_script_lang_js_extends({
           id: id,
           url: src,
           name: name,
@@ -17314,7 +17314,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           appCode: appCode,
           visible: false,
           size: size
-        };
+        }, config);
         var n = this.dialogs.push(_dialog);
         this.$nextTick(function () {
           _this5.$set(_dialog, 'index', n - 1);
@@ -17436,7 +17436,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     handleIframeLoad: function handleIframeLoad(iframe, data) {
       iframe = iframe ? iframe : document.getElementById(data.appCode || data.id);
       var origin = new URL(iframe.src).origin;
-      iframe.contentWindow.postMessage(data, origin);
+      iframe.contentWindow.postMessage(mainvue_type_script_lang_js_extends({}, data, { method: 'windowOpen' }), origin);
     },
 
 
@@ -17458,7 +17458,11 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
      * @date 2024年9月7日
      **/
     handleClosed: function handleClosed(res, index) {
-      this.dialogs.splice(index, 1);
+      var _this6 = this;
+
+      this.$nextTick(function () {
+        _this6.dialogs.splice(index, 1);
+      });
     },
 
     /**
@@ -17483,6 +17487,15 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
   },
   beforeDestroy: function beforeDestroy() {
     window.removeEventListener('message', this.handleMessage);
+    var bus = this.bus || this.$root.Bus;
+    if (bus) {
+      bus.$off('reLogin');
+      bus.$off('refresh');
+      bus.$off('windowOpen');
+      bus.$off('windowClose');
+      bus.$off('jumpMenu');
+      bus.$off('emit');
+    }
     external_wujie_vue2_default.a.bus.$off('reLogin');
     external_wujie_vue2_default.a.bus.$off('refresh');
     external_wujie_vue2_default.a.bus.$off('jumpMenu');

package/package.json

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

package/packages/main/src/main.vue

@@ -27,7 +27,7 @@
       v-for="(item, index) in dialogs"
       :visible.sync="item.visible"
       :key="item.appCode || item.id || item.name || index"
-      :title="item.name"
+      :title="item.name || item.title"
       :width="item.width"
       :height="item.height"
       :size="item.size"
@@ -345,7 +345,16 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winOpen({ url, name, width = '100%', height = '100%', appCode, id, size }) {
+    winOpen({
+      url,
+      name,
+      width = '100%',
+      height = '100%',
+      appCode,
+      id,
+      size,
+      ...config
+    }) {
       id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       const openModel = util.getStorage('openModel');
       let src = url;
@@ -367,7 +376,8 @@ export default {
           height,
           appCode,
           visible: false,
-          size
+          size,
+          ...config
         };
         let n = this.dialogs.push(dialog);
         this.$nextTick(() => {
@@ -476,7 +486,10 @@ export default {
         ? iframe
         : document.getElementById(data.appCode || data.id);
       const origin = new URL(iframe.src).origin;
-      iframe.contentWindow.postMessage(data, origin);
+      iframe.contentWindow.postMessage(
+        { ...data, method: 'windowOpen' },
+        origin
+      );
     },
 
     /**
@@ -493,7 +506,9 @@ export default {
      * @date 2024年9月7日
      **/
     handleClosed(res, index) {
-      this.dialogs.splice(index, 1);
+      this.$nextTick(() => {
+        this.dialogs.splice(index, 1);
+      });
     },
     /**
      * @desc:主应用向子应用发送事件
@@ -521,6 +536,15 @@ export default {
   },
   beforeDestroy() {
     window.removeEventListener('message', this.handleMessage);
+    const bus = this.bus || this.$root.Bus;
+    if (bus) {
+      bus.$off('reLogin');
+      bus.$off('refresh');
+      bus.$off('windowOpen');
+      bus.$off('windowClose');
+      bus.$off('jumpMenu');
+      bus.$off('emit');
+    }
     WujieVue.bus.$off('reLogin');
     WujieVue.bus.$off('refresh');
     WujieVue.bus.$off('jumpMenu');

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

@@ -1809,34 +1809,31 @@ export default {
           ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
           : util.indexOfObj(this.tabs, this.activeName, 'id');
       let tab = this.tabs[i];
-      if (tab.method === 'iframe') {
-        tab.url = util.handlerUrl(tab.url);
-      } else {
-        let tab = this.tabs[i];
-        if (tab.method === 'iframe') {
-          if (arg && arg === 'pageData') {
-            const iframe = document.getElementById(tab.id || tab.appCode);
-            iframe.contentWindow.postMessage({ method: 'refresh' }, tab.url);
-          } else {
-            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-          }
+      if (isIE || tab.method === 'iframe') {
+        if (arg && arg === 'pageData') {
+          const iframe = document.getElementById(tab.id || tab.appCode);
+          iframe.contentWindow.postMessage({ method: 'refresh' }, tab.url);
+        } else {
+          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
         }
-        if (tab.method === 'wujie' && tab.appCode) {
-          if (arg && arg === 'pageData') {
-            WujieVue.$emit('refresh', tab);
-          } else {
-            window.document
-              .querySelector(`iframe[name=${tab.appCode}]`)
-              .contentWindow.location.reload(true);
-          }
+        return;
+      }
+      if (tab.method === 'wujie' && tab.appCode) {
+        if (arg && arg === 'pageData') {
+          WujieVue.$emit('refresh', tab);
+        } else {
+          window.document
+            .querySelector(`iframe[name=${tab.appCode}]`)
+            .contentWindow.location.reload(true);
         }
-        if (tab.method === 'router') {
-          if (arg && arg === 'pageData') {
-            const bus = this.bus || this.$root.Bus;
-            bus.$emit('refresh', tab);
-          } else {
-            this.$set(this.tabs[i], 'keys', util.uuid());
-          }
+        return;
+      }
+      if (tab.method === 'router') {
+        if (arg && arg === 'pageData') {
+          const bus = this.bus || this.$root.Bus;
+          bus.$emit('refresh', tab);
+        } else {
+          this.$set(this.tabs[i], 'keys', util.uuid());
         }
       }
     },

package/src/index.js

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