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

package/src/components/activity/OActivityForm.vue

@@ -25,6 +25,7 @@ const message = useMessage(null);
 const { lePadV } = useScreen();
 const { t } = useI18n();
 const $t = t;
+
 interface TypeOptionT {
   label: string;
   value: number;
@@ -47,7 +48,6 @@ const form = ref<ParamsItemT>({
   end: '',
   is_publish: 'true',
   email_list: '',
-  content: '',
   approver: '',
 });
 
@@ -174,7 +174,7 @@ const rules = ref<Record<string, RulesT[]>>({
       triggers: ['blur', 'change'],
     },
   ],
-  content: [{
+  synopsis: [{
     validator: (value: string) => {
       if (value.length > 1000) {
         return {
@@ -258,6 +258,9 @@ watch(
         is_publish,
         approver,
         update_activity_id,
+        synopsis,
+        email_list,
+        organizer,
       } = val;
       let params = {
         title,
@@ -273,6 +276,9 @@ watch(
         is_publish,
         approver,
         update_activity_id,
+        synopsis,
+        email_list,
+        organizer,
       } as ParamsItemT;
       form.value = { ...params };
       typeValue.value = acticityTypeMap.get(val.activity_type)?.label;
@@ -292,11 +298,11 @@ const confirm = async (val: boolean) => {
     }
     loading.value = true;
     form.value.is_publish = `${ val }`;
-    if (isEdit.value && props.status === 3) {
+    if (isEdit.value && props.data?.status === 3) {
       form.value.update_activity_id = props.data?.id;
       await props.creatActivity?.(form.value);
     } else if (isEdit.value) {
-      await props.editActivity?.(props.data.id, form.value);
+      await props.editActivity?.(props.data?.id, form.value);
     } else {
       await props.creatActivity?.(form.value);
     }
@@ -314,6 +320,8 @@ const confirm = async (val: boolean) => {
     message.danger({
       content: msg,
     });
+  } finally {
+    loading.value = false;
   }
 };
 const close = () => {
@@ -341,7 +349,9 @@ defineExpose({
         <OInput size="large" placeholder="请输入活动名称" v-model="form.title" />
       </OFormItem>
       <OFormItem :rules="rules.organizer" label="活动主办方" field="organizer">
-        <OInput size="large" placeholder="请选择活动主办方" v-model="form.organizer" />
+        <OSelect placeholder="请选择活动主办方" size="large" v-model="form.organizer">
+          <OOption v-for="t in organizers" :key="t.name" :value="t.name">{{ t.name }}</OOption>
+        </OSelect>
       </OFormItem>
       <OFormItem :rules="rules.activity_type" label="活动类型" field="activity_type">
         <OSelect placeholder="请选择活动类型" size="large" v-model="typeValue" @change="changeType">
@@ -404,8 +414,8 @@ defineExpose({
       <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 :rules="rules.synopsis" label="活动内容" field="synopsis">
+        <OTextarea size="large" placeholder="请输入活动内容" v-model="form.synopsis" />
       </OFormItem>
       <OFormItem field="email_list" :rules="rules.email_list" label="邮件地址">
         <OTextarea
@@ -479,6 +489,7 @@ defineExpose({
     }
 
     .o-textarea {
+      --_box-radius: var(--o-radius-xs);
       width: 100%;
     }