diff --git a/resources/assets/js/components/ChainReaction.vue b/resources/assets/js/components/ChainReaction.vue new file mode 100644 index 000000000..03dbc48ce --- /dev/null +++ b/resources/assets/js/components/ChainReaction.vue @@ -0,0 +1,90 @@ + + + diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index eecf43f0c..f590666be 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -264,6 +264,9 @@ + + + @@ -290,6 +293,7 @@ import ApproveExport from "./manage/components/ApproveExport"; import notificationKoro from "notification-koro1"; import {Store} from "le5le-store"; import MicroApps from "../components/MicroApps.vue"; +import ChainReaction from "../components/ChainReaction.vue"; export default { components: { @@ -308,7 +312,8 @@ export default { ProjectManagement, TeamManagement, ProjectArchived, - MicroApps + MicroApps, + ChainReaction }, directives: {longpress}, data() { diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index 9e3e7ff85..56645bc6a 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -311,6 +311,7 @@ export default { { value: "signin", label: "签到" }, { value: "meeting", label: "会议" }, { value: "calendar", label: "日历" }, + { value: "jielong", label: "接龙" }, ]; // wap模式 let appApplyList = this.windowOrientation != 'portrait' ? ( @@ -400,6 +401,9 @@ export default { case 'scan': $A.eeuiAppScan(this.scanResult); return; + case 'jielong': + // DOTO + return; } this.$emit("on-click", item.value) }, diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index b82ece712..48d642ffc 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -106,6 +106,10 @@ {{$L('全屏输入')}} +
+ + {{$L('接龙')}} +
@@ -1228,6 +1232,13 @@ export default { case 'anon': this.$emit('on-more', action) break; + + case 'chain-reaction': + this.$store.state.chainReaction = { + type: 'create', + dialog_id: this.dialogId + } + break; } }, @@ -1350,7 +1361,7 @@ export default { }) }) moreUser.sort((a, b) => a.last_at > b.last_at ? -1 : (a.last_at < b.last_at ? 1 : 0)); - // + // this.userList = list this.userCache = []; if (moreUser.length > 0) { diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue index 1e2667cec..853b5a053 100644 --- a/resources/assets/js/pages/manage/setting/index.vue +++ b/resources/assets/js/pages/manage/setting/index.vue @@ -6,7 +6,7 @@

{{settingTitleName}}

-
+
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index fe8b1f7b6..3690d84c2 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -209,6 +209,9 @@ export default { meetingid: 0 }, + // 接龙 + chainReaction: {}, + // okr窗口 okrWindow: { type: 'open', diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss index d0df45049..85ee4e306 100755 --- a/resources/assets/sass/pages/components/_.scss +++ b/resources/assets/sass/pages/components/_.scss @@ -29,4 +29,4 @@ @import "project-menu"; @import "calendar"; @import "home-calendar"; -@import "home-calendar"; +@import "chain-reaction"; diff --git a/resources/assets/sass/pages/components/chain-reaction.scss b/resources/assets/sass/pages/components/chain-reaction.scss new file mode 100644 index 000000000..f81d5798f --- /dev/null +++ b/resources/assets/sass/pages/components/chain-reaction.scss @@ -0,0 +1,14 @@ +.chain-reaction-wrapper { + +} + +body.window-portrait { + .chain-reaction-wrapper { + + } + @media (max-width: 640px) { + .chain-reaction-wrapper { + + } + } +}