mm_os 1.6.0 → 1.6.2

package/core/com/api/drive.js

@@ -12,9 +12,6 @@ if (!$.dict) {
 	}
 }
 
-var dir = '/app/sys/static/doc/';
-var url_path = "/sys/doc/";
-
 /**
  * Api接口驱动类
  * @extends {Item}
@@ -29,7 +26,10 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./api.json";
-
+		
+		this.save_dir = '/static/file/';
+		this.url_path = "/file/";
+		
 		// oauth身份验证配置 + 函数
 		this.oauth;
 		// param参数配置 + 函数
@@ -329,20 +329,17 @@ Drive.prototype.save_file = function(files) {
 		var f = files.file;
 		// 创建可读流
 		var stamp = Date.now();
-		var name = f.name;
-		file = path.join($.runPath, dir, name);
-		const fileDir = path.join($.runPath, dir);
-		if (!fs.existsSync(fileDir)) {
-			fs.mkdirSync(fileDir, err => {
-				$.log.error('创建失败', err);
-			});
-		}
+		var name = f.name || f.originalFilename;
+		file = ("./" + name).fullname(this.save_dir);
+		file.addDir();
 		// 创建写入流
+		var readStream = fs.createReadStream(f.filepath);
+		
 		try {
 			const writeStream = fs.createWriteStream(file);
 			readStream.pipe(writeStream);
 			// writeStream.close();
-			url = url_path + name;
+			url = this.url_path + name;
 		} catch (err) {
 			$.log.error('保存文件失败', err);
 		}

package/core/com/sql/drive.js

@@ -1,8 +1,6 @@
 const Item = require('mm_machine').Item;
 const Excel = require('mm_excel');
 
-
-
 /**
  * Sql操作驱动类
  * @extends {Item}
@@ -563,16 +561,17 @@ Drive.prototype.addOrSet = async function(db, query, body) {
  * @param {Array} fields 要获取的字段数组
  * @return {Array} 返回参数信息列表
  */
-Drive.prototype.get_params = async function(fields) {
+Drive.prototype.get_params = async function(db, fields) {
 	var cg = this.config;
 	if (cg.params) {
 		return cg.params;
 	}
+
 	var params;
 	var name = cg.table;
-	var db = $.pool.db['sys'];
-	if (db) {
-		var dt = db.get(name);
+	var pool = $.pool.db['sys'];
+	if (pool) {
+		var dt = pool.get(name);
 		if (dt && dt.config) {
 			var list = dt.config.fields;
 			if (fields) {
@@ -592,6 +591,20 @@ Drive.prototype.get_params = async function(fields) {
 			}
 		}
 	}
+	if (!params) {
+		db.table = this.config.table;
+		var list = await db.fields();
+		var lt = [];
+		for (var i = 0; i < list.length; i++) {
+			var o = list[i];
+			var note = o.note ? o.note.replace(":", "：") : o.name;
+			lt.push({
+				name: o.name,
+				title: note.left("：", true)
+			});
+		}
+		params = lt;
+	}
 	if (!params) {
 		var field = cg.field_default;
 		var lt = [];
@@ -646,8 +659,9 @@ Drive.prototype.get_format = async function(db) {
  * @return {Object} 返回导入结果
  */
 Drive.prototype.import_main = async function(db, file) {
-	var params = await this.get_params();
+	var params = await this.get_params(db);
 	var format = await this.get_format(db);
+	
 	file = file.replace(this.url_path, this.save_dir);
 	var path;
 	if ($.config.path) {
@@ -773,7 +787,7 @@ Drive.prototype.export_main = async function(db, query, body) {
 	if (!fields && query.field) {
 		fields = query.field;
 	}
-	var params = await this.get_params(fields);
+	var params = await this.get_params(db, fields);
 	var format = await this.get_format(db);
 
 	file = file.fullname(path);
@@ -1041,4 +1055,5 @@ Drive.prototype.count = async function(db, query, body) {
 	return await this.count_main(db, pm);
 };
 
+
 module.exports = Drive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "koa-send": "^5.0.1",
     "koa-websocket": "^7.0.0",
     "mm_check": "^1.4.4",
-    "mm_excel": "^1.0.9",
+    "mm_excel": "^1.1.1",
     "mm_expand": "^1.5.6",
     "mm_html": "^1.1.1",
     "mm_koa_proxy": "^1.0.0",