xs-common-plugins 1.0.6 → 1.0.10

package/src/mixin/tableCell/colTableCell_analysis.js

@@ -1,103 +1,103 @@
-
-export const MIX_ColCellAnalysis = {
-    data() {
-        return {
-            copyClass: false,
-            hideClass: false
-        }
-    },
-    props: {
-        source: {
-            type: Object,
-            default: () => {
-                return {};
-            }
-        },
-        layout: {
-            type: Array,
-            default: []
-        },
-    },
-    computed: {
-        _layout: function () {
-            const that = this;
-            let _layoutObj = {};
-            let _layoutArr = [];
-            if (toString.call(this.layout[0]) !== '[object Array]') {
-                const row = this.layout;
-                row.forEach(item => {
-                    const group = item.split("|");  //['(orderId)','订单','copy']
-                    let isCopy, isHide = false;
-
-                    // 判断是否有复制按钮
-                    if (group[group.length - 1] == "copy") {
-                        this.copyClass = true;
-                        isCopy = true;
-                    }
-
-                    if (group[group.length - 1] == "hide") {
-                        this.hideClass = true;
-                        isHide = true;
-                    }
-
-                    let _value = "";
-
-                    var reg = /(^\()?\D*\)$/;
-                    //test()返回值bool类型，判断参数是否符合正则表达式
-                    var result = reg.test(group[0]);
-                    if (result) {
-                        _value = group[0];
-                    } else {
-                        _value = that.source[group[0]]
-                    }
-                    _layoutArr.push({
-                        value: _value,
-                        label: group[1] ? group[1] !== "copy" ? group[1] : "" : "",
-                        copy: isCopy,
-                        hide: isHide
-                    })
-                });
-              
-                return _layoutArr;
-            } else {
-                this.layout.forEach(row => {
-                    let newObj = row.map(item => {
-                        const group = item.split("|");
-                        if (item === "copy") {
-                            this.copyClass = true;
-                            return "copy";
-                        }
-                        let isCopy = false, isHide = false;
-                        if (group[group.length - 1] == "copy") {
-                            this.copyClass = true;
-                            isCopy = true;
-                        }
-                        if (group[group.length - 1] == "hide") {
-                            this.hideClass = true;
-                            isHide = true;
-                        }
-
-                        let _value = "";
-                        var reg = /(^\()?\D*\)$/;
-                        //test()返回值bool类型，判断参数是否符合正则表达式
-                        var result = reg.test(group[0]);
-                        if (result) {
-                            _value = group[0];
-                        } else {
-                            _value = that.source[group[0]]
-                        }
-
-                        return {
-                            value: _value,
-                            label: group[1] !== "copy" ? group[1] : "",
-                            copy: isCopy,
-                            hide: isHide
-                        };
-                    });
-                    _layoutArr.push(newObj);
-                });
-                return _layoutArr;
-            }
-        }
-    }
-}
+
+export const MIX_ColCellAnalysis = {
+    data() {
+        return {
+            copyClass: false,
+            hideClass: false
+        }
+    },
+    props: {
+        source: {
+            type: Object,
+            default: () => {
+                return {};
+            }
+        },
+        layout: {
+            type: Array,
+            default: []
+        },
+    },
+    computed: {
+        _layout: function () {
+            const that = this;
+            let _layoutObj = {};
+            let _layoutArr = [];
+            if (toString.call(this.layout[0]) !== '[object Array]') {
+                const row = this.layout;
+                row.forEach(item => {
+                    const group = item.split("|");  //['(orderId)','订单','copy']
+                    let isCopy, isHide = false;
+
+                    // 判断是否有复制按钮
+                    if (group[group.length - 1] == "copy") {
+                        this.copyClass = true;
+                        isCopy = true;
+                    }
+
+                    if (group[group.length - 1] == "hide") {
+                        this.hideClass = true;
+                        isHide = true;
+                    }
+
+                    let _value = "";
+
+                    var reg = /(^\()?\D*\)$/;
+                    //test()返回值bool类型，判断参数是否符合正则表达式
+                    var result = reg.test(group[0]);
+                    if (result) {
+                        _value = group[0];
+                    } else {
+                        _value = that.source[group[0]]
+                    }
+                    _layoutArr.push({
+                        value: _value,
+                        label: group[1] ? group[1] !== "copy" ? group[1] : "" : "",
+                        copy: isCopy,
+                        hide: isHide
+                    })
+                });
+              
+                return _layoutArr;
+            } else {
+                this.layout.forEach(row => {
+                    let newObj = row.map(item => {
+                        const group = item.split("|");
+                        if (item === "copy") {
+                            this.copyClass = true;
+                            return "copy";
+                        }
+                        let isCopy = false, isHide = false;
+                        if (group[group.length - 1] == "copy") {
+                            this.copyClass = true;
+                            isCopy = true;
+                        }
+                        if (group[group.length - 1] == "hide") {
+                            this.hideClass = true;
+                            isHide = true;
+                        }
+
+                        let _value = "";
+                        var reg = /(^\()?\D*\)$/;
+                        //test()返回值bool类型，判断参数是否符合正则表达式
+                        var result = reg.test(group[0]);
+                        if (result) {
+                            _value = group[0];
+                        } else {
+                            _value = that.source[group[0]]
+                        }
+
+                        return {
+                            value: _value,
+                            label: group[1] !== "copy" ? group[1] : "",
+                            copy: isCopy,
+                            hide: isHide
+                        };
+                    });
+                    _layoutArr.push(newObj);
+                });
+                return _layoutArr;
+            }
+        }
+    }
+}

