@opendesign-plus-test/components 0.0.1-rc.23 → 0.0.1-rc.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.23",
+  "version": "0.0.1-rc.24",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -32,8 +32,8 @@
     "dayjs": "^1.11.13",
     "video.js": "^8.23.7",
     "vue-dompurify-html": "^3.1.2",
-    "@opendesign-plus/styles": "0.0.1-rc.2",
-    "@opendesign-plus/composables": "0.0.1-rc.6"
+    "@opendesign-plus/composables": "0.0.1-rc.6",
+    "@opendesign-plus/styles": "0.0.1-rc.2"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.0",

package/src/components/activity/OActivityForm.vue

@@ -1,17 +1,30 @@
 <script setup lang="ts">
 
-import { OButton, OForm, OFormItem, OInput, OOption, OSelect, RulesT, useMessage } from '@opensig/opendesign';
+import {
+  OButton,
+  OForm,
+  OFormItem,
+  OInput,
+  OOption,
+  OSelect,
+  OTextarea,
+  RulesT, SelectValueT,
+  useMessage,
+} from '@opensig/opendesign';
 import { computed, ref, watch } from 'vue';
 import { ActivityFormPropsT, ParamsItemT } from './types';
 import { useScreen } from '@opendesign-plus/composables';
 import { dayjs, ElDatePicker } from 'element-plus';
 import { acticityTypeMap, WEBSITE_REGEXP } from './config';
+import { EMAIL_REGEX } from '@/components/meeting/config.ts';
+import { useI18n } from '@/i18n';
 
 const emits = defineEmits(['confirm', 'close']);
 
 const message = useMessage(null);
 const { lePadV } = useScreen();
-
+const { t } = useI18n();
+const $t = t;
 interface TypeOptionT {
   label: string;
   value: number;
@@ -21,6 +34,7 @@ const props = withDefaults(defineProps<ActivityFormPropsT>(), {});
 const isEdit = computed(() => !!props.data);
 const form = ref<ParamsItemT>({
   title: '',
+  organizer: '',
   start_date: '',
   end_date: '',
   register_end_date: '',
@@ -32,6 +46,8 @@ const form = ref<ParamsItemT>({
   start: '',
   end: '',
   is_publish: 'true',
+  email_list: '',
+  content: '',
   approver: '',
 });
 
@@ -55,10 +71,11 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   activity_type: [{ required: true, message: '请选择活动类型' }],
+  organizer: [{ required: true, message: '请选择活动类型' }],
   start_date: [
     { required: true, message: '请选择活动时间' },
     {
-      validator: (value: string) => {
+      validator: () => {
         const { start_date, end_date } = form.value;
         const startDate = start_date.split(' ');
         const endDate = end_date.split(' ');
@@ -109,7 +126,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   address: [
-    { required: true, message: '请输入活动地址' },
+    { required: true, message: '请输入活动地点' },
     {
       validator: (value: string) => {
         if (value.length > 255) {
@@ -122,7 +139,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   register_url: [
-    { required: true, message: '请输入报名网址' },
+    { required: true, message: '请输入活动报名网址' },
     {
       validator: (value: string) => {
         const str = value.replaceAll(' ', '') || '';
@@ -140,7 +157,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   content_url: [
-    { required: true, message: '请输入活动详情网址' },
+    { required: true, message: '请输入活动详情介绍网址' },
     {
       validator: (value: string) => {
         const str = value.replaceAll(' ', '') || '';
@@ -157,26 +174,69 @@ const rules = ref<Record<string, RulesT[]>>({
       triggers: ['blur', 'change'],
     },
   ],
+  content: [{
+    validator: (value: string) => {
+      if (value.length > 1000) {
+        return {
+          type: 'danger',
+          message: '活动内容不能超过1000个字符',
+        };
+      }
+    },
+  }],
+  email_list: [{
+    validator: (value: string) => {
+      const str = value.replaceAll(' ', '') || '';
+      if (str.length) {
+        if (str.length > 1020) {
+          return {
+            type: 'danger',
+            message: t('meeting.emailTooLong'),
+          };
+        }
+        const list = str.split(';') || [];
+        if (list.some((v) => !EMAIL_REGEX.test(v))) {
+          return {
+            type: 'danger',
+            message: t('meeting.emailInvalid'),
+          };
+        }
+        if (list.some((v) => v.length > 50)) {
+          return {
+            type: 'danger',
+            message: t('meeting.singleEmailTooLong'),
+          };
+        }
+        if (list.length > 20) {
+          return {
+            type: 'danger',
+            message: t('meeting.emailCountTooLong'),
+          };
+        }
+      }
+    },
+    triggers: ['blur', 'change'],
+  }],
   approver: [{ required: true, message: '请选择活动审批人' }],
 });
 
 
 // -------------------- 活动管理员 ---------------------
 const approverList = computed(() => {
-  return props.admin || [];
+  return props.admins || [];
 });
 
-const typeValue = ref('');
+const typeValue = ref<string>('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
 acticityTypeMap.forEach((item) => {
   typeOptions.value.push(item);
 });
-const changeType = (val: string) => {
+const changeType = (val: SelectValueT) => {
   const item = typeOptions.value.find((v) => v.label === val);
   form.value.activity_type = item?.value as number;
 };
 
-const disabledDate = (date) => {
+const disabledDate = (date: Date) => {
   return date.getTime() < Date.now() - 24 * 60 * 60 * 1000;
 };
 
@@ -280,8 +340,8 @@ defineExpose({
       <OFormItem :rules="rules.title" label="活动名称" field="title">
         <OInput size="large" placeholder="请输入活动名称" v-model="form.title" />
       </OFormItem>
-      <OFormItem :rules="rules.title" label="活动主办方" field="title">
-        <OInput size="large" placeholder="请输入活动名称" v-model="form.title" />
+      <OFormItem :rules="rules.organizer" label="活动主办方" field="organizer">
+        <OInput size="large" placeholder="请选择活动主办方" v-model="form.organizer" />
       </OFormItem>
       <OFormItem :rules="rules.activity_type" label="活动类型" field="activity_type">
         <OSelect placeholder="请选择活动类型" size="large" v-model="typeValue" @change="changeType">
@@ -291,10 +351,10 @@ defineExpose({
       <OFormItem
         v-if="form.activity_type === 1 || form.activity_type === 3"
         :rules="rules.address"
-        label="活动地址"
+        label="活动地点"
         field="address"
       >
-        <OInput size="large" placeholder="请输入活动地址" v-model="form.address" />
+        <OInput size="large" placeholder="请输入活动地点" v-model="form.address" />
       </OFormItem>
       <OFormItem :rules="rules.start_date" label="活动时间" field="start_date" required>
         <div class="time-config">
@@ -339,10 +399,21 @@ defineExpose({
         />
       </OFormItem>
       <OFormItem :rules="rules.register_url" label="报名网址" field="register_url">
-        <OInput size="large" placeholder="请输入报名网址" v-model="form.register_url" />
+        <OInput size="large" placeholder="请输入活动报名网址" v-model="form.register_url" />
       </OFormItem>
       <OFormItem :rules="rules.content_url" label="活动详情网址" field="content_url">
-        <OInput size="large" placeholder="请输入活动详情网址" v-model="form.content_url" />
+        <OInput size="large" placeholder="请输入活动详情介绍网址" v-model="form.content_url" />
+      </OFormItem>
+      <OFormItem :rules="rules.content" label="活动内容" field="content">
+        <OTextarea size="large" placeholder="请输入活动内容" v-model="form.content" />
+      </OFormItem>
+      <OFormItem field="email_list" :rules="rules.email_list" label="邮件地址">
+        <OTextarea
+          :disabled="isEdit"
+          size="large"
+          :placeholder="$t('meeting.enterEmail')"
+          :rows="4"
+          v-model="form.email_list" />
       </OFormItem>
       <OFormItem :rules="rules.approver" label="活动审批人" field="approver">
         <OSelect placeholder="请选择活动审批人" size="large" v-model="form.approver">
@@ -407,6 +478,10 @@ defineExpose({
       width: 100%;
     }
 
+    .o-textarea {
+      width: 100%;
+    }
+
     .el-input {
       width: 100%;
     }