mm_os 2.1.2 → 2.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/com/sql/drive.js +4 -4
- package/package.json +2 -2
package/core/com/sql/drive.js
CHANGED
|
@@ -16,9 +16,9 @@ class Drive extends Item {
|
|
|
16
16
|
super(dir, __dirname);
|
|
17
17
|
this.default_file = "./sql.json";
|
|
18
18
|
// 保存文件目录
|
|
19
|
-
this.save_dir = './
|
|
19
|
+
this.save_dir = './file/';
|
|
20
20
|
// 读取文件目录
|
|
21
|
-
this.url_path = "
|
|
21
|
+
this.url_path = "/file/";
|
|
22
22
|
|
|
23
23
|
/* 通用项 */
|
|
24
24
|
// 配置参数
|
|
@@ -667,7 +667,7 @@ Drive.prototype.import_main = async function(db, file) {
|
|
|
667
667
|
}
|
|
668
668
|
file = file.fullname(path);
|
|
669
669
|
}
|
|
670
|
-
|
|
670
|
+
|
|
671
671
|
if (!file.hasFile()) {
|
|
672
672
|
return $.ret.error(30001, file + "文件不存在！");
|
|
673
673
|
}
|
|
@@ -787,7 +787,6 @@ Drive.prototype.export_main = async function(db, query, body) {
|
|
|
787
787
|
}
|
|
788
788
|
if (!file) {
|
|
789
789
|
file = this.save_dir + name;
|
|
790
|
-
file.addDir(path);
|
|
791
790
|
}
|
|
792
791
|
if (!fields && query.field) {
|
|
793
792
|
fields = query.field;
|
|
@@ -795,6 +794,7 @@ Drive.prototype.export_main = async function(db, query, body) {
|
|
|
795
794
|
var params = await this.get_params(db, fields);
|
|
796
795
|
var format = await this.get_format(db);
|
|
797
796
|
file = file.fullname(path);
|
|
797
|
+
file.addDir();
|
|
798
798
|
var excel = new Excel({
|
|
799
799
|
file,
|
|
800
800
|
params,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mm_os",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.4",
|
|
4
4
|
"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"koa-send": "^5.0.1",
|
|
37
37
|
"koa-websocket": "^7.0.0",
|
|
38
38
|
"mm_check": "^1.4.7",
|
|
39
|
-
"mm_excel": "^1.
|
|
39
|
+
"mm_excel": "^1.2.0",
|
|
40
40
|
"mm_expand": "^1.7.0",
|
|
41
41
|
"mm_html": "^1.1.6",
|
|
42
42
|
"mm_koa_proxy": "^1.0.0",
|