mm_os 2.1.5 → 2.1.7

package/core/com/api/drive.js

@@ -268,12 +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;
-			}
-		}
+		// if (this.sql && this.param && this.param.config) {
+		// 	var list = this.param.config.list;
+		// 	if (list && list.length) {
+		// 		this.sql.params = list;
+		// 	}
+		// }
 	}
 };
 

package/core/com/sql/drive.js

@@ -556,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'
+	}
+}
 
 /**
  * 获取数据
@@ -597,15 +609,16 @@ Drive.prototype.get_params = async function(db, fields) {
 			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)
 			});
 		}
 	}
 	if (!fields) {
-		fields = cg.field_default.replace(/`/g, "");
+		fields = cg.field_default;
 	}
 	if (fields && fields !== "*") {
-		var arr = fields.split(',');
+		var arr = fields.replace(/`/g, "").split(',');
 		var params = [];
 		arr.map((name) => {
 			var obj = lt.getObj({
@@ -618,6 +631,7 @@ Drive.prototype.get_params = async function(db, fields) {
 	} else {
 		params = lt;
 	}
+	console.log("列表", params, fields);
 	return params;
 };
 
@@ -792,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.5",
+  "version": "2.1.7",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {