2 tahun lalu · dc831f7a5d
--- a/dist/assets/index-114e8cc6.css
+++ b/dist/assets/index-114e8cc6.css
--- a/dist/assets/index-863f905d.css
+++ b/dist/assets/index-863f905d.css
--- a/dist/assets/index-f0b3192a.js
+++ b/dist/assets/index-f0b3192a.js
--- a/dist/index.html
+++ b/dist/index.html
@@ -6,8 +6,13 @@
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
 
				   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
			
 
				   <title>IM</title>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./assets/index-16d5c9b2.js"></script>
			
 
				   <link rel="stylesheet" href="./assets/index-863f905d.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./assets/index-f0b3192a.js"></script>
			
 
				+  <link rel="stylesheet" href="./assets/index-114e8cc6.css">
			
 
				+>>>>>>> online
			
 
				 </head>
			
 
				 
			
 
				 <body>
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/index.vue
+++ b/src/TUIKit/TUIComponents/container/TUIChat/index.vue
@@ -274,7 +274,7 @@ const TUIChat: any = defineComponent({
 
				         const userRole = conversation?.groupProfile?.selfInfo.role;
			
 
				         const isMember = userRole === TUIServer.TUICore.TIM.TYPES.GRP_MBR_ROLE_MEMBER;
			
 
				         if (isMember && conversation?.groupProfile?.muteAllMembers) {
			
 
				-          // data.muteText = "管理员开启全员禁言";
			
 
				+          // data.muteText = "管理员开启学生禁言";
			
 
				           return true;
			
 
				         }
			
 
				         const time: number = new Date().getTime();
			
@@ -321,7 +321,7 @@ const TUIChat: any = defineComponent({
 
				         const userRole = conversation?.groupProfile?.selfInfo.role;
			
 
				         const isMember = userRole === TUIServer.TUICore.TIM.TYPES.GRP_MBR_ROLE_MEMBER;
			
 
				         if (isMember && conversation?.groupProfile?.muteAllMembers) {
			
 
				-          data.muteText = "管理员开启全员禁言";
			
 
				+          data.muteText = "管理员开启学生禁言";
			
 
				         }
			
 
				         const time: number = new Date().getTime();
			
 
				         if ((data.selfInfo as any)?.muteUntil * 1000 - time > 0) {
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage-notification.vue
+++ b/src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage-notification.vue
@@ -1,11 +1,15 @@
 
				 <template>
			
 
				   <main class="notification">
			
 
				-    <textarea v-if="isEdit" v-model="input" @keyup.enter="updateProfile"></textarea>
			
 
				+    <input v-if="isEdit" type="text" v-model="title" placeholder="请输入标题" maxlength="15" />
			
 
				+    <textarea v-if="isEdit" v-model="input" @keyup.enter="updateProfile" placeholder="请输入内容"></textarea>
			
 
				     <section v-else>
			
 
				       <p v-if="!groupList.content">
			
 
				         {{ $t(`TUIChat.manage.暂无公告`) }}
			
 
				       </p>
			
 
				-      <article v-else>{{ groupList.content }}</article>
			
 
				+      <article v-else>
			
 
				+        <h2>{{ groupList.title }}</h2>
			
 
				+        {{ groupList.content }}
			
 
				+      </article>
			
 
				     </section>
			
 
				     <footer v-if="isAuth">
			
 
				       <button class="btn" v-if="isEdit" @click="updateProfile">
			
@@ -36,6 +40,7 @@ const ManageNotification = defineComponent({
 
				   setup(props: any, ctx: any) {
			
 
				     const data: any = reactive({
			
 
				       groupProfile: {},
			
 
				+      title: "",
			
 
				       input: "",
			
 
				       groupList: {},
			
 
				       isEdit: false,
			
@@ -51,6 +56,7 @@ const ManageNotification = defineComponent({
 
				         const result = res.data.rows || [];
			
 
				         if (result.length > 0) {
			
 
				           data.input = result[0].content;
			
 
				+          data.title = result[0].title;
			
 
				           data.groupList = result[0];
			
 
				         }
			
 
				       } catch (e: any) {
			
@@ -67,7 +73,7 @@ const ManageNotification = defineComponent({
 
				 
			
 
				     // 更新群资料
			
 
				     const updateProfile = async () => {
			
 
				-      if (data.input && data.input !== data.groupProfile.notification) {
			
 
				+      if (data.title && data.input) {
			
 
				         // ctx.emit("update", { key: "notification", value: data.input });
			
 
				         // data.groupProfile.notification = data.input;
			
 
				         // data.input = "";
			
@@ -76,7 +82,7 @@ const ManageNotification = defineComponent({
 
				             clientType: "TEACHER",
			
 
				             groupId: data.groupProfile.groupID,
			
 
				             content: data.input,
			
 
				-            title: data.input,
			
 
				+            title: data.title,
			
 
				           };
			
 
				           if (data.groupList.id) {
			
 
				             await imGroupNoticeUpdate({
			
@@ -87,8 +93,8 @@ const ManageNotification = defineComponent({
 
				             await imGroupNoticeSave(params);
			
 
				           }
			
 
				           data.groupList.content = data.input;
			
 
				-          ctx.emit("update", { key: "notification", value: data.input });
			
 
				-          data.groupProfile.notification = data.input;
			
 
				+          ctx.emit("update", { key: "notification", value: data.title });
			
 
				+          data.groupProfile.notification = data.title;
			
 
				           data.input = "";
			
 
				         } catch {
			
 
				           //
			
@@ -117,6 +123,8 @@ export default ManageNotification;
 
				   section {
			
 
				     flex: 1;
			
 
				     font-size: 14px;
			
 
				+    word-wrap: break-word;
			
 
				+    word-break: break-word;
			
 
				     p {
			
 
				       text-align: center;
			
 
				       padding-bottom: 20px;
			
@@ -131,6 +139,19 @@ export default ManageNotification;
 
				     resize: none;
			
 
				     font-size: 14px;
			
 
				   }
			
 
				+
			
 
				+  input {
			
 
				+    margin-bottom: 20px;
			
 
				+    padding: 10px;
			
 
				+    border: 1px solid #e8e8e9;
			
 
				+    resize: none;
			
 
				+    font-size: 14px;
			
 
				+  }
			
 
				+
			
 
				+  h2 {
			
 
				+    font-size: 16px;
			
 
				+  }
			
 
				+
			
 
				   footer {
			
 
				     display: flex;
			
 
				     justify-content: flex-end;
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage.vue
+++ b/src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage.vue
@@ -133,9 +133,9 @@
 
				         </div>
			
 
				         <div class="admin-content space-top" v-if="isSetMuteTime">
			
 
				           <aside>
			
 
				-            <label>{{ $t(`TUIChat.manage.全员禁言`) }}</label>
			
 
				+            <label>{{ $t(`TUIChat.manage.学生禁言`) }}</label>
			
 
				             <p>
			
 
				-              {{ $t(`TUIChat.manage.全员禁言开启后，只允许群主和管理员发言。`) }}
			
 
				+              {{ $t(`TUIChat.manage.学生禁言开启后，只允许群主和管理员发言。`) }}
			
 
				             </p>
			
 
				           </aside>
			
 
				           <Slider :open="conversation.groupProfile.muteAllMembers" @change="setAllMuteTime" />
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/manage-components/style/web.scss
+++ b/src/TUIKit/TUIComponents/container/TUIChat/manage-components/style/web.scss
@@ -71,6 +71,11 @@
 
				         flex-wrap: wrap;
			
 
				         padding-bottom: 20Px;
			
 
				 
			
 
				+        dt {
			
 
				+          text-align: center;
			
 
				+          margin: 0 auto;
			
 
				+        }
			
 
				+
			
 
				         dl {
			
 
				           position: relative;
			
 
				           flex: 0 0 36Px;
			
@@ -87,8 +92,10 @@
 
				           }
			
 
				 
			
 
				           dd {
			
 
				+            padding-top: 6px;
			
 
				             text-align: center;
			
 
				-            max-width: 36Px;
			
 
				+            max-width: 50Px;
			
 
				+            font-size: 12px;
			
 
				             overflow: hidden;
			
 
				             text-overflow: ellipsis;
			
 
				             white-space: nowrap;
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/utils/dist/utils.js
+++ b/src/TUIKit/TUIComponents/container/TUIChat/utils/dist/utils.js
@@ -266,9 +266,9 @@ function handleTipGrpUpdated(message) {
 
				   var text = "";
			
 
				   if ("muteAllMembers" in newGroupProfile) {
			
 
				     if (newGroupProfile["muteAllMembers"]) {
			
 
				-      text = t("message.tip.管理员") + " " + operatorID + " " + t("message.tip.开启全员禁言");
			
 
				+      text = t("message.tip.管理员") + " " + operatorID + " " + t("message.tip.开启学生禁言");
			
 
				     } else {
			
 
				-      text = t("message.tip.管理员") + " " + operatorID + " " + t("message.tip.取消全员禁言");
			
 
				+      text = t("message.tip.管理员") + " " + operatorID + " " + t("message.tip.取消学生禁言");
			
 
				     }
			
 
				   } else if ("ownerID" in newGroupProfile) {
			
 
				     text = newGroupProfile["ownerID"] + " " + t("message.tip.成为新的群主");
			
--- a/src/TUIKit/TUIComponents/container/TUIChat/utils/utils.ts
+++ b/src/TUIKit/TUIComponents/container/TUIChat/utils/utils.ts
@@ -198,9 +198,9 @@ function handleTipGrpUpdated(message: any) {
 
				   let text = "";
			
 
				   if ("muteAllMembers" in newGroupProfile) {
			
 
				     if (newGroupProfile["muteAllMembers"]) {
			
 
				-      text = `${t("message.tip.管理员")} ${operatorID} ${t("message.tip.开启全员禁言")}`;
			
 
				+      text = `${t("message.tip.管理员")} ${operatorID} ${t("message.tip.开启学生禁言")}`;
			
 
				     } else {
			
 
				-      text = `${t("message.tip.管理员")} ${operatorID} ${t("message.tip.取消全员禁言")}`;
			
 
				+      text = `${t("message.tip.管理员")} ${operatorID} ${t("message.tip.取消学生禁言")}`;
			
 
				     }
			
 
				   } else if ("ownerID" in newGroupProfile) {
			
 
				     text = `${newGroupProfile["ownerID"]} ${t("message.tip.成为新的群主")}`;
			
--- a/src/TUIKit/locales/en/TUIChat.json
+++ b/src/TUIKit/locales/en/TUIChat.json
@@ -36,7 +36,7 @@
 
				   "表情": "[face]",
			
 
				   "文件": "[file]",
			
 
				   "自定义": "[custom message]",
			
 
				-  "管理员开启全员禁言": "The admin enables Mute All",
			
 
				+  "管理员开启学生禁言": "The admin enables Mute All",
			
 
				   "您已被管理员禁言": "You have been muted by the admin",
			
 
				   "按Enter发送，Ctrl+Enter换行": "Press Enter to send a message and Ctrl+Enter to start a new line",
			
 
				   "单击下载": "Click download",
			
@@ -87,8 +87,8 @@
 
				     "解散群聊": "Disband group",
			
 
				     "退出群组": "Quit group",
			
 
				     "群管理员": "Group admin",
			
 
				-    "全员禁言": "Mute All",
			
 
				-    "全员禁言开启后，只允许群主和管理员发言。": "If Mute All is enabled, only the group owner and admin can speak.",
			
 
				+    "学生禁言": "Mute All",
			
 
				+    "学生禁言开启后，只允许群主和管理员发言。": "If Mute All is enabled, only the group owner and admin can speak.",
			
 
				     "单独禁言人员": "Mute a member",
			
 
				     "删除成员": "Remove member",
			
 
				     "确定从群聊中删除该成员？": "Are you sure you want to remove this member from the group chat?",
			
--- a/src/TUIKit/locales/en/message.json
+++ b/src/TUIKit/locales/en/message.json
@@ -11,8 +11,8 @@
 
				     "被取消禁言": "cancel the prohibition",
			
 
				     "群提示消息": "group prompt message",
			
 
				     "管理员": "The admin",
			
 
				-    "开启全员禁言": "enabled Mute All",
			
 
				-    "取消全员禁言": "disabled Mute All",
			
 
				+    "开启学生禁言": "enabled Mute All",
			
 
				+    "取消学生禁言": "disabled Mute All",
			
 
				     "成为新的群主": "became the new group owner",
			
 
				     "修改群名为": "changed the group name to",
			
 
				     "发布新公告": "posted a new notice",
			
@@ -24,7 +24,7 @@
 
				     "解散": "disbanded",
			
 
				     "创建群": "created the group",
			
 
				     "邀请你加群": "invite you to join the group",
			
 
				-    "你退出群组" : "You left the group",
			
 
				+    "你退出群组": "You left the group",
			
 
				     "你被": "You were",
			
 
				     "设置为群": "set as group",
			
 
				     "的管理员": "as an admin",
			
--- a/src/TUIKit/locales/zh_cn/TUIChat.json
+++ b/src/TUIKit/locales/zh_cn/TUIChat.json
@@ -37,7 +37,7 @@
 
				   "表情": "[表情]",
			
 
				   "文件": "[文件]",
			
 
				   "自定义": "[自定义消息]",
			
 
				-  "管理员开启全员禁言": "管理员开启全员禁言",
			
 
				+  "管理员开启学生禁言": "管理员开启学生禁言",
			
 
				   "您已被管理员禁言": "您已被管理员禁言",
			
 
				   "按Enter发送，Ctrl+Enter换行": "按Enter发送，Ctrl+Enter换行",
			
 
				   "单击下载": "单击下载",
			
@@ -89,8 +89,8 @@
 
				     "解散群聊": "解散群聊",
			
 
				     "退出群组": "退出群组",
			
 
				     "群管理员": "群管理员",
			
 
				-    "全员禁言": "全员禁言",
			
 
				-    "全员禁言开启后，只允许群主和管理员发言。": "全员禁言开启后，只允许群主和管理员发言。",
			
 
				+    "学生禁言": "学生禁言",
			
 
				+    "学生禁言开启后，只允许群主和管理员发言。": "学生禁言开启后，只允许群主和管理员发言。",
			
 
				     "单独禁言人员": "单独禁言人员",
			
 
				     "删除成员": "删除成员",
			
 
				     "确定从群聊中删除该成员？": "确定从群聊中删除该成员？",
			
--- a/src/TUIKit/locales/zh_cn/message.json
+++ b/src/TUIKit/locales/zh_cn/message.json
@@ -11,8 +11,8 @@
 
				     "被取消禁言": "被取消禁言",
			
 
				     "群提示消息": "群提示消息",
			
 
				     "管理员": "管理员",
			
 
				-    "开启全员禁言": "开启全员禁言",
			
 
				-    "取消全员禁言": "取消全员禁言",
			
 
				+    "开启学生禁言": "开启学生禁言",
			
 
				+    "取消学生禁言": "取消学生禁言",
			
 
				     "成为新的群主": "成为新的群主",
			
 
				     "修改群名为": "修改群名为",
			
 
				     "发布新公告": "发布新公告",
			
--- a/src/TUIKit/locales/zh_cn/translate.json
+++ b/src/TUIKit/locales/zh_cn/translate.json
@@ -16,7 +16,7 @@
 
				   "TUIKit-TUIChat-15": "描述",
			
 
				   "TUIKit-TUIChat-16": "经度",
			
 
				   "TUIKit-TUIChat-17": "纬度",
			
 
				-  "TUIKit-TUIChat-18": "管理员开启全员禁言",
			
 
				+  "TUIKit-TUIChat-18": "管理员开启学生禁言",
			
 
				   "TUIKit-TUIChat-19": "您已被管理员禁言",
			
 
				   "TUIKit-TUIChat-20": "按Enter发送，Ctrl+Enter换行",
			
 
				   "TUIKit-TUIChat-mange-01": "群公告",
			
@@ -38,8 +38,8 @@
 
				   "TUIKit-TUIChat-mange-17": "解散群聊",
			
 
				   "TUIKit-TUIChat-mange-18": "退出群组",
			
 
				   "TUIKit-TUIChat-mange-19": "群管理员",
			
 
				-  "TUIKit-TUIChat-mange-20": "全员禁言",
			
 
				-  "TUIKit-TUIChat-mange-21": "全员禁言开启后，只允许群主和管理员发言。",
			
 
				+  "TUIKit-TUIChat-mange-20": "学生禁言",
			
 
				+  "TUIKit-TUIChat-mange-21": "学生禁言开启后，只允许群主和管理员发言。",
			
 
				   "TUIKit-TUIChat-mange-22": "单独禁言人员",
			
 
				   "TUIKit-TUIChat-mange-23": "删除成员",
			
 
				   "TUIKit-TUIChat-mange-24": "确定从群聊中删除该成员？",
			
@@ -118,8 +118,8 @@
 
				   "TUIKit-message-tip-09": "被取消禁言",
			
 
				   "TUIKit-message-tip-10": "群提示消息",
			
 
				   "TUIKit-message-tip-11": "管理员",
			
 
				-  "TUIKit-message-tip-12": "开启全员禁言",
			
 
				-  "TUIKit-message-tip-13": "取消全员禁言",
			
 
				+  "TUIKit-message-tip-12": "开启学生禁言",
			
 
				+  "TUIKit-message-tip-13": "取消学生禁言",
			
 
				   "TUIKit-message-tip-14": "成为新的群主",
			
 
				   "TUIKit-message-tip-15": "修改群名为",
			
 
				   "TUIKit-message-tip-16": "发布新公告",
			
--- a/src/main.ts
+++ b/src/main.ts
@@ -41,8 +41,8 @@ import { TUIComponents, TUICore, genTestUserSig } from "./TUIKit";
 
				 console.log(import.meta.env.DEV, "import.meta.env.DEV");
			
 
				 
			
 
				 // 判断是否是测试环境的
			
 
				-const SDKAppID = parseSearch.appId || hashSearch.appId || 1400805079; // import.meta.env.DEV ? 1400805079 : 1400799837; // 1400805079; // Your SDKAppID
			
 
				-const secretKey = parseSearch.secretKey || hashSearch.secretKey || "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; //import.meta.env.DEV ? "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30" : "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //"c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; // Your secretKey
			
 
				+const SDKAppID = parseSearch.appId || hashSearch.appId || 1400799837; // import.meta.env.DEV ? 1400805079 : 1400799837; // 1400805079; // Your SDKAppID
			
 
				+const secretKey = parseSearch.secretKey || hashSearch.secretKey || "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //import.meta.env.DEV ? "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30" : "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //"c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; // Your secretKey
			
 
				 const userID = parseSearch.userID; //|| "KT:140:TEACHER"; // User ID
			
 
				 
			
 
				 // init TUIKit