eoss-ui 0.7.33 → 0.7.35

package/lib/utils/util.js

@@ -609,6 +609,8 @@ var busEmit = function busEmit(that, _ref3) {
       }
       return;
     }
+    console.log('busEmit', method, args);
+
     var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
     _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }

package/lib/wujie.js

@@ -693,6 +693,8 @@ var busEmit = function busEmit(that, _ref3) {
       }
       return;
     }
+    console.log('busEmit', method, args);
+
     var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
     _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }

package/lib/wxlogin.js

@@ -693,6 +693,8 @@ var busEmit = function busEmit(that, _ref3) {
       }
       return;
     }
+    console.log('busEmit', method, args);
+
     var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
     _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }

package/package.json

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

package/packages/dialog/src/main.vue

@@ -317,8 +317,8 @@ export default {
         return {};
       }
     },
-    width: String,
-    height: String,
+    width: [String, Number],
+    height: [String, Number],
     middle: {
       type: Boolean,
       default: true

package/packages/login/src/main.vue

@@ -778,7 +778,11 @@ export default {
     },
     caModel: String,
     caInstallPath: String,
-    showKeySelect: Boolean
+    showKeySelect: Boolean,
+    alertCallback: {
+      type: Function,
+      default: () => {}
+    }
   },
   computed: {
     transform() {
@@ -1498,9 +1502,15 @@ export default {
       this.$alert(content, title, {
         dangerouslyUseHTMLString: isMarkdown,
         setHeight: isMarkdown,
-        showConfirmButton: false,
+        customClass: 'es-login-alert',
         ...config
-      }).catch(() => {});
+      })
+        .then(() => {
+          this.alertCallback(1, { content, title, ...config });
+        })
+        .catch(() => {
+          this.alertCallback(0, { content, title, ...config });
+        });
     },
     async downloadMdFile(url) {
       try {

package/packages/main/src/main.vue

@@ -24,10 +24,17 @@
 
     <!-- 公用弹窗 -->
     <es-dialog
+      class="es-main-public-dialog"
       v-for="(item, index) in dialogs"
+      :custom-class="
+        'es-public-dialog' +
+        (item.customClassNames ? ` ${item.customClassNames}` : '')
+      "
+      modal-class="es-main-public-dialog-modal"
+      :class="item.classNames"
       :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"
@@ -149,6 +156,7 @@ export default {
       this.$nextTick(() => {
         this.getConfig();
         const bus = this.bus || this.$root.Bus;
+        console.log('bus', bus);
         if (bus) {
           bus.$on('reLogin', this.handleReLogin);
           bus.$on('refresh', this.$refs.main.handleRefresh);
@@ -345,7 +353,17 @@ 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
+    }) {
+      url = typeof arguments[0] === 'string' ? arguments[0] : url;
       id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       const openModel = util.getStorage('openModel');
       let src = url;
@@ -367,7 +385,8 @@ export default {
           height,
           appCode,
           visible: false,
-          size
+          size,
+          ...config
         };
         let n = this.dialogs.push(dialog);
         this.$nextTick(() => {
@@ -402,7 +421,7 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winClose({ url, appCode, id, index, refresh, jumpMenu }) {
+    winClose({ url, appCode, id, index, refresh, jumpMenu, callBack }) {
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
@@ -420,6 +439,7 @@ export default {
           this.dialogs.splice(dialog.index, 1);
         }
       }
+      callBack && callBack();
       refresh && this.$refs.main.handleRefresh(refresh);
       jumpMenu &&
         (Array.isArray(jumpMenu)
@@ -496,7 +516,9 @@ export default {
      * @date 2024年9月7日
      **/
     handleClosed(res, index) {
-      this.dialogs.splice(index, 1);
+      this.$nextTick(() => {
+        this.dialogs.splice(index, 1);
+      });
     },
     /**
      * @desc:主应用向子应用发送事件
@@ -524,6 +546,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/public/online.vue

@@ -54,7 +54,7 @@ export default {
           title: '登录时间',
           field: 'loginDate',
           align: 'center',
-          width: 156
+          width: 170
         },
         {
           title: '登录次数',

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

@@ -58,7 +58,15 @@
           ></es-icon>
         </el-badge>
       </el-tooltip>
-      <div class="es-simplicity-handler-item" v-else :key="item.type">
+      <div
+        class="es-simplicity-handler-item"
+        :class="{
+          'es-simplicity-handler-item-hover': showTitleType === 'text'
+        }"
+        v-else
+        :key="item.type"
+        @click.stop="handleClick(item)"
+      >
         <el-badge
           class="es-simplicity-handler-item"
           :hidden="!nums[item.type] && !item.num"
@@ -67,11 +75,17 @@
         >
           <es-icon
             class="es-simplicity-handler-icon"
-            @click.stop="handleClick(item)"
+            :class="{
+              'es-simplicity-handler-icon-hover': showTitleType !== 'text'
+            }"
             :contents="item.icon"
           ></es-icon>
         </el-badge>
-        <span class="" v-if="showTitleType === 'text'">{{ item.title }}</span>
+        <span
+          class="es-simplicity-handler-text"
+          v-if="showTitleType === 'text'"
+          >{{ item.title }}</span
+        >
       </div>
     </template>
   </div>

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

@@ -460,7 +460,7 @@ export default {
     //是否显示头像
     avatar: {
       type: Boolean,
-      default: false
+      default: true
     },
     //im用例编码
     imUseCaseCode: String,
@@ -705,7 +705,7 @@ export default {
       dialog: {},
       handleNums: {
         //消息数
-        notice: 10,
+        notice: 0,
         //在线人数
         online: 1
       },
@@ -746,15 +746,16 @@ export default {
   },
   computed: {
     _handleDatas() {
-      return this.handleDatas.filter((item) => {
+      const handleDatas = this.handleDatas.filter((item, index) => {
         if (item.type === 'contact' && this.contact) {
-          item = { ...item, ...this.contact };
+          this.$set(this.handleDatas, index, { ...item, ...this.contact });
         }
         if (item.type === 'contact' && !this.contact) {
           return false;
         }
         return !item.hide && !this.hide[item.type];
       });
+      return handleDatas;
     },
     //菜单接口
     _menuUrl() {
@@ -1043,6 +1044,7 @@ export default {
           if (results[i].contact) {
             let contact = JSON.parse(results[i].contact);
             let content = contact.content.split(',');
+            this;
             this.contact = {
               ...contact,
               content
@@ -1809,34 +1811,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/packages/main/src/simplicity/message.vue

@@ -215,6 +215,33 @@ export default {
     },
     //处理消息
     handleMessage(item, index) {
+      const openModel = util.getStorage('openModel');
+      if (openModel && openModel == 'dialog') {
+        let { handlerUrl, title, id, metaData } = item;
+        metaData &&
+          (title =
+            metaData.title ||
+            metaData.pendtitle ||
+            metaData.meetName ||
+            title ||
+            '办理');
+        const jsonData =
+          metaData && metaData.jsonData ? JSON.parse(metaData.jsonData) : {};
+        util.busEmit(this, {
+          method: 'windowOpen',
+          args: {
+            url: handlerUrl,
+            title: title,
+            id: id,
+            ...jsonData,
+            callBack: () => {
+              this.count -= 1;
+              this.msgs.splice(index, 1);
+            }
+          }
+        });
+        return;
+      }
       this.count -= 1;
       this.msgs.splice(index, 1);
       if (this.winopen) {

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

@@ -152,6 +152,32 @@ export default {
     },
     //处理消息
     handleMessage(item, index) {
+      const openModel = util.getStorage('openModel');
+      if (openModel && openModel == 'dialog') {
+        let { handlerUrl, title, id, metaData } = item;
+        metaData &&
+          (title =
+            metaData.title ||
+            metaData.pendtitle ||
+            metaData.meetName ||
+            title ||
+            '办理');
+        const jsonData =
+          metaData && metaData.jsonData ? JSON.parse(metaData.jsonData) : {};
+        util.busEmit(this, {
+          method: 'windowOpen',
+          args: {
+            url: handlerUrl,
+            title: title,
+            id: id,
+            ...jsonData,
+            callBack: () => {
+              this.index = index;
+            }
+          }
+        });
+        return;
+      }
       if (item.urlopenmode === 1 || this.winopen) {
         const mywin = util.win.open(item.handlerUrl);
         if (mywin) {

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

@@ -17,9 +17,17 @@
     >
       <div class="es-simplicity-menus-box" :style="{ width: width + 'px' }">
         <div class="es-simplicity-menus-title">
-          <span class="es-simplicity-menus-title-text" v-if="!fold">{{
-            title || text
-          }}</span>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            placement="right"
+            :content="title || text"
+            :auto="true"
+          >
+            <span class="es-simplicity-menus-title-text" v-if="!fold">{{
+              title || text
+            }}</span>
+          </el-tooltip>
           <i
             class="es-icon-shouqicaidan es-simplicity-menus-title-icon"
             v-show="!fold"