mm_os 2.8.3 → 2.8.5

package/core/com/api/drive.js

@@ -36,7 +36,10 @@ class Drive extends Item {
 		this.param;
 		// sql模板配置 + 函数
 		this.sql;
+		
 		/* 通用项 */
+		// 默认启用热更新
+		this.mode = 2;
 		// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo

package/core/com/api/index.js

@@ -18,6 +18,8 @@ class Api extends Index {
 		this.Drive = Drive;
 		this.type = "api";
 		this.title = title;
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 
@@ -55,7 +57,7 @@ Api.prototype.run = async function(ctx, db) {
 	for (var i = 0, o; o = lt[i++];) {
 		if (o.config.state === 1 && path.has(o.config.path)) {
 			var ret = await o.run(ctx, db);
-			if (this.mode) {
+			if (this.mode > 2) {
 				o.load(o.filename);
 			}
 			if (ret) {

package/core/com/cmd/drive.js

@@ -14,7 +14,8 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./cmd.json";
-
+		// 默认启用热更新
+		this.mode = 2;
 		// 开关 true为开启, false为关闭
 		this.onOff = true;
 

package/core/com/cmd/index.js

@@ -21,6 +21,8 @@ class Cmd extends Index {
 		this.list_before = [];
 		this.list_main = [];
 		this.list_after = [];
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 

package/core/com/component/drive.js

@@ -15,7 +15,8 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./component.json";
-
+		// 默认启用热更新
+		this.mode = 2;
 		/* 通用项 */
 		// 配置参数
 		this.config = {

package/core/com/component/index.js

@@ -19,6 +19,8 @@ class Component extends Index {
 		this.type = "component";
 		this.title = title;
 		this.list = [];
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 

package/core/com/event/drive.js

@@ -14,7 +14,7 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./event.json";
-
+		
 		/* 通用项 */
 		// 配置参数
 		this.config = {

package/core/com/event/index.js

@@ -18,7 +18,8 @@ class Event extends Index {
 		this.Drive = Drive;
 		this.type = "event";
 		this.title = title;
-
+		// 默认启用热更新
+		this.mode = 2;
 		/* ===  验证  === */
 		// 验证前
 		this.list_before = [];
@@ -149,7 +150,7 @@ Event.prototype.doing = async function(o, ctx, db) {
 	if (types.isPromise(ret)) {
 		ret = await ret;
 	}
-	if (this.mode) {
+	if (this.mode > 2) {
 		o.load(o.filename);
 	}
 	return ret;
@@ -167,7 +168,7 @@ Event.prototype.run_sub = async function(list, target, ctx, db) {
 	for (var i = 0, o; o = list[i++];) {
 		if (o.config.state === 1 && target.has(o.config.target)) {
 			var ret = await o.run(ctx, db);
-			if (this.mode) {
+			if (this.mode > 2) {
 				o.load(o.filename);
 			}
 			if (ret) {

package/core/com/eventer/com.js

@@ -151,7 +151,7 @@ Eventer.prototype.doing = async function(o, ...msg) {
 		if (types.isPromise(ret)) {
 			ret = await ret;
 		}
-		if (this.mode) {
+		if (this.mode > 2) {
 			o.load(o.filename);
 		}
 	} catch (err) {

package/core/com/nav/drive.js

@@ -28,7 +28,8 @@ class Drive extends Item {
 
 		// 模板路径
 		this.tpl_path = "./tpl/";
-
+		// 默认启用热更新
+		this.mode = 2;
 		/* 通用项 */
 		// 配置参数
 		this.config = {
@@ -563,4 +564,4 @@ Drive.prototype.update_vue = async function(route_path, cover) {
 	}
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/nav/index.js

@@ -18,6 +18,8 @@ class Nav extends Index {
 		this.Drive = Drive;
 		this.type = "nav";
 		this.title = title;
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 

package/core/com/param/drive.js

@@ -13,7 +13,8 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./param.json";
-
+		// 默认启用热更新
+		this.mode = 2;
 		/* 通用项 */
 		// 配置参数
 		this.config = {

package/core/com/param/index.js

@@ -18,6 +18,8 @@ class Param extends Index {
 		this.Drive = Drive;
 		this.type = "param";
 		this.title = title;
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 

package/core/com/plugin/drive.js

@@ -17,7 +17,8 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./plugin.json";
-
+		// 默认启用热更新
+		this.mode = 2;
 		/**
 		 * 当前语言
 		 */

package/core/com/plugin/index.js

@@ -19,6 +19,8 @@ class Plugin extends Index {
 		this.Drive = Drive;
 		this.type = "plugin";
 		this.title = title;
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 

package/core/com/sql/drive.js

@@ -19,7 +19,8 @@ class Drive extends Item {
 		this.save_dir = './file/';
 		// 读取文件目录
 		this.url_path = "/file/";
-
+		// 默认启用热更新
+		this.mode = 2;
 		/* 通用项 */
 		this.params = null;
 		// 配置参数

package/core/com/sql/index.js

@@ -18,6 +18,8 @@ class Sql extends Index {
 		this.Drive = Drive;
 		this.type = "sql";
 		this.title = title;
+		// 默认启用热更新
+		this.mode = 2;
 	}
 }
 
@@ -66,7 +68,7 @@ Sql.prototype.run = async function(name, query, body, db) {
 	var obj = this.get(name);
 	if (obj) {
 		var ret = await obj.run(query, body, db);
-		if (this.mode) {
+		if (this.mode > 2) {
 			o.load(o.filename);
 		}
 		return ret;

package/core/com/static/drive.js

@@ -74,7 +74,7 @@ class Drive extends Item {
 			}
 		}
 		if (this.config.convert_amd) {
-			this.mode(true);
+			this.run_mode(true);
 		}
 	}
 }
@@ -95,7 +95,7 @@ Drive.prototype.loadObj = function(obj) {
 	$.push(this.config, obj, true);
 	var cg = this.config;
 	if (cg.convert_amd) {
-		this.mode(true);
+		this.run_mode(true);
 	}
 	var f = cg.func_file;
 	if (f) {
@@ -142,10 +142,10 @@ Drive.prototype.main = async function(ctx, path) {
 Drive.prototype.after = async function(ctx, path) {};
 
 /**
- * 切换模式
+ * 切换运行模式
  * @param {Boolean} convert_amd 是否将ES6转换AMD
  */
-Drive.prototype.mode = async function(convert_amd) {
+Drive.prototype.run_mode = async function(convert_amd) {
 	var cg = this.config;
 	if (convert_amd) {
 		this.main = async function main(ctx, path) {

package/core/com/task/index.js

@@ -61,7 +61,10 @@ Task.prototype.load_item = function(dir, cg, file) {
 	var drive = new this.Drive(dir);
 	drive.loadObj(cg);
 	drive.filename = file;
-	drive.task_admin = this;
+	var _this = this;
+	drive.admin = function() {
+		return this;
+	};
 	this.list.push(drive);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "2.8.3",
+	"version": "2.8.5",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -42,7 +42,7 @@
 		"mm_html": "^1.1.6",
 		"mm_koa_proxy": "^1.0.0",
 		"mm_logs": "^1.1.7",
-		"mm_machine": "^1.8.5",
+		"mm_machine": "^1.8.9",
 		"mm_mongodb": "^1.4.2",
 		"mm_mqtt": "^1.0.6",
 		"mm_mysql": "^1.8.9",