@duxweb/dvha-template 1.0.7 → 1.0.9

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 DuxWeb
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -86,4 +86,4 @@ npm publish --access=public
 
 ## 许可证
 
-LGPL-3.0
+MIT

package/bin/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-import fs from 'fs-extra'
-import path from 'path'
-import { fileURLToPath } from 'url'
-import { input, select, confirm } from '@inquirer/prompts'
-import { cyan, green, red, yellow, blue, bold } from 'kolorist'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { confirm, input, select } from '@inquirer/prompts'
 import { Command } from 'commander'
+import fs from 'fs-extra'
+import { bold, cyan, green, red, yellow } from 'kolorist'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
@@ -29,7 +29,7 @@ async function createProject(projectName) {
   if (!targetDir) {
     targetDir = await input({
       message: '请输入项目名称 / Enter project name:',
-      default: 'my-dvha-app'
+      default: 'my-dvha-app',
     })
   }
 
@@ -43,7 +43,7 @@ async function createProject(projectName) {
   if (fs.existsSync(root)) {
     const overwrite = await confirm({
       message: `目录 ${targetDir} 已存在，是否覆盖？ / Directory ${targetDir} already exists, overwrite?`,
-      default: false
+      default: false,
     })
 
     if (!overwrite) {
@@ -58,15 +58,15 @@ async function createProject(projectName) {
   const uiConfigsDir = path.resolve(__dirname, '..', 'template', 'ui-configs')
   const availableUIs = fs.readdirSync(uiConfigsDir)
     .filter(dir => fs.statSync(path.join(uiConfigsDir, dir)).isDirectory())
-    .map(dir => {
-      const configPath = path.join(uiConfigsDir, dir + '.json')
+    .map((dir) => {
+      const configPath = path.join(uiConfigsDir, `${dir}.json`)
       if (fs.existsSync(configPath)) {
         const config = fs.readJsonSync(configPath)
         return {
           name: config.name,
           display: config.display,
           description: config.description,
-          value: config.name
+          value: config.name,
         }
       }
       return null
@@ -78,8 +78,8 @@ async function createProject(projectName) {
     choices: availableUIs.map(ui => ({
       name: `${ui.display} - ${ui.description}`,
       value: ui.value,
-      description: ui.description
-    }))
+      description: ui.description,
+    })),
   })
 
   if (!template) {
@@ -117,19 +117,19 @@ async function createProject(projectName) {
       const fileName = path.basename(src)
 
       // 过滤掉不需要的目录和文件
-      const shouldExclude =
-        relativePath.includes('node_modules') ||
-        relativePath.includes('.git') ||
-        relativePath.includes('dist') ||
-        relativePath.includes('.vite') ||
-        fileName === '.DS_Store' ||
-        fileName.endsWith('.log') ||
-        fileName === 'bun.lockb' ||
-        fileName === 'package-lock.json' ||
-        fileName === 'yarn.lock'
+      const shouldExclude
+        = relativePath.includes('node_modules')
+          || relativePath.includes('.git')
+          || relativePath.includes('dist')
+          || relativePath.includes('.vite')
+          || fileName === '.DS_Store'
+          || fileName.endsWith('.log')
+          || fileName === 'bun.lockb'
+          || fileName === 'package-lock.json'
+          || fileName === 'yarn.lock'
 
       return !shouldExclude
-    }
+    },
   })
 
   // 2. 复制UI特定的pages文件
@@ -150,13 +150,13 @@ async function createProject(projectName) {
     // 更新依赖
     pkg.dependencies = {
       ...pkg.dependencies,
-      ...uiConfig.dependencies
+      ...uiConfig.dependencies,
     }
 
     if (uiConfig.devDependencies && Object.keys(uiConfig.devDependencies).length > 0) {
       pkg.devDependencies = {
         ...pkg.devDependencies,
-        ...uiConfig.devDependencies
+        ...uiConfig.devDependencies,
       }
     }
 
@@ -173,7 +173,7 @@ async function createProject(projectName) {
     const appUseStatements = uiConfig.appUse || []
 
     // 找到现有导入的位置
-    const appImportIndex = mainTsContent.indexOf("import App from './App.vue'")
+    const appImportIndex = mainTsContent.indexOf('import App from \'./App.vue\'')
     if (appImportIndex !== -1) {
       const insertPosition = mainTsContent.indexOf('\n', appImportIndex) + 1
       const additionalImports = importStatements.join('\n') + (importStatements.length > 0 ? '\n' : '')
@@ -184,7 +184,7 @@ async function createProject(projectName) {
     if (appUseStatements.length > 0) {
       const appUseIndex = mainTsContent.indexOf('app.use(createDux(config))')
       if (appUseIndex !== -1) {
-        const additionalUse = appUseStatements.join('\n') + '\n'
+        const additionalUse = `${appUseStatements.join('\n')}\n`
         mainTsContent = mainTsContent.slice(0, appUseIndex) + additionalUse + mainTsContent.slice(appUseIndex)
       }
     }
@@ -223,7 +223,8 @@ program
   .action(async (projectName) => {
     try {
       await createProject(projectName)
-    } catch (error) {
+    }
+    catch (error) {
       if (error.name === 'ExitPromptError') {
         console.log(yellow('\n👋 操作已取消 / Operation cancelled'))
         process.exit(0)
@@ -247,4 +248,4 @@ program
     console.log()
   })
 
-program.parse()
+program.parse()

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@duxweb/dvha-template",
   "type": "module",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Create DVHA project from template",
   "author": "DuxWeb",
-  "license": "LGPL-3.0",
+  "license": "MIT",
   "homepage": "https://github.com/your-username/dux-vue#readme",
   "repository": {
     "type": "git",
@@ -36,15 +36,17 @@
   "engines": {
     "node": ">=20.0.0"
   },
-  "scripts": {
-    "test": "./scripts/test.sh",
-    "push": "./scripts/publish.sh",
-    "dev": "bun run bin/index.js"
-  },
   "dependencies": {
     "@inquirer/prompts": "^7.5.1",
     "commander": "^14.0.0",
     "fs-extra": "^11.2.0",
     "kolorist": "^1.8.0"
+  },
+  "scripts": {
+    "test": "./scripts/test.sh",
+    "push": "./scripts/publish.sh",
+    "dev": "node bin/index.js",
+    "changeset": "changeset",
+    "changeset:version": "changeset version"
   }
-}
+}

package/template/base/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "version": "0.0.0",
   "author": "DuxWeb",
-  "license": "LGPL-3.0",
+  "license": "MIT",
   "files": [
     "README.md",
     "dist",

package/template/base/uno.config.ts

@@ -1,11 +1,11 @@
-import { defineConfig, presetIcons, presetWind3 } from 'unocss'
 import icons from '@iconify-json/tabler/icons.json'
+import { defineConfig, presetIcons, presetWind3 } from 'unocss'
 
-const generateSafeList = () => {
+function generateSafeList() {
   return Object.keys(icons.icons).flatMap((item) => {
     return `i-tabler:${item}`
   })
-};
+}
 
 const safeList = generateSafeList()
 

package/template/ui-configs/elementui/pages/layout.vue

@@ -1,30 +1,62 @@
+<script setup lang="ts">
+import { useGetAuth, useLogout, useManage } from '@duxweb/dvha-core'
+import { onMounted, onUnmounted, ref } from 'vue'
+import Sidebar from './menu.vue'
+
+const manage = useManage()
+const user = useGetAuth()
+
+const { mutate: logout } = useLogout({
+  onSuccess: () => console.log('退出成功'),
+  onError: error => console.error('退出失败:', error),
+})
+
+const sidebarOpen = ref(false)
+const showUserMenu = ref(false)
+
+const getUserName = () => user?.info?.name || user?.info?.username || 'Admin'
+const toggleSidebar = () => sidebarOpen.value = !sidebarOpen.value
+const handleLogout = () => logout()
+
+function closeDropdowns(event: Event) {
+  if (!(event.target as HTMLElement).closest('.relative')) {
+    showUserMenu.value = false
+  }
+}
+
+onMounted(() => document.addEventListener('click', closeDropdowns))
+onUnmounted(() => document.removeEventListener('click', closeDropdowns))
+</script>
+
 <template>
   <div class="min-h-screen bg-gray-50 flex flex-col">
     <!-- 头部 -->
     <header class="bg-white shadow-sm border-b fixed w-full top-0 z-50">
       <div class="flex items-center justify-between h-16 px-4">
         <div class="flex items-center">
-          <button @click="toggleSidebar" class="p-2 rounded hover:bg-gray-100 lg:hidden">
-            <div class="i-tabler:menu-2 text-xl"></div>
+          <button class="p-2 rounded hover:bg-gray-100 lg:hidden" @click="toggleSidebar">
+            <div class="i-tabler:menu-2 text-xl" />
           </button>
           <div class="flex items-center ml-4 lg:ml-0">
-            <div class="i-tabler:brand-vue text-2xl text-blue-600 mr-3"></div>
-            <h1 class="text-xl font-bold">{{ manage.config?.title || 'Dux Admin' }}</h1>
+            <div class="i-tabler:brand-vue text-2xl text-blue-600 mr-3" />
+            <h1 class="text-xl font-bold">
+              {{ manage.config?.title || 'Dux Admin' }}
+            </h1>
           </div>
         </div>
 
         <!-- 用户菜单 -->
         <div class="relative">
-          <button @click="showUserMenu = !showUserMenu" class="flex items-center p-2 rounded hover:bg-gray-100">
-            <div class="i-tabler:user-circle text-xl mr-2"></div>
+          <button class="flex items-center p-2 rounded hover:bg-gray-100" @click="showUserMenu = !showUserMenu">
+            <div class="i-tabler:user-circle text-xl mr-2" />
             <span class="hidden md:block text-sm font-medium">{{ getUserName() }}</span>
-            <div class="i-tabler:chevron-down text-sm ml-1 hidden md:block"></div>
+            <div class="i-tabler:chevron-down text-sm ml-1 hidden md:block" />
           </button>
 
           <div v-if="showUserMenu" class="absolute right-0 mt-2 w-40 bg-white rounded-md shadow-lg border z-50">
             <div class="py-1">
-              <button @click="handleLogout" class="flex items-center w-full px-4 py-2 text-sm hover:bg-gray-100">
-                <div class="i-tabler:logout mr-3"></div>
+              <button class="flex items-center w-full px-4 py-2 text-sm hover:bg-gray-100" @click="handleLogout">
+                <div class="i-tabler:logout mr-3" />
                 退出登录
               </button>
             </div>
@@ -38,7 +70,7 @@
       <Sidebar :sidebar-open="sidebarOpen" />
 
       <!-- 遮罩层 -->
-      <div v-if="sidebarOpen" @click="toggleSidebar" class="fixed inset-0 z-30 bg-black bg-opacity-50 lg:hidden"></div>
+      <div v-if="sidebarOpen" class="fixed inset-0 z-30 bg-black bg-opacity-50 lg:hidden" @click="toggleSidebar" />
 
       <!-- 主内容 -->
       <main class="flex-1">
@@ -47,33 +79,3 @@
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
-import { useManage, useGetAuth, useLogout } from '@duxweb/dvha-core'
-import Sidebar from './menu.vue'
-
-const manage = useManage()
-const user = useGetAuth()
-
-const { mutate: logout } = useLogout({
-  onSuccess: () => console.log('退出成功'),
-  onError: (error) => console.error('退出失败:', error)
-})
-
-const sidebarOpen = ref(false)
-const showUserMenu = ref(false)
-
-const getUserName = () => user?.info?.name || user?.info?.username || 'Admin'
-const toggleSidebar = () => sidebarOpen.value = !sidebarOpen.value
-const handleLogout = () => logout()
-
-const closeDropdowns = (event: Event) => {
-  if (!(event.target as HTMLElement).closest('.relative')) {
-    showUserMenu.value = false
-  }
-}
-
-onMounted(() => document.addEventListener('click', closeDropdowns))
-onUnmounted(() => document.removeEventListener('click', closeDropdowns))
-</script>

package/template/ui-configs/elementui/pages/login.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
+import type { FormInstance } from 'element-plus'
+import { useLogin } from '@duxweb/dvha-core'
+import { Lock, User } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
+import { reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { useLogin } from '@duxweb/dvha-core'
-import type { FormInstance } from 'element-plus'
-import { User, Lock } from '@element-plus/icons-vue'
 import 'element-plus/dist/index.css'
 
 const router = useRouter()
@@ -14,16 +14,16 @@ const formRef = ref<FormInstance>()
 const formModel = reactive({
   username: '',
   password: '',
-  remember: false
+  remember: false,
 })
 
 const rules = reactive({
   username: [
-    { required: true, message: '请输入用户名', trigger: 'blur' }
+    { required: true, message: '请输入用户名', trigger: 'blur' },
   ],
   password: [
-    { required: true, message: '请输入密码', trigger: 'blur' }
-  ]
+    { required: true, message: '请输入密码', trigger: 'blur' },
+  ],
 })
 
 const { mutate, isLoading } = useLogin({
@@ -33,18 +33,19 @@ const { mutate, isLoading } = useLogin({
   onError: (error) => {
     console.log(error)
     ElMessage.error(error?.message || '登录失败，请检查用户名和密码')
-  }
+  },
 })
 
-const handleSubmit = () => {
-  if (!formRef.value) return
+function handleSubmit() {
+  if (!formRef.value)
+    return
 
   formRef.value.validate((valid) => {
     if (valid) {
       mutate({
         username: formModel.username,
         password: formModel.password,
-        code: "0000"
+        code: '0000',
       })
     }
   })
@@ -55,8 +56,12 @@ const handleSubmit = () => {
   <div class="flex justify-center items-center min-h-screen bg-gray-100">
     <div class="w-400px p-40px rounded-8px bg-white shadow-sm">
       <div class="text-center mb-40px">
-        <h1 class="m-0 mb-8px text-24px font-600 text-gray-800">系统登录</h1>
-        <p class="m-0 text-gray-500 text-14px">欢迎使用管理系统，请登录</p>
+        <h1 class="m-0 mb-8px text-24px font-600 text-gray-800">
+          系统登录
+        </h1>
+        <p class="m-0 text-gray-500 text-14px">
+          欢迎使用管理系统，请登录
+        </p>
       </div>
 
       <el-form