diff --git a/public/images/dialog/file-white.svg b/public/images/dialog/file-white.svg
new file mode 100644
index 000000000..c0b6c8ed3
--- /dev/null
+++ b/public/images/dialog/file-white.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/public/images/dialog/file.svg b/public/images/dialog/file.svg
new file mode 100644
index 000000000..8353dfb80
--- /dev/null
+++ b/public/images/dialog/file.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/public/images/dialog/image-white.svg b/public/images/dialog/image-white.svg
new file mode 100644
index 000000000..56578ded1
--- /dev/null
+++ b/public/images/dialog/image-white.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/public/images/dialog/image.svg b/public/images/dialog/image.svg
new file mode 100644
index 000000000..e76c18511
--- /dev/null
+++ b/public/images/dialog/image.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/public/images/dialog/link-white.svg b/public/images/dialog/link-white.svg
new file mode 100644
index 000000000..477feef1f
--- /dev/null
+++ b/public/images/dialog/link-white.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/public/images/dialog/link.svg b/public/images/dialog/link.svg
new file mode 100644
index 000000000..1e20706c2
--- /dev/null
+++ b/public/images/dialog/link.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/public/images/dialog/msg-white.svg b/public/images/dialog/msg-white.svg
new file mode 100644
index 000000000..57bd172e0
--- /dev/null
+++ b/public/images/dialog/msg-white.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/public/images/dialog/msg.svg b/public/images/dialog/msg.svg
new file mode 100644
index 000000000..633590b17
--- /dev/null
+++ b/public/images/dialog/msg.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/public/images/dialog/tag-white.svg b/public/images/dialog/tag-white.svg
new file mode 100644
index 000000000..1af06dd26
--- /dev/null
+++ b/public/images/dialog/tag-white.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/public/images/dialog/tag.svg b/public/images/dialog/tag.svg
new file mode 100644
index 000000000..2e8f1f2aa
--- /dev/null
+++ b/public/images/dialog/tag.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 7cef0cf33..264b1a7a9 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -65,16 +65,21 @@
-
+
@@ -91,7 +96,6 @@
:item-class-add="itemClassAdd"
:extra-props="{dialogData, operateVisible, operateItem, hidePercentage: isMyDialog, hideReply: msgId > 0}"
:estimate-size="78"
- :top-threshold="120"
:keeps="70"
@scroll="onScroll"
@range="onRange"
@@ -586,13 +590,14 @@ export default {
},
msgType(type) {
- if (!type) return
this.onToBottom()
- this.$store.dispatch("getDialogMsgs", {
- dialog_id: this.dialogId,
- msg_id: this.msgId,
- msg_type: this.msgType,
- }).catch(_ => {});
+ if (type) {
+ this.$store.dispatch("getDialogMsgs", {
+ dialog_id: this.dialogId,
+ msg_id: this.msgId,
+ msg_type: this.msgType,
+ }).catch(_ => {});
+ }
},
dialogSearchMsgId() {
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 5f4b261a4..747c4862b 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -210,41 +210,96 @@
.nav-tags {
position: absolute;
- top: 78px;
+ top: 70px;
left: 0;
width: 100%;
z-index: 2;
+ padding: 4px 0;
display: flex;
align-items: center;
- justify-content: center;
- transition: all 0.2s;
+ justify-content: flex-start;
+ overflow-x: auto;
- > li {
- list-style: none;
+ > ul {
+ margin: 0 auto;
display: flex;
align-items: center;
- margin: 0 7px;
- padding: 3px 8px;
- background-color: #c0c4cc;
- color: #fff;
- border-radius: 6px;
- font-size: 12px;
- cursor: pointer;
- box-shadow: 0 1px 6px rgba(255, 255, 255, 0.2);
+ justify-content: center;
- .taskfont {
- font-size: 13px;
- padding-right: 6px;
- }
+ > li {
+ list-style: none;
+ display: flex;
+ align-items: center;
+ margin: 0 8px;
+ padding: 4px 8px;
+ color: $primary-title-color;
+ background-color: #F2F2F2;
+ border: 1px solid #F2F2F2;
+ border-radius: 6px;
+ font-size: 12px;
+ cursor: pointer;
+ box-shadow: 0 1px 6px rgba(255, 255, 255, 0.2);
- > span {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
+ > i {
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ background-repeat: no-repeat;
+ background-size: contain;
+ background-position: center center;
+ }
- &.active {
- background-color: $primary-color;
+ > span {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &.tag-file i {
+ background-image: url("../images/dialog/file.svg");
+ }
+
+ &.tag-image i {
+ background-image: url("../images/dialog/image.svg");
+ }
+
+ &.tag-link i {
+ background-image: url("../images/dialog/link.svg");
+ }
+
+ &.tag-msg i {
+ background-image: url("../images/dialog/msg.svg");
+ }
+
+ &.tag-tag i {
+ background-image: url("../images/dialog/tag.svg");
+ }
+
+ &.active {
+ color: #ffffff;
+ background-color: $primary-color;
+ border-color: $primary-color;
+
+ &.tag-file i {
+ background-image: url("../images/dialog/file-white.svg");
+ }
+
+ &.tag-image i {
+ background-image: url("../images/dialog/image-white.svg");
+ }
+
+ &.tag-link i {
+ background-image: url("../images/dialog/link-white.svg");
+ }
+
+ &.tag-msg i {
+ background-image: url("../images/dialog/msg-white.svg");
+ }
+
+ &.tag-tag i {
+ background-image: url("../images/dialog/tag-white.svg");
+ }
+ }
}
}
}
@@ -1278,10 +1333,11 @@
}
}
.nav-tags {
- top: 60px;
-
- > li {
- margin: 0 5px;
+ top: 58px;
+ > ul {
+ > li {
+ margin: 0 5px;
+ }
}
}
}
diff --git a/resources/assets/statics/public/images/dialog/file-white.svg b/resources/assets/statics/public/images/dialog/file-white.svg
new file mode 100644
index 000000000..c0b6c8ed3
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/file-white.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/file.svg b/resources/assets/statics/public/images/dialog/file.svg
new file mode 100644
index 000000000..8353dfb80
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/file.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/image-white.svg b/resources/assets/statics/public/images/dialog/image-white.svg
new file mode 100644
index 000000000..56578ded1
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/image-white.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/image.svg b/resources/assets/statics/public/images/dialog/image.svg
new file mode 100644
index 000000000..e76c18511
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/image.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/link-white.svg b/resources/assets/statics/public/images/dialog/link-white.svg
new file mode 100644
index 000000000..477feef1f
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/link-white.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/link.svg b/resources/assets/statics/public/images/dialog/link.svg
new file mode 100644
index 000000000..1e20706c2
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/link.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/msg-white.svg b/resources/assets/statics/public/images/dialog/msg-white.svg
new file mode 100644
index 000000000..57bd172e0
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/msg-white.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/msg.svg b/resources/assets/statics/public/images/dialog/msg.svg
new file mode 100644
index 000000000..633590b17
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/msg.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/tag-white.svg b/resources/assets/statics/public/images/dialog/tag-white.svg
new file mode 100644
index 000000000..1af06dd26
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/tag-white.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/resources/assets/statics/public/images/dialog/tag.svg b/resources/assets/statics/public/images/dialog/tag.svg
new file mode 100644
index 000000000..2e8f1f2aa
--- /dev/null
+++ b/resources/assets/statics/public/images/dialog/tag.svg
@@ -0,0 +1,13 @@
+
+
+