xs-common-plugins 1.0.3 → 1.0.7

package/README.md

@@ -206,4 +206,21 @@
    1.0.3
    1. 弹窗组件中能使用 this.$store
    2. 移除 .el-radio-group 中 的 display: flex;
+```
+```
+   1.0.4
+   1. 报表组件 show-summary 增加判断
+   2. common.js 增加公用方法  common.format 用于快速格式化样式
+```
+```
+   1.0.5
+   1. 报表组件 过多不出滚动条问题修复
+```
+```
+   1.0.6
+   1. 处理 登录后 菜单权限推送两次的问题
+```
+```
+   1.0.7
+   1. 融云聊天功能剔除已读消息
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "private": false,
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",

package/src/common/common.js

@@ -66,7 +66,7 @@ common.getObject = (url, obj = ask) => {
 
  */
 common.saveData = (that, url, query, ref, callBack) => {
-    let newQuery = query ? query : that.postForm;
+    let newQuery = query ? query : JSON.parse(JSON.stringify(that.postForm)); // 深拷贝， 避免影响页面显示
     if(ref === false) {
         common.handleData(that, url, newQuery, callBack)
     } else {
@@ -363,4 +363,31 @@ common.requiredList = (list) => {
     return obj
 }
 
+/**
+ *  格式化数据样式
+ * @param {*} value  值
+ * @param {*} type  要格式化的类型 [date, price]
+ * @returns 
+ */
+ common.format = (value, type="date") => {
+    switch (type) {
+        case 'date':
+            if(value) return value.replace("T", ' ').substr(0, 19)
+            else return ''
+            break;
+        case 'price':
+            if(typeof(value) === 'number') {
+                return value.toFixed(2).toString().replace(/,/g,'').replace(/\d+/, function (n) { // 先提取整数部分
+                    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
+                      return $1 + ",";
+                    });
+                });
+            }
+            else return ''
+            break;
+        default:
+            break;
+    }
+}
+
 export default common

package/src/components/ReportCmp/index.vue

@@ -11,7 +11,7 @@
 
     <div class="t-table">
       <el-table v-if="query.data && query.data.data && query.data.data.length > 0" ref="table" size="mini"
-        :data="query.data.data" style="width: 100%" :height="'100%'" :show-summary="showSummary" border fit
+        :data="query.data.data" style="width: 100%" :height="'100%'" :show-summary="showSummary || query.report.totalCol == 2" border fit
         highlight-current-row :row-class-name="rowClassName" @selection-change="handleSelectionChange"
         @sort-change="customSortChange">
         <!--:fixed="idx==0"-->

package/src/plugins/im/components/chat/index.vue

@@ -26,6 +26,7 @@
         ></withoutmessage>
         <div
           v-for="(message, i) in messageList"
+          v-if="message.messageType != 'RC:ReadNtf'"
           :key="message.uId"
           :id="'U-' + message.uId"
           class="rong-message uni-page-wrapper"

package/src/plugins/im/components/chat/methods.js

@@ -58,7 +58,7 @@ export default {
             let messages = result.messageList;
             let hasMore = result.hasMore;
             this.hasMore = hasMore
-            let messageList = messages.concat(this.messageList);
+            let messageList = messages.concat(this.messageList).filter(item => item.messageType !== 'RC:ReadNtf'); // 过滤 已读标识消息
             console.log('messageList', messageList)
 
             let toView = '';

package/src/styles/index.scss

@@ -85,7 +85,6 @@ li {
 
 
 .dlg-wrapper {
-
   .el-date-editor.el-input,
   .el-date-editor.el-input__inner {
     width: 100%;

package/src/styles/table.scss

@@ -81,11 +81,10 @@ tbody td .cell img {
   }
 }
 
-
-.el-radio-group {
-  margin-top: 13px;
-
-  >div {
-    margin-right: 30px;
-  }
-}
+//影响全局的样式， 单项目里自行调整
+// .el-radio-group {
+//   margin-top: 13px;
+//   >div {
+//     margin-right: 30px;
+//   }
+// }

package/src/views/callback/index.vue

@@ -4,10 +4,7 @@ import { setToken } from "@/utils/auth"; // get token from cookie
 import { getQuery } from "@/common/utils";
 import { getConfig } from "@/utils/global-config";
 import { setLocalStorage } from "@utils/localStorage";
-// TODO moduleConfig
-import { main } from "@/utils/getMenu";
 const endTimestamp = new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1;
-
 export default {
   mounted() {
     if (getConfig("ID4_LOGINTYPE")) {
@@ -22,7 +19,6 @@ export default {
             sessionStorage.setItem("token", user.access_token);
             sessionStorage.setItem("iframeAuthExpireTime", endTimestamp);
             var redic_url = getQuery(window.location.href, "redic_url");
-            main();
             that.$router.push(
               redic_url ? decodeURIComponent(redic_url).substr(1) : `/`
             );