调整命令执行方式,增加自定义命令

Author: kscript

server/router/index.js

@@ -84,17 +84,18 @@ router.post('/exec', async (ctx) => {
         commands.push('nvm use ' + data.nodeVersion)
     }
     if (typeof data.commandLines === 'string' || Array.isArray(data.commandLines)) {
+        const result = []
         const commandLines = (Array.isArray(data.commandLines) ? data.commandLines : data.commandLines.split('\n'))
         commandLines.map(command => {
             commands.push(command.replace(/(^\s+|\s+$)/g, ''))
         })
-        const result = []
         const promises = commands.map((command, index) => {
             return new Promise((resolve, reject) => {
                 if (!command) resolve()
                 let content = ''
-                const child = spawn('cmd.exe', ['/c', command], {
-                    cwd: data.path,
+                const child = spawn(command, [''], {
+                    shell: true,
+                    env: process.env,
                     encoding: 'utf8'
                 })
                 const item = {
@@ -127,7 +128,7 @@ router.post('/exec', async (ctx) => {
         const execPromise = () => Promise.all(promises).then((data) => {
             useResponse(ctx, result.slice(data.nodeVersion ? 1 : 0), 200)
         }).catch(error => {
-            useResponse(ctx, {}, 500, error.toString())
+            useResponse(ctx, [], 500, error.toString())
         }).finally(() => {
             if (data.uuid) {
                 commandList[data.uuid] = commandList[data.uuid].filter(item => item !== current)

src/views/market/index.vue

@@ -9,13 +9,14 @@
               <div class="desc fs-12 opa-70">{{ command.description }}</div>
             </div>
           </template>
-          <markdownIt :content="command.content">
+          <el-input v-if="command.editable" v-model="command.content" type="textarea" :rows="3"></el-input>
+          <markdownIt v-else :content="command.content">
             <el-empty class="pt-6 pb-0" description=" " :image-size="40"></el-empty>
           </markdownIt>
           <template #footer>
             <el-button>复制</el-button>
             <el-button type="success">使用</el-button>
-            <el-button type="danger">运行</el-button>
+            <el-button type="danger" @click="handleExec(command)">运行</el-button>
           </template>
         </el-card>
       </el-col>
@@ -27,9 +28,25 @@ import { ref } from 'vue'
 import api from '@/api'
 import markdownIt from '@/components/markdown-it'
 const commands = ref([])
+const handleExec = ({ wait, content }) => {
+  if (content) {
+    api.exec({
+      wait,
+      commandLines: content.replace(/^\n+|\n+$/g, '')
+    })
+  }
+}
 const initData = () => {
   api.market({}).then(res => {
-    commands.value = res.data
+    commands.value = [
+      {
+        name: '自定义',
+        description: '自定义命令',
+        wait: true,
+        content: '',
+        editable: true
+      }
+    ].concat(res.data)
   })
 }
 initData()

vue.config.js

@@ -1,5 +1,10 @@
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
   publicPath: process.env.NODE_ENV === 'development' ? '/' : '/command-manager/',
-  transpileDependencies: true
+  transpileDependencies: true,
+  devServer: {
+    client: {
+      overlay: false
+    }
+  }
 })