tmui-cli 1.1.3 → 1.1.5

package/bin/tmui.js

@@ -64,33 +64,62 @@ chalk.then(v=>{
 		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)
+				.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可用版本号')
@@ -100,7 +129,6 @@ chalk.then(v=>{
 				program.command('use')
 				.description('引导式安装tmui3.0项目[自定义安装]')
 				.action(function(type, name){
-					const { prompt,Separator} = ivk.default;
 						prompt([
 							{
 							type: 'list',
@@ -164,30 +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)
-									})
+							}else if(answers.tmuiVerName=='tmui4.0x'){
+								
+								prompt([{
+										type: 'input',
+										name: 'filename',
+										message: '在当前路径下创建项目，请输入项目名称：',
+									}, ])
+									.then(answers2 => {
+										create4xhbx.run(null,null,null,answers2.filename)
+									})
 							}
 						});
 	

package/package.json

@@ -35,6 +35,7 @@
     "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",
@@ -65,5 +66,5 @@
   "scripts": {
     "run": "node ./bin/tmui.js"
   },
-  "version": "1.1.3"
+  "version": "1.1.5"
 }

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,安装成功，正在清理'))
@@ -84,35 +100,49 @@ exports.run = function(type, name,vr,packname="npm") {
 										fs.unlinkSync(path.join(nowPath,'cli.zip'))
 									}
 									countdown.message(ck.green('正在安装依赖'))
-									const installNpm = chilPro.exec(packname+' install',(error, stdout, stderr)=>{
-										
-										if(error){
-											countdown.stop()
-											console.log('安装失败，请在当前目录手动安装依赖文件执行：',ck.bgRed(error))
-											console.log(ck.green(packname+' install'))
-											return
-										}
-										countdown.stop()
-										clear()
-										figlet('TMUI OK!!', function(err, data) {
-											if (err) {
-												console.log('Something went wrong...');
-												console.dir(err);
-												return;
+									
+									if(filename){
+										chilPro.exec(`cd ${filename}`,(error1, stdout1, stderr1)=>{
+											process.chdir(nowPath)
+											installdir()
+										})
+									}else{
+										installdir()
+									}
+									
+									function installdir(){
+										const installNpm = chilPro.exec(packname+' install',(error, stdout, stderr)=>{
+											if(error){
+												countdown.stop()
+												console.log('安装失败，请在当前目录手动安装依赖文件执行：',ck.bgRed(error))
+												console.log(ck.green(packname+' install'))
+												return
 											}
-											console.log(ck.bgGreen(data))
-											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('在本窗口输入上述命令，按回车键编译。'))
+											countdown.stop()
+											clear()
+											figlet('TMUI 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('安装成功请执行uni cli命令，编译一个H5项目试：'))
+												console.log(ck.green(`请切换到你的项目目录: cd ${filename}`))
+												console.log(ck.green('再执行: '+packname+' run dev:h5'))
+												
+											})
+										})
+										installNpm.stdout?.on("data",(msg)=>{
+											console.log(msg.toString('utf8'))
 										})
 										
-									})
+									}
+									
 								
-									installNpm.stdout?.on("data",(msg)=>{
-										console.log(msg.toString('utf8'))
-									})
+									
 									
 								}).catch(err=>{
 									countdown.stop()

package/src/create4xhbx.js

@@ -1,28 +1,28 @@
-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) {
-	chalk.then(v => {
-		clear()
-		const ck = new v.Chalk();
-		const nowPath = path.resolve('./');
+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)
@@ -90,9 +90,9 @@ exports.run = function(type, name, vr, packname) {
 					});
 			}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导入项目，运行本项目。'))
 							})