eoss-ui 0.7.38 → 0.7.40

package/lib/utils/util.js

@@ -609,8 +609,6 @@ 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));
   }
@@ -971,7 +969,7 @@ var esDecode = function esDecode(value) {
     arr[i] = cat1 * kleng * kleng + cat2 * kleng + cat3;
   }
   // eslint-disable-next-line no-eval
-  result = eval('String.fromCharCode(' + arr.join(',') + ')');
+  result = String.fromCharCode.apply(null, arr);
   return result;
 };
 

package/lib/wujie.js

@@ -693,8 +693,6 @@ 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));
   }
@@ -1055,7 +1053,7 @@ var esDecode = function esDecode(value) {
     arr[i] = cat1 * kleng * kleng + cat2 * kleng + cat3;
   }
   // eslint-disable-next-line no-eval
-  result = eval('String.fromCharCode(' + arr.join(',') + ')');
+  result = String.fromCharCode.apply(null, arr);
   return result;
 };
 

package/lib/wxlogin.js

@@ -693,8 +693,6 @@ 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));
   }
@@ -1055,7 +1053,7 @@ var esDecode = function esDecode(value) {
     arr[i] = cat1 * kleng * kleng + cat2 * kleng + cat3;
   }
   // eslint-disable-next-line no-eval
-  result = eval('String.fromCharCode(' + arr.join(',') + ')');
+  result = String.fromCharCode.apply(null, arr);
   return result;
 };
 

package/package.json

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

package/packages/main/src/main.vue

@@ -156,7 +156,6 @@ 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);
@@ -421,7 +420,7 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winClose({ url, appCode, id, index, refresh, jumpMenu, callBack }) {
+    winClose({ url, appCode, id, index, refresh, jumpMenu, callback }) {
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
@@ -439,12 +438,19 @@ export default {
           this.dialogs.splice(dialog.index, 1);
         }
       }
-      callBack && callBack();
-      refresh && this.$refs.main.handleRefresh(refresh);
-      jumpMenu &&
-        (Array.isArray(jumpMenu)
-          ? this.$refs.main.jumpMenu(...jumpMenu)
-          : this.$refs.main.jumpMenu(jumpMenu));
+      if (callback) {
+        const bus = this.bus || this.$root.Bus;
+        if (bus) {
+          // 主应用发送事件
+          bus.$emit(callback, arguments[0]);
+        }
+      } else {
+        refresh && this.$refs.main.handleRefresh(refresh);
+        jumpMenu &&
+          (Array.isArray(jumpMenu)
+            ? this.$refs.main.jumpMenu(...jumpMenu)
+            : this.$refs.main.jumpMenu(jumpMenu));
+      }
     },
 
     /**

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

@@ -140,6 +140,8 @@ export default {
   },
   mounted() {
     util.win.deleteMsg = this.handleRemove;
+    const bus = this.bus || this.$root.Bus;
+    bus && bus.$on('deleteMessage', this.handleRemove);
   },
   methods: {
     //获取消息列表
@@ -234,10 +236,7 @@ export default {
             title: title,
             id: id,
             ...jsonData,
-            callBack: () => {
-              this.count -= 1;
-              this.msgs.splice(index, 1);
-            }
+            callback: 'handleRemove'
           }
         });
         return;
@@ -281,6 +280,10 @@ export default {
     handleClose() {
       this.$parent.$emit('bus-emit', 'waitdone');
     }
+  },
+  destroyed() {
+    const bus = this.bus || this.$root.Bus;
+    bus.$off('deleteMessage', this.handleRemove);
   }
 };
 </script>

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

@@ -108,6 +108,10 @@ export default {
       index: null
     };
   },
+  mounted() {
+    const bus = this.bus || this.$root.Bus;
+    bus && bus.$on('deleteNotice', this.handleRemove);
+  },
   methods: {
     afterEnter() {
       this.$emit('opened');
@@ -171,9 +175,7 @@ export default {
             title: title,
             id: id,
             ...jsonData,
-            callBack: () => {
-              this.index = index;
-            }
+            callback: 'deleteNotice'
           }
         });
         return;
@@ -210,6 +212,10 @@ export default {
     },
     handleClose() {
       this.$parent.$emit('bus-emit', 'waitdone');
+    },
+    destroyed() {
+      const bus = this.bus || this.$root.Bus;
+      bus.$off('deleteNotice', this.handleRemove);
     }
   }
 };

package/src/index.js

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

package/src/utils/util.js

@@ -581,8 +581,6 @@ const busEmit = function (that, { method, args, opener }) {
       }
       return;
     }
-    console.log('busEmit', method, args);
-
     const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
     bus && (Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args));
   }
@@ -964,7 +962,7 @@ const esDecode = function (value) {
     arr[i] = cat1 * kleng * kleng + cat2 * kleng + cat3;
   }
   // eslint-disable-next-line no-eval
-  result = eval('String.fromCharCode(' + arr.join(',') + ')');
+  result = String.fromCharCode.apply(null, arr);
   return result;
 };