From e0b7da7a7799d9b20df8f3ff8b05af33e3b391db Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Wed, 11 Mar 2020 13:49:00 +0800 Subject: [PATCH] refactor : meta variable (halo-dev/console#92) * 1.3.0-beta.2 * refactor: metas variable. * refactor: metas variable. --- src/views/post/PostEdit.vue | 10 +++--- src/views/post/PostList.vue | 10 +++--- .../post/components/PostSettingDrawer.vue | 34 +++++++++---------- src/views/sheet/SheetEdit.vue | 10 +++--- .../sheet/components/CustomSheetList.vue | 10 +++--- .../sheet/components/SheetSettingDrawer.vue | 30 ++++++++-------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue index e93cfbb4b..66acfdd68 100644 --- a/src/views/post/PostEdit.vue +++ b/src/views/post/PostEdit.vue @@ -31,7 +31,7 @@ :post="postToStage" :tagIds="selectedTagIds" :categoryIds="selectedCategoryIds" - :postMetas="selectedPostMetas" + :metas="selectedMetas" :visible="postSettingVisible" @close="onPostSettingsClose" @onRefreshPost="onRefreshPostFromSetting" @@ -95,7 +95,7 @@ export default { postToStage: {}, selectedTagIds: [], selectedCategoryIds: [], - selectedPostMetas: [], + selectedMetas: [], isSaved: false, contentChanges: 0, saving: false @@ -111,7 +111,7 @@ export default { vm.postToStage = post vm.selectedTagIds = post.tagIds vm.selectedCategoryIds = post.categoryIds - vm.selectedPostMetas = post.postMetas + vm.selectedMetas = post.metas }) } }) @@ -276,8 +276,8 @@ export default { onRefreshCategoryIdsFromSetting(categoryIds) { this.selectedCategoryIds = categoryIds }, - onRefreshPostMetasFromSetting(postMetas) { - this.selectedPostMetas = postMetas + onRefreshPostMetasFromSetting(metas) { + this.selectedMetas = metas }, onSaved(isSaved) { this.isSaved = isSaved diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue index d9cd19e93..0bcf98a9f 100644 --- a/src/views/post/PostList.vue +++ b/src/views/post/PostList.vue @@ -487,7 +487,7 @@ :post="selectedPost" :tagIds="selectedTagIds" :categoryIds="selectedCategoryIds" - :postMetas="selectedPostMetas" + :metas="selectedMetas" :needTitle="true" :saveDraftButton="false" :savePublishButton="false" @@ -600,7 +600,7 @@ export default { columns, selectedRowKeys: [], categories: [], - selectedPostMetas: [ + selectedMetas: [ { key: '', value: '' @@ -749,7 +749,7 @@ export default { this.selectedPost = response.data.data this.selectedTagIds = this.selectedPost.tagIds this.selectedCategoryIds = this.selectedPost.categoryIds - this.selectedPostMetas = this.selectedPost.postMetas + this.selectedMetas = this.selectedPost.metas this.postSettingVisible = true }) }, @@ -791,8 +791,8 @@ export default { onRefreshCategoryIdsFromSetting(categoryIds) { this.selectedCategoryIds = categoryIds }, - onRefreshPostMetasFromSetting(postMetas) { - this.selectedPostMetas = postMetas + onRefreshPostMetasFromSetting(metas) { + this.selectedMetas = metas } } } diff --git a/src/views/post/components/PostSettingDrawer.vue b/src/views/post/components/PostSettingDrawer.vue index 182613011..3b07b96b0 100644 --- a/src/views/post/components/PostSettingDrawer.vue +++ b/src/views/post/components/PostSettingDrawer.vue @@ -238,21 +238,21 @@

元数据

- K + K - + V @@ -347,7 +347,7 @@ export default { type: Array, required: true }, - postMetas: { + metas: { type: Array, required: true }, @@ -396,7 +396,7 @@ export default { selectedCategoryIds(val) { this.$emit('onRefreshCategoryIds', val) }, - selectedPostMetas(val) { + selectedMetas(val) { this.$emit('onRefreshPostMetas', val) }, visible: function(newValue, oldValue) { @@ -409,10 +409,10 @@ export default { } }, computed: { - selectedPostMetas() { - // 不能将selectedPostMetas直接定义在data里 - // 还没有获取到值就渲染视图,可以直接使用postMetas - return this.postMetas + selectedMetas() { + // 不能将selectedMetas直接定义在data里 + // 还没有获取到值就渲染视图,可以直接使用metas + return this.metas }, pickerDefaultValue() { if (this.selectedPost.createTime) { @@ -436,12 +436,12 @@ export default { }) }, loadPresetMetasField() { - if (this.postMetas.length <= 0) { + if (this.metas.length <= 0) { themeApi.getActivatedTheme().then(response => { const fields = response.data.data.postMetaField if (fields && fields.length > 0) { for (let i = 0, len = fields.length; i < len; i++) { - this.selectedPostMetas.push({ + this.selectedMetas.push({ value: '', key: fields[i] }) @@ -507,7 +507,7 @@ export default { // Set tag ids this.selectedPost.tagIds = this.selectedTagIds // Set post metas - this.selectedPost.postMetas = this.selectedPostMetas + this.selectedPost.metas = this.selectedMetas this.saving = true if (this.selectedPost.id) { // Update the post @@ -555,13 +555,13 @@ export default { this.selectedPost.createTime = value.valueOf() }, handleRemovePostMeta(item) { - var index = this.selectedPostMetas.indexOf(item) + var index = this.selectedMetas.indexOf(item) if (index !== -1) { - this.selectedPostMetas.splice(index, 1) + this.selectedMetas.splice(index, 1) } }, handleInsertPostMeta() { - this.selectedPostMetas.push({ + this.selectedMetas.push({ value: '', key: '' }) diff --git a/src/views/sheet/SheetEdit.vue b/src/views/sheet/SheetEdit.vue index 31f4f059f..cf1285718 100644 --- a/src/views/sheet/SheetEdit.vue +++ b/src/views/sheet/SheetEdit.vue @@ -29,7 +29,7 @@ { const sheet = response.data.data vm.sheetToStage = sheet - vm.selectedSheetMetas = sheet.sheetMetas + vm.selectedMetas = sheet.metas }) } }) @@ -256,8 +256,8 @@ export default { onRefreshSheetFromSetting(sheet) { this.sheetToStage = sheet }, - onRefreshSheetMetasFromSetting(sheetMetas) { - this.selectedSheetMetas = sheetMetas + onRefreshSheetMetasFromSetting(metas) { + this.selectedMetas = metas }, onSaved(isSaved) { this.isSaved = isSaved diff --git a/src/views/sheet/components/CustomSheetList.vue b/src/views/sheet/components/CustomSheetList.vue index d688451c8..d0f22eff3 100644 --- a/src/views/sheet/components/CustomSheetList.vue +++ b/src/views/sheet/components/CustomSheetList.vue @@ -318,7 +318,7 @@ { this.selectedSheet = response.data.data - this.selectedSheetMetas = this.selectedSheet.sheetMetas + this.selectedMetas = this.selectedSheet.metas this.sheetSettingVisible = true }) }, @@ -510,8 +510,8 @@ export default { onRefreshSheetFromSetting(sheet) { this.selectedSheet = sheet }, - onRefreshSheetMetasFromSetting(sheetMetas) { - this.selectedSheetMetas = sheetMetas + onRefreshSheetMetasFromSetting(metas) { + this.selectedMetas = metas } } } diff --git a/src/views/sheet/components/SheetSettingDrawer.vue b/src/views/sheet/components/SheetSettingDrawer.vue index dd4ed0937..9a50cd24f 100644 --- a/src/views/sheet/components/SheetSettingDrawer.vue +++ b/src/views/sheet/components/SheetSettingDrawer.vue @@ -156,21 +156,21 @@

元数据

- K + K - + V @@ -237,7 +237,7 @@ export default { type: Object, required: true }, - sheetMetas: { + metas: { type: Array, required: true }, @@ -263,7 +263,7 @@ export default { selectedSheet(val) { this.$emit('onRefreshSheet', val) }, - selectedSheetMetas(val) { + selectedMetas(val) { this.$emit('onRefreshSheetMetas', val) }, visible: function(newValue, oldValue) { @@ -274,8 +274,8 @@ export default { } }, computed: { - selectedSheetMetas() { - return this.sheetMetas + selectedMetas() { + return this.metas }, pickerDefaultValue() { if (this.selectedSheet.createTime) { @@ -294,12 +294,12 @@ export default { }, 500) }, loadPresetMetasField() { - if (this.sheetMetas.length <= 0) { + if (this.metas.length <= 0) { themeApi.getActivatedTheme().then(response => { const fields = response.data.data.sheetMetaField if (fields && fields.length > 0) { for (let i = 0, len = fields.length; i < len; i++) { - this.selectedSheetMetas.push({ + this.selectedMetas.push({ value: '', key: fields[i] }) @@ -343,7 +343,7 @@ export default { }) return } - this.selectedSheet.sheetMetas = this.selectedSheetMetas + this.selectedSheet.metas = this.selectedMetas this.saving = true if (this.selectedSheet.id) { sheetApi @@ -389,13 +389,13 @@ export default { this.selectedSheet.createTime = value.valueOf() }, handleRemoveSheetMeta(item) { - var index = this.selectedSheetMetas.indexOf(item) + var index = this.selectedMetas.indexOf(item) if (index !== -1) { - this.selectedSheetMetas.splice(index, 1) + this.selectedMetas.splice(index, 1) } }, handleInsertSheetMeta() { - this.selectedSheetMetas.push({ + this.selectedMetas.push({ value: '', key: '' })