mm_os 1.5.4 → 1.5.6

package/core/com/api/drive.js

@@ -328,7 +328,6 @@ Drive.prototype.save_file = function(files) {
 	if (files.file) {
 		var f = files.file;
 		// 创建可读流
-		const readStream = fs.createReadStream(f.path);
 		var stamp = Date.now();
 		var name = f.name;
 		file = path.join($.runPath, dir, name);
@@ -375,7 +374,10 @@ $.get_state = async function(db, token) {
 		o.password = o.password ? "******" : "";
 		delete o.salt;
 		delete o.time_create;
-		return { state, user: o };
+		return {
+			state,
+			user: o
+		};
 	} else {
 		return null;
 	}
@@ -714,4 +716,4 @@ Drive.prototype.runRPC = async function(db, method, query, body) {
 	return ret;
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/sql/drive.js

@@ -1,8 +1,7 @@
 const Item = require('mm_machine').Item;
 const Excel = require('mm_excel');
 
-var save_dir = '/app/sys/static/doc/';
-var url_path = "/sys/doc/";
+
 
 /**
  * Sql操作驱动类
@@ -18,6 +17,10 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./sql.json";
+		// 保存文件目录
+		this.save_dir = '/static/file/';
+		// 读取文件目录
+		this.url_path = "/file/";
 
 		/* 通用项 */
 		// 配置参数
@@ -620,7 +623,12 @@ Drive.prototype.get_format = async function(db) {
 		if (o.table) {
 			if (!o.list || o.list.length == 0) {
 				dbs.table = o.table;
-				o.list = await dbs.getSql(o.where, null, o.key + "," + o.name);
+				var list = await dbs.getSql(o.where, null, o.id + "," + o.name);
+				if (o.id !== o.key) {
+					o.list.map((m) => {
+						m[o.key] = m[o.id]
+					})
+				}
 			}
 		}
 	}
@@ -636,8 +644,14 @@ Drive.prototype.get_format = async function(db) {
 Drive.prototype.import_main = async function(db, file) {
 	var params = await this.get_params();
 	var format = await this.get_format(db);
-	file = file.replace(url_path, save_dir);
-	file = file.fullname($.config.path.user || $.config.path.static);
+	file = file.replace(this.url_path, this.save_dir);
+	var path;
+	if ($.config.path) {
+		path = $.config.path.user || $.config.path.static || "/static/";
+	} else {
+		path = "/static/";
+	}
+	file = file.fullname(path);
 	if (!file.hasFile()) {
 		return $.ret.error(30001, file + "文件不存在！");
 	}
@@ -740,9 +754,17 @@ Drive.prototype.export_main = async function(db, query, body) {
 	var table = db.table || this.config.table;
 	var date = new Date();
 	var name = table + "_" + date.stamp() + '.xlsx';
+
+	if (!path) {
+		if ($.config.path) {
+			path = $.config.path.user || $.config.path.static || "/static/";
+		} else {
+			path = "/static/";
+		}
+	}
 	if (!file) {
-		file = save_dir + name;
-		file.addDir($.config.path.user || $.config.path.static);
+		file = this.save_dir + name;
+		file.addDir(path);
 	}
 	if (!fields && query.field) {
 		fields = query.field;
@@ -750,10 +772,7 @@ Drive.prototype.export_main = async function(db, query, body) {
 	var params = await this.get_params(fields);
 	var format = await this.get_format(db);
 
-	if (!path) {
-		path = $.config.path.user;
-	}
-	file = file.fullname(path || $.config.path.static);
+	file = file.fullname(path);
 	var excel = new Excel({
 		file,
 		params,
@@ -771,7 +790,7 @@ Drive.prototype.export_main = async function(db, query, body) {
 
 	var body = $.ret.bl(!!file, file ? '导出成功!' : '导出失败!');
 	body.result.file = file;
-	body.result.url = url_path + name;
+	body.result.url = this.url_path + name;
 	if (message) {
 		body.result.message = message;
 	}
@@ -1019,4 +1038,4 @@ Drive.prototype.count = async function(db, query, body) {
 };
 
 
-module.exports = Drive;
+module.exports = Drive;

package/package.json

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