From d40b706457441f4d142fb9d12ddef80cb99771a1 Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Tue, 6 Sep 2022 14:17:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88vscode=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - admin/.gitignore | 4 - admin/.vscode/extensions.json | 3 + admin/.vscode/settings.json | 11 + .../component/widgets/search/options.ts | 2 +- admin/src/views/decoration/pages/index.vue | 11 +- admin/yarn.lock | 4305 +++++++++++++++++ app/.vscode/extensions.json | 3 + app/.vscode/settings.json | 11 + 9 files changed, 4342 insertions(+), 9 deletions(-) create mode 100644 admin/.vscode/extensions.json create mode 100644 admin/.vscode/settings.json create mode 100644 admin/yarn.lock create mode 100644 app/.vscode/extensions.json create mode 100644 app/.vscode/settings.json diff --git a/.gitignore b/.gitignore index efc8bd53..39cb8a42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.vscode .idea *.iws *.iml diff --git a/admin/.gitignore b/admin/.gitignore index e3f04797..61ed8a5c 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -30,7 +30,3 @@ components.d.ts *.sln *.sw? -# lock - -package-lock.json -yarn.lock diff --git a/admin/.vscode/extensions.json b/admin/.vscode/extensions.json new file mode 100644 index 00000000..91f12b27 --- /dev/null +++ b/admin/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"] +} diff --git a/admin/.vscode/settings.json b/admin/.vscode/settings.json new file mode 100644 index 00000000..1b50e37a --- /dev/null +++ b/admin/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "editor.detectIndentation": false, + "editor.tabSize": 4, + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + }, + "css.validate": false, + "less.validate": false, + "scss.validate": false +} diff --git a/admin/src/views/decoration/component/widgets/search/options.ts b/admin/src/views/decoration/component/widgets/search/options.ts index 5930b440..e02e2983 100644 --- a/admin/src/views/decoration/component/widgets/search/options.ts +++ b/admin/src/views/decoration/component/widgets/search/options.ts @@ -1,7 +1,7 @@ export default () => ({ title: '搜索', name: 'search', - disabled: true, + disabled: 1, content: {}, styles: {} }) diff --git a/admin/src/views/decoration/pages/index.vue b/admin/src/views/decoration/pages/index.vue index d632c5e3..2411e388 100644 --- a/admin/src/views/decoration/pages/index.vue +++ b/admin/src/views/decoration/pages/index.vue @@ -72,21 +72,26 @@ const getSelectWidget = computed(() => { const getData = async () => { const data = await getDecoratePages({ id: activeMenu.value }) + menus[String(data.id)].pageData = JSON.parse(data.pageData) } const setData = async () => { - await setDecoratePages(menus[activeMenu.value]) - feedback.msg('保存成功') + await setDecoratePages({ + ...menus[activeMenu.value], + pageData: JSON.stringify(menus[activeMenu.value].pageData) + }) + getData() + feedback.msgSuccess('保存成功') } watch( activeMenu, () => { selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled) + getData() }, { immediate: true } ) -getData()