package/src/mixin/upload.js

@@ -1,22 +1,22 @@
-import { getConfig } from "@/utils/global-config"
-import { getToken } from "@/utils/auth";
-const tokenKey=`${getConfig('CLIENT_ID')}_token`
-const token = getToken(tokenKey)
-    ? "Bearer " + getToken(tokenKey)
-    : "Bearer";
-export const MIX_Upload = {
-    data: function () {
-
-        return {
-            imageUrl: '',
-            uploadAction: getConfig("UPLOAD_API"),
-            myHeaders: {
-                Authorization: token,
-                "Client-Id": getConfig("CLIENT_ID")
-            }
-        }
-    },
-    components: {},
-    created() { },
-    methods: {},
-}
+import { getConfig } from "@/utils/global-config"
+import { getToken } from "@/utils/auth";
+const tokenKey=`${getConfig('CLIENT_ID')}_token`
+const token = getToken(tokenKey)
+    ? "Bearer " + getToken(tokenKey)
+    : "Bearer";
+export const MIX_Upload = {
+    data: function () {
+
+        return {
+            imageUrl: '',
+            uploadAction: getConfig("UPLOAD_API"),
+            myHeaders: {
+                Authorization: token,
+                "Client-Id": getConfig("CLIENT_ID")
+            }
+        }
+    },
+    components: {},
+    created() { },
+    methods: {},
+}

package/src/mixin/vmodel.js

@@ -1,26 +1,26 @@
-const EVENT_INPUT = 'input'
-
-export const MIX_VMODEL = {
-  props: {
-    value: [Object, Array, String, Number, Boolean]
-  },
-  data() {
-    return {
-      inputValue: {}
-    }
-  },
-  watch: {
-    value: {
-      handler(newValue) {
-        this.inputValue = newValue
-      },
-      deep: true
-    },
-    inputValue: {
-      handler(newValue) {
-        this.$emit(EVENT_INPUT, newValue)
-      },
-      deep: true
-    }
-  }
-}
+const EVENT_INPUT = 'input'
+
+export const MIX_VMODEL = {
+  props: {
+    value: [Object, Array, String, Number, Boolean]
+  },
+  data() {
+    return {
+      inputValue: {}
+    }
+  },
+  watch: {
+    value: {
+      handler(newValue) {
+        this.inputValue = newValue
+      },
+      deep: true
+    },
+    inputValue: {
+      handler(newValue) {
+        this.$emit(EVENT_INPUT, newValue)
+      },
+      deep: true
+    }
+  }
+}

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/plugins/im/components/conversation-list/index.css

