tmui-cli 1.1.2 → 1.1.4

package/README.md

@@ -21,10 +21,11 @@ npm -g install tmui-cli
 
 #### 命令解释
 
-0. tmui cli 创建uniapp 平台的cli初始项目，内部已经包含了tmui最新框架（自动更新）
-1. tmui hbx 创建uniapp 平台的HBX初始项目，内部已经包含了tmui最新框架（自动更新）
-2. tmui rcli 为【已有】uniapp 平台的cli项目，更新和下载tmui最新框架（自动更新）
-3. tmui rhbx 为【已有】uniapp 平台的HBX项目，更新和下载tmui最新框架（自动更新）
+0. tmui 4x 创建uniappx 平台的hbx tmui4.0x项目
+1. tmui cli 创建uniapp 平台的cli初始项目，内部已经包含了tmui最新框架（自动更新）
+2. tmui hbx 创建uniapp 平台的HBX初始项目，内部已经包含了tmui最新框架（自动更新）
+3. tmui rcli 为【已有】uniapp 平台的cli项目，更新和下载tmui最新框架（自动更新）
+4. tmui rhbx 为【已有】uniapp 平台的HBX项目，更新和下载tmui最新框架（自动更新）
 4. tmui use 为保姆级引导式下载安装上述功能项目。
 
 #### 注意事项

package/bin/cmd/cmdTool.js

@@ -0,0 +1,219 @@
+const fs = require('fs');
+const path = require('path');
+const { spawn, exec } = require('child_process');
+const process = require('process');
+var codecs = require('codecs')
+const psTree = require('ps-tree');
+var iconv = require('iconv-lite');
+
+function detectEncoding(str) {
+    const buffer = Buffer.from(str);
+    if (buffer[0] < 128) {
+        return 'ascii';
+    } else if (buffer[0] < 224) {
+        return 'utf8';
+    } else if (buffer[0] < 240) {
+        return 'utf16le';
+    } else {
+        return 'utf32le';
+    }
+}
+
+
+function send(ws,arg){
+    ws.forEach(el=>{
+        el.send(arg)
+    })
+}
+
+function execCmd(cb, end, command) {
+    try {
+        // const npmPath = path.join(process.env.APPDATA, 'npm', 'npm.cmd');
+        const spawnObj = exec(command, { encoding: 'binary' })
+        // const spawnObj = spawn("npm.cmd",["run","dev:h5"],{detached:true})
+        
+        spawnObj.stdout?.on('data', function (chunk) {
+            // Buffer.from(chunk,'binary').toString('utf-8')
+            // var str = iconv.decode(, 'cp936');
+            if (cb) {
+                let str = Buffer.from(chunk, 'binary').toString("utf8")
+               
+                var codecsDecode = codecs(detectEncoding(chunk))
+                let strii = codecsDecode.decode(Buffer.from(chunk,'binary')).toString('utf-8');
+                // 去除控制符
+                const cleanStr = strii.replace(/[\u001B\u009B][[\]()#;?]*(?:(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[A-PR-Za-z~])/g, '');
+                cb(cleanStr,spawnObj.pid||0)
+            }
+        });
+        spawnObj.addListener('error', (err) => {
+            if (end) {
+                cb(err)
+                end('error')
+            }
+        })
+        spawnObj.on('close', function (code) {
+            // console.log('close code : ' + code);
+            if (end) {
+                end('end')
+            }
+        })
+        spawnObj.on('exit', (code) => {
+            // console.log('exit code : ' + code);
+            if (end) {
+                end('end')
+            }
+        });
+
+        return spawnObj;
+    } catch (error) {
+        if (end) {
+            cb(error)
+            end('end')
+        }
+        return null; 
+    }
+}
+// 杀死子进程及其所有子孙进程
+function killChildAndGrandChildren(pid) {
+   
+    if (process.platform === 'win32') {
+        // 在 Windows 系统上执行的代码
+        const command = `taskkill /T /F /PID ${pid}`;
+        exec(command, (err, stdout, stderr) => {
+            if (err) {
+                console.error(`服务进程退出失败！不要担心，当你关闭主进程时，未退出的子进程会一并关闭哦`);
+            }
+            // console.log(`stdout: ${stdout}`);
+            // console.error(`stderr: ${stderr}`);
+        });
+    } else {
+        // 在 Linux/Unix/Mac 系统上执行的代码
+        psTree(pid, (err, children) => {
+            // 使用 kill 命令杀死所有子孙进程
+            console.log(5555)
+            exec(`kill -TERM ${pid} ${children.map(c => c.PID).join(' ')}`);
+        });
+    }
+    
+  }
+function devRunApp(ws, obj) {
+   
+    const nowcd = process.cwd();
+    process.chdir(path.normalize(obj.data.path));
+
+    const childreProcess = execCmd(function (msg,pid) {
+        send(ws,JSON.stringify({
+            event: 'info',
+            data: msg
+        }))
+        const reg_1 = /http:\/\/localhost(:\d+)?(\/[^\s]*)?/g;
+        const reg_2 = /http:\/\/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(:\d+)?(\/[^\s]*)?/g;
+        
+        
+        if(reg_1.test(msg)){
+            send(ws,JSON.stringify({
+                event: '1',
+                data: {
+                    id:obj.data.id,
+                    msg:msg.match(reg_1)[0],
+                    pid:pid
+                }
+            }))
+        }
+        if(reg_2.test(msg)){
+            send(ws,JSON.stringify({
+                event: '1',
+                data: {
+                    id:obj.data.id,
+                    msg:msg.match(reg_2)[0],
+                    pid:pid
+                }
+            }))
+        }
+        if(msg.indexOf('ready')>-1){
+            send(ws,JSON.stringify({
+                event: 'ready',
+                data: {
+                    id:obj.data.id,
+                    pid:pid
+                },
+            }))
+        }
+    }, function (type) {
+
+
+        if(type=='end'){
+            send(ws,JSON.stringify({
+                event: 'end',
+                data: {
+                    id:obj.data.id
+                },
+            }))
+        }else{
+            send(ws,JSON.stringify({
+                event: 'error',
+                data: {
+                    id:obj.data.id
+                },
+            }))
+
+        }
+        
+    }, obj.command)
+
+    return childreProcess;
+}
+
+function buildApp(ws, obj,end) {
+   
+    const nowcd = process.cwd();
+    process.chdir(path.normalize(obj.data.path));
+
+    const childreProcess = execCmd(function (msg,pid) {
+        send(ws,JSON.stringify({
+            event: 'info',
+            data: msg
+        }))
+        if(msg.indexOf('DONE')>-1){
+            send(ws,JSON.stringify({
+                event: 'buildSucess',
+                data: {
+                    id:obj.data.id,
+                    pid:pid
+                },
+            }))
+        }
+    }, function (type) {
+
+       
+        if(type=='end'){
+            send(ws,JSON.stringify({
+                event: 'end',
+                data: {
+                    id:obj.data.id
+                },
+            }))
+            
+            console.log('编译完成')
+        }else{
+            send(ws,JSON.stringify({
+                event: 'error',
+                data: {
+                    id:obj.data.id
+                },
+            }))
+        }
+        if(end){
+            end()
+        }
+        
+    }, obj.command)
+
+    return childreProcess;
+}
+
+
+exports.execCmd = execCmd;
+exports.devRunApp = devRunApp;
+exports.killChildAndGrandChildren = killChildAndGrandChildren;
+exports.buildApp = buildApp;

package/bin/cmd/dirTool.js

@@ -0,0 +1,174 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const process = require('process');
+const { spawn, exec } = require('child_process');
+
+function getJsonFiles(jsonPath) {
+  let jsonFiles = [];
+  function findJsonFile(www) {
+    let files = fs.readdirSync(www);
+    files.forEach(function (item, index) {
+      let fPath = path.join(www, item);
+      let stat = fs.statSync(fPath);
+      if (stat.isDirectory() === true) {
+        findJsonFile(fPath);
+      }
+      if (stat.isFile() === true) {
+        jsonFiles.push(fPath);
+      }
+    });
+  }
+  findJsonFile(jsonPath);
+  return jsonFiles;
+}
+
+function getJsonDir(basePath = './') {
+  const dirPath = basePath;
+  const root = { name: '', type: 'dir', parent: dirPath, children: [] };
+  const files = fs.readdirSync(dirPath);
+
+  const tree = [];
+  for (let i = 0; i < files.length; i++) {
+    const filename = files[i];
+    const filePath = path.join(dirPath, filename);
+    try {
+      if (filename.lastIndexOf('.tmp') == -1 && filename.lastIndexOf('.sys') == -1) {
+        const stats = fs.statSync(filePath);
+        if (stats.isFile()) {
+          const fileNode = { name: filename, type: 'file', parent: dirPath };
+          tree.push(fileNode);
+        } else if (stats.isDirectory()) {
+          const dirNode = { name: filename, type: 'dir', parent: dirPath, children: [] };
+          tree.push(dirNode);
+        }
+      }
+    } catch (error) {
+
+    }
+
+  }
+  root.children = tree;
+
+  return root;
+}
+
+/**读取项目信息根据提供的路径。 */
+function checkProject(obj) {
+  // const {id,path,type} = obj;
+  let mainsetStrPath = "";
+  // 检查是否有tmui文件。和目录。
+  let tmuiDir = ""
+  //可运行的命令行。
+  let scriptsPackagePath = ""
+  if (obj.type == 'cli') {
+    mainsetStrPath = path.join(obj.path, 'src', 'manifest.json')
+    tmuiDir = path.join(obj.path, 'src', 'tmui', 'package.json')
+    scriptsPackagePath = path.join(obj.path, 'package.json')
+  } else {
+    mainsetStrPath = path.join(obj.path, 'manifest.json')
+    tmuiDir = path.join(obj.path, 'tmui', 'package.json')
+  }
+
+  let str = fs.readFileSync(mainsetStrPath).toString('utf-8');
+
+  reg = /("([^\\\"]*(\\.)?)*")|('([^\\\']*(\\.)?)*')|(\/{2,}.*?(\r|\n|$))|(\/\*(\n|.)*?\*\/)/g;
+
+  str = str.replace(reg, function (word) {
+    // 去除注释后的文本 
+    return /^\/{2,}/.test(word) || /^\/\*/.test(word) ? "" : word;
+  });
+
+  const d = JSON.parse(str);
+  let tmui = "";
+  if (fs.existsSync(tmuiDir)) {
+    let str2 = fs.readFileSync(tmuiDir).toString('utf-8');
+    const p = JSON.parse(str2);
+    tmui = p.version
+  }
+
+  // 读取运行的命令行。
+  let scripts = ""
+  if (fs.existsSync(scriptsPackagePath)) {
+    let str2 = fs.readFileSync(scriptsPackagePath).toString('utf-8');
+    const p = JSON.parse(str2);
+    scripts = p.scripts
+  }
+
+  return {
+    name: d.name,
+    appid: d.appid,
+    versionName: d.versionName,
+    tmui: tmui,
+    id: obj.id,
+    scripts: scripts
+  }
+}
+/**获取系统磁盘。 */
+function getDirver(callbck) {
+  if (process.platform === 'win32') {
+    // 执行 wmic 命令
+    const cmd = spawn('wmic', ['logicaldisk', 'get', 'name']);
+    // 监听命令输出流
+    cmd.stdout.on('data', data => {
+      // 解析命令输出结果
+      const disks = data.toString()
+        .split('\r\r\n') // 分割为行
+        .slice(1) // 跳过标题行
+        .map(line => line.trim()) // 去除行首尾空格
+        .filter(name => /^[A-Za-z]:$/.test(name)); // 过滤掉非磁盘名称
+      const pdist = disks.map(el=>el+"\\")
+      
+      if(callbck){
+        callbck(pdist)
+      }
+    });
+
+    // 监听命令错误流
+    cmd.stderr.on('data', data => {
+      // console.error(`执行 wmic 命令出错：${data}`);
+    });
+
+    // 监听命令退出事件
+    cmd.on('exit', code => {
+      // console.log(`wmic 命令退出，返回码：${code}`);
+    });
+
+
+  } else {
+    // 在 Linux/Unix/Mac 系统上执行的代码
+    // 获取系统中的所有磁盘名称
+    fs.readFile('/proc/mounts', 'utf8', (err, data) => {
+      if (err) {
+        console.error(`获取磁盘信息失败：${err}`);
+        return;
+      }
+      const lines = data.split('\n');
+      const disks = [];
+      for (const line of lines) {
+        const parts = line.split(' ');
+        const mountpoint = parts[1];
+
+        if (mountpoint.startsWith('/dev/')) {
+          const disk = parts[0];
+          disks.push(disk);
+        }
+      }
+
+      console.log(`系统中的所有磁盘：${disks}`);
+      if (callbck) {
+        callbck(disks)
+      }
+
+    });
+
+  }
+
+}
+
+
+exports.getJsonFiles = getJsonFiles;
+exports.getJsonDir = getJsonDir;
+exports.checkProject = checkProject;
+exports.getDirver = getDirver;
+

package/bin/cmd/selectedDir.js

@@ -0,0 +1,27 @@
+const fs = require("fs");
+const path = require("path");
+const globalDirectories = require('global-dirs');
+const { getJsonDir } = require("./dirTool");
+
+
+
+async function selectedDir(cb, end, pathStr) {
+    try {
+        let dirpath = globalDirectories.npm.prefix
+        if(pathStr){
+            dirpath = path.normalize(pathStr);
+        }
+        let str = getJsonDir(dirpath);
+        cb(str)
+        end('end')
+    } catch (error) {
+        console.log(error,'---')
+        if (end) {
+            cb(error)
+            end('end')
+        }
+    }
+}
+
+
+exports.selectedDir = selectedDir;

package/bin/donet.js

@@ -0,0 +1,50 @@
+const express = require('express');
+const fs = require('fs');
+const {spawn}  = require('child_process');
+var iconv = require('iconv-lite');
+var BufferHelper = require('bufferhelper');
+const app = express();
+const {getJsonFiles} = require("./cmd/dirTool")
+const open = require('open');
+
+app.post("/api/dirlist",(req,res)=>{
+    res.setHeader("Access-Control-Allow-Headers","*")
+    res.setHeader("Access-Control-Allow-Methods","GET, POST, PUT, DELETE, OPTIONS")
+    res.setHeader("Access-Control-Allow-Headers","DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization")
+
+    const ls = getJsonFiles( __dirname )
+    res.json(ls)
+    
+})
+
+app.post("/api/cmd",(req,res)=>{
+    res.setHeader("Access-Control-Allow-Headers","*")
+    res.setHeader("Access-Control-Allow-Methods","GET, POST, PUT, DELETE, OPTIONS")
+    res.setHeader("Access-Control-Allow-Headers","DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization")
+    
+    
+    res.json(["响应中..."])
+    
+})
+
+
+
+app.listen(6170)
+// open('http://localhost:6170')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

package/bin/hooks.js

@@ -0,0 +1,170 @@
+
+const ws = require('ws')
+const wss = new ws.WebSocketServer({ port: 6169 });
+const { execCmd, devRunApp, killChildAndGrandChildren, buildApp } = require("./cmd/cmdTool");
+const { selectedDir } = require('./cmd/selectedDir');
+const { checkProject, getDirver } = require('./cmd/dirTool');
+const osUtils = require('node-os-utils');
+
+var client
+var processList = [];
+var runAppInfoList = [];
+var wslist = [];
+console.log(getDirver())
+function uuid(len = 24, radix) {
+    var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+    var uuid = [], i;
+    radix = radix || chars.length;
+    if (len) {
+        // Compact form
+        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+    } else {
+        // rfc4122, version 4 form
+        var r;
+        // rfc4122 requires these characters
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+        uuid[14] = '4';
+        for (i = 0; i < 36; i++) {
+            if (!uuid[i]) {
+                r = 0 | Math.random() * 16;
+                uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+
+            }
+
+        }
+
+    }
+
+    return uuid.join('');
+}
+function removeWs(id) {
+    const index = wslist.findIndex(el => el.uuid == id)
+    if (index > -1) {
+        wslist.splice(index, 1)
+    }
+}
+function send(arg) {
+    wslist.forEach(el => {
+        el.send(arg)
+    })
+}
+wss.on('connection', function connection(ws) {
+
+    ws.uuid = uuid();
+    wslist.push(ws)
+    ws.on('error', console.error);
+    ws.on('message', function message(data) {
+        try {
+            let obj = JSON.parse(data)
+            // 执行命令
+            if (obj.event == 'cmd') {
+                execCmd(function (str) {
+                    send(JSON.stringify({
+                        event: 'info',
+                        data: str
+                    }))
+                }, function () {
+                    send(JSON.stringify({
+                        event: 'end',
+                        data: ""
+                    }))
+                }, obj.command)
+                // 选择文件目录。
+            } else if (obj.event == '18') {
+                selectedDir(function (str) {
+                    send(JSON.stringify({
+                        event: '18',
+                        data: str
+                    }))
+                }, function () {
+                    send(JSON.stringify({
+                        event: 'end',
+                        data: ""
+                    }))
+                }, obj.command)
+                // 查询目录项目的信息
+            } else if (obj.event == '17') {
+                let result = checkProject(obj.command)
+                let runfl = runAppInfoList.filter(el => el.id == result.id)
+                send(JSON.stringify({
+                    event: '17',
+                    data: result,
+                    run: runfl
+                }))
+                send(JSON.stringify({
+                    event: 'end',
+                    data: ""
+                }))
+                /**运行项目dev:xxx */
+            } else if (obj.event == '1') {
+
+                const childrenProcess = devRunApp(wslist, obj.command)
+                if (childrenProcess) {
+                    processList.push(childrenProcess)
+
+                }
+                /**关闭并退出运行的项目服务 */
+            } else if (obj.event == '2') {
+                try {
+                    if (!obj.command) return;
+                    // process.kill(Number(obj.command||0))
+                    const pid = Number(obj.command || 0);
+                    const index = processList.findIndex(el => el.pid == pid)
+                    if (index > -1) {
+                        // process.kill(sflit[0].pid)
+                        killChildAndGrandChildren(processList[index].pid)
+                        processList.splice(index, 1)
+                        const index2 = runAppInfoList.findIndex(el => el.pid == pid)
+                        runAppInfoList.splice(index2, 1)
+                    }
+                } catch (error) {
+
+                }
+                /**编译应用build:xx */
+            } else if (obj.event == '3') {
+                const id = obj.command.data.id;
+                const childrenProcess = buildApp(wslist, obj.command, () => {
+                    const index2 = runAppInfoList.findIndex(el => el.id == id)
+                    console.log("编译结束")
+                    if (index2 > -1) {
+                        runAppInfoList.splice(index2, 1)
+                    }
+                })
+                /**保存当前运行的用户信息。 */
+            } else if (obj.event == 'saveRunInfo') {
+                const index2 = runAppInfoList.findIndex(el => el.id == obj.command.id)
+                if (index2 > -1) {
+                    runAppInfoList.splice(index2, 1, obj.command)
+                } else {
+                    runAppInfoList.push(obj.command)
+                }
+                /**获取系统使用率 */
+            } else if (obj.event == 'getCpu') {
+               
+               Promise.all([osUtils.mem.info(),osUtils.cpu.usage()])
+               .then(arg=>{
+                    send(JSON.stringify({
+                        event: 'getCpu',
+                        data: {
+                            memUsage:arg[0].usedMemPercentage.toFixed(2),
+                            cpuUsage:arg[1].toFixed(2)
+                        }
+                    }))
+               })
+                
+            }
+
+
+
+        } catch (error) {
+
+        }
+    });
+    ws.on('close', () => {
+        removeWs(ws.uuid)
+    })
+    send('something');
+});
+
+
+

package/bin/tmui.js

@@ -5,53 +5,121 @@ const chalk = import("chalk")
 const { Command } = require('commander');
 const program = new Command();
 const create = require("../src/create")
+const create4xhbx = require("../src/create4xhbx")
 const createHbx = require("../src/createHbx")
 const rhbx = require("../src/rhbx")
 const rcli = require("../src/rcli")
 const viewTmuiVer = require("../src/viewTmuiVer")
 const tm2 = require("../src/tmui2")
-const inquirer = import('inquirer');
-const ft =  import("node-fetch")
+const inquirer = import("inquirer")
+const fetch = import("node-fetch")
 var clear = require('clear');
 var figlet = require('figlet');
+// require('./donet')
+// require('./hooks')
+const ft =  import("node-fetch")
 clear()
+
+
+
+// async function main(){
+// 	const Chalk = await (await chalk).default
+// 	const Inquirer = await (await inquirer).default
+// 	const Fetch = await (await fetch).default
+// 	figlet('TMUI3.1.0',figletSucess)
+// 	function figletSucess(err,d){
+// 		console.log(Chalk.green(d))
+// 		console.log(Chalk.white('请注意浏览器打开状态，如果打开失败'))
+// 		console.log(Chalk.white('请访问：http://localhost:6170'))
+// 	}
+
+// }
+
+
+
+// main()
+
+
+
+
+
+
+
+
+
+
 chalk.then(v=>{
 	const ck = new v.Chalk();
 	
-	figlet('TMUI3.0 CLI', function(err, data) {
+	figlet('TMUI4.0x CLI', function(err, data) {
 		if (err) {
 			console.log('Something went wrong...');
 			console.dir(err);
 			return;
 		}
-		console.log(ck.white(`---------------------------------------------------`))
 		console.log(ck.green(data))
-		console.log(ck.green(`文档地址：https://tmui.design`))
+		console.log(ck.green(`tmui2.0文档地址：https://jx2d.cn`))
+		console.log(ck.blue(`tmui3.0文档地址：https://tmui.design`))
+		console.log(ck.yellow(`tmui4.0x文档地址：https://xui.tmui.design`))
 		console.log(ck.white(`---------------------------------------------------`))
 		console.log(ck.white(`命令使用方式为:tmui xxx命令 比如：tmui use`))
 		console.log(ck.white(`---------------------------------------------------`))
+
+		
 		inquirer.then(ivk=>{
+			const { prompt,Separator} = ivk.default;
+
+			function createTest(type,name){
+				if(type=="rcli"){
+					rcli.run(type,name,null,'npm','')
+				}else if(type=="rhbx"){
+					createHbx.run(type,name,null,'npm','')
+				}
+				prompt([{
+					type: 'input',
+					name: 'filename',
+					message: '在当前路径下创建项目，请输入项目名称：',
+				}, ])
+				.then(answers2 => {
+					if(type=="cli"){
+						create.run(type,name,null,'npm',answers2.filename)
+					}else if(type=="rcli"){
+						rcli.run(type,name,null,'npm',answers2.filename)
+					}
+				})
+			}
 			program
 				.version(require('../package').version)
+				program.command('4x')
+				.description('创建uniapp的tmui4.0x hbx项目')
+				.action(function(type, name){
+					create4xhbx.run(type,name,null,null)
+				})
 				program.command('cli')
 				.description('创建uniapp的cli项目包含tmui3.0[推荐]')
 				.action(function(type, name){
-					create.run(type,name)
+					createTest('cli',name)
 				})
 				program.command('hbx')
 				.description('创建uniapp的hbx项目包含tmui3.0[不推荐]')
 				.action(function(type, name){
-					createHbx.run(type,name)
+					// createHbx.run(type,name)
+					createTest('hbx',name)
+
 				})
 				program.command('rcli')
 				.description('为cli项目下载/更新tmui3.0')
 				.action(function(type, name){
-					rcli.run(type,name)
+					// rcli.run(type,name)
+					createTest('rcli',name)
+
+
 				})
 				program.command('rhbx')
 				.description('为hbx项目下载/更新tmui3.0')
 				.action(function(type, name){
-					rhbx.run(type,name)
+					// rhbx.run(type,name)
+					createTest('rhbx',name)
 				})
 				program.command('ver')
 				.description('查看tmui可用版本号')
@@ -61,15 +129,15 @@ chalk.then(v=>{
 				program.command('use')
 				.description('引导式安装tmui3.0项目[自定义安装]')
 				.action(function(type, name){
-					const { prompt,Separator} = ivk.default;
 						prompt([
 							{
 							type: 'list',
 							name: 'tmuiVerName',
-							message: '请选择你的uniApp项目的vue版本',
+							message: '请选择你的uniApp项目的vue版本/项目类型',
 							choices: [
 								'vue2',
-								'vue3'
+								'vue3',
+								'tmui4.0x'
 							],
 							}
 						])
@@ -124,20 +192,40 @@ chalk.then(v=>{
 												console.log(ck.red("请正确输入版本号"))
 												return;
 											}
-											if(ms=="cli"){
-												create.run(null,null,ver,packname)
-											}else if(ms=="rcli"){
-												rcli.run(null,null,ver,packname)
-											}else if(ms=="hbx"){
-												createHbx.run(null,null,ver,packname)
-											}else if(ms=="rhbx"){
-												rhbx.run(null,null,ver,packname)
-											}
+											prompt([{
+												type: 'input',
+												name: 'filename',
+												message: '在当前路径下创建项目，请输入项目名称：',
+											}, ])
+											.then(answers2 => {
+												
+												if(ms=="cli"){
+													create.run(null,null,ver,packname,answers2.filename)
+												}else if(ms=="rcli"){
+													rcli.run(null,null,ver,packname,answers2.filename)
+												}else if(ms=="hbx"){
+													createHbx.run(null,null,ver,packname,answers2.filename)
+												}else if(ms=="rhbx"){
+													rhbx.run(null,null,ver,packname,answers2.filename)
+												}
+											})
+
+											
 										})	
 									})
 									
 								})	
 								
+							}else if(answers.tmuiVerName=='tmui4.0x'){
+								
+								prompt([{
+										type: 'input',
+										name: 'filename',
+										message: '在当前路径下创建项目，请输入项目名称：',
+									}, ])
+									.then(answers2 => {
+										create4xhbx.run(null,null,null,answers2.filename)
+									})
 							}
 						});
 	
@@ -153,4 +241,3 @@ chalk.then(v=>{
 	
 })
 
-

package/package.json

@@ -1,52 +1,70 @@
-{
-  "_from": "tmui-cli",
-  "_inBundle": false,
-  "_integrity": "sha512-mnddgPs3eUjTuxQGv6hxlc0b98d53YXtjd0tvrlzWvrAnf0IS0qQMo4bZHi+ImwOEYqbNLX9jhd9pq1cVb9tjw==",
-  "_location": "/tmui-cli",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "tmui-cli",
-    "name": "tmui-cli",
-    "escapedName": "tmui-cli",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER"
-  ],
-  "_resolved": "https://registry.npmjs.org/tmui-cli/-/tmui-cli-1.0.3.tgz",
-  "_shasum": "162803da7d6cc696e3f4a908b223a15f0b33d245",
-  "_spec": "tmui-cli",
-  "_where": "C:\\Users\\zsylp",
-  "author": {
-    "name": "tmzdy tmui"
-  },
-  "bin": {
-    "tmui": "bin/tmui.js"
-  },
-  "bundleDependencies": false,
-  "dependencies": {
-    "chalk": "^5.0.1",
-    "clear": "^0.1.0",
-    "clui": "^0.3.6",
-    "commander": "^9.4.0",
-    "compressing": "^1.6.2",
-    "figlet": "^1.5.2",
-    "inquirer": "^9.1.0",
-    "node-fetch": "^3.2.10"
-  },
-  "deprecated": false,
-  "description": "tmui3.0",
-  "keywords": [
-    "tmui",
-    "tm-vuetify"
-  ],
-  "license": "ISC",
-  "main": "./bin/tmui.js",
-  "name": "tmui-cli",
-  "scripts": {},
-  "version": "1.1.2"
-}
+{
+  "_from": "tmui-cli",
+  "_inBundle": false,
+  "_integrity": "sha512-mnddgPs3eUjTuxQGv6hxlc0b98d53YXtjd0tvrlzWvrAnf0IS0qQMo4bZHi+ImwOEYqbNLX9jhd9pq1cVb9tjw==",
+  "_location": "/tmui-cli",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "tmui-cli",
+    "name": "tmui-cli",
+    "escapedName": "tmui-cli",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER"
+  ],
+  "_resolved": "https://registry.npmjs.org/tmui-cli/-/tmui-cli-1.0.3.tgz",
+  "_shasum": "162803da7d6cc696e3f4a908b223a15f0b33d245",
+  "_spec": "tmui-cli",
+  "_where": "C:\\Users\\zsylp",
+  "author": {
+    "name": "tmzdy tmui"
+  },
+  "bin": {
+    "tmui": "bin/tmui.js"
+  },
+  "dependencies": {
+    "bufferhelper": "^0.2.1",
+    "chalk": "^5.0.1",
+    "clear": "^0.1.0",
+    "clui": "^0.3.6",
+    "codecs": "^3.0.0",
+    "commander": "^9.4.0",
+    "compressing": "^1.6.2",
+    "echarts": "^5.5.1",
+    "express": "^4.18.2",
+    "figlet": "^1.5.2",
+    "global-dirs": "^3.0.1",
+    "iconv-lite": "^0.6.3",
+    "inquirer": "^9.1.4",
+    "node-fetch": "^3.2.10",
+    "node-os-utils": "^1.3.7",
+    "open": "^8.4.2",
+    "ps-tree": "^1.2.0",
+    "ws": "^8.13.0"
+  },
+  "deprecated": false,
+  "description": "tmui3.0,tmui4.0x,tmui2.0",
+  "keywords": [
+    "tmui",
+    "tm-vuetify",
+    "tmui4",
+    "tmui4.0x",
+    "tmui2.0",
+    "uts",
+    "uvue",
+    "uniappx",
+    "uniapp"
+  ],
+  "license": "ISC",
+  "main": "./bin/tmui.js",
+  "name": "tmui-cli",
+  "scripts": {
+    "run": "node ./bin/tmui.js"
+  },
+  "version": "1.1.4"
+}

package/src/create.js

@@ -10,11 +10,11 @@ var CLI = require('clui'),
 Spinner = CLI.Spinner;
 var countdown = new Spinner('请等待... ', ['/','\\','/','\\']);
 const delFile = require("./util").default.delFile
-exports.run = function(type, name,vr,packname="npm") {
+exports.run = function(type, name,vr,packname="npm",filename="") {
 	chalk.then(v=>{
 		const ck = new v.Chalk();
-		const nowPath = path.resolve('./');
-		
+		const nowPath = path.join(path.resolve('./'),filename);
+		var vrNumber = 0
 		countdown.message(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
 		let userInputVer = "";
 		if(vr!=null){
@@ -33,9 +33,17 @@ exports.run = function(type, name,vr,packname="npm") {
 				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 			}
 		}
+		vrNumber = parseInt(userInputVer.replace(/\./g,''))
+		if(isNaN(vrNumber)){
+			console.log(ck.red("没有输入版本号"))
+		}
+		
 		countdown.start()
 		// 检查是否有router目录？
 		// fs.existsSync(path.join(nowPath,'router','index.ts'))
+		if(!fs.existsSync(nowPath)){
+			fs.mkdirSync(nowPath);
+		}
 		ft.then((fah)=>{
 			const fetch = fah.default
 			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
@@ -53,7 +61,7 @@ exports.run = function(type, name,vr,packname="npm") {
 				
 				
 				countdown.message(ck.green('正在使用版本号：'+ver))
-				fetch(`https://cdn.tmui.design/public/static/cli.zip`).then(async (rf)=>{
+				fetch(`https://cdn.tmui.design/public/static/${vrNumber>=320?'cli32':'cli'}.zip`).then(async (rf)=>{
 					let d = await rf.buffer()
 					fs.writeFile(path.join(nowPath,'cli.zip'),d,(err)=>{
 						if(err){
@@ -65,6 +73,13 @@ exports.run = function(type, name,vr,packname="npm") {
 						.then(revalue=>{
 							//创建tmui目录
 							let tmuipath = path.join(nowPath,'src','tmui');
+							if(vrNumber>=320){
+								tmuipath = path.join(nowPath,'src','uni_modules');
+								if(!fs.existsSync(tmuipath)){
+									fs.mkdirSync(tmuipath);
+								}
+								tmuipath = path.join(nowPath,'src','uni_modules','tm-ui');
+							}
 							if(!fs.existsSync(tmuipath)){
 								fs.mkdirSync(tmuipath);
 							}else{
@@ -74,6 +89,7 @@ exports.run = function(type, name,vr,packname="npm") {
 							let donloadTmui = `https://cdn.tmui.design/public/static/tmui${ver}.zip`
 							fetch(donloadTmui).then(async (tmuires)=>{
 								fs.writeFileSync(path.join(nowPath,'tmui.zip'),await tmuires.buffer())
+								
 								compressing.zip.uncompress(path.join(nowPath,'tmui.zip'),tmuipath)
 								.then(comtmui=>{
 									countdown.message(ck.green('非常nice,安装成功，正在清理'))
@@ -104,8 +120,9 @@ exports.run = function(type, name,vr,packname="npm") {
 											console.log(ck.green(`---------------------------------------------------`))
 											console.log(ck.green(`---------------------------------------------------`))
 											console.log(ck.green('安装成功请执行uni cli命令，编译一个H5项目试：'))
-											console.log(ck.green(packname+' run dev:h5'))
-											console.log(ck.green('在本窗口输入上述命令，按回车键编译。'))
+											console.log(ck.green(`请切换到你的项目目录: cd ${filename}`))
+											console.log(ck.green('再执行: '+packname+' run dev:h5'))
+											
 										})
 										
 									})

package/src/create4xhbx.js

@@ -0,0 +1,98 @@
+const chalk = import("chalk")
+const path = require("path")
+const {
+	Command
+} = require('commander');
+const fs = require("fs")
+const ft = import("node-fetch")
+const compressing = require("compressing")
+const chilPro = require("child_process")
+var clear = require('clear');
+var figlet = require('figlet');
+const program = new Command();
+const inquirer = import("inquirer")
+var CLI = require('clui'),
+	Spinner = CLI.Spinner;
+const delFile = require("./util").default.delFile
+
+// https://cdn.tmui.design/tmui4.0/tmui4.0xhbxModel.zip
+exports.run = function(type, name, vr, packname,filename) {
+	chalk.then(v => {
+		clear()
+		const ck = new v.Chalk();
+		const nowPath = path.resolve('./');
+		console.log(ck.white('不 要 关闭窗体，正在创建中....'))
+		
+		inquirer.then(ivk => {
+			function build(fname){
+				let filemul = path.join(nowPath, fname)
+				console.log(ck.green(`正在当前目录${filemul}创建项目`))
+				fetch(`https://cdn.tmui.design/tmui4.0/tmui4.0xhbxModel.zip`).then(async (rf) => {
+					if(!fs.existsSync(filemul)){
+						fs.mkdirSync(filemul)
+					}
+					let d = await rf.arrayBuffer()
+					
+					fs.writeFile(path.join(filemul, 'tmui4.0xhbxModel.zip'), Buffer.from(d), (err) => {
+						if (err) {
+							console.log(ck.bgRed(err))
+							return;
+						}
+						compressing.zip.uncompress(path.join(filemul, 'tmui4.0xhbxModel.zip'), path.join(
+								filemul))
+							.then(revalue => {
+								console.log(ck.green( '非常nice,安装成功，正在清理'))
+								if (fs.existsSync(path.join(
+										filemul,
+										'tmui4.0xhbxModel.zip'))) {
+									fs.unlinkSync(path.join(
+										filemul,
+										'tmui4.0xhbxModel.zip'))
+								}
+								figlet('TMUI4.0x OK!!', function(err, data) {
+									if (err) {
+										console.log('Something went wrong...');
+										console.dir(err);
+										return;
+									}
+									console.log(ck.bgGreen(data))
+									console.log(ck.green(`---------------------------------------------------`))
+									console.log(ck.green(`---------------------------------------------------`))
+									console.log(ck.green('请使用hbx4.21+以上版本导入项目目录并运行'))
+									console.log(ck.yellow('想要运行成功：您还需要导入tmui4.0x组件库及插件库，请联系作者购买授权并下载'))
+									console.log(ck.blue('市场购买地址：https://ext.dcloud.net.cn/plugin?id=16369'))
+									console.log(ck.green('文档地址：https://xui.tmui.design/'))
+									console.log(ck.yellow('线上WEB、H5预览：https://xui.tmui.design/h5'))
+									console.log(ck.yellow('安卓安装：https://gitee.com/LYTB/tmui4.0/releases/download/1.07/%20tmui4.0for%20unix%201.0.7.apk'))
+									console.log(ck.white('敬请期待4.0x的鸿蒙，小程序版本!!!'))
+								})
+				
+							}).catch(errs => {
+								console.log(ck.bgRed(errs))
+							})
+					})
+				}).catch(e => {
+					console.log(ck.bgRed(e))
+				})
+			}
+			if(packname==null){
+				const {
+					prompt,
+					Separator
+				} = ivk.default;
+				prompt([{
+						type: 'input',
+						name: 'filename',
+						message: '在当前路径下创建项目，请输入项目名称：',
+					}, ])
+					.then(answers => {
+						build(answers.filename)
+					});
+			}else{
+				build(packname)
+			}
+			
+		})
+
+	})
+}

package/src/createHbx.js

@@ -10,11 +10,12 @@ var CLI = require('clui'),
 Spinner = CLI.Spinner;
 const delFile = require("./util").default.delFile
 var countdown = new Spinner('请等待... ', ['/','\\','/','\\']);
-exports.run = function(type, name,vr,packname="npm") {
+exports.run = function(type, name,vr,packname="npm",filename) {
 	chalk.then(v=>{
 		clear()
 		const ck = new v.Chalk();
-		const nowPath = path.resolve('./');
+		const nowPath = path.join(path.resolve('./'),filename);
+		var vrNumber = 0
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
 		let userInputVer = "";
 		if(vr!=null){
@@ -33,7 +34,13 @@ exports.run = function(type, name,vr,packname="npm") {
 				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 			}
 		}
-		
+		vrNumber = parseInt(userInputVer.replace(/\./g,''))
+		if(isNaN(vrNumber)){
+			console.log(ck.red("没有输入版本号"))
+		}
+		if(!fs.existsSync(nowPath)){
+			fs.mkdirSync(nowPath);
+		}
 		ft.then((fah)=>{
 			const fetch = fah.default
 			
@@ -63,11 +70,19 @@ exports.run = function(type, name,vr,packname="npm") {
 						.then(revalue=>{
 							//创建tmui目录
 							let tmuipath = path.join(nowPath,'tmui');
+							if(vrNumber>=320){
+								tmuipath = path.join(nowPath,'uni_modules');
+								if(!fs.existsSync(tmuipath)){
+									fs.mkdirSync(tmuipath);
+								}
+								tmuipath = path.join(nowPath,'uni_modules','tm-ui');
+							}
 							if(!fs.existsSync(tmuipath)){
 								fs.mkdirSync(tmuipath);
 							}else{
 								delFile(tmuipath)
 							}
+
 							countdown.start()
 							//下载tmui
 							let donloadTmui = `https://cdn.tmui.design/public/static/tmui${ver}.zip`
@@ -99,7 +114,6 @@ exports.run = function(type, name,vr,packname="npm") {
 											}
 											console.log(ck.bgGreen(data))
 											console.log(ck.green(`---------------------------------------------------`))
-											console.log(ck.red(`截止3.5.4 hbx版本号，运行到浏览器会报错，其它平台没问题。这是uni的bug。但cli模式不会有问题。`))
 											console.log(ck.bgGreen('安装成功，请使用hbx导入项目，运行本项目。'))
 										})
 										

package/src/rcli.js

@@ -10,10 +10,11 @@ var CLI = require('clui'),
 Spinner = CLI.Spinner;
 var countdown = new Spinner('请等待... ', ['/','\\','/','\\']);
 const delFile = require("./util").default.delFile
-exports.run = function(type, name,vr,packname="npm") {
+exports.run = function(type, name,vr,packname="npm",filename="") {
 	chalk.then(v=>{
 		const ck = new v.Chalk();
-		const nowPath = path.resolve('./');
+		const nowPath = path.join(path.resolve('./'),filename);
+		var vrNumber = 0
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
 		let userInputVer = "";
 		if(vr!=null){
@@ -32,6 +33,13 @@ exports.run = function(type, name,vr,packname="npm") {
 				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 			}
 		}
+		vrNumber = parseInt(userInputVer.replace(/\./g,''))
+		if(isNaN(vrNumber)){
+			console.log(ck.red("没有输入版本号"))
+		}
+		if(!fs.existsSync(nowPath)){
+			fs.mkdirSync(nowPath);
+		}
 		ft.then((fah)=>{
 			const fetch = fah.default
 			
@@ -56,7 +64,16 @@ exports.run = function(type, name,vr,packname="npm") {
 					console.log(ck.bgRed('非cli项目，请使用rhbx项目'))
 					return
 				}
+				//创建tmui目录
 				let tmuipath = path.join(nowPath,'src','tmui');
+				if(vrNumber>=320){
+					tmuipath = path.join(nowPath,'src','uni_modules');
+					if(!fs.existsSync(tmuipath)){
+						fs.mkdirSync(tmuipath);
+					}
+					tmuipath = path.join(nowPath,'src','uni_modules','tm-ui');
+				}
+
 				if(!fs.existsSync(tmuipath)){
 					fs.mkdirSync(tmuipath);
 				}else{

package/src/rhbx.js

@@ -11,11 +11,12 @@ Spinner = CLI.Spinner;
 const delFile = require("./util").default.delFile
 
 var countdown = new Spinner('请等待... ', ['/','\\','/','\\']);
-exports.run = function(type, name,vr,packname="npm") {
+exports.run = function(type, name,vr,packname="npm",filename) {
 	chalk.then(v=>{
 		clear()
 		const ck = new v.Chalk();
-		const nowPath = path.resolve('./');
+		const nowPath = path.join(path.resolve('./'),filename);
+		var vrNumber = 0
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
 		let userInputVer = "";
 		if(vr!=null){
@@ -35,28 +36,25 @@ exports.run = function(type, name,vr,packname="npm") {
 			}
 		}
 		
-		if(!fs.existsSync(path.join(nowPath,'router','index.ts'))){
-			if(!fs.existsSync(path.join(nowPath,'router'))){
-				fs.mkdirSync(path.join(nowPath,'router'));
-			}
-			let txt = require('./router').txt;
-			fs.writeFileSync(path.join(nowPath,'router','index.ts'),txt)
+		vrNumber = parseInt(userInputVer.replace(/\./g,''))
+		if(isNaN(vrNumber)){
+			console.log(ck.red("没有输入版本号"))
 		}
-		if(!fs.existsSync(path.join(nowPath,'theme','index.ts'))){
-			if(!fs.existsSync(path.join(nowPath,'theme'))){
-				fs.mkdirSync(path.join(nowPath,'theme'));
-			}
-			let txt = require('./theme').txt;
-			fs.writeFileSync(path.join(nowPath,'theme','index.ts'),txt)
+		if(!fs.existsSync(nowPath)){
+			fs.mkdirSync(nowPath);
 		}
-		
-		
-		// 检查是否有router目录？
-		// fs.existsSync(path.join(nowPath,'router','index.ts'))
+
 		ft.then((fah)=>{
 			const fetch = fah.default
 			//创建tmui目录
 			let tmuipath = path.join(nowPath,'tmui');
+			if(vrNumber>=320){
+				tmuipath = path.join(nowPath,'uni_modules');
+				if(!fs.existsSync(tmuipath)){
+					fs.mkdirSync(tmuipath);
+				}
+				tmuipath = path.join(nowPath,'uni_modules','tm-ui');
+			}
 			if(!fs.existsSync(tmuipath)){
 				fs.mkdirSync(tmuipath);
 			}else{
@@ -111,7 +109,6 @@ exports.run = function(type, name,vr,packname="npm") {
 								}
 								console.log(ck.bgGreen(data))
 								console.log(ck.green(`---------------------------------------------------`))
-								console.log(ck.red(`截止3.5.4 hbx版本号，运行到浏览器会报错，其它平台没问题。这是uni的bug。但cli模式不会有问题。`))
 								console.log(ck.bgGreen('安装成功，请使用hbx导入项目，运行本项目。'))
 							})