@opendesign-plus-test/components 0.0.1-rc.32 → 0.0.1-rc.34

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -904,10 +904,15 @@ const cancelActions = computed<DialogActionT[]>(() => {
             th {
               text-align: center;
               border: none;
+              --o-color-control3-light: transparent;
+            }
+
+            tr {
+              --o-color-fill2: transparent;
             }
 
             td {
-              background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
+              background-color: transparent !important;
               border: none;
               text-align: center;
               transition: none;
@@ -1025,9 +1030,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
       .o-scroller {
         .o-scrollbar-rail {
           right: -16px;
-        }
-
-        .o-scrollbar {
           height: 100%;
         }
       }
@@ -1265,8 +1267,8 @@ const cancelActions = computed<DialogActionT[]>(() => {
               width: 20px;
               height: 20px;
               font-size: 20px;
-              bottom: var(--o-gap-2);
-              top: revert;
+              top: 50%;
+              transform: translateY(-50%);
             }
           }
 
@@ -1277,6 +1279,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
             flex-direction: column;
             align-items: flex-start;
             justify-content: space-between;
+            margin-bottom: 0;
             .item-header-left {
               display: flex;
               align-items: flex-start;
@@ -1348,6 +1351,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
                   color: var(--o-color-info3);
                   display: flex;
                   align-items: center;
+                  font-weight: 400;
                   @include tip1;
 
                   span:last-child {
@@ -1386,8 +1390,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
               display: var(--copy-display);
               @include respond-to('phone') {
                 bottom: var(--o-gap-2);
-                transform: revert;
-                top: revert;
                 right: calc(20px + var(--o-gap-2))
               }
 

package/src/components/meeting/components/OMeetingCalendarList.vue

@@ -15,7 +15,9 @@ import { CYCLE_TYPE_OPTIONS, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from
 
 import { formatDate, getConfig, getPointStr } from '../utils.ts';
 import { useI18n } from '@/i18n';
-import { acticityTypeMap } from '@/components/activity/config.ts';
+import { getActicityTypeMap } from '@/components/activity/config.ts';
+
+const acticityTypeMap = getActicityTypeMap();
 
 const props = withDefaults(defineProps<{
   list: MeetingItemT[];

package/src/components/meeting/components/OMeetingDetail.vue

@@ -28,28 +28,32 @@ const infoList = computed(() =>
 );
 
 
-const activityInfoList = computed(() =>
-  [
-    { label: '起始日期', key: 'start_date_time' },
-    { label: '结束日期', key: 'end_date_time' },
-    { label: '报名截止时间', key: 'register_end_date' },
-    { label: '活动地点', key: 'address' },
-    { label: '活动详情地址', key: 'content_url', isLink: true },
-    { label: '活动审批人', key: 'approver' },
-    { label: '审核备注', key: 'approve_record', isRecord: true },
-  ].slice(0, props.from === 'home' ? 4 : 7),
-);
-const activityInfoApprovalList = computed(() => [
-  { label: '活动类型', key: 'activity_type', isType: true },
-  { label: '活动地点', key: 'address' },
-  { label: '起始日期', key: 'start_date_time' },
-  { label: '结束日期', key: 'end_date_time' },
-  { label: '报名截止时间', key: 'register_end_date' },
-  { label: '报名网址', key: 'register_url', isLink: true },
-  { label: '活动详情地址', key: 'content_url', isLink: true },
-  { label: '活动审批人', key: 'approver' },
-  { label: '审核备注', key: 'approve_record', isRecord: true },
-]);
+const activityInfoList = computed(() => {
+  const isLive = props.data.activity_type === 2 || props.data.activity_type === '线上';
+  return [
+    { label: t('meeting.startDate'), key: 'start_date_time' },
+    { label: t('meeting.endDate'), key: 'end_date_time' },
+    { label: t('meeting.registrationDeadline'), key: 'register_end_date' },
+    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: 'address' },
+    { label: t('meeting.activityDetailUrl'), key: 'content_url', isLink: true },
+    { label: t('meeting.activityApprover'), key: 'approver' },
+    { label: t('meeting.reviewNotesLabel'), key: 'approve_record', isRecord: true },
+  ].slice(0, props.from === 'home' ? 4 : 7);
+});
+const activityInfoApprovalList = computed(() => {
+  const isLive = props.data.activity_type === 2 || props.data.activity_type === '线上';
+  return [
+    { label: t('meeting.activityType'), key: 'activity_type', isType: true },
+    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: 'address' },
+    { label: t('meeting.startDate'), key: 'start_date_time' },
+    { label: t('meeting.endDate'), key: 'end_date_time' },
+    { label: t('meeting.registrationDeadline'), key: 'register_end_date' },
+    { label: t('meeting.registrationUrl'), key: 'register_url', isLink: true },
+    { label: t('meeting.activityDetailUrl'), key: 'content_url', isLink: true },
+    { label: t('meeting.activityApprover'), key: 'approver' },
+    { label: t('meeting.reviewNotesLabel'), key: 'approve_record', isRecord: true },
+  ];
+});
 
 const columns = computed(() => {
   if (props.data.type === CalendarDataType.ACTIVITY || props.data.type === CalendarDataType.EVENTS) {
@@ -116,7 +120,7 @@ defineExpose({ copyInfo });
           <p v-for="re in data[info.key]" :key="re.create_time" class="value">
             {{ re.reason }}&nbsp;&nbsp;
             {{ formatDate(re.create_time, 'YYYY/MM/DD HH:mm:ss') }}
-            审核{{ re.action === 1 ? '通过' : '驳回' }}
+            {{ re.action === 1 ? t('meeting.approveReview') : t('meeting.rejectReview') }}
           </p>
         </div>
       </template>

package/src/i18n/en.ts

@@ -133,6 +133,7 @@ export default {
   'meeting.sigs': 'SIG Groups',
   'meeting.groups': 'Groups',
   'meeting.activityAddress': 'Address',
+  'meeting.livePlatform': 'Live Platform',
   'meeting.meetingTopic': 'Topics: ',
   'meeting.meetingDetail': 'Details',
   'meeting.meetingEtherpad': 'Etherpad',
@@ -164,4 +165,97 @@ export default {
   'cookie.analyticalCookieDetail': 'We will use these cookies only with your consent. These cookies help us make improvements by collecting statistics such as the number of visits and traffic sources.',
   'cookie.saveSetting': 'Save Settings',
   'cookie.setting': 'Cookie settings',
+  'meeting.create': 'Create',
+  'meeting.createMeeting': 'Create Meeting',
+  'meeting.createActivity': 'Create Event',
+  'meeting.createPermission': 'Workspace role required to create meetings or events',
+  'meeting.createActivityPermission': 'Workspace role required to create events',
+  'meeting.myActivity': 'Events',
+  'meeting.activityName': 'Event Name',
+  'meeting.enterActivityName': 'Enter a name',
+  'meeting.activityOrganizer': 'Organizer',
+  'meeting.selectActivityOrganizer': 'Select organizer',
+  'meeting.activityType': 'Event Type',
+  'meeting.selectActivityType': 'Select type',
+  'meeting.activityTime': 'Event Time',
+  'meeting.selectActivityStartDate': 'Set start date',
+  'meeting.selectActivityEndDate': 'Set end date',
+  'meeting.registrationDeadline': 'Registration Deadline',
+  'meeting.selectActivityDeadline': 'Set deadline',
+  'meeting.registrationUrl': 'Registration URL',
+  'meeting.enterActivityRegistrationUrl': 'Enter registration URL',
+  'meeting.activityDetailUrl': 'Event Overview URL',
+  'meeting.enterActivityDetailUrl': 'Enter event overview URL',
+  'meeting.activityContent': 'Event Details',
+  'meeting.enterActivityContent': 'Enter event details',
+  'meeting.email': 'Email',
+  'meeting.enterEmailDesc': 'Enter the recipient email addresses. Separate multiple addresses with commas (,) or semicolons (;).',
+  'meeting.activityApprover': 'Approver',
+  'meeting.selectActivityApprover': 'Select approver',
+  'meeting.saveDraft': 'Save as Draft',
+  'meeting.cancelBtn': 'Cancel',
+  'meeting.communityActivityApproval': 'Approve Event',
+  'meeting.reviewActivityTip': 'Review events submitted for approval',
+  'meeting.applicant': 'Applicant',
+  'meeting.searchApplicant': 'Search applicant',
+  'meeting.submissionTime': 'Submission Time',
+  'meeting.status': 'Status',
+  'meeting.statusPending': 'Pending',
+  'meeting.statusApproved': 'Approved',
+  'meeting.statusRejected': 'Rejected',
+  'meeting.statusCanceled': 'Canceled',
+  'meeting.action': 'Action',
+  'meeting.cancelActivity': 'Cancel',
+  'meeting.approve': 'Approve',
+  'meeting.reject': 'Reject',
+  'meeting.approveReview': 'Approve',
+  'meeting.rejectReview': 'Reject',
+  'meeting.reviewNotes': 'Review Notes',
+  'meeting.enterReviewNotes': 'Enter review notes here',
+  'meeting.confirmCancelActivity': 'Cancel "{0}"? Once canceled, it will be removed from the homepage, and all registration data will be cleared. Please proceed with caution.',
+  'meeting.confirmBtn': 'OK',
+  'meeting.activityDetail': 'View Details',
+  'meeting.modifyActivity': 'Modify',
+  'meeting.withdrawReview': 'Withdraw',
+  'meeting.deleteActivity': 'Delete',
+  'meeting.submitReview': 'Submit',
+  'meeting.confirmDeleteActivity': 'Delete "{0}"? Once deleted, it will be removed from User Center.',
+  'meeting.registerNow': 'Register Now',
+  'meeting.onlineOffline': 'Online & Offline',
+  'meeting.statusDraft': 'Draft',
+  'meeting.statusUnderReview': 'Pending Review',
+  'meeting.statusRegistering': 'Registering',
+  'meeting.statusInProgress': 'In Progress',
+  'meeting.statusEnded': 'Finished',
+  'meeting.statusModified': 'Modified',
+  'meeting.reviewSuccess': '"{0}" reviewed',
+  'meeting.reviewFail': '"{0}" review failed',
+  'meeting.reviewNotesLabel': 'Review Notes',
+  'meeting.reviewed': 'Reviewed',
+  'meeting.activityActionSuccess': '"{0}" {1} successful',
+  'meeting.activityActionFail': '"{0}" {1} failed',
+  'meeting.activityNameMaxLength': 'Activity name cannot exceed 50 characters',
+  'meeting.selectActivityTime': 'Select activity time',
+  'meeting.selectActivityDate': 'Select activity date',
+  'meeting.activityTimeRange': 'Start and end time must be between 8:00-22:00',
+  'meeting.endDateAfterStartDate': 'End date must be after start date',
+  'meeting.registerDeadlineBeforeEnd': 'Registration deadline must be before end date',
+  'meeting.enterActivityAddress': 'Enter activity location',
+  'meeting.activityAddressMaxLength': 'Activity location cannot exceed 255 characters',
+  'meeting.invalidRegistrationUrl': 'Enter a valid registration URL',
+  'meeting.invalidActivityDetailUrl': 'Enter a valid activity detail URL',
+  'meeting.activityContentMaxLength': 'Activity content cannot exceed 1000 characters',
+  'meeting.revokeActivitySuccess': '"{0}" activity review withdrawn successfully',
+  'meeting.revokeActivityFail': '"{0}" activity review withdrawal failed',
+  'meeting.submitReviewSuccess': '"{0}" activity submitted for review successfully',
+  'meeting.submitReviewFail': '"{0}" activity submission failed',
+  'meeting.deleteActivitySuccess': '"{0}" activity deleted successfully',
+  'meeting.deleteActivityFail': '"{0}" activity deletion failed',
+  'meeting.loading': 'Loading...',
+  'meeting.confirmRevokeActivity': 'Are you sure you want to withdraw "{0}" activity? After withdrawal, the activity will become a draft.',
+  'events.status': 'Status',
+  'events.statusAll': 'All',
+  'events.statusIng': 'Progress',
+  'events.statusFinish': 'Finish',
+  'events.searchPlaceholder': 'Enter search...',
 };

package/src/i18n/zh.ts

@@ -133,6 +133,7 @@ export default {
   'meeting.sigs': 'SIG 组',
   'meeting.groups': '工作组',
   'meeting.activityAddress': '活动地点',
+  'meeting.livePlatform': '直播平台',
   'meeting.meetingTopic': '会议主题：',
   'meeting.meetingDetail': '会议详情',
   'meeting.meetingEtherpad': '会议纪要',
@@ -153,6 +154,94 @@ export default {
   'common.more': '更多',
   'cookie.desc': '我们使用cookie来确保您的高速浏览体验。继续浏览本站，即表示您同意我们使用cookie。',
   'cookie.about': '查看详情',
+  'meeting.create': '创建',
+  'meeting.createMeeting': '创建会议',
+  'meeting.createActivity': '创建活动',
+  'meeting.createPermission': '创建会议或活动需要工作组角色权限',
+  'meeting.createActivityPermission': '创建活动需要工作组角色权限',
+  'meeting.myActivity': '我的活动',
+  'meeting.activityName': '活动名称',
+  'meeting.enterActivityName': '请输入活动名称',
+  'meeting.activityOrganizer': '活动主办方',
+  'meeting.selectActivityOrganizer': '请选择活动主办方',
+  'meeting.activityType': '活动类型',
+  'meeting.selectActivityType': '请选择活动类型',
+  'meeting.activityTime': '活动时间',
+  'meeting.selectActivityStartDate': '请选择活动起始日期',
+  'meeting.selectActivityEndDate': '请选择活动结束日期',
+  'meeting.registrationDeadline': '报名截止时间',
+  'meeting.selectActivityDeadline': '请选择活动截止时间',
+  'meeting.registrationUrl': '报名网址',
+  'meeting.enterActivityRegistrationUrl': '请输入活动报名网址',
+  'meeting.activityDetailUrl': '活动详情网址',
+  'meeting.enterActivityDetailUrl': '请输入活动详情介绍网址',
+  'meeting.activityContent': '活动内容',
+  'meeting.enterActivityContent': '请输入活动内容',
+  'meeting.email': '邮件地址',
+  'meeting.enterEmailDesc': '请输入电子邮件地址，多个邮件地址以 " , " 或 " ; " 间隔',
+  'meeting.activityApprover': '活动审批人',
+  'meeting.selectActivityApprover': '请选择活动审批人',
+  'meeting.saveDraft': '保存草稿',
+  'meeting.cancelBtn': '取消',
+  'meeting.communityActivityApproval': '社区活动审批',
+  'meeting.reviewActivityTip': '在这里查看需要您审核的活动',
+  'meeting.applicant': '申请人',
+  'meeting.searchApplicant': '搜索申请人',
+  'meeting.submissionTime': '申请时间',
+  'meeting.status': '状态',
+  'meeting.statusPending': '未审核',
+  'meeting.statusApproved': '已通过',
+  'meeting.statusRejected': '已驳回',
+  'meeting.statusCanceled': '已取消',
+  'meeting.action': '操作',
+  'meeting.cancelActivity': '取消活动',
+  'meeting.approve': '通过',
+  'meeting.reject': '驳回',
+  'meeting.approveReview': '审核通过',
+  'meeting.rejectReview': '审核驳回',
+  'meeting.reviewNotes': '审核备注',
+  'meeting.enterReviewNotes': '请输入审核的备注信息',
+  'meeting.confirmCancelActivity': '确定取消"xxxxxxxxxxxxxxxxx"活动？取消后将不会在会议首页呈现，且已报名的数据也会被清空，请谨慎操作。',
+  'meeting.confirmBtn': '确定',
+  'meeting.activityDetail': '活动详情',
+  'meeting.modifyActivity': '修改活动',
+  'meeting.withdrawReview': '撤销审核',
+  'meeting.deleteActivity': '删除活动',
+  'meeting.submitReview': '提交审核',
+  'meeting.confirmDeleteActivity': '确定删除"xxxxxxxxxxxxxxxxx"活动？删除后记录将不再我的个人中心呈现。',
+  'meeting.registerNow': '我要报名',
+  'meeting.onlineOffline': '线上与线下',
+  'meeting.statusDraft': '草稿',
+  'meeting.statusUnderReview': '审核中',
+  'meeting.statusRegistering': '报名中',
+  'meeting.statusInProgress': '进行中',
+  'meeting.statusEnded': '已结束',
+  'meeting.statusModified': '已修改',
+  'meeting.reviewSuccess': '“{0}”活动审核成功',
+  'meeting.reviewFail': '“{0}”活动审核失败',
+  'meeting.reviewNotesLabel': '审核备注',
+  'meeting.reviewed': '审核',
+  'meeting.activityActionSuccess': '"{0}"活动{1}成功',
+  'meeting.activityActionFail': '"{0}"活动{1}失败',
+  'meeting.activityNameMaxLength': '活动名称不能超过50个字符',
+  'meeting.selectActivityTime': '请选择活动时间',
+  'meeting.selectActivityDate': '请选择活动日期',
+  'meeting.activityTimeRange': '开始和结束时间必须在8：00-22：00点之间',
+  'meeting.endDateAfterStartDate': '结束日期必须大于起始日期',
+  'meeting.registerDeadlineBeforeEnd': '报名截止日期必须小于结束日期',
+  'meeting.enterActivityAddress': '请输入活动地点',
+  'meeting.activityAddressMaxLength': '活动地点不能超过255个字符',
+  'meeting.invalidRegistrationUrl': '请输入正确的报名网址',
+  'meeting.invalidActivityDetailUrl': '请输入正确的活动详情网址',
+  'meeting.activityContentMaxLength': '活动内容不能超过1000个字符',
+  'meeting.revokeActivitySuccess': '"{0}"活动撤销审核成功',
+  'meeting.revokeActivityFail': '"{0}"活动撤销审核失败',
+  'meeting.submitReviewSuccess': '"{0}"活动提交审核成功',
+  'meeting.submitReviewFail': '"{0}"活动提交审核失败',
+  'meeting.deleteActivitySuccess': '"{0}"活动删除成功',
+  'meeting.deleteActivityFail': '"{0}"活动删除失败',
+  'meeting.loading': '加载中···',
+  'meeting.confirmRevokeActivity': '是否确认要撤销"{0}"活动？撤销审核后活动将变成草稿状态。',
   'events.status': '活动状态',
   'events.statusAll': '全部',
   'events.statusIng': '进行中',