From bf37b6a132df9b9347dbdbe9073b27de6d4a6c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= Date: Wed, 8 Sep 2021 15:30:33 +0800 Subject: [PATCH 001/100] Update issue templates --- .github/ISSUE_TEMPLATE/----bug.md | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/----bug.md diff --git a/.github/ISSUE_TEMPLATE/----bug.md b/.github/ISSUE_TEMPLATE/----bug.md new file mode 100644 index 00000000..b4a31890 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/----bug.md @@ -0,0 +1,38 @@ +--- +name: 提交一个bug +about: 如果您发现了bug可以在这里告诉我们 +title: '' +labels: bug +assignees: piexlmax, SliverHorn, songzhibin97 + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. From 2fc2cea1ccf641723ee4d2175e8ff7583821968d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Wed, 8 Sep 2021 15:35:03 +0800 Subject: [PATCH 002/100] Update and rename ----bug.md to ----bug.ymal --- .github/ISSUE_TEMPLATE/----bug.md | 38 ----------------------------- .github/ISSUE_TEMPLATE/----bug.ymal | 36 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/----bug.md create mode 100644 .github/ISSUE_TEMPLATE/----bug.ymal diff --git a/.github/ISSUE_TEMPLATE/----bug.md b/.github/ISSUE_TEMPLATE/----bug.md deleted file mode 100644 index b4a31890..00000000 --- a/.github/ISSUE_TEMPLATE/----bug.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: 提交一个bug -about: 如果您发现了bug可以在这里告诉我们 -title: '' -labels: bug -assignees: piexlmax, SliverHorn, songzhibin97 - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/----bug.ymal b/.github/ISSUE_TEMPLATE/----bug.ymal new file mode 100644 index 00000000..9c3de850 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/----bug.ymal @@ -0,0 +1,36 @@ + +name: 提交一个bug +about: 如果您发现了bug可以在这里告诉我们 +title: '' +labels: bug +assignees: piexlmax, SliverHorn, songzhibin97 +body: +- type: textarea + attributes: + label: Operating System + description: What operating system are you using? + placeholder: Example: macOS Big Sur + value: operating system + validations: + required: true +- type: dropdown + attributes: + label: Version + description: What version of our software are you running? + multiple: false + options: + - label: 1.0.2 (Default) + - label: 1.0.3 (Edge) + validations: + required: true +- type: checkboxes + attributes: + label: Code of Conduct + description: The Code of Conduct helps create a safe space for everyone. We require + that everyone agrees to it. + options: + - label: I agree to follow this project's [Code of Conduct](link/to/coc) + required: true +- type: markdown + attributes: + value: "Thanks for completing our form!" From 5b4e113b71054f45ec83fe7c934a7131c3845c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Wed, 8 Sep 2021 16:49:58 +0800 Subject: [PATCH 003/100] Update and rename ----bug.ymal to config.ymal --- .github/ISSUE_TEMPLATE/----bug.ymal | 36 ----------------- .github/ISSUE_TEMPLATE/config.ymal | 62 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 36 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/----bug.ymal create mode 100644 .github/ISSUE_TEMPLATE/config.ymal diff --git a/.github/ISSUE_TEMPLATE/----bug.ymal b/.github/ISSUE_TEMPLATE/----bug.ymal deleted file mode 100644 index 9c3de850..00000000 --- a/.github/ISSUE_TEMPLATE/----bug.ymal +++ /dev/null @@ -1,36 +0,0 @@ - -name: 提交一个bug -about: 如果您发现了bug可以在这里告诉我们 -title: '' -labels: bug -assignees: piexlmax, SliverHorn, songzhibin97 -body: -- type: textarea - attributes: - label: Operating System - description: What operating system are you using? - placeholder: Example: macOS Big Sur - value: operating system - validations: - required: true -- type: dropdown - attributes: - label: Version - description: What version of our software are you running? - multiple: false - options: - - label: 1.0.2 (Default) - - label: 1.0.3 (Edge) - validations: - required: true -- type: checkboxes - attributes: - label: Code of Conduct - description: The Code of Conduct helps create a safe space for everyone. We require - that everyone agrees to it. - options: - - label: I agree to follow this project's [Code of Conduct](link/to/coc) - required: true -- type: markdown - attributes: - value: "Thanks for completing our form!" diff --git a/.github/ISSUE_TEMPLATE/config.ymal b/.github/ISSUE_TEMPLATE/config.ymal new file mode 100644 index 00000000..d4ae8619 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.ymal @@ -0,0 +1,62 @@ +name: Bug Report +description: File a bug report +title: "[Bug]: " +labels: [bug] +assignees: + - piexlmax, SliverHorn, songzhibin97 +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! + - type: input + id: contact + attributes: + label: Contact Details + description: How can we get in touch with you if we need more info? + placeholder: ex. email@example.com + validations: + required: false + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? + placeholder: Tell us what you see! + value: "A bug happened!" + validations: + required: true + - type: dropdown + id: version + attributes: + label: Version + description: What version of our software are you running? + options: + - 1.0.2 (Default) + - 1.0.3 (Edge) + validations: + required: true + - type: dropdown + id: browsers + attributes: + label: What browsers are you seeing the problem on? + multiple: true + options: + - Firefox + - Chrome + - Safari + - Microsoft Edge + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell + - type: checkboxes + id: terms + attributes: + label: Code of Conduct + description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com) + options: + - label: I agree to follow this project's Code of Conduct + required: true From 6f2fcdcf65cf5eaa32568a1864c43eb1329347e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= Date: Wed, 8 Sep 2021 17:08:32 +0800 Subject: [PATCH 004/100] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..dd84ea78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..bbcbbe7d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 1c4a7747654982a55824f3d8f8c4dbe64606be3e Mon Sep 17 00:00:00 2001 From: piexlmax Date: Wed, 8 Sep 2021 17:10:59 +0800 Subject: [PATCH 005/100] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug_report.md | 38 ------------ .../{bug.ymal => bug_report.ymal} | 0 .github/ISSUE_TEMPLATE/config.ymal | 62 ------------------- .github/ISSUE_TEMPLATE/feature_request.md | 20 ------ .../{feature.ymal => feature_request.ymal} | 0 5 files changed, 120 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md rename .github/ISSUE_TEMPLATE/{bug.ymal => bug_report.ymal} (100%) delete mode 100644 .github/ISSUE_TEMPLATE/config.ymal delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md rename .github/ISSUE_TEMPLATE/{feature.ymal => feature_request.ymal} (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea78..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug.ymal b/.github/ISSUE_TEMPLATE/bug_report.ymal similarity index 100% rename from .github/ISSUE_TEMPLATE/bug.ymal rename to .github/ISSUE_TEMPLATE/bug_report.ymal diff --git a/.github/ISSUE_TEMPLATE/config.ymal b/.github/ISSUE_TEMPLATE/config.ymal deleted file mode 100644 index d4ae8619..00000000 --- a/.github/ISSUE_TEMPLATE/config.ymal +++ /dev/null @@ -1,62 +0,0 @@ -name: Bug Report -description: File a bug report -title: "[Bug]: " -labels: [bug] -assignees: - - piexlmax, SliverHorn, songzhibin97 -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this bug report! - - type: input - id: contact - attributes: - label: Contact Details - description: How can we get in touch with you if we need more info? - placeholder: ex. email@example.com - validations: - required: false - - type: textarea - id: what-happened - attributes: - label: What happened? - description: Also tell us, what did you expect to happen? - placeholder: Tell us what you see! - value: "A bug happened!" - validations: - required: true - - type: dropdown - id: version - attributes: - label: Version - description: What version of our software are you running? - options: - - 1.0.2 (Default) - - 1.0.3 (Edge) - validations: - required: true - - type: dropdown - id: browsers - attributes: - label: What browsers are you seeing the problem on? - multiple: true - options: - - Firefox - - Chrome - - Safari - - Microsoft Edge - - type: textarea - id: logs - attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell - - type: checkboxes - id: terms - attributes: - label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com) - options: - - label: I agree to follow this project's Code of Conduct - required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7d..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/feature.ymal b/.github/ISSUE_TEMPLATE/feature_request.ymal similarity index 100% rename from .github/ISSUE_TEMPLATE/feature.ymal rename to .github/ISSUE_TEMPLATE/feature_request.ymal From 833a31ae1499f7e4f7a592da286635b741966538 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Wed, 8 Sep 2021 17:15:50 +0800 Subject: [PATCH 006/100] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/{bug_report.ymal => bug_report.yaml} | 0 .../ISSUE_TEMPLATE/{feature_request.ymal => feature_request.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{bug_report.ymal => bug_report.yaml} (100%) rename .github/ISSUE_TEMPLATE/{feature_request.ymal => feature_request.yaml} (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.ymal b/.github/ISSUE_TEMPLATE/bug_report.yaml similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.ymal rename to .github/ISSUE_TEMPLATE/bug_report.yaml diff --git a/.github/ISSUE_TEMPLATE/feature_request.ymal b/.github/ISSUE_TEMPLATE/feature_request.yaml similarity index 100% rename from .github/ISSUE_TEMPLATE/feature_request.ymal rename to .github/ISSUE_TEMPLATE/feature_request.yaml From ceddd99dc455101ee47ee4ebe5cd38d417e65251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Wed, 8 Sep 2021 17:23:27 +0800 Subject: [PATCH 007/100] Create config.yml --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..e3838d75 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Document + url: https://www.gin-vue-admin.com + about: If you have any questions about the use, you can check our official documents first From 98d0e69173a6b5732e1285554cd30f769041b61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Wed, 8 Sep 2021 17:29:18 +0800 Subject: [PATCH 008/100] Update feature_request.yaml --- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 3ce0b0f9..b68a852b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -1,7 +1,7 @@ name: 🚀 Feature request description: Suggest an idea for Gin-Vue-Admin title: "[Feature]: " -labels: [feature, ] +labels: [feature] assignees: - piexlmax body: From 2dc2ef4f0c53e469dcf13947b81f4609f217e3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Wed, 8 Sep 2021 17:31:40 +0800 Subject: [PATCH 009/100] Update feature_request.yaml --- .github/ISSUE_TEMPLATE/feature_request.yaml | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index b68a852b..529a8ab8 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -5,16 +5,16 @@ labels: [feature] assignees: - piexlmax body: -- type: textarea - attributes: - label: 功能描述以及必要性描述 - description: 您觉得此新功能会为框架带来什么便利. - placeholder: | - 1. 首先... - 2. 然后... - validations: - required: true -- type: textarea - attributes: - label: 建议和方案 - description: 您有好的建议或者修改方案可以提供给我们。 + - type: textarea + attributes: + label: 功能描述以及必要性描述 + description: 您觉得此新功能会为框架带来什么便利. + placeholder: | + 1. 首先... + 2. 然后... + validations: + required: true + - type: textarea + attributes: + label: 建议和方案 + description: 您有好的建议或者修改方案可以提供给我们。 From 4587e49ff67c3ca5abd92de2842db862fe9b0136 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Wed, 8 Sep 2021 17:33:58 +0800 Subject: [PATCH 010/100] =?UTF-8?q?=E6=8F=90=E4=BA=A4issue=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug_report.yaml | 88 +++++++++++++------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index ac2fcd35..1acc7d67 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -7,47 +7,47 @@ assignees: - songzhibin97 - SliverHorn body: -- type: input - attributes: - label: gin-vue-admin 版本 - description: 请输入您当前使用的项目版本? - placeholder: 2.4.5Beta - validations: - required: true -- type: input - attributes: - label: Node 版本 - description: 请输入您当前使用的NODE版本? - placeholder: v14.16.0 - validations: - required: true -- type: input - attributes: - label: Golang 版本 - description: 请输入您当前使用的GOLANG版本? - placeholder: go 1.16 - validations: - required: true -- type: dropdown - attributes: - label: 是否依旧存在 - description: 是否可以在master分支复现此bug? - options: - - 可以 - - 不可以 - - 未测试 - validations: - required: true -- type: textarea - attributes: - label: bug描述 - description: 请简要描述bug以及复现过程. - placeholder: | - 1. 首先... - 2. 然后... - validations: - required: true -- type: textarea - attributes: - label: 修改建议 - description: 您有好的建议或者修改方案可以提供给我们。 + - type: input + attributes: + label: gin-vue-admin 版本 + description: 请输入您当前使用的项目版本? + placeholder: 2.4.5Beta + validations: + required: true + - type: input + attributes: + label: Node 版本 + description: 请输入您当前使用的NODE版本? + placeholder: v14.16.0 + validations: + required: true + - type: input + attributes: + label: Golang 版本 + description: 请输入您当前使用的GOLANG版本? + placeholder: go 1.16 + validations: + required: true + - type: dropdown + attributes: + label: 是否依旧存在 + description: 是否可以在master分支复现此bug? + options: + - 可以 + - 不可以 + - 未测试 + validations: + required: true + - type: textarea + attributes: + label: bug描述 + description: 请简要描述bug以及复现过程. + placeholder: | + 1. 首先... + 2. 然后... + validations: + required: true + - type: textarea + attributes: + label: 修改建议 + description: 您有好的建议或者修改方案可以提供给我们。 From aee0fecaed45ecffda32446bbd0df146494cfb27 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Wed, 8 Sep 2021 17:42:51 +0800 Subject: [PATCH 011/100] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20issueid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug_report.yaml | 6 ++++++ .github/ISSUE_TEMPLATE/feature_request.yaml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 1acc7d67..da610943 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -8,6 +8,7 @@ assignees: - SliverHorn body: - type: input + id: gva attributes: label: gin-vue-admin 版本 description: 请输入您当前使用的项目版本? @@ -15,6 +16,7 @@ body: validations: required: true - type: input + id: node attributes: label: Node 版本 description: 请输入您当前使用的NODE版本? @@ -22,6 +24,7 @@ body: validations: required: true - type: input + id: golang attributes: label: Golang 版本 description: 请输入您当前使用的GOLANG版本? @@ -29,6 +32,7 @@ body: validations: required: true - type: dropdown + id: reappearance attributes: label: 是否依旧存在 description: 是否可以在master分支复现此bug? @@ -39,6 +43,7 @@ body: validations: required: true - type: textarea + id: desc attributes: label: bug描述 description: 请简要描述bug以及复现过程. @@ -48,6 +53,7 @@ body: validations: required: true - type: textarea + id: advise attributes: label: 修改建议 description: 您有好的建议或者修改方案可以提供给我们。 diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 529a8ab8..99a2603f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -6,6 +6,7 @@ assignees: - piexlmax body: - type: textarea + id: desc attributes: label: 功能描述以及必要性描述 description: 您觉得此新功能会为框架带来什么便利. @@ -15,6 +16,7 @@ body: validations: required: true - type: textarea + id: advise attributes: label: 建议和方案 description: 您有好的建议或者修改方案可以提供给我们。 From a54144d4e1a0dd37a03ee3eb68620ad40bec3e98 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Thu, 9 Sep 2021 10:43:58 +0800 Subject: [PATCH 012/100] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E8=AE=BF=E9=97=AE=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=B7=AF=E7=94=B1=E5=AF=BC=E8=87=B4=E7=99=BD?= =?UTF-8?q?=E5=B1=8F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/permission.js | 28 ++++++++++++++++++++-------- web/src/store/module/user.js | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/web/src/permission.js b/web/src/permission.js index 7d53caab..91caab56 100644 --- a/web/src/permission.js +++ b/web/src/permission.js @@ -5,13 +5,26 @@ let asyncRouterFlag = 0 const whiteList = ['Login', 'Init'] +const getRouter = async() => { + await store.dispatch('router/SetAsyncRouter') + await store.dispatch('user/GetUserInfo') + const asyncRouters = store.getters['router/asyncRouters'] + asyncRouters.map(asyncRouter => { + router.addRoute(asyncRouter) + }) +} + router.beforeEach(async(to, from, next) => { const token = store.getters['user/token'] // 在白名单中的判断情况 document.title = getPageTitle(to.meta.title) if (whiteList.indexOf(to.name) > -1) { if (token) { - next({ path: '/layout/dashboard' }) + if (!asyncRouterFlag) { + asyncRouterFlag++ + await getRouter() + } + next({ name: store.getters['user/userInfo'].authority.defaultRouter }) } else { next() } @@ -21,15 +34,14 @@ router.beforeEach(async(to, from, next) => { // 添加flag防止多次获取动态路由和栈溢出 if (!asyncRouterFlag) { asyncRouterFlag++ - await store.dispatch('router/SetAsyncRouter') - await store.dispatch('user/GetUserInfo') - const asyncRouters = store.getters['router/asyncRouters'] - asyncRouters.map(asyncRouter => { - router.addRoute(asyncRouter) - }) + await getRouter() next({ ...to, replace: true }) } else { - next() + if (to.matched.length) { + next() + } else { + next({ path: '/layout/404' }) + } } } // 不在白名单中并且未登陆的时候 diff --git a/web/src/store/module/user.js b/web/src/store/module/user.js index b14f68e5..e836a327 100644 --- a/web/src/store/module/user.js +++ b/web/src/store/module/user.js @@ -11,7 +11,7 @@ export const user = { uuid: '', nickName: '', headerImg: '', - authority: '', + authority: {}, sideMode: 'dark', activeColor: '#1890ff', baseColor: '#fff' From 108959c84c927e62fe57d29e1edc3b50c88d847b Mon Sep 17 00:00:00 2001 From: qimiao <303176530@qq.com> Date: Thu, 9 Sep 2021 17:56:23 +0800 Subject: [PATCH 013/100] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E7=94=B1http=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BAhttps=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E6=80=A7?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/model/system/request/sys_user.go | 2 +- server/model/system/sys_user.go | 18 +++++++++--------- server/source/admin.go | 4 ++-- server/source/file.go | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/model/system/request/sys_user.go b/server/model/system/request/sys_user.go index 84ab1ef4..c03807e1 100644 --- a/server/model/system/request/sys_user.go +++ b/server/model/system/request/sys_user.go @@ -5,7 +5,7 @@ type Register struct { Username string `json:"userName"` Password string `json:"passWord"` NickName string `json:"nickName" gorm:"default:'QMPlusUser'"` - HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"` + HeaderImg string `json:"headerImg" gorm:"default:'https://qmplusimg.henrongyi.top/gva_header.jpg'"` AuthorityId string `json:"authorityId" gorm:"default:888"` AuthorityIds []string `json:"authorityIds"` } diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go index c7fbf90e..40678cd4 100644 --- a/server/model/system/sys_user.go +++ b/server/model/system/sys_user.go @@ -7,15 +7,15 @@ import ( type SysUser struct { global.GVA_MODEL - UUID uuid.UUID `json:"uuid" gorm:"comment:用户UUID"` // 用户UUID - Username string `json:"userName" gorm:"comment:用户登录名"` // 用户登录名 - Password string `json:"-" gorm:"comment:用户登录密码"` // 用户登录密码 - NickName string `json:"nickName" gorm:"default:系统用户;comment:用户昵称"` // 用户昵称 - SideMode string `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"` // 用户侧边主题 - HeaderImg string `json:"headerImg" gorm:"default:http://qmplusimg.henrongyi.top/head.png;comment:用户头像"` // 用户头像 - BaseColor string `json:"baseColor" gorm:"default:#fff;comment:基础颜色"` // 基础颜色 - ActiveColor string `json:"activeColor" gorm:"default:#1890ff;comment:活跃颜色"` // 活跃颜色 - AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID + UUID uuid.UUID `json:"uuid" gorm:"comment:用户UUID"` // 用户UUID + Username string `json:"userName" gorm:"comment:用户登录名"` // 用户登录名 + Password string `json:"-" gorm:"comment:用户登录密码"` // 用户登录密码 + NickName string `json:"nickName" gorm:"default:系统用户;comment:用户昵称"` // 用户昵称 + SideMode string `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"` // 用户侧边主题 + HeaderImg string `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像 + BaseColor string `json:"baseColor" gorm:"default:#fff;comment:基础颜色"` // 基础颜色 + ActiveColor string `json:"activeColor" gorm:"default:#1890ff;comment:活跃颜色"` // 活跃颜色 + AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"` Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"` } diff --git a/server/source/admin.go b/server/source/admin.go index 3128acb0..713035a1 100644 --- a/server/source/admin.go +++ b/server/source/admin.go @@ -16,8 +16,8 @@ var Admin = new(admin) type admin struct{} var admins = []system.SysUser{ - {GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "http://qmplusimg.henrongyi.top/gva_header.jpg", AuthorityId: "888"}, - {GVA_MODEL: global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "http://qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528"}, + {GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "https:///qmplusimg.henrongyi.top/gva_header.jpg", AuthorityId: "888"}, + {GVA_MODEL: global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "https:///qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528"}, } //@author: [SliverHorn](https://github.com/SliverHorn) diff --git a/server/source/file.go b/server/source/file.go index 59b2db14..964383c6 100644 --- a/server/source/file.go +++ b/server/source/file.go @@ -14,8 +14,8 @@ var File = new(file) type file struct{} var files = []example.ExaFileUploadAndDownload{ - {global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "10.png", "http://qmplusimg.henrongyi.top/gvalogo.png", "png", "158787308910.png"}, - {global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "logo.png", "http://qmplusimg.henrongyi.top/1576554439myAvatar.png", "png", "1587973709logo.png"}, + {global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "10.png", "https://qmplusimg.henrongyi.top/gvalogo.png", "png", "158787308910.png"}, + {global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "logo.png", "https://qmplusimg.henrongyi.top/1576554439myAvatar.png", "png", "1587973709logo.png"}, } //@author: [SliverHorn](https://github.com/SliverHorn) From f0969e09d3193602b2a380cd8439d4493ad5e0b4 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Fri, 10 Sep 2021 11:57:27 +0800 Subject: [PATCH 014/100] feat: issues #692 --- server/service/system/sys_auto_code.go | 4 ++++ server/service/system/sys_autocode_history.go | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go index d9b4a350..c27c40d6 100644 --- a/server/service/system/sys_auto_code.go +++ b/server/service/system/sys_auto_code.go @@ -154,6 +154,10 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru //@return: err error func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruct, ids ...uint) (err error) { + // 增加判断: 重复创建struct + if autoCode.AutoMoveFile && AutoCodeHistoryServiceApp.Repeat(autoCode.StructName) { + return RepeatErr + } dataList, fileList, needMkdir, err := autoCodeService.getNeedList(&autoCode) if err != nil { return err diff --git a/server/service/system/sys_autocode_history.go b/server/service/system/sys_autocode_history.go index 479e9ff3..c222a004 100644 --- a/server/service/system/sys_autocode_history.go +++ b/server/service/system/sys_autocode_history.go @@ -1,6 +1,7 @@ package system import ( + "errors" "fmt" "path/filepath" "strings" @@ -14,11 +15,20 @@ import ( "go.uber.org/zap" ) +var RepeatErr = errors.New("重复创建") + type AutoCodeHistoryService struct { } var AutoCodeHistoryServiceApp = new(AutoCodeHistoryService) +func (autoCodeHistoryService *AutoCodeHistoryService) Repeat(structName string) bool { + + var count int64 + global.GVA_DB.Model(&system.SysAutoCodeHistory{}).Where("struct_name = ?", structName).Count(&count) + return count > 0 +} + // CreateAutoCodeHistory RouterPath : RouterPath@RouterString;RouterPath2@RouterString2 func (autoCodeHistoryService *AutoCodeHistoryService) CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string) error { return global.GVA_DB.Create(&system.SysAutoCodeHistory{ From fffc2b7a57438de87fee6324985cea9d118e5bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E6=B7=BC=EF=BC=88piexlmax?= <303176530@qq.com> Date: Fri, 10 Sep 2021 19:00:07 +0800 Subject: [PATCH 015/100] Update bug_report.yaml --- .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index da610943..134a4168 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -6,6 +6,7 @@ assignees: - piexlmax - songzhibin97 - SliverHorn + - bypanghu body: - type: input id: gva From c993e2d070e8619db99e59da77fc4506a6a38372 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Mon, 13 Sep 2021 11:07:59 +0800 Subject: [PATCH 016/100] =?UTF-8?q?fix:=E9=87=8D=E5=A4=8D=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=88=A4=E6=96=AD=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/service/system/sys_autocode_history.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/service/system/sys_autocode_history.go b/server/service/system/sys_autocode_history.go index c222a004..4bce5d02 100644 --- a/server/service/system/sys_autocode_history.go +++ b/server/service/system/sys_autocode_history.go @@ -25,7 +25,7 @@ var AutoCodeHistoryServiceApp = new(AutoCodeHistoryService) func (autoCodeHistoryService *AutoCodeHistoryService) Repeat(structName string) bool { var count int64 - global.GVA_DB.Model(&system.SysAutoCodeHistory{}).Where("struct_name = ?", structName).Count(&count) + global.GVA_DB.Model(&system.SysAutoCodeHistory{}).Where("struct_name = ? and flag = 0", structName).Count(&count) return count > 0 } From f2e5e56fdb7800e03b5187e36f81e17e98f52172 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Tue, 14 Sep 2021 16:26:55 +0800 Subject: [PATCH 017/100] =?UTF-8?q?feat:jwt=E7=AD=BE=E5=90=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/service/system/sys_initdb.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/service/system/sys_initdb.go b/server/service/system/sys_initdb.go index a0a768e5..45d3b747 100644 --- a/server/service/system/sys_initdb.go +++ b/server/service/system/sys_initdb.go @@ -5,6 +5,8 @@ import ( "fmt" "path/filepath" + uuid "github.com/satori/go.uuid" + "github.com/flipped-aurora/gin-vue-admin/server/config" "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/example" @@ -33,6 +35,7 @@ func (initDBService *InitDBService) writeConfig(viper *viper.Viper, mysql config for k, v := range cs { viper.Set(k, v) } + viper.Set("jwt.signing-key", uuid.NewV4()) return viper.WriteConfig() } @@ -159,6 +162,7 @@ func (initDBService *InitDBService) InitDB(conf request.InitDB) error { global.GVA_DB = nil return err } + if err = initDBService.writeConfig(global.GVA_VP, MysqlConfig); err != nil { return err } From ccce04df1cc52b96f4df8d5817bc9adbf629cb8e Mon Sep 17 00:00:00 2001 From: SliverHorn Date: Tue, 14 Sep 2021 17:41:21 +0800 Subject: [PATCH 018/100] =?UTF-8?q?fixed:=20#699=20go=20build=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=20gcc=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/server/Dockerfile b/server/Dockerfile index b7f4b3a4..0e03cd50 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -5,6 +5,7 @@ COPY . . RUN go env -w GO111MODULE=on RUN go env -w GOPROXY=https://goproxy.cn,direct +RUN go env -w CGO_ENABLED=0 RUN go env RUN go mod tidy RUN go build -o server . From 3706937d4a677b403ebdce2ebe44138f5953f77b Mon Sep 17 00:00:00 2001 From: piexlmax Date: Tue, 14 Sep 2021 19:49:06 +0800 Subject: [PATCH 019/100] =?UTF-8?q?=E5=89=8D=E7=AB=AFui=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/template/web/table.vue.tpl | 28 +++++------ web/src/components/upload/image.vue | 11 +++-- web/src/style/main.scss | 40 +++++++++++----- web/src/view/example/customer/customer.vue | 11 ++--- web/src/view/example/excel/excel.vue | 7 +-- web/src/view/example/upload/upload.vue | 48 +++++++++---------- web/src/view/layout/aside/index.vue | 2 +- web/src/view/layout/setting/index.vue | 6 ++- web/src/view/superAdmin/api/api.vue | 30 ++++++------ .../view/superAdmin/authority/authority.vue | 12 ++--- .../superAdmin/authority/components/apis.vue | 2 +- .../superAdmin/authority/components/datas.vue | 11 +++-- .../superAdmin/authority/components/menus.vue | 2 +- .../superAdmin/dictionary/sysDictionary.vue | 10 ++-- .../dictionary/sysDictionaryDetail.vue | 12 ++--- web/src/view/superAdmin/menu/menu.vue | 8 +--- .../operation/sysOperationRecord.vue | 28 +++++------ web/src/view/superAdmin/user/user.vue | 9 +--- web/src/view/systemTools/autoCode/index.vue | 4 +- .../view/systemTools/autoCodeAdmin/index.vue | 14 ++---- web/src/view/systemTools/system/system.vue | 11 ++--- 21 files changed, 149 insertions(+), 157 deletions(-) diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl index 6fd337c0..878830c3 100644 --- a/server/resource/template/web/table.vue.tpl +++ b/server/resource/template/web/table.vue.tpl @@ -21,21 +21,21 @@ {{ end }}{{ end }}{{ end }} - - 查询 - 新增 - -

确定要删除吗？

-
- 取消 - 确定 -
- - - +
+ 查询 + 新增 + +

确定要删除吗？

+
+ 取消 + 确定 +
+ + +
- - + 压缩上传
@@ -53,6 +51,13 @@ export default { }, methods: { beforeImageUpload(file) { + const isJPG = file.type === 'image/jpeg' + const isPng = file.type === 'image/png' + if (!isJPG && !isPng) { + this.$message.error('上传头像图片只能是 jpg或png 格式!') + return false + } + const isRightSize = file.size / 1024 < this.fileSize if (!isRightSize) { // 压缩 diff --git a/web/src/style/main.scss b/web/src/style/main.scss index f5da1cb4..e3418976 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -653,7 +653,7 @@ li { color: #fff; } .el-menu--inline { - border-left: 5px solid #2c3b41; + // border-left: 5px solid #2c3b41; } } .hideside { @@ -810,9 +810,6 @@ li { padding: 0 15px; border-left: 1px solid #ebeef5; border-right: 1px solid #ebeef5; - .demo-form-inline { - margin-bottom: 10px; - } } // table @@ -892,6 +889,14 @@ li { // upload-demo .upload-demo, .upload { + .upload-box{ + margin-bottom: 12px; + display: flex; + justify-content: flex-end; + .upload-btn{ + margin-left: 12px; + } + } background-color: $white-bg; padding: 15px; .el-upload-list__item-status-label { @@ -1019,6 +1024,7 @@ li { .main-cont.el-main { background-color: $bg-main; .menu-total { + cursor: pointer; font-size: 22px; color: #838383; margin-top: 16px; @@ -1042,7 +1048,12 @@ li { height: $height-nav-scroll; border: none; border-left: 1px solid $border-color; + border-right: 1px solid $border-color; + +.el-tabs__item{ + border-left: 0px solid $border-color; + } } + .el-tabs__item.is-active { background-color: rgba(64, 158, 255, .08); } @@ -1145,10 +1156,6 @@ $mainHight: 100vh; } } -.el-scrollbar__wrap { - padding-bottom: 17px; -} - .layout-cont { .right-box { height: $height-header; @@ -1174,10 +1181,6 @@ $mainHight: 100vh; background-color: #fff; padding: 0; } - .fl-right { - // height: $height-header; - // line-height: $height-header; - } &.el-main { overflow: auto; background: #fff; @@ -1186,6 +1189,8 @@ $mainHight: 100vh; overflow: visible; position: relative; .menu-total { + margin-left:6px; + cursor: pointer; float: left; margin-top: 10px; width: 30px; @@ -1201,7 +1206,7 @@ $mainHight: 100vh; } } .el-menu-vertical { - height: calc(100vh - 64px) !important; + height: calc(100vh - 60px) !important; visibility: auto; &:not(.el-menu--collapse) { width: 220px; @@ -1397,6 +1402,15 @@ $mainHight: 100vh; } } +.gva-btn-list{ + margin-bottom: 12px; + display: flex; + justify-content: flex-end; + .el-button+.el-button{ + margin-left: 12px; + } +} + ::-webkit-scrollbar-track-piece { background-color: #f8f8f8; } diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue index c1043d89..942e59eb 100644 --- a/web/src/view/example/customer/customer.vue +++ b/web/src/view/example/customer/customer.vue @@ -1,11 +1,9 @@