eoss-ui 0.7.57 → 0.7.58

package/lib/main.js

@@ -4538,7 +4538,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=431974fc&
+// 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=02fe8fea&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4663,13 +4663,13 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=431974fc&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=02fe8fea&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(19);
 
-// 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/index.vue?vue&type=template&id=129bf7fd&scoped=true&
-var simplicityvue_type_template_id_129bf7fd_scoped_true_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/index.vue?vue&type=template&id=c0669294&scoped=true&
+var simplicityvue_type_template_id_c0669294_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5433,11 +5433,11 @@ var simplicityvue_type_template_id_129bf7fd_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_129bf7fd_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_129bf7fd_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_c0669294_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_c0669294_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=129bf7fd&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=c0669294&scoped=true&
 
 // 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/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -12350,42 +12350,43 @@ var events = [function (tabs, index, that) {
     setTips: function setTips(obj) {
       var _this4 = this;
 
+      if (!this.menuTips || !Object.keys(this.menuTips).length) {
+        return false;
+      }
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this4.setTips(item);
+          var n = _this4.setTips(item);
+          n = n ? parseInt(n) : 0;
+          _this4.$set(obj, 'tips', n);
+          _this4.setDot(_this4.userApps, item.appCode, n);
+          _this4.setDot(_this4.applications, item.appCode, n);
+          _this4.setDot(_this4.business, item.appCode, n);
+          _this4.setDot(_this4.systems, item.appCode, n);
         });
       } else {
-        if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
-          this.$set(obj, 'tips', false);
-          delete obj.tips;
-        }
         var flag = 0;
         if (obj.children && obj.children.length) {
           obj.children.forEach(function (item) {
             var n = _this4.setTips(item);
             flag += n ? parseInt(n) : 0;
           });
-          if (flag) {
-            this.$set(obj, 'tips', flag);
-            this.setDot(this.userApps, obj.appCode);
-            this.setDot(this.applications, obj.appCode);
-            this.setDot(this.business, obj.appCode);
-            this.setDot(this.systems, obj.appCode);
-            return flag;
-          }
+          this.$set(obj, 'tips', flag);
+          this.setDot(this.userApps, obj.appCode, flag);
+          this.setDot(this.applications, obj.appCode, flag);
+          this.setDot(this.business, obj.appCode, flag);
+          this.setDot(this.systems, obj.appCode, flag);
+          return flag;
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach(function (item) {
             var n = _this4.setTips(item);
             flag += n ? parseInt(n) : 0;
           });
-          if (flag) {
-            this.$set(obj, 'tips', flag);
-            this.setDot(this.userApps, obj.appCode);
-            this.setDot(this.applications, obj.appCode);
-            this.setDot(this.business, obj.appCode);
-            this.setDot(this.systems, obj.appCode);
-            return flag;
-          }
+          this.$set(obj, 'tips', flag);
+          this.setDot(this.userApps, obj.appCode, flag);
+          this.setDot(this.applications, obj.appCode, flag);
+          this.setDot(this.business, obj.appCode, flag);
+          this.setDot(this.systems, obj.appCode, flag);
+          return flag;
         } else {
           var num = this.menuTips[obj.id] || this.menuTips[obj.code] || this.menuTips[obj.appCode];
           if (num && Number(num)) {
@@ -12399,12 +12400,15 @@ var events = [function (tabs, index, that) {
     setDot: function setDot(obj, code) {
       var _this5 = this;
 
+      var flag = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
+      flag = flag ? true : false;
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this5.setDot(item, code);
+          _this5.setDot(item, code, flag);
         });
       } else if (obj.code === code) {
-        this.$set(obj, 'tips', true);
+        this.$set(obj, 'tips', flag);
       }
     },
 
@@ -13191,11 +13195,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_129bf7fd_scoped_true_render,
-  simplicityvue_type_template_id_129bf7fd_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_c0669294_scoped_true_render,
+  simplicityvue_type_template_id_c0669294_scoped_true_staticRenderFns,
   false,
   null,
-  "129bf7fd",
+  "c0669294",
   null
   
 )
@@ -17384,8 +17388,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         external_wujie_vue2_default.a.bus.$on('reLogin', _this.handleReLogin);
         external_wujie_vue2_default.a.bus.$on('refresh', _this.$refs.main.handleRefresh);
         external_wujie_vue2_default.a.bus.$on('jumpMenu', _this.$refs.main.jumpMenu);
