Prechádzať zdrojové kódy

refactor: adjust some styles

Casper Dai 3 rokov pred
rodič
commit
75fb28dfa1

+ 1 - 1
src/components/Schedule/ScheduleCalendar/index.vue

@@ -2,12 +2,12 @@
   <schedule-wrapper
     class="c-schedule-calendar"
     :name="name"
-    :hide-header="hideHeader"
     :editable="editable"
     :dirty="dirty"
     @add="onAdd"
     @submit="submit"
     @save="onSave"
+    @back="onBack"
   >
     <div class="l-flex__none l-flex--row">
       <button

+ 7 - 5
src/components/Schedule/ScheduleSwiper/index.vue

@@ -2,11 +2,11 @@
   <schedule-wrapper
     class="c-schedule-swiper"
     :name="name"
-    :hide-header="hideHeader"
     :editable="editable"
     :dirty="dirty"
     @submit="submit"
     @save="onSave"
+    @back="onBack"
   >
     <template v-if="editable">
       <div class="l-flex__auto l-flex">
@@ -123,10 +123,12 @@ export default {
         ],
         cols: [
           { type: 'selection' },
-          { prop: 'name', label: '节目名称' },
-          { type: 'invoke', width: 80, render: [
-            { label: '查看', on: this.onView }
-          ] }
+          { label: '缩略图', type: 'asset', render ({ img }) {
+            return img
+              ? { thumbnail: img }
+              : null
+          }, on: this.onView },
+          { prop: 'name', label: '节目名称' }
         ]
       }
     }

+ 12 - 10
src/components/Schedule/components/ScheduleWrapper.vue

@@ -3,11 +3,13 @@
     class="l-flex--col c-schedule-wrapper"
     @click.stop
   >
-    <div
-      v-if="!hideHeader"
-      class="l-flex__none l-flex--row c-schedule-wrapper__header has-bottom-padding"
-    >
-      <div class="l-flex__auto l-flex--row c-sibling-item c-schedule-wrapper__tip u-ellipsis">
+    <div class="l-flex__none l-flex--row c-schedule-wrapper__header has-bottom-padding">
+      <i
+        v-if="editable"
+        class="l-flex__none el-icon-arrow-left u-pointer"
+        @click="onBack"
+      />
+      <div class="l-flex__auto l-flex--row c-sibling-item u-bold u-ellipsis">
         {{ name }}
       </div>
       <template v-if="editable">
@@ -76,6 +78,9 @@ export default {
     },
     onSave () {
       this.$emit('save')
+    },
+    onBack () {
+      this.$emit('back')
     }
   }
 }
@@ -84,13 +89,10 @@ export default {
 <style lang="scss" scoped>
 .c-schedule-wrapper {
   &__header {
-    border-bottom: 1px solid $border;
-  }
-
-  &__tip {
     color: $black;
     font-size: 24px;
-    font-weight: bold;
+    line-height: 1;
+    border-bottom: 1px solid $border;
   }
 }
 </style>

+ 3 - 4
src/components/Schedule/mixins/schedule.js

@@ -9,10 +9,6 @@ export default {
       type: Object,
       default: null
     },
-    hideHeader: {
-      type: [Boolean, String],
-      default: false
-    },
     editable: {
       type: [Boolean, String],
       default: false
@@ -57,6 +53,9 @@ export default {
       submitSchedule(this.scheduleOptions, this.getEvents()).then(() => {
         this.$emit('submit')
       })
+    },
+    onBack () {
+      this.$emit('back')
     }
   }
 }

+ 5 - 0
src/components/dialog/EventTargetDialog/index.vue

@@ -42,6 +42,11 @@ export default {
           { key: 'name', type: 'search', placeholder: '节目名称' }
         ],
         cols: [
+          { label: '缩略图', type: 'asset', render ({ img }) {
+            return img
+              ? { thumbnail: img }
+              : null
+          }, on: this.onView },
           { prop: 'name', label: '节目名称' },
           { type: 'invoke', render: [
             { label: '查看', on: this.onView }

+ 4 - 0
src/components/dialog/ScheduleDialog/index.vue

@@ -11,6 +11,10 @@
       class="l-flex__auto has-padding"
       :schedule="scheduleId"
     />
+    <i
+      class="l-flex__none c-preview__close el-icon-close u-bold u-pointer"
+      @click="onCloseScheduleDialog"
+    />
   </el-dialog>
 </template>
 

+ 10 - 1
src/scss/bem/_component.scss

@@ -13,7 +13,7 @@
   }
 
   &.medium {
-    width: 40%;
+    width: 720px;
   }
 
   &.mini {
@@ -324,6 +324,15 @@
     }
   }
 
+  &__close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 16px;
+    color: $black;
+    font-size: 24px;
+  }
+
   .el-dialog__header {
     display: none;
   }

+ 1 - 1
src/views/realm/user/Settings.vue

@@ -461,7 +461,7 @@ export default {
   width: 100%;
 
   ::v-deep {
-    .el-transfer__panel {
+    .el-transfer-panel {
       flex: 1 1 0;
       min-width: 0;
       width: auto;

+ 3 - 2
src/views/schedule/designer/index.vue

@@ -9,7 +9,8 @@
       class="l-flex__auto"
       :schedule="scheduleId"
       editable
-      @submit="onSubmit"
+      @submit="onBack"
+      @back="onBack"
     />
   </wrapper>
 </template>
@@ -29,7 +30,7 @@ export default {
     }
   },
   methods: {
-    onSubmit () {
+    onBack () {
       if (this.redirect) {
         this.$router.replace({
           name: this.redirect