@opendesign-plus-test/components 0.0.1-rc.25 → 0.0.1-rc.27

package/src/components/activity/OActivityApproval.vue

@@ -288,8 +288,9 @@ const cancelActions = computed<DialogActionT[]>(() => {
     id: 'confirm',
     loading: loading.value,
     color: 'primary',
-    variant: lePadV.value ? 'text' : 'outline',
+    variant: lePadV.value ? 'text' : 'solid',
     round: 'pill',
+    size: 'large',
     label: '确定',
     onClick: () => {
       confirmCancel();
@@ -297,8 +298,9 @@ const cancelActions = computed<DialogActionT[]>(() => {
   }, {
     id: 'cancel',
     color: 'primary',
-    variant: lePadV.value ? 'text' : 'solid',
+    variant: lePadV.value ? 'text' : 'outline',
     round: 'pill',
+    size: 'large',
     label: '取消',
     onClick: () => {
       cancel();
@@ -312,6 +314,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     color: 'primary',
     variant: lePadV.value ? 'text' : 'solid',
     round: 'pill',
+    size: 'large',
     label: '确定',
     onClick: () => {
       confirm();
@@ -321,6 +324,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     color: 'primary',
     variant: lePadV.value ? 'text' : 'outline',
     round: 'pill',
+    size: 'large',
     label: '取消',
     onClick: () => {
       cancel();
@@ -524,7 +528,6 @@ const reviewActions = computed<DialogActionT[]>(() => {
             <OTextarea
               size="large"
               placeholder="请输入审核的备注信息"
-              style="width: 100%"
               :rows="4"
               resize="none"
               :max-length="1000"
@@ -539,7 +542,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     <ODialog
       v-model:visible="cancelVisible"
       :phone-half-full="lePadV"
-      main-class="handle-dialog-approval"
+      main-class="handle-dialog-approval cancel-dialog"
       :actions="cancelActions"
     >
       <template #header>{{ cancelTitle }}</template>
@@ -550,284 +553,273 @@ const reviewActions = computed<DialogActionT[]>(() => {
   </div>
 </template>
 
-<style lang="scss" scoped>
-.my-approval {
-  height: 100%;
-}
-
-.title {
-  color: var(--o-color-info1);
-  font-weight: 500;
-  @include h2;
-}
-
-.desc {
-  color: var(--o-color-info2);
-  margin-top: 12px;
-  @include tip1;
-}
-
-.o-divider {
-  --o-divider-gap: 24px;
-}
+<style lang="scss">
+.o-activity-table {
 
-.expand-detail {
-  padding: 16px 60px;
-  background-color: rgba(243, 246, 250, 1);
-}
+  .expand-detail {
+    padding: 16px 60px;
+    background-color: rgba(243, 246, 250, 1);
+  }
 
-.o-form {
-  &.o-form-layout-v {
-    .o-form-item-label {
-      margin-bottom: var(--o-gap-2);
+  .activity-btn {
+    .o-btn + .o-btn {
+      margin-left: 24px;
     }
-  }
-}
 
-.activity-btn {
-  .o-btn + .o-btn {
-    margin-left: 24px;
+    @include respond-to('<=pad_v') {
+      .o-btn + .o-btn {
+        margin-left: 16px;
+      }
+    }
+    @include respond-to('phone') {
+      margin-top: 8px;
+      .o-btn + .o-btn {
+        margin-left: 12px;
+      }
+    }
   }
 
-  @include respond-to('<=pad_v') {
-    .o-btn + .o-btn {
-      margin-left: 16px;
+  .o-btn-text {
+    @include hover {
+      background-color: transparent;
+      color: var(--o-color-primary1);
     }
   }
-  @include respond-to('phone') {
-    margin-top: 8px;
-    .o-btn + .o-btn {
-      margin-left: 12px;
-    }
+
+  .o-btn.o-btn-text {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+    min-width: auto;
   }
-}
 
-.o-btn-text {
-  @include hover {
-    background-color: transparent;
-    color: var(--o-color-primary1);
+  .o-tag {
+    --tag-radius: 100px;
+    --tag-bg-color: rgba(0, 113, 243, 0.1);
+    --tag-bd-color: transparent;
   }
-}
 
-.o-btn.o-btn-text {
-  padding-left: 0 !important;
-  padding-right: 0 !important;
-  min-width: auto;
-}
+  .tag-draft,
+  .tag-cancel {
+    --tag-color: var(--o-color-info3);
+    --tag-bg-color: rgba(222, 222, 227, 1);
+  }
 
-.o-tag {
-  --tag-radius: 100px;
-  --tag-bg-color: rgba(0, 113, 243, 0.1);
-  --tag-bd-color: transparent;
-}
+  .tag-registration,
+  .tag-in-progress,
+  .tag-ended {
+    --tag-color: rgba(36, 171, 54, 1);
+    --tag-bg-color: rgba(36, 171, 54, 0.1);
+  }
 
-.tag-draft,
-.tag-cancel {
-  --tag-color: var(--o-color-info3);
-  --tag-bg-color: rgba(222, 222, 227, 1);
-}
+  .tag-reject {
+    --tag-color: rgba(294, 118, 17, 1);
+    --tag-bg-color: rgba(294, 118, 17, 0.1);
+  }
 
-.tag-registration,
-.tag-in-progress,
-.tag-ended {
-  --tag-color: rgba(36, 171, 54, 1);
-  --tag-bg-color: rgba(36, 171, 54, 0.1);
-}
+  .sort-time {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+  }
 
-.tag-reject {
-  --tag-color: rgba(294, 118, 17, 1);
-  --tag-bg-color: rgba(294, 118, 17, 0.1);
-}
+  .sort-btn {
+    margin-left: 4px;
+  }
 
-.sort-time {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
+  .sort-item {
+    width: 0;
+    height: 0;
+    border: 5px solid transparent;
+  }
 
-.sort-btn {
-  margin-left: 4px;
-}
+  .sort-asc {
+    border-bottom-color: var(--o-color-info2);
+    margin-bottom: 2px;
 
-.sort-item {
-  width: 0;
-  height: 0;
-  border: 5px solid transparent;
-}
+    &.active {
+      border-bottom-color: var(--o-color-primary1);
+    }
+  }
 
-.sort-asc {
-  border-bottom-color: var(--o-color-info2);
-  margin-bottom: 2px;
+  .sort-desc {
+    border-top-color: var(--o-color-info2);
+    margin-top: 2px;
 
-  &.active {
-    border-bottom-color: var(--o-color-primary1);
+    &.active {
+      border-top-color: var(--o-color-primary1);
+    }
   }
-}
 
-.sort-desc {
-  border-top-color: var(--o-color-info2);
-  margin-top: 2px;
+  .el-table {
+    --el-table-header-bg-color: rgba(235, 241, 250, 1);
+    color: var(--o-color-info1);
+    @include text1;
 
-  &.active {
-    border-top-color: var(--o-color-primary1);
-  }
-}
+    .el-table__header-wrapper {
+      border-radius: 12px 12px 0 0;
 
-.el-table {
-  --el-table-header-bg-color: rgba(235, 241, 250, 1);
-  color: var(--o-color-info1);
-  @include text1;
+      .el-table__cell {
+        padding: 12px 0 11px;
+      }
 
-  .el-table__header-wrapper {
-    border-radius: 12px 12px 0 0;
+      .cell {
+        color: var(--o-color-info2);
+        font-weight: 600;
+        @include text1;
+      }
+    }
 
-    .el-table__cell {
-      padding: 12px 0 11px;
+    .el-table__expanded-cell {
+      padding: 0;
     }
 
     .cell {
-      color: var(--o-color-info2);
-      font-weight: 600;
-      @include text1;
+      white-space: nowrap;
     }
   }
 
-  .el-table__expanded-cell {
-    padding: 0;
+  .pagination {
+    margin-top: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
   }
 
-  .cell {
-    white-space: nowrap;
+  .o-textarea {
+    --_box-radius: 16px;
   }
-}
-
-.pagination {
-  margin-top: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
 
-.review-dialog {
-  .review-content {
-    width: 100%;
-  }
-}
-
-.o-textarea {
-  --_box-radius: 16px;
-}
+  .dialog-footer {
+    display: flex;
+    justify-content: center;
+    align-items: center;
 
-.dialog-footer {
-  display: flex;
-  justify-content: center;
-  align-items: center;
+    .o-btn + .o-btn {
+      margin-left: 16px;
+    }
 
-  .o-btn + .o-btn {
-    margin-left: 16px;
+    @include respond-to('<=pad_v') {
+      .o-btn {
+        width: 140px;
+        color: var(--o-color-info1);
+        padding: 6px 24px !important;
+      }
+      .o-btn + .o-btn {
+        margin-left: 0;
+      }
+    }
   }
 
-  @include respond-to('<=pad_v') {
-    .o-btn {
-      width: 140px;
-      color: var(--o-color-info1);
-      padding: 6px 24px !important;
-    }
-    .o-btn + .o-btn {
-      margin-left: 0;
+  .collapse-wrapper {
+    .o-tag {
+      height: 24px;
     }
-  }
-}
 
-.collapse-wrapper {
-  .o-tag {
-    height: 24px;
-  }
+    .o-collapse {
+      padding: 0;
+      border-radius: 12px;
 
-  .o-collapse {
-    padding: 0;
-    border-radius: 12px;
+      .o-collapse-item {
+        --collapse-item-header-padding: 8px 0 12px;
 
-    .o-collapse-item {
-      --collapse-item-header-padding: 8px 0 12px;
+        &:last-child {
+          padding-bottom: 16px;
+        }
+      }
 
-      &:last-child {
-        padding-bottom: 16px;
+      .act-sponsor {
+        display: flex;
+        align-items: center;
+        color: var(--o-color-info3);
+        margin-right: 16px;
+        @include text1;
       }
-    }
 
-    .act-sponsor {
-      display: flex;
-      align-items: center;
-      color: var(--o-color-info3);
-      margin-right: 16px;
-      @include text1;
-    }
+      .sponsor {
+        margin-right: 12px;
+        @include text-truncate(1);
+      }
 
-    .sponsor {
-      margin-right: 12px;
-      @include text-truncate(1);
-    }
+      .o-collapse-item-icon {
+        transform: rotate(0deg);
+        width: 24px;
+        height: 24px;
+      }
 
-    .o-collapse-item-icon {
-      transform: rotate(0deg);
-      width: 24px;
-      height: 24px;
+      .o-collapse-item-expanded .o-collapse-item-icon {
+        transform: rotate(90deg);
+      }
+
+      .o-collapse-item-header {
+        border-bottom: 1px solid var(--o-color-control4);
+        margin: 0 16px;
+      }
     }
 
-    .o-collapse-item-expanded .o-collapse-item-icon {
-      transform: rotate(90deg);
+    .activity-detail {
+      padding: 12px 16px;
+      background-color: rgba(243, 246, 250, 1);
     }
 
-    .o-collapse-item-header {
-      border-bottom: 1px solid var(--o-color-control4);
-      margin: 0 16px;
+    .pagination {
+      justify-content: center;
+      margin-top: 24px;
     }
   }
 
-  .activity-detail {
-    padding: 12px 16px;
-    background-color: rgba(243, 246, 250, 1);
-  }
+  .title-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 16px 0;
 
-  .pagination {
-    justify-content: center;
-    margin-top: 24px;
+    .act-title {
+      color: var(--o-color-info1);
+      margin-right: 12px;
+      font-weight: 600;
+      @include text1;
+      @include text-truncate(1);
+    }
   }
 }
 
-.title-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 12px 16px 0;
-
-  .act-title {
-    color: var(--o-color-info1);
-    margin-right: 12px;
-    font-weight: 600;
-    @include text1;
-    @include text-truncate(1);
-  }
-}
 </style>
 
 <style lang="scss">
-.review-dialog {
-  width: 690px;
-  --dlg-radius: 16px;
+.handle-dialog-approval {
+  --dlg-width: 450px;
+  --dlg-radius: var(--o-radius-xs);
   @include respond-to('<=pad_v') {
     width: 100%;
-    --dlg-radius: 16px 16px 0 0;
+    --dlg-radius: var(--o-radius-xs) var(--o-radius-xs) 0 0;
   }
 }
 
-.handle-dialog-approval {
-  width: 450px;
-  --dlg-radius: 16px;
-  @include respond-to('<=pad_v') {
-    width: 100%;
-    --dlg-radius: 16px 16px 0 0;
+.cancel-dialog {
+  .o-dlg-footer {
+    margin-top: var(--o-gap-5);
+  }
+}
+.review-dialog {
+  --dlg-width: 690px;
+
+  .o-form {
+    width: 450px;
+    margin: 0 auto;
+
+    .o-form-item-label {
+      margin-bottom: var(--o-gap-2);
+    }
+
+    .o-textarea {
+      width: 100%;
+      --_box-radius: var(--o-radius-xs);
+    }
+  }
+
+  .o-dlg-footer {
+    margin-top: var(--o-gap-6);
   }
 }
+
 </style>

package/src/components/activity/OActivityForm.vue

@@ -298,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);
     }