From f628b36ce8618ab602510d483f506227975bc7e0 Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Wed, 4 Aug 2021 11:15:56 +0800 Subject: [PATCH 1/4] fix issue-182 --- templates/repo/home.tmpl | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7d632ea14..f1c47167e 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -155,37 +155,61 @@
-

简介

+

简介 + +

- {{if .Repository.DescriptionHTML}} - {{.Repository.DescriptionHTML}} - {{else}} - {{.i18n.Tr "repo.no_desc"}} - {{end}} - {{.Repository.Website}} + {{if .Repository.DescriptionHTML}} + {{.Repository.DescriptionHTML}} + {{else}} + {{.i18n.Tr "repo.no_desc"}} + {{end}} +

+
+ + + {{if .Repository.Website}} +

+ + {{.Repository.Website}} +

+ {{else}} + + {{end}} +

{{range .Topics}}{{.Name}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}

- + {{if .LanguageStats}}

{{range .LanguageStats}} {{.Language}} {{end}}

+ + {{else}} + + {{end}} + {{if .LICENSE}}

{{if .LICENSE}} {{.LICENSE}} {{end}}

+ {{else}} + + {{end}}
From 0344e2ca388b346b764d9f69627c7fb2cca571fa Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Thu, 5 Aug 2021 09:34:31 +0800 Subject: [PATCH 2/4] modified the issue 182 --- package-lock.json | 48 +++++++++++++ package.json | 1 + templates/repo/home.tmpl | 2 +- web_src/js/components/EditAboutInfo.vue | 96 ++++++++++++++++++++++++++ web_src/js/components/basic/editDialog.vue | 104 +++++++++++++++++++++++++++++ web_src/js/index.js | 20 +++++- 6 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 web_src/js/components/EditAboutInfo.vue create mode 100644 web_src/js/components/basic/editDialog.vue diff --git a/package-lock.json b/package-lock.json index 2c3c983e6..b0b0acad0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1841,6 +1841,14 @@ "async-done": "^1.2.2" } }, + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1934,6 +1942,11 @@ } } }, + "babel-helper-vue-jsx-merge-props": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" + }, "babel-loader": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz", @@ -3882,6 +3895,26 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.437.tgz", "integrity": "sha512-PBQn2q68ErqMyBUABh9Gh8R6DunGky8aB5y3N5lPM7OVpldwyUbAK5AX9WcwE/5F6ceqvQ+iQLYkJYRysAs6Bg==" }, + "element-ui": { + "version": "2.15.5", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz", + "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "dependencies": { + "deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + } + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -9186,6 +9219,11 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==" }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "now-and-later": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", @@ -11687,6 +11725,11 @@ "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz", "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==" }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -13526,6 +13569,11 @@ "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz", "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==" }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", diff --git a/package.json b/package.json index 4afc213e7..bda9843e8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "cssnano": "4.1.10", "domino": "2.1.5", "dropzone": "5.7.2", + "element-ui": "2.15.5", "esdk-obs-browserjs": "3.20.7", "esdk-obs-nodejs": "3.20.11", "fast-glob": "3.2.2", diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index f1c47167e..5e33aa7be 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -155,7 +155,7 @@
-

简介 +

简介 diff --git a/web_src/js/components/EditAboutInfo.vue b/web_src/js/components/EditAboutInfo.vue new file mode 100644 index 000000000..53e4915a0 --- /dev/null +++ b/web_src/js/components/EditAboutInfo.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/web_src/js/components/basic/editDialog.vue b/web_src/js/components/basic/editDialog.vue new file mode 100644 index 000000000..810a73a11 --- /dev/null +++ b/web_src/js/components/basic/editDialog.vue @@ -0,0 +1,104 @@ + + + + diff --git a/web_src/js/index.js b/web_src/js/index.js index 1a4326f7d..e7e57d1b9 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -6,6 +6,8 @@ import './publicpath.js'; import './polyfills.js'; import Vue from 'vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; import 'jquery.are-you-sure'; import './vendor/semanticdropdown.js'; import {svg} from './utils.js'; @@ -29,8 +31,10 @@ import { } from './features/notification.js'; import {createCodeEditor} from './features/codeeditor.js'; import MinioUploader from './components/MinioUploader.vue'; -import ObsUploader from './components/ObsUploader.vue' +import ObsUploader from './components/ObsUploader.vue'; +import EditAboutInfo from './components/EditAboutInfo.vue'; +Vue.use(ElementUI); const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; function htmlEncode(text) { @@ -2957,6 +2961,7 @@ $(document).ready(async () => { initVueApp(); initVueUploader(); initObsUploader(); + initVueEditAbout(); initTeamSettings(); initCtrlEnterSubmit(); initNavbarContentToggle(); @@ -3642,6 +3647,19 @@ function initVueUploader() { }); } +function initVueEditAbout() { + const el = document.getElementById('about-desc'); + console.log(el) + if (!el) { + return; + } + + new Vue({ + el: '#about-desc', + render: h => h(EditAboutInfo) + }); +} + // 新增 function initObsUploader() { const el = document.getElementById('obsUploader'); From c9f19b30baf5680ef4a6f35734bcb554e2af7995 Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Thu, 5 Aug 2021 09:37:15 +0800 Subject: [PATCH 3/4] fix bug --- templates/repo/home.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 5e33aa7be..a50b6e83f 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -178,8 +178,8 @@ {{.Repository.Website}}

- {{else}} - + {{end}}

@@ -196,19 +196,19 @@ {{end}}

- {{else}} - + {{end}} {{if .LICENSE}}

- {{if .LICENSE}} + {{.LICENSE}} - {{end}} +

- {{else}} - + {{end}}
From 2202e4b4b90c3145954f10273f30ccc907df2de5 Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Fri, 6 Aug 2021 09:38:49 +0800 Subject: [PATCH 4/4] fix issue-182 issue-181 and new create the edit about desc link fucntion --- templates/repo/home.tmpl | 16 ++--- web_src/js/components/EditAboutInfo.vue | 96 ++++++++++++++++++++++-------- web_src/js/components/basic/editDialog.vue | 9 +-- web_src/js/index.js | 4 ++ 4 files changed, 86 insertions(+), 39 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index a50b6e83f..ca064b990 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -178,8 +178,7 @@ {{.Repository.Website}}

- + {{end}}

@@ -188,7 +187,7 @@ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}

- {{if .LanguageStats}} +

{{range .LanguageStats}} @@ -196,19 +195,14 @@ {{end}}

- - {{end}} + {{if .LICENSE}}

- - {{.LICENSE}} - + {{.LICENSE}}

- + {{end}}
diff --git a/web_src/js/components/EditAboutInfo.vue b/web_src/js/components/EditAboutInfo.vue index 53e4915a0..76157008f 100644 --- a/web_src/js/components/EditAboutInfo.vue +++ b/web_src/js/components/EditAboutInfo.vue @@ -11,17 +11,19 @@ v-model="editDataDialog" :deleteCallback="editDataFunc" :deleteLoading ="editDataListLoading" + deleteParam = "ruleForm" + @input="initForm" >
- - - + + + - - + +
@@ -30,13 +32,9 @@