eoss-ui 0.7.39 → 0.7.41

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=467951a0&
+// 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=431974fc&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4652,7 +4652,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=467951a0&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=431974fc&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(20);
@@ -8275,8 +8275,8 @@ var user_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity_user = (user_component.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/simplicity/message.vue?vue&type=template&id=1ebe665a&
-var messagevue_type_template_id_1ebe665a_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/message.vue?vue&type=template&id=cbe7afdc&
+var messagevue_type_template_id_cbe7afdc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8441,11 +8441,11 @@ var messagevue_type_template_id_1ebe665a_render = function () {
     1
   )
 }
-var messagevue_type_template_id_1ebe665a_staticRenderFns = []
-messagevue_type_template_id_1ebe665a_render._withStripped = true
+var messagevue_type_template_id_cbe7afdc_staticRenderFns = []
+messagevue_type_template_id_cbe7afdc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/message.vue?vue&type=template&id=1ebe665a&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/message.vue?vue&type=template&id=cbe7afdc&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/message.vue?vue&type=script&lang=js&
 var messagevue_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; };
@@ -8565,6 +8565,8 @@ var messagevue_type_script_lang_js_extends = Object.assign || function (target)
     total: function total(val, old) {
       if (parseInt(val, 10) < parseInt(old, 10) && this.index !== null) {
         this.handleRemove();
+      } else {
+        this.getMsg(true);
       }
     }
   },
@@ -8589,6 +8591,8 @@ var messagevue_type_script_lang_js_extends = Object.assign || function (target)
   },
   mounted: function mounted() {
     util["a" /* default */].win.deleteMsg = this.handleRemove;
+    var bus = this.bus || this.$root.Bus;
+    bus && bus.$on('deleteMessage', this.handleRemove);
   },
 
   methods: {
@@ -8683,7 +8687,9 @@ var messagevue_type_script_lang_js_extends = Object.assign || function (target)
             url: handlerUrl,
             title: title,
             id: id
-          }, jsonData)
+          }, jsonData, {
+            callback: 'deleteMessage'
+          })
         });
         return;
       }
@@ -8726,6 +8732,10 @@ var messagevue_type_script_lang_js_extends = Object.assign || function (target)
     handleClose: function handleClose() {
       this.$parent.$emit('bus-emit', 'waitdone');
     }
+  },
+  destroyed: function destroyed() {
+    var bus = this.bus || this.$root.Bus;
+    bus.$off('deleteMessage', this.handleRemove);
   }
 });
 // CONCATENATED MODULE: ./packages/main/src/simplicity/message.vue?vue&type=script&lang=js&
@@ -8740,8 +8750,8 @@ var messagevue_type_script_lang_js_extends = Object.assign || function (target)
 
 var message_component = Object(componentNormalizer["a" /* default */])(
   simplicity_messagevue_type_script_lang_js_,
-  messagevue_type_template_id_1ebe665a_render,
-  messagevue_type_template_id_1ebe665a_staticRenderFns,
+  messagevue_type_template_id_cbe7afdc_render,
+  messagevue_type_template_id_cbe7afdc_staticRenderFns,
   false,
   null,
   null,
@@ -8750,8 +8760,8 @@ var message_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var message = (message_component.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/simplicity/notice.vue?vue&type=template&id=8640e12c&
-var noticevue_type_template_id_8640e12c_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/notice.vue?vue&type=template&id=15704157&
+var noticevue_type_template_id_15704157_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8899,11 +8909,11 @@ var noticevue_type_template_id_8640e12c_render = function () {
     ]
   )
 }
-var noticevue_type_template_id_8640e12c_staticRenderFns = []
-noticevue_type_template_id_8640e12c_render._withStripped = true
+var noticevue_type_template_id_15704157_staticRenderFns = []
+noticevue_type_template_id_15704157_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/notice.vue?vue&type=template&id=8640e12c&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/notice.vue?vue&type=template&id=15704157&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/notice.vue?vue&type=script&lang=js&
 var noticevue_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; };
@@ -9019,6 +9029,10 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
       index: null
     };
   },
+  mounted: function mounted() {
+    var bus = this.bus || this.$root.Bus;
+    bus && bus.$on('deleteNotice', this.handleRemove);
+  },
 
   methods: {
     afterEnter: function afterEnter() {
@@ -9083,7 +9097,9 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
             url: handlerUrl,
             title: title,
             id: id
-          }, jsonData)
+          }, jsonData, {
+            callback: 'deleteNotice'
+          })
         });
         return;
       }
@@ -9119,6 +9135,10 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
     },
     handleClose: function handleClose() {
       this.$parent.$emit('bus-emit', 'waitdone');
+    },
+    destroyed: function destroyed() {
+      var bus = this.bus || this.$root.Bus;
+      bus.$off('deleteNotice', this.handleRemove);
     }
   }
 });
@@ -9134,8 +9154,8 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var notice_component = Object(componentNormalizer["a" /* default */])(
   simplicity_noticevue_type_script_lang_js_,
-  noticevue_type_template_id_8640e12c_render,
-  noticevue_type_template_id_8640e12c_staticRenderFns,
+  noticevue_type_template_id_15704157_render,
+  noticevue_type_template_id_15704157_staticRenderFns,
   false,
   null,
   null,
@@ -17214,7 +17234,6 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       this.$nextTick(function () {
         _this.getConfig();
         var bus = _this.bus || _this.$root.Bus;
-        console.log('bus', bus);
         if (bus) {
           bus.$on('reLogin', _this.handleReLogin);
           bus.$on('refresh', _this.$refs.main.handleRefresh);
@@ -17466,15 +17485,13 @@ 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,
           index = _ref2.index,
           refresh = _ref2.refresh,
           jumpMenu = _ref2.jumpMenu,
-          callBack = _ref2.callBack;
+          callback = _ref2.callback;
 
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
@@ -17493,8 +17510,18 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           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));
+      if (callback) {
+        var bus = this.bus || this.$root.Bus;
+        if (bus) {
+          // 主应用发送事件
+          bus.$emit(callback, arguments[0]);
+        }
+      } else {
+        var _$refs$main;
+
+        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));
+      }
     },
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.39",
+  "version": "0.7.41",
   "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,11 +438,19 @@ export default {
           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));
+      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

@@ -116,6 +116,8 @@ export default {
     total(val, old) {
       if (parseInt(val, 10) < parseInt(old, 10) && this.index !== null) {
         this.handleRemove();
+      } else {
+        this.getMsg(true);
       }
     }
   },
@@ -140,6 +142,8 @@ export default {
   },
   mounted() {
     util.win.deleteMsg = this.handleRemove;
+    const bus = this.bus || this.$root.Bus;
+    bus && bus.$on('deleteMessage', this.handleRemove);
   },
   methods: {
     //获取消息列表
@@ -233,7 +237,8 @@ export default {
             url: handlerUrl,
             title: title,
             id: id,
-            ...jsonData
+            ...jsonData,
+            callback: 'deleteMessage'
           }
         });
         return;
@@ -277,6 +282,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');
@@ -170,7 +174,8 @@ export default {
             url: handlerUrl,
             title: title,
             id: id,
-            ...jsonData
+            ...jsonData,
+            callback: 'deleteNotice'
           }
         });
         return;
@@ -207,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.39',
+  version: '0.7.41',
   install,
   Button,
   ButtonGroup,