mm_os 1.5.9 → 1.6.1

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 = [];
@@ -630,6 +643,7 @@ Drive.prototype.get_format = async function(db) {
 				if (o.id !== o.key) {
 					o.list.map((m) => {
 						m[o.key] = m[o.id];
+						return m;
 					});
 				}
 			}
@@ -645,7 +659,7 @@ 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;
@@ -772,7 +786,9 @@ 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);
+
+	console.log("参数", params, fields);
 	var format = await this.get_format(db);
 
 	file = file.fullname(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "1.5.9",
+  "version": "1.6.1",
   "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.8",
+    "mm_excel": "^1.0.9",
     "mm_expand": "^1.5.6",
     "mm_html": "^1.1.1",
     "mm_koa_proxy": "^1.0.0",