From 8b7c482fcc5784074857d89b5d70e02fa175e921 Mon Sep 17 00:00:00 2001 From: baishun Date: Fri, 24 Feb 2023 15:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4prettier=E5=B9=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 3 + .eslintrc.js | 5 +- .prettierignore | 5 + .prettierrc | 3 +- .vscode/settings.json | 17 +--- index.html | 22 ++--- package.json | 4 +- src/App.vue | 48 +++++---- src/assets/reset.css | 4 +- src/bg-ui/bg-btns.vue | 8 +- src/bg-ui/bg-card.vue | 24 ++--- src/bg-ui/bg-code-editor.vue | 109 ++++++++++----------- src/bg-ui/bg-detail-table.vue | 8 +- src/bg-ui/bg-detail-table2.vue | 4 +- src/bg-ui/bg-detail.vue | 115 ++++++++++++---------- src/bg-ui/bg-filter-group.vue | 24 ++++- src/bg-ui/bg-filter.vue | 116 +++++++++++----------- src/bg-ui/bg-info.vue | 38 ++++++-- src/bg-ui/bg-switch.vue | 5 +- src/bg-ui/bg-tab.vue | 7 +- src/bg-ui/bg-table-btns.vue | 2 +- src/bg-ui/bg-table-btns2.vue | 23 ++++- src/bg-ui/bg-tabs.vue | 4 +- src/bg-ui/bg-tags.vue | 4 +- src/bg-ui/bg-user-upload-image.vue | 10 +- src/bg-ui/debounce.js | 141 ++++++++++++++------------- src/bg-ui/hook/mixin-select-table.js | 112 ++++++++++----------- src/bg-ui/index.js | 84 ++++++++-------- src/bg-ui/index.scss | 68 ++++++------- src/bg-ui/utils/index.js | 28 +++--- src/components/componentWrapper.vue | 4 +- src/main.js | 5 +- yarn.lock | 5 + 33 files changed, 572 insertions(+), 487 deletions(-) diff --git a/.eslintignore b/.eslintignore index c6a6b19..61160e3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,6 @@ env.d.ts pnpm-lock.yaml *.md iconfont.js +dist +.DS_Store +.history diff --git a/.eslintrc.js b/.eslintrc.js index 52626cc..6223b75 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -47,10 +47,7 @@ module.exports = { node: true, }, parser: "vue-eslint-parser", - extends: [ - "plugin:vue/vue3-recommended", - "eslint:recommended", - ], + extends: ["plugin:vue/vue3-recommended", "eslint:recommended"], parserOptions: { ecmaVersion: 2021, }, diff --git a/.prettierignore b/.prettierignore index a241427..21b5539 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,8 @@ dist pnpm-lock.yaml auto-imports.d.ts components.d.ts +env.d.ts +*.md +iconfont.js +.DS_Store +.history diff --git a/.prettierrc b/.prettierrc index 88c0117..20f3354 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "$schema": "http://json.schemastore.org/prettierrc", "semi": true, - "singleQuote": false + "singleQuote": false, + "bracketSameLine": true } diff --git a/.vscode/settings.json b/.vscode/settings.json index f7ed6ff..cb01b02 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,21 +1,10 @@ { - "eslint.validate": [ - "vue", - "javascript", - "javascriptreact" - ], + "eslint.validate": ["vue", "javascript", "javascriptreact"], "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.codeActionsOnSave": [ - "source.formatDocument", - "source.fixAll.eslint" - ], + "editor.codeActionsOnSave": ["source.formatDocument", "source.fixAll.eslint"], "editor.formatOnSave": false, "files.eol": "\n", "path-intellisense.mappings": { "@": "${workspaceFolder}/src" - }, - "volar.codeLens.pugTools": false, - "typescript.preferences.useAliasesForRenames": false, - "liveServer.settings.root": "/dist", - "prettier.printWidth": 120 + } } diff --git a/index.html b/index.html index a5f2f19..f71416e 100644 --- a/index.html +++ b/index.html @@ -1,16 +1,14 @@ + + + + + BG-UI Demos + - - - - - BG-UI Demos - - - -
- - - + +
+ + diff --git a/package.json b/package.json index cb3bcec..b7db199 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,12 @@ "name": "my-vue-app", "private": true, "version": "0.0.0", - "type": "module", "scripts": { "dev": "vite", "build": "vite build", "preview": "vite preview", "lint": "eslint --ext .js,vue --ignore-pattern '!.*ignore' .", - "lint:fix": "pnpm lint --fix" + "lint:fix": "eslint --fix && prettier --config .prettierrc --write --write ." }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", @@ -27,6 +26,7 @@ "eslint": "^8.34.0", "eslint-define-config": "^1.15.0", "eslint-plugin-vue": "^9.9.0", + "prettier": "2.8.4", "sass": "^1.58.2", "vite": "^4.1.1" } diff --git a/src/App.vue b/src/App.vue index 52d5f5f..f6e0918 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,9 @@ onMounted(() => { nav.addEventListener("click", (e) => { const el = e.target; if (el.tagName === "LI") { - const topDistance = document.querySelector(el.getAttribute("data-id")).offsetTop - navHeight; + const topDistance = + document.querySelector(el.getAttribute("data-id")).offsetTop - + navHeight; window.scrollTo(0, topDistance); } }); @@ -141,7 +143,9 @@ const { title: cardTitle, icon: cardIcon } = toRefs(card); - + @@ -180,27 +184,27 @@ const { title: cardTitle, icon: cardIcon } = toRefs(card); + +
content
+
+
--> + +
a
+
b
+
c
+ +
+
--> - + - + diff --git a/src/assets/reset.css b/src/assets/reset.css index e1a6f0a..a319136 100644 --- a/src/assets/reset.css +++ b/src/assets/reset.css @@ -50,7 +50,9 @@ html { box-sizing: border-box; } -*, *::before, *::after { +*, +*::before, +*::after { box-sizing: inherit; } diff --git a/src/bg-ui/bg-btns.vue b/src/bg-ui/bg-btns.vue index 142fbbf..64f1094 100644 --- a/src/bg-ui/bg-btns.vue +++ b/src/bg-ui/bg-btns.vue @@ -15,20 +15,20 @@ diff --git a/src/bg-ui/bg-card.vue b/src/bg-ui/bg-card.vue index 9baa986..b6cd15d 100644 --- a/src/bg-ui/bg-card.vue +++ b/src/bg-ui/bg-card.vue @@ -25,7 +25,7 @@ const props = defineProps({ type: String, default: "", }, - subTitle:{ + subTitle: { type: String, default: "", }, @@ -33,26 +33,26 @@ const props = defineProps({ type: String, default: "", }, - easyIcon:{ - type:Boolean, - default:false, - } + easyIcon: { + type: Boolean, + default: false, + }, }); \ No newline at end of file + diff --git a/src/bg-ui/bg-code-editor.vue b/src/bg-ui/bg-code-editor.vue index ee377dd..c3f39f3 100644 --- a/src/bg-ui/bg-code-editor.vue +++ b/src/bg-ui/bg-code-editor.vue @@ -2,18 +2,18 @@ diff --git a/src/bg-ui/bg-detail-table.vue b/src/bg-ui/bg-detail-table.vue index 5523d9c..129d624 100644 --- a/src/bg-ui/bg-detail-table.vue +++ b/src/bg-ui/bg-detail-table.vue @@ -18,13 +18,17 @@ v-if="!item.urls" :title="item.info" :style="item.url ? { color: '#515fe7', cursor: 'pointer' } : ''" - @click="down_file(item.url)">{{ item.info }} + @click="down_file(item.url)" + >{{ item.info }} {{ helper.downloadFileFormatNew(it) }}、 + @click="down_file(it)" + >{{ helper.downloadFileFormatNew(it) }}、 diff --git a/src/bg-ui/bg-detail-table2.vue b/src/bg-ui/bg-detail-table2.vue index bf56a91..32a95c7 100644 --- a/src/bg-ui/bg-detail-table2.vue +++ b/src/bg-ui/bg-detail-table2.vue @@ -7,7 +7,9 @@ :style="{ width: item.width }">

{{ item.label }} - {{ item.value }} + {{ + item.value + }} diff --git a/src/bg-ui/bg-detail.vue b/src/bg-ui/bg-detail.vue index b573351..f893d03 100644 --- a/src/bg-ui/bg-detail.vue +++ b/src/bg-ui/bg-detail.vue @@ -59,7 +59,17 @@ diff --git a/src/bg-ui/bg-filter-group.vue b/src/bg-ui/bg-filter-group.vue index c61f699..fa551cb 100644 --- a/src/bg-ui/bg-filter-group.vue +++ b/src/bg-ui/bg-filter-group.vue @@ -20,18 +20,26 @@ @clear="search"> -

+
高级搜索 - +
@@ -43,7 +51,15 @@ diff --git a/src/bg-ui/bg-info.vue b/src/bg-ui/bg-info.vue index a5a5016..3d40516 100644 --- a/src/bg-ui/bg-info.vue +++ b/src/bg-ui/bg-info.vue @@ -7,26 +7,46 @@ :style="{ width: item.full ? `100%` : `calc(100% / ${col})`, }"> - + {{ item.name }} - + {{ - item.value - }} + style="text-decoration: underline" + @click.stop="item.callback && item.callback()" + >{{ item.value }} {{ item.value }} - 复制 + + 复制 + { }; }); const now_label_style = computed(() => { - return now_index.value == 0 ? { left: circle_height.value + gap.value + 5 + "px" } : { left: "10px" }; + return now_index.value == 0 + ? { left: circle_height.value + gap.value + 5 + "px" } + : { left: "10px" }; }); const now_circle_style = computed(() => { return now_index.value == 0 @@ -93,5 +95,4 @@ onMounted(() => { circle_height.value = circle.value.offsetHeight; gap.value = (box_height.value - circle_height.value - 4) / 2; }); - diff --git a/src/bg-ui/bg-tab.vue b/src/bg-ui/bg-tab.vue index a518971..80a6ae0 100644 --- a/src/bg-ui/bg-tab.vue +++ b/src/bg-ui/bg-tab.vue @@ -14,15 +14,12 @@ import { reactive, ref, onBeforeMount, toRefs, computed, inject } from "vue"; const getActiveName = inject( "activeName", - ()=>{ + () => { return ""; }, false ); -const getIsTabs = inject( - "isTabs", - false -); +const getIsTabs = inject("isTabs", false); const props = defineProps({ label: { diff --git a/src/bg-ui/bg-table-btns.vue b/src/bg-ui/bg-table-btns.vue index 87f9bfe..83d2629 100644 --- a/src/bg-ui/bg-table-btns.vue +++ b/src/bg-ui/bg-table-btns.vue @@ -14,7 +14,7 @@ @mouseenter="showMoreBtns" @mouseleave="hideMoreBtns"> - + {{ item.name }} + @click="action(item.onClick, item.disabled)" + >{{ item.name }} @@ -28,7 +30,18 @@ diff --git a/src/main.js b/src/main.js index e0cf48d..d0c146d 100644 --- a/src/main.js +++ b/src/main.js @@ -9,4 +9,7 @@ import "@/assets/reset.css"; import bgui from "@/bg-ui"; import "@/bg-ui/index.scss"; -createApp(App).use(ElementPlus, { locale, size: "small" }).use(bgui).mount("#app"); +createApp(App) + .use(ElementPlus, { locale, size: "small" }) + .use(bgui) + .mount("#app"); diff --git a/yarn.lock b/yarn.lock index 3ee9d84..a1b04c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1582,6 +1582,11 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +prettier@2.8.4: + version "2.8.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3" + integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw== + prismjs@^1.23.0: version "1.29.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" -- 2.26.0