mm_os 1.8.4 → 1.8.6

package/core/com/sql/drive.js

@@ -657,30 +657,40 @@ 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) {
-		path = $.config.path.user || $.config.path.static || "/static/";
-	} else {
-		path = "/static/";
+	if (file.indexOf($.runPath) !== 0) {
+		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);
 	}
-	file = file.fullname(path);
+	
 	if (!file.hasFile()) {
 		return $.ret.error(30001, file + "文件不存在！");
 	}
-	var excel = new Excel({
-		file,
-		params,
-		format
-	});
+
 	var jarr = [];
-	try {
-		jarr = await excel.load();
-	} catch (e) {
-		$.log.error("导入文件", e);
-	} finally {
-		excel.clear();
-		excel = null;
+	if (file.endsWith(".json")) {
+		jarr = file.loadJson();
+	} else if (file.endsWith(".xml")) {
+		jarr = file.loadXml();
+	} else {
+		var excel = new Excel({
+			file,
+			params,
+			format
+		});
+		try {
+			jarr = await excel.load();
+		} catch (e) {
+			$.log.error("导入文件", e);
+		} finally {
+			excel.clear();
+			excel = null;
+		}
 	}
 
 	var list = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "koa-websocket": "^7.0.0",
     "mm_check": "^1.4.4",
     "mm_excel": "^1.1.5",
-    "mm_expand": "^1.6.7",
+    "mm_expand": "^1.6.9",
     "mm_html": "^1.1.1",
     "mm_koa_proxy": "^1.0.0",
     "mm_logs": "^1.1.2",
@@ -48,7 +48,7 @@
     "mm_ret": "^1.3.7",
     "mm_session": "^1.4.1",
     "mm_statics": "^1.4.0",
-    "mm_tpl": "^2.2.5",
+    "mm_tpl": "^2.2.7",
     "mm_xml": "^1.1.3",
     "mosca": "^2.8.3",
     "mqtt": "^4.3.7"