Merge branch 'master' into develop

# Conflicts:
#	initializer-ui/package.json
#	initializer-ui/src/components/starter.vue

initializer-ui/package.json

@@ -14,8 +14,8 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.1",
-    "typescript": "^4.6.3",
-    "vite": "^2.9.6",
-    "vue-tsc": "^0.34.10"
+    "typescript": "^4.6.4",
+    "vite": "^2.9.7",
+    "vue-tsc": "^0.34.11"
   }
 }
\ No newline at end of file

initializer-ui/src/App.vue

 <template>
-  <Starter/>
+  <!--suppress HtmlUnknownTag -->
+  <a-config-provider :locale="locale">
+    <Starter/>
+  </a-config-provider>
 </template>
 
 <script lang="ts" setup>
-import Starter from "./components/starter.vue"</script>
+import Starter from "./components/starter.vue"
\ No newline at end of file
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
+import {ref} from "vue";
+
+const locale = ref(zhCN);
+</script>
\ No newline at end of file

initializer-ui/src/components/starter.vue

@@ -41,7 +41,7 @@
       <highlightjs :autodetect="false" :code="fileContent" :language="fileExtension"></highlightjs>
     </a-modal>
 
-    <a-modal v-model:visible="gitlabGroupVisible" @ok="gitlabGroupVisible=false" title="Gitlab 群组" width="500px">
+    <a-modal v-model:visible="gitlabGroupVisible" @close="onGroupModalClose" @ok="onGroupModalClose" @cancel="onGroupModalClose" title="Gitlab 群组" width="500px">
       <a-directory-tree :tree-data="gitlabGroupTreeData" @select="onGroupTreeNodeSelect"/>
     </a-modal>
   </div>
@@ -165,6 +165,13 @@ const onGroupTreeNodeSelect = async (selectedKeys: string[], event: { node: Tree
   formState.repoGroup = node.title
 }
 
+const onGroupModalClose = async () => {
+  if (formState.repoGroupId === -1) {
+    formState.initGitRepo = false
+  }
+  gitlabGroupVisible.value = false
+}
+
 const downloadGeneratedProject = (data: BlobPart, fileName: string) => {
   const blob = new Blob([data])
   const link = document.createElement('a')