-        external_wujie_vue2_default.a.bus.$on('windowOpen', _this.$refs.main.winOpen);
-        external_wujie_vue2_default.a.bus.$on('windowClose', _this.$refs.main.winClose);
+        external_wujie_vue2_default.a.bus.$on('windowOpen', _this.winOpen);
+        external_wujie_vue2_default.a.bus.$on('windowClose', _this.winClose);
         external_wujie_vue2_default.a.bus.$on('emit', function (method, args) {
           // 主应用发送事件
           external_wujie_vue2_default.a.bus.$emit(method, args);

package/package.json

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

package/packages/flow/src/component/CommonOpinions.vue

@@ -88,6 +88,7 @@
       title="添加常用意见"
       :visible.sync="addVisible"
       v-if="addVisible"
+      width="600"
       height="auto"
     >
       <ideas :data="FormData" @subMit="submit" />

package/packages/flow/src/form.vue

@@ -24,6 +24,8 @@
       >
         <el-input
           v-model="newData.content"
+          type="textarea"
+          :rows="3"
           :placeholder="`请输入内容`"
         ></el-input>
       </el-form-item>

package/packages/flow-group/src/main.vue

@@ -465,6 +465,7 @@ export default {
       default: '0'
     },
     contents: Array,
+    closeWindow: Boolean,
     closeDialog: {
       type: Boolean,
       default: true
@@ -682,7 +683,14 @@ export default {
       this.$emit('endMessageChange', val);
     },
     handleSuccess() {
-      if (this.closeDialog && this.esDialog) {
+      let windowOpenConfig = sessionStorage.getItem('windowOpenConfig');
+      if (this.closeWindow && windowOpenConfig) {
+        util.busEmit(this, {
+          method: 'windowClose',
+          ...JSON.parse(windowOpenConfig)
+        });
+        util.win.top.windowClose(JSON.parse(windowOpenConfig));
+      } else if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
       } else if (util.win.top.COOS_SDK) {
         util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();
@@ -695,7 +703,14 @@ export default {
       this.$emit('success');
     },
     handleSave(id, event) {
-      if (this.closeDialog && this.esDialog) {
+      let windowOpenConfig = sessionStorage.getItem('windowOpenConfig');
+      if (this.closeWindow && windowOpenConfig) {
+        util.busEmit(this, {
+          method: 'windowClose',
+          ...JSON.parse(windowOpenConfig)
+        });
+        util.win.top.windowClose(JSON.parse(windowOpenConfig));
+      } else if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
       } else if (util.win.top.COOS_SDK) {
         util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();

package/packages/main/src/main.vue

@@ -175,8 +175,8 @@ export default {
         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('windowOpen', this.winOpen);
+        WujieVue.bus.$on('windowClose', this.winClose);
         WujieVue.bus.$on('emit', (method, args) => {
           // 主应用发送事件
           WujieVue.bus.$emit(method, args);

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

@@ -1447,46 +1447,43 @@ export default {
      * @date 2024年9月7日
      **/
     setTips(obj) {
+      if (!this.menuTips || !Object.keys(this.menuTips).length) {
+        return false;
+      }
       if (Array.isArray(obj)) {
         obj.forEach((item) => {
-          this.setTips(item);
+          let n = this.setTips(item);
+          n = n ? parseInt(n) : 0;
+          this.$set(obj, 'tips', n);
+          this.setDot(this.userApps, item.appCode, n);
+          this.setDot(this.applications, item.appCode, n);
+          this.setDot(this.business, item.appCode, n);
+          this.setDot(this.systems, item.appCode, n);
         });
       } else {
-        if (
-          obj &&
-          Object.prototype.hasOwnProperty.call(obj, 'tips') &&
-          obj.tips
-        ) {
-          this.$set(obj, 'tips', false);
-          delete obj.tips;
-        }
         let flag = 0;
         if (obj.children && obj.children.length) {
           obj.children.forEach((item) => {
             let n = this.setTips(item);
             flag += n ? parseInt(n) : 0;
           });
-          if (flag) {
-            this.$set(obj, 'tips', flag);
-            this.setDot(this.userApps, obj.appCode);
-            this.setDot(this.applications, obj.appCode);
-            this.setDot(this.business, obj.appCode);
-            this.setDot(this.systems, obj.appCode);
-            return flag;
-          }
+          this.$set(obj, 'tips', flag);
+          this.setDot(this.userApps, obj.appCode, flag);
+          this.setDot(this.applications, obj.appCode, flag);
+          this.setDot(this.business, obj.appCode, flag);
+          this.setDot(this.systems, obj.appCode, flag);
+          return flag;
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach((item) => {
             let n = this.setTips(item);
             flag += n ? parseInt(n) : 0;
           });
-          if (flag) {
-            this.$set(obj, 'tips', flag);
-            this.setDot(this.userApps, obj.appCode);
-            this.setDot(this.applications, obj.appCode);
-            this.setDot(this.business, obj.appCode);
-            this.setDot(this.systems, obj.appCode);
-            return flag;
-          }
+          this.$set(obj, 'tips', flag);
+          this.setDot(this.userApps, obj.appCode, flag);
+          this.setDot(this.applications, obj.appCode, flag);
+          this.setDot(this.business, obj.appCode, flag);
+          this.setDot(this.systems, obj.appCode, flag);
+          return flag;
         } else {
           let num =
             this.menuTips[obj.id] ||
@@ -1500,13 +1497,14 @@ export default {
       }
       return false;
     },
-    setDot(obj, code) {
+    setDot(obj, code, flag = true) {
+      flag = flag ? true : false;
       if (Array.isArray(obj)) {
         obj.forEach((item) => {
-          this.setDot(item, code);
+          this.setDot(item, code, flag);
         });
       } else if (obj.code === code) {
-        this.$set(obj, 'tips', true);
+        this.$set(obj, 'tips', flag);
       }
     },
     /**

package/src/index.js

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