@@ -1,92 +1,92 @@
-.rong-avatar {
-  height: 50px;
-  width: 50px;
-  border-radius: 50%;
-}
-.nodata {
-  text-align: center;
-}
-
-.conversation-wrapper {
-  width: 100%;
-  height: 100vh;
-}
-.rong-conversation {
-  width: 95%;
-  margin: 0 auto;
-  position: relative;
-  padding: 10px 0px 10px 0px;
-  border-bottom: 1px solid rgba(238, 238, 238, 1);
-  cursor: pointer;
-}
-
-.rong-conversation-messagecontent {
-  margin-top: 30px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  width: 50%;
-  font-family: 'PingFang SC';
-  font-weight: 500;
-  color: #666666;
-  margin-left: 65px;
-  padding-bottom: 2px;
-}
-
-.rong-conversation-title {
-  color: #333;
-  position: relative;
-  top: 10px;
-  font-family: 'PingFang SC';
-  font-weight: bold;
-  color: #000000;
-}
-
-.rong-conversation-avatar {
-  float: left;
-  margin-right: 20px;
-  margin-top: 4px;
-}
-
-.rong-conversation-unreadcount {
-  position: absolute;
-  top: 5px;
-  left: 35px;
-  background-color: red;
-  border-radius: 50%;
-  color: #FFF;
-  height: 15px;
-  min-width: 15px;
-  text-align: center;
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.rong-conversation-senttime {
-  position: absolute;
-  top: 32px;
-  right: 20px;
-}
-
-.isTop {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-  font-size: 12px;
-}
-
-.isTophover {
-  opacity: 0.9;
-  background: #f7f7f7;
-}
-
-.isDisturb {
-  position: absolute;
-  bottom: 0;
-  right: 50px;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-  font-size: 12px;
+.rong-avatar {
+  height: 50px;
+  width: 50px;
+  border-radius: 50%;
+}
+.nodata {
+  text-align: center;
+}
+
+.conversation-wrapper {
+  width: 100%;
+  height: 100vh;
+}
+.rong-conversation {
+  width: 95%;
+  margin: 0 auto;
+  position: relative;
+  padding: 10px 0px 10px 0px;
+  border-bottom: 1px solid rgba(238, 238, 238, 1);
+  cursor: pointer;
+}
+
+.rong-conversation-messagecontent {
+  margin-top: 30px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  width: 50%;
+  font-family: 'PingFang SC';
+  font-weight: 500;
+  color: #666666;
+  margin-left: 65px;
+  padding-bottom: 2px;
+}
+
+.rong-conversation-title {
+  color: #333;
+  position: relative;
+  top: 10px;
+  font-family: 'PingFang SC';
+  font-weight: bold;
+  color: #000000;
+}
+
+.rong-conversation-avatar {
+  float: left;
+  margin-right: 20px;
+  margin-top: 4px;
+}
+
+.rong-conversation-unreadcount {
+  position: absolute;
+  top: 5px;
+  left: 35px;
+  background-color: red;
+  border-radius: 50%;
+  color: #FFF;
+  height: 15px;
+  min-width: 15px;
+  text-align: center;
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+
+.rong-conversation-senttime {
+  position: absolute;
+  top: 32px;
+  right: 20px;
+}
+
+.isTop {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  font-size: 12px;
+}
+
+.isTophover {
+  opacity: 0.9;
+  background: #f7f7f7;
+}
+
+.isDisturb {
+  position: absolute;
+  bottom: 0;
+  right: 50px;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  font-size: 12px;
 }

package/src/plugins/im/components/conversation-list/index.json

@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }