eoss-ui 0.7.28 → 0.7.30

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

@@ -952,7 +952,7 @@ export default {
           document.title = results[i];
         }
         if (i === 'loginPage' && results[i]) {
-          util.setStorage('loginPage', results[i]);
+          util.setStorage({ key: 'loginPage', value: results[i] });
         }
         if (i === 'sysLogoIco' && results[i]) {
           localStorage.setItem('sysLogoIco', results[i]);
@@ -986,7 +986,7 @@ export default {
             } catch (error) {}
           }
           if (results[i].loginPage) {
-            util.setStorage('loginPage', results[i].loginPage);
+            util.setStorage({ key: 'loginPage', value: results[i].loginPage });
           }
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;

package/packages/main/src/main.vue

@@ -25,24 +25,33 @@
     <!-- 公用弹窗 -->
     <es-dialog
       v-for="(item, index) in dialogs"
-      :visible.sync="visibles[index]"
-      :key="item.id || item.name || index"
-      size="md"
-      v-bind="
-        exclAttribute({
-          data: item,
-          attrs: ['visible', 'url']
-        })
-      "
+      :visible.sync="item.visible"
+      :key="item.appCode || item.id || item.name || index"
+      :title="item.name"
+      :width="item.width"
+      :height="item.height"
+      :size="item.size"
       @close="handleClosed(item, index)"
     >
-      <iframe
-        v-if="visibles[index]"
-        width="100%"
-        height="100%"
-        frameborder="0"
-        :src="item.url"
-      ></iframe>
+      <template v-if="item.visible">
+        <es-wujie
+          v-if="item.openModel === 'wujie' && !isIE"
+          :host="host"
+          :show="true"
+          :name="item.appCode"
+          :url="item.url"
+          :props="item"
+        ></es-wujie>
+        <iframe
+          v-else
+          width="100%"
+          height="100%"
+          frameborder="0"
+          :id="item.appCode || item.id"
+          :src="item.url"
+          @load="(event) => handleIframeLoad(event.target, item)"
+        ></iframe>
+      </template>
     </es-dialog>
     <!-- 公用弹窗 end -->
   </div>
@@ -53,6 +62,7 @@ import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
+import { size } from 'lodash';
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -102,7 +112,8 @@ export default {
       visibles: [],
       isLogin: false,
       layoutType: this.type,
-      layout: this.scene
+      layout: this.scene,
+      isIE: /MSIE|Trident/.test(navigator.userAgent)
     };
   },
   created() {
@@ -142,6 +153,8 @@ export default {
         if (bus) {
           bus.$on('reLogin', this.handleReLogin);
           bus.$on('refresh', this.$refs.main.handleRefresh);
+          bus.$on('windowOpen', this.winOpen);
+          bus.$on('windowClose', this.winClose);
           bus.$on('jumpMenu', this.$refs.main.jumpMenu);
           bus.$on('emit', (method, args) => {
             // 主应用发送事件
@@ -149,65 +162,21 @@ export default {
           });
         }
         util.win.reLogin = this.handleReLogin;
-        util.win.windowOpen = this.openPage;
+        util.win.windowOpen = this.winOpen;
+        util.win.windowClose = this.winClose;
         util.win.refresh = this.$refs.main.handleRefresh;
         util.win.jumpMenu = this.$refs.main.jumpMenu;
         WujieVue.bus.$on('reLogin', this.handleReLogin);
         WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
         WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
+        WujieVue.bus.$on('windowOpen', this.$refs.main.winOpen);
+        WujieVue.bus.$on('windowClose', this.$refs.main.winClose);
         WujieVue.bus.$on('emit', (method, args) => {
           // 主应用发送事件
           WujieVue.bus.$emit(method, args);
         });
 
-        window.addEventListener('message', (e) => {
-          const { method, args } = e.data;
-          switch (method) {
-            case 'reLogin':
-              this.handleReLogin(args);
-              break;
-            case 'refresh':
-              this.$refs.main.handleRefresh(args);
-              break;
-            case 'jumpMenu':
-              Array.isArray(args)
-                ? this.$refs.main.jumpMenu(...args)
-                : this.$refs.main.jumpMenu(args);
-              break;
-            case 'emit':
-              const { origin, ...data } = args;
-              let iframes = document.getElementsByTagName('iframe');
-              iframes = iframes.filter((item) => {
-                return origin
-                  ? item.src.indexOf(origin) > -1
-                  : item.src.indexOf(e.origin) == -1;
-              });
-              for (let i = 0; i < iframes.length; i++) {
-                iframes[i] &&
-                  iframes[i].contentWindow.postMessage(
-                    data,
-                    origin ? origin : '*'
-                  );
-              }
-              break;
-            case 'openDialog':
-              this.dialogs.push(args);
-              let index = this.visibles.length;
-              this.visibles.push(false);
-              this.$nextTick(() => {
-                this.$set(this.visibles, index, true);
-              });
-              break;
-            case 'closeDialog':
-              for (let i = 0; i < this.dialogs.length; i++) {
-                let item = this.dialogs[i];
-                if (item.url == args.url) {
-                  this.$set(this.visibles, i, false);
-                }
-              }
-              break;
-          }
-        });
+        window.addEventListener('message', this.handleMessage);
       });
     } else {
       const loginPage =
@@ -373,11 +342,16 @@ export default {
       }
     },
     /**
-     * @desc:打开页面
+     * @desc:打开dialog页面
      * @author huangbo
      * @date 2024年9月7日
      **/
-    openPage(url, name, width, height) {
+    winOpen({ url, name, width, height, appCode, id, size }) {
+      if (!appCode && !id) {
+        console.error('参数错误，缺少appCode或者id');
+        return;
+      }
+      const openModel = util.getStorage('openModel');
       let src = url;
       if (!util.startWith(url, ['http', '/'], true)) {
         let pathname = window.location.pathname;
@@ -388,6 +362,25 @@ export default {
         }
         src = pathname + url.replace('./', '/');
       }
+      if (openModel && openModel == 'dialog') {
+        let dialog = {
+          id,
+          url: src,
+          name,
+          width,
+          height,
+          appCode,
+          visible: false,
+          size
+        };
+        let n = this.dialogs.push(dialog);
+        this.$nextTick(() => {
+          this.$set(dialog, 'index', n - 1);
+          this.$set(dialog, 'visible', true);
+        });
+        return dialog;
+      }
+
       if (name) {
         let w = 0;
         let h = 0;
@@ -407,6 +400,109 @@ export default {
         return util.win.open(src);
       }
     },
+
+    /**
+     * @desc:关闭dialog页面
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    winClose({ url, appCode, id }) {
+      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);
+        this.dialogs.splice(dialog.index, 1);
+      }
+    },
+
+    /**
+     * @desc:postMessage消息处理
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleMessage(e) {
+      const { method, args } = e.data;
+      const { index, refresh, jumpMenu } = args;
+      switch (method) {
+        case 'reLogin':
+          this.handleReLogin(args);
+          break;
+        case 'refresh':
+          this.$refs.main.handleRefresh(args);
+          break;
+        case 'jumpMenu':
+          Array.isArray(args)
+            ? this.$refs.main.jumpMenu(...args)
+            : this.$refs.main.jumpMenu(args);
+          break;
+        case 'emit':
+          const { origin, appCode, id, ...data } = args;
+          let iframe = document.getElementById(appCode || id);
+          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);
+          });
+          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));
+          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);
+          });
+          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));
+          break;
+      }
+    },
+
+    /**
+     * @desc:dialog页面加载完成后通讯
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleIframeLoad(iframe, data) {
+      iframe = iframe
+        ? iframe
+        : document.getElementById(data.appCode || data.id);
+      const origin = new URL(iframe.src).origin;
+      iframe.contentWindow.postMessage(data, origin);
+    },
+
     /**
      * @desc:排除属性
      * @author huangbo
@@ -422,7 +518,6 @@ export default {
      **/
     handleClosed(res, index) {
       this.dialogs.splice(index, 1);
-      this.visibles.splice(index, 1);
     },
     /**
      * @desc:主应用向子应用发送事件
@@ -449,6 +544,7 @@ export default {
     }
   },
   beforeDestroy() {
+    window.removeEventListener('message', this.handleMessage);
     WujieVue.bus.$off('reLogin');
     WujieVue.bus.$off('refresh');
     WujieVue.bus.$off('jumpMenu');

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

@@ -228,6 +228,7 @@
         closable
         hide-bar
         opacity
+        @tab-click="handleTabClick"
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -244,7 +245,8 @@
 
         <!-- 菜单 -->
         <sub-menu
-          :collapse="collapse"
+          v-if="subMenus"
+          :collapse="isCollapse"
           :mode="mode"
           :visible.sync="showMenu"
           :closed.sync="fold"
@@ -650,6 +652,8 @@ export default {
       subActive: '',
       //折叠菜单
       fold: false,
+      //菜单样式是否折叠形式
+      isCollapse: this.collapse,
       //人工智能配置
       aiConfig: null,
       //im配置
@@ -940,7 +944,7 @@ export default {
           document.title = results[i];
         }
         if (i === 'loginPage' && results[i]) {
-          util.setStorage('loginPage', results[i]);
+          util.setStorage({ key: 'loginPage', value: results[i] });
         }
         if (i === 'sysLogoIco' && results[i]) {
           localStorage.setItem('sysLogoIco', results[i]);
@@ -979,15 +983,22 @@ export default {
           if (results[i].userInfoContents) {
             this.userInfoContents = JSON.parse(results[i].userInfoContents);
           }
+          //水印配置
           if (results[i].webPageWatermark) {
             try {
               util.win.webPageWatermark = results[i].webPageWatermark;
               util.watermark(results[i].webPageWatermark);
             } catch (error) {}
           }
+          //登录页页面地址
           if (results[i].loginPage) {
-            util.setStorage('loginPage', results[i].loginPage);
+            util.setStorage({ key: 'loginPage', value: results[i].loginPage });
           }
+          //登录页页面地址
+          if (results[i].openModel) {
+            util.setStorage({ key: 'openModel', value: results[i].openModel });
+          }
+          //ai配置
           if (results[i].aiConfig) {
             if (typeof results[i].aiConfig == 'string') {
               try {
@@ -999,6 +1010,7 @@ export default {
               this.aiConfig = results[i].aiConfig;
             }
           }
+          //im配置
           if (results[i].imConfig) {
             if (typeof results[i].imConfig == 'string') {
               try {
@@ -1039,6 +1051,12 @@ export default {
           if (results[i].showHandlerTitleType) {
             this.showTitleType = results[i].showHandlerTitleType;
           }
+          //菜单样式是否折叠形式
+          if (results[i].menuCollapse !== undefined) {
+            this.isCollapse =
+              results[i].menuCollapse !== false &&
+              results[i].menuCollapse !== 'false';
+          }
         }
         if (i === 'userModel' && results[i]) {
           if (results[i].userHeadUrl) {
@@ -1050,6 +1068,9 @@ export default {
             results[i].userHeadUrl = this.userHead;
           }
           this.userModel = results[i];
+          if (results[i].openModel) {
+            util.setStorage({ key: 'openModel', value: results[i].openModel });
+          }
         }
         if (i === 'notifyList' && results[i]) {
           this.notifyList = results[i];
@@ -1781,8 +1802,11 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handleRefresh() {
-      let i = util.indexOfObj(this.tabs, this.activeName, 'id');
+    handleRefresh(arg) {
+      let i =
+        arg && arg != true
+          ? 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);
@@ -1859,7 +1883,12 @@ export default {
       this.showTabsHandler = false;
       window.removeEventListener('click', this.closeTabsEvents);
     },
-    //关闭页签事件面板
+
+    /**
+     * @desc:关闭页签事件面板
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
     closeTabsEvents(e) {
       if (
         e.target.parentNode != this.$refs.tabsHandler.$el &&
@@ -1869,6 +1898,17 @@ export default {
       }
       window.removeEventListener('click', this.closeTabsEvents);
     },
+
+    /**
+     * @desc:tabs页签点击事件
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleTabClick() {
+      this.active = '';
+      this.subMenus = null;
+      this.showMenu = false;
+    },
     /**
      * @desc:handler工具栏点击事件
      * @author huangbo
@@ -1928,6 +1968,9 @@ export default {
             this.activeName = this.homePage.id;
             this.showMsg = false;
             this.showSet = false;
+            this.active = '';
+            this.subMenus = null;
+            this.showMenu = false;
             break;
           case 'search':
             this.showSearch = true;

package/packages/main/src/simplicity/sub-menu.vue

@@ -122,7 +122,6 @@ export default {
     mode: String,
     collapse: Boolean,
     title: String,
-    active: String,
     closed: Boolean,
     color: {
       type: [String, Array],
@@ -193,6 +192,9 @@ export default {
       } else {
         this.width = this.size;
       }
+    },
+    visible(val) {
+      val === false && (this.actives = []);
     }
   },
   created() {},

package/packages/menu/src/main.vue

@@ -303,7 +303,6 @@ export default {
           })
         );
       }
-      console.log(item.tips, item.text);
       title.push(
         h(
           'div',

package/src/index.js

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

package/src/utils/util.js

@@ -16,6 +16,7 @@ import WebSocket from './webSocket';
 import { UAParser } from 'ua-parser-js';
 
 const win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
+const isIE = /MSIE|Trident/.test(navigator.userAgent);
 const parser = new UAParser();
 const $hueStep = 2;
 const $saturationStep1 = 0.16;
@@ -557,11 +558,20 @@ const browser = function () {
  * @date 2022年5月7日
  **/
 const busEmit = function (that, { method, args }) {
-  const bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-  if (bus) {
-    Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
+  if (isIE) {
+    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    if (bus) {
+      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
+    } else {
+      win.parent.postMessage({ method, query: args, args }, '*');
+    }
   } else {
-    win.parent.postMessage({ method, query: args }, '*');
+    const bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    if (bus) {
+      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
+    } else {
+      win.parent.postMessage({ method, query: args, args }, '*');
+    }
   }
 };
 
@@ -3564,7 +3574,6 @@ const removeStorage = function (key) {
  * @param {boolean} [isSession] 是否是会话cookie
  **/
 const setCookie = function (name, value, isSession = true, time) {
-  const isIE = /MSIE|Trident/.test(navigator.userAgent);
   try {
     const cookieParts = [
       `${encodeURIComponent(name)}=${encodeURIComponent(value)}`,
@@ -3637,6 +3646,20 @@ const removeCookie = function (key) {
   }
 };
 
+const winTopOpen = function (config) {
+  if (isIE) {
+    if (win.top !== win.self) {
+      try {
+        win.top.windowOpen(config);
+      } catch (error) {
+        win.postMessage({ method: 'windowOpen', query: config }, '*');
+      }
+    }
+  } else {
+    busEmit('windowOpen', config);
+  }
+};
+
 export default {
   ajax,
   ajaxStream,
@@ -3690,6 +3713,7 @@ export default {
   isEmpty,
   isExist,
   isFunction,
+  isIE,
   isLogged,
   isLogined,
   isObject,
@@ -3729,5 +3753,6 @@ export default {
   urlJoinParams,
   uuid,
   watermark,
-  win
+  win,
+  winTopOpen
 };