Merge branch 'dev' of https://github.com/halo-dev/halo-admin into dev

2019-08-27 23:49:29 +08:00 · 2019-08-27 23:49:29 +08:00 · 16b70eee80
parent eb3879c91d 6d51f45d60
commit 16b70eee80
2 changed files with 6 additions and 5 deletions
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@ -267,7 +267,7 @@
      :saveDraftButton="false"
      :savePublishButton="false"
      :saveButton="true"
-      v-model="postSettingVisible"
+      :visible="postSettingVisible"
      @close="onPostSettingsClose"
      @onRefreshPost="onRefreshPostFromSetting"
      @onRefreshTagIds="onRefreshTagIdsFromSetting"
--- a/src/views/post/components/PostSetting.vue
+++ b/src/views/post/components/PostSetting.vue
@ -212,10 +212,11 @@ export default {
      categoryToCreate: {}
    }
  },
-  model: {
-    prop: 'visible',
-    event: 'close'
-  },
+  // TODO delete this commented code
+  // model: {
+  //   prop: 'visible',
+  //   event: 'close'
+  // },
  props: {
    post: {
      type: Object,