mm_os 2.1.4 → 2.1.6

package/core/com/api/drive.js

@@ -26,10 +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参数配置 + 函数
@@ -268,6 +268,12 @@ Drive.prototype.loadSql = async function(file_path) {
 			this.sql.load(p);
 			this.setSql(this.sql);
 		}
+		// if (this.sql && this.param && this.param.config) {
+		// 	var list = this.param.config.list;
+		// 	if (list && list.length) {
+		// 		this.sql.params = list;
+		// 	}
+		// }
 	}
 };
 
@@ -334,7 +340,7 @@ Drive.prototype.save_file = function(files) {
 		file.addDir();
 		// 创建写入流
 		var readStream = fs.createReadStream(f.filepath);
-		
+
 		try {
 			const writeStream = fs.createWriteStream(file);
 			readStream.pipe(writeStream);

package/core/com/sql/drive.js

@@ -21,6 +21,7 @@ class Drive extends Item {
 		this.url_path = "/file/";
 
 		/* 通用项 */
+		this.params = null;
 		// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
@@ -555,6 +556,18 @@ Drive.prototype.addOrSet = async function(db, query, body) {
 	return await this.addOrSet_main(db, query, body);
 };
 
+/**
+ * 获取数据类型
+ * @param {String} dataType 数据库数据类型
+ * @returns {String} 返回数据类型
+ */
+Drive.prototype.get_type = function(dataType) {
+	if (dataType.indexOf('int') !== -1) {
+		return 'number'
+	} else {
+		return 'string'
+	}
+}
 
 /**
  * 获取数据
@@ -566,6 +579,9 @@ Drive.prototype.get_params = async function(db, fields) {
 	if (cg.params) {
 		return cg.params;
 	}
+	if (this.params) {
+		return this.params;
+	}
 	var lt = [];
 	if ($.pool.db) {
 		var pool = $.pool.db['sys'];
@@ -589,11 +605,13 @@ Drive.prototype.get_params = async function(db, fields) {
 		var list = await db.fields();
 		for (var i = 0; i < list.length; i++) {
 			var o = list[i];
+			console.log("值", o);
 			var name = o.name;
 			var note = o.note ? o.note.replace(":", "：") : name;
 			lt.push({
 				name,
-				title: note.left("：", true)
+				title: note.left("：", true),
+				type: this.get_type(o.type)
 			});
 		}
 	}
@@ -788,8 +806,15 @@ Drive.prototype.export_main = async function(db, query, body) {
 	if (!file) {
 		file = this.save_dir + name;
 	}
-	if (!fields && query.field) {
-		fields = query.field;
+	if (!fields) {
+		if (query.field) {
+			fields = query.field;
+		} else {
+			var f = this.config.field_default;
+			if (f.length !== "*") {
+				fields = f;
+			}
+		}
 	}
 	var params = await this.get_params(db, fields);
 	var format = await this.get_format(db);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {