mm_os 1.6.4 → 1.6.5

package/core/com/sql/drive.js

@@ -566,57 +566,52 @@ Drive.prototype.get_params = async function(db, fields) {
 	if (cg.params) {
 		return cg.params;
 	}
-
-	var params;
-	var name = cg.table;
-	var pool = $.pool.db['sys'];
-	if (pool) {
-		var dt = pool.get(name);
-		if (dt && dt.config) {
-			var list = dt.config.fields;
-			if (fields) {
-				var lt = [];
-				var arr = fields.split(',');
-				arr.map((name) => {
-					for (var i = 0; i < list.length; i++) {
-						var o = list[i];
-						if (name === o.name) {
-							lt.push(o);
-						}
-					}
-				});
-				params = lt;
-			} else {
-				params = list;
+	var lt = [];
+	if ($.pool.db) {
+		var pool = $.pool.db['sys'];
+		if (pool) {
+			var dt = pool.get(cg.table);
+			if (dt && dt.config) {
+				var list = dt.config.fields;
+				for (var i = 0; i < list.length; i++) {
+					var o = list[i];
+					var name = o.replace(/`/g, '');
+					lt.push({
+						name,
+						title: name
+					});
+				}
 			}
 		}
 	}
-	if (!params) {
-		db.table = this.config.table;
+	if (!lt.length) {
+		db.table = cg.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;
+			var name = o.name;
+			var note = o.note ? o.note.replace(":", "：") : name;
 			lt.push({
-				name: o.name,
+				name,
 				title: note.left("：", true)
 			});
 		}
-		params = lt;
 	}
-	if (!params) {
-		var field = cg.field_default;
-		var lt = [];
-		var arr = field.split(',');
-		for (var i = 0; i < arr.length; i++) {
-			var o = arr[i];
-			var name = o.replace(/`/g, '');
-			lt.push({
-				name,
-				title: name,
+	if (!fields) {
+		fields = cg.field_default.replace(/`/g, "");
+	}
+	if (fields && fields !== "*") {
+		var arr = fields.split(',');
+		var params = [];
+		arr.map((name) => {
+			var obj = lt.getObj({
+				name
 			});
-		}
+			if (obj) {
+				params.push(obj);
+			}
+		});
+	} else {
 		params = lt;
 	}
 	return params;
@@ -661,7 +656,7 @@ Drive.prototype.get_format = async function(db) {
 Drive.prototype.import_main = async function(db, file) {
 	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) {
@@ -789,7 +784,6 @@ Drive.prototype.export_main = async function(db, query, body) {
 	}
 	var params = await this.get_params(db, fields);
 	var format = await this.get_format(db);
-
 	file = file.fullname(path);
 	var excel = new Excel({
 		file,
@@ -866,7 +860,6 @@ Drive.prototype.del_repeat_main = async function(db, params) {
 	} else {
 		msg = '没有重复项。';
 	}
-	// console.log(list);
 	return $.ret.bl(!msg, msg ? '去重失败!原因：' + msg : '去重成功!');
 };
 

package/index.js

@@ -79,7 +79,7 @@ class Soa {
 
 /**
  * 初始化数据
- * @param {Object} config
+ * @param {Object} config 配置参数
  */
 Soa.prototype.initData = function(config) {
 	var p = config.runPath;
@@ -115,7 +115,7 @@ Soa.prototype.initData = function(config) {
 
 /**
  * 加载核心模块
- * @param {Object} config
+ * @param {Object} config 配置参数
  */
 Soa.prototype.loadModule = function(config) {
 	$.com = new Com();
@@ -130,7 +130,7 @@ Soa.prototype.loadModule = function(config) {
 
 /**
  * 初始化
- * @param {Object} config 配置参数
+ * @param {Object} config - 配置参数
  */
 Soa.prototype.init = function(config) {
 	this.config = Object.assign(this.config, config);
@@ -139,8 +139,11 @@ Soa.prototype.init = function(config) {
 	this.initBase(this.config);
 }
 
-/**
- * 运行基础数据
+/**
+* 运行基础数据
+* @param {Object} cg - 配置对象
+*/
+Soa.prototype.initBase = function(cg) {
  */
 Soa.prototype.initBase = function(cg) {
 	var middleware = $.middleware;

package/package.json

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