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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.22",
+  "version": "0.0.1-rc.23",
   "type": "module",
   "publishConfig": {
     "access": "public",

package/src/components/activity/OActivityForm.vue

@@ -1,30 +1,17 @@
 <script setup lang="ts">
 
-import {
-  OButton,
-  OForm,
-  OFormItem,
-  OInput,
-  OOption,
-  OSelect,
-  OTextarea,
-  RulesT, SelectValueT,
-  useMessage,
-} from '@opensig/opendesign';
+import { OButton, OForm, OFormItem, OInput, OOption, OSelect, RulesT, 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;
@@ -34,7 +21,6 @@ const props = withDefaults(defineProps<ActivityFormPropsT>(), {});
 const isEdit = computed(() => !!props.data);
 const form = ref<ParamsItemT>({
   title: '',
-  organizer: '',
   start_date: '',
   end_date: '',
   register_end_date: '',
@@ -46,8 +32,6 @@ const form = ref<ParamsItemT>({
   start: '',
   end: '',
   is_publish: 'true',
-  email_list: '',
-  content: '',
   approver: '',
 });
 
@@ -71,11 +55,10 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   activity_type: [{ required: true, message: '请选择活动类型' }],
-  organizer: [{ required: true, message: '请选择活动类型' }],
   start_date: [
     { required: true, message: '请选择活动时间' },
     {
-      validator: () => {
+      validator: (value: string) => {
         const { start_date, end_date } = form.value;
         const startDate = start_date.split(' ');
         const endDate = end_date.split(' ');
@@ -126,7 +109,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   address: [
-    { required: true, message: '请输入活动地点' },
+    { required: true, message: '请输入活动地址' },
     {
       validator: (value: string) => {
         if (value.length > 255) {
@@ -139,7 +122,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   register_url: [
-    { required: true, message: '请输入活动报名网址' },
+    { required: true, message: '请输入报名网址' },
     {
       validator: (value: string) => {
         const str = value.replaceAll(' ', '') || '';
@@ -157,7 +140,7 @@ const rules = ref<Record<string, RulesT[]>>({
     },
   ],
   content_url: [
-    { required: true, message: '请输入活动详情介绍网址' },
+    { required: true, message: '请输入活动详情网址' },
     {
       validator: (value: string) => {
         const str = value.replaceAll(' ', '') || '';
@@ -174,69 +157,26 @@ 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.admins || [];
+  return props.admin || [];
 });
 
-const typeValue = ref<string>('');
+const typeValue = ref('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
 acticityTypeMap.forEach((item) => {
   typeOptions.value.push(item);
 });
-const changeType = (val: SelectValueT) => {
+const changeType = (val: string) => {
   const item = typeOptions.value.find((v) => v.label === val);
   form.value.activity_type = item?.value as number;
 };
 
-const disabledDate = (date: Date) => {
+const disabledDate = (date) => {
   return date.getTime() < Date.now() - 24 * 60 * 60 * 1000;
 };
 
@@ -340,8 +280,8 @@ defineExpose({
       <OFormItem :rules="rules.title" label="活动名称" field="title">
         <OInput size="large" placeholder="请输入活动名称" v-model="form.title" />
       </OFormItem>
-      <OFormItem :rules="rules.organizer" label="活动主办方" field="organizer">
-        <OInput size="large" placeholder="请选择活动主办方" v-model="form.organizer" />
+      <OFormItem :rules="rules.title" label="活动主办方" field="title">
+        <OInput size="large" placeholder="请输入活动名称" v-model="form.title" />
       </OFormItem>
       <OFormItem :rules="rules.activity_type" label="活动类型" field="activity_type">
         <OSelect placeholder="请选择活动类型" size="large" v-model="typeValue" @change="changeType">
@@ -351,10 +291,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">
@@ -399,21 +339,10 @@ 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" />
-      </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" />
+        <OInput size="large" placeholder="请输入活动详情网址" v-model="form.content_url" />
       </OFormItem>
       <OFormItem :rules="rules.approver" label="活动审批人" field="approver">
         <OSelect placeholder="请选择活动审批人" size="large" v-model="form.approver">
@@ -478,10 +407,6 @@ defineExpose({
       width: 100%;
     }
 
-    .o-textarea {
-      width: 100%;
-    }
-
     .el-input {
       width: 100%;
     }