eoss-ui 0.7.30 → 0.7.31

package/lib/main.js

@@ -4514,7 +4514,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=0d6a4fb9&
+// 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=a5fa23da&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4633,7 +4633,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=0d6a4fb9&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a5fa23da&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(20);
@@ -17254,16 +17254,15 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
       var url = _ref.url,
           name = _ref.name,
-          width = _ref.width,
-          height = _ref.height,
+          _ref$width = _ref.width,
+          width = _ref$width === undefined ? '100%' : _ref$width,
+          _ref$height = _ref.height,
+          height = _ref$height === undefined ? '100%' : _ref$height,
           appCode = _ref.appCode,
           id = _ref.id,
           size = _ref.size;
 
-      if (!appCode && !id) {
-        console.error('参数错误，缺少appCode或者id');
-        return;
-      }
+      id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       var openModel = util["a" /* default */].getStorage('openModel');
       var src = url;
       if (!util["a" /* default */].startWith(url, ['http', '/'], true)) {
@@ -17276,7 +17275,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         src = pathname + url.replace('./', '/');
       }
       if (openModel && openModel == 'dialog') {
-        var dialog = {
+        var _dialog = {
           id: id,
           url: src,
           name: name,
@@ -17286,12 +17285,12 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           visible: false,
           size: size
         };
-        var n = this.dialogs.push(dialog);
+        var n = this.dialogs.push(_dialog);
         this.$nextTick(function () {
-          _this5.$set(dialog, 'index', n - 1);
-          _this5.$set(dialog, 'visible', true);
+          _this5.$set(_dialog, 'index', n - 1);
+          _this5.$set(_dialog, 'visible', true);
         });
-        return dialog;
+        return _dialog;
       }
 
       if (name) {
@@ -17317,21 +17316,34 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
      * @date 2024年9月7日
      **/
     winClose: function winClose(_ref2) {
+      var _$refs$main;
+
       var url = _ref2.url,
           appCode = _ref2.appCode,
-          id = _ref2.id;
+          id = _ref2.id,
+          index = _ref2.index,
+          refresh = _ref2.refresh,
+          jumpMenu = _ref2.jumpMenu;
 
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
       }
-      var dialog = this.dialogs.find(function (item) {
-        return item.url == url || item.appCode == appCode || item.id == id;
-      });
-      if (dialog) {
-        this.$set(dialog, 'visible', false);
+      if (index) {
+        this.$set(this.dialogs, 'visible', false);
         this.dialogs.splice(dialog.index, 1);
+      } else {
+        var _dialog2 = this.dialogs.find(function (item) {
+          return item.url == url || item.appCode == appCode || item.id == id;
+        });
+
+        if (_dialog2) {
+          this.$set(_dialog2, 'visible', false);
+          this.dialogs.splice(_dialog2.index, 1);
+        }
       }
+      refresh && this.$refs.main.handleRefresh(refresh);
+      jumpMenu && (Array.isArray(jumpMenu) ? (_$refs$main = this.$refs.main).jumpMenu.apply(_$refs$main, jumpMenu) : this.$refs.main.jumpMenu(jumpMenu));
     },
 
 
@@ -17341,17 +17353,11 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
      * @date 2024年9月7日
      **/
     handleMessage: function handleMessage(e) {
-      var _$refs$main,
-          _this6 = this,
-          _$refs$main2,
-          _$refs$main3;
+      var _$refs$main2;
 
       var _e$data = e.data,
           method = _e$data.method,
           args = _e$data.args;
-      var index = args.index,
-          refresh = args.refresh,
-          jumpMenu = args.jumpMenu;
 
       switch (method) {
         case 'reLogin':
@@ -17361,7 +17367,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           this.$refs.main.handleRefresh(args);
           break;
         case 'jumpMenu':
-          Array.isArray(args) ? (_$refs$main = this.$refs.main).jumpMenu.apply(_$refs$main, args) : this.$refs.main.jumpMenu(args);
+          Array.isArray(args) ? (_$refs$main2 = this.$refs.main).jumpMenu.apply(_$refs$main2, args) : this.$refs.main.jumpMenu(args);
           break;
         case 'emit':
           var origin = args.origin,
@@ -17374,43 +17380,19 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           break;
         case 'openDialog':
           //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(function () {
-            _this6.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'closeDialog':
           //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu && (Array.isArray(jumpMenu) ? (_$refs$main2 = this.$refs.main).jumpMenu.apply(_$refs$main2, jumpMenu) : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
         case 'windowOpen':
           //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(function () {
-            _this6.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'windowClose':
           //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu && (Array.isArray(jumpMenu) ? (_$refs$main3 = this.$refs.main).jumpMenu.apply(_$refs$main3, jumpMenu) : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
       }
     },

package/package.json

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

package/packages/main/src/main.vue

@@ -346,11 +346,8 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winOpen({ url, name, width, height, appCode, id, size }) {
-      if (!appCode && !id) {
-        console.error('参数错误，缺少appCode或者id');
-        return;
-      }
+    winOpen({ url, name, width = '100%', height = '100%', appCode, id, size }) {
+      id = id ? id : appCode ?undefined: 'iframe' + this.dialogs.length;
       const openModel = util.getStorage('openModel');
       let src = url;
       if (!util.startWith(url, ['http', '/'], true)) {
@@ -406,18 +403,29 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winClose({ url, appCode, id }) {
+    winClose({ url, appCode, id, index, refresh, jumpMenu }) {
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
       }
-      let dialog = this.dialogs.find(
-        (item) => item.url == url || item.appCode == appCode || item.id == id
-      );
-      if (dialog) {
-        this.$set(dialog, 'visible', false);
+      if (index) {
+        this.$set(this.dialogs, 'visible', false);
         this.dialogs.splice(dialog.index, 1);
+      } else {
+        let dialog = this.dialogs.find(
+          (item) => item.url == url || item.appCode == appCode || item.id == id
+        );
+
+        if (dialog) {
+          this.$set(dialog, 'visible', false);
+          this.dialogs.splice(dialog.index, 1);
+        }
       }
+      refresh && this.$refs.main.handleRefresh(refresh);
+      jumpMenu &&
+        (Array.isArray(jumpMenu)
+          ? this.$refs.main.jumpMenu(...jumpMenu)
+          : this.$refs.main.jumpMenu(jumpMenu));
     },
 
     /**
@@ -427,7 +435,6 @@ export default {
      **/
     handleMessage(e) {
       const { method, args } = e.data;
-      const { index, refresh, jumpMenu } = args;
       switch (method) {
         case 'reLogin':
           this.handleReLogin(args);
@@ -446,46 +453,16 @@ export default {
           iframe.contentWindow.postMessage(data, origin ? origin : '*');
           break;
         case 'openDialog': //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(() => {
-            this.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'closeDialog': //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu &&
-            (Array.isArray(jumpMenu)
-              ? this.$refs.main.jumpMenu(...jumpMenu)
-              : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
         case 'windowOpen': //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(() => {
-            this.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'windowClose': //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu &&
-            (Array.isArray(jumpMenu)
-              ? this.$refs.main.jumpMenu(...jumpMenu)
-              : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
       }
     },

package/src/index.js

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