mm_os 4.0.9 → 4.1.0

package/com/api/drive.js

@@ -131,7 +131,7 @@ Drive.prototype.getParam = function (file) {
  */
 Drive.prototype._loadParam = async function (file_path) {
   if (file_path) {
-    var p = file_path.fullname(this._getDir());
+    var p = file_path.fullname(this.getDir());
     var param = this.getParam(p);
     if (param) {
       this.param = param;
@@ -197,7 +197,7 @@ Drive.prototype.getSql = function (file) {
  */
 Drive.prototype._loadSql = async function (file_path) {
   if (file_path) {
-    var p = file_path.fullname(this._getDir());
+    var p = file_path.fullname(this.getDir());
     var sql = this.getSql(p);
     if (sql) {
       this.sql = sql;
@@ -216,7 +216,7 @@ Drive.prototype._loadSql = async function (file_path) {
 Drive.prototype._loadOauth = function () {
   var cg = this.config.oauth;
   if (cg) {
-    this.oauth = new Oauth(this._getDir());
+    this.oauth = new Oauth(this.getDir());
     this.oauth.loadObj(cg);
   }
 };
@@ -693,7 +693,7 @@ Drive.prototype.plugin = function (app, name) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/api/oauth.js

@@ -38,7 +38,7 @@ Oauth.prototype.loadObj = function (obj) {
   $.push(this.config, obj);
   var f = this.config.main;
   if (f) {
-    var file = f.fullname(this._getDir());
+    var file = f.fullname(this.getDir());
     if (file.hasFile()) {
       var cs = require(file);
       if (cs) {

package/com/cmd/drive.js

@@ -1534,7 +1534,7 @@ Drive.prototype.plugin = function (app, name) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/db/drive.js

@@ -1985,7 +1985,7 @@ Drive.prototype.newApi = async function (client, manage, cover) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/event/drive.js

@@ -35,7 +35,7 @@ class Drive extends Item {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/event/index.js

@@ -56,7 +56,7 @@ class Event extends Manager {
      * 是否懒加载
      * @type {boolean}
      */
-    lazy_load: false,
+    lazy_load: true,
     /**
      * 模式
      * 1.生产模式，改变文件不会重新加载
@@ -249,6 +249,9 @@ Event.prototype.runSub = async function (list, target, ctx, db) {
       let mod = this.getMod(info.name);
       if (mod && this.isMatch(target, mod.config.target)) {
         try {
+          if (!mod.isLoaded()) {
+            await mod.call('loadScript');
+          }
           var ret = await mod.run(ctx, db);
           if (this.mode > 4) {
             mod.do('reload');
@@ -332,7 +335,6 @@ Event.prototype.after = async function (target, ctx, db) {
  * @returns {object} 执行结果
  */
 Event.prototype.run = async function (target, ctx, db = {}) {
-  console.log('执行事件', target);
   var ret = await this.before(target, ctx, db);
   if (!ret) {
     ret = await this.check(target, ctx, db);

package/com/mqtt/drive.js

@@ -662,7 +662,7 @@ Drive.prototype.plugin = function (app, name) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/nav/drive.js

@@ -688,7 +688,7 @@ Drive.prototype.updateVue = async function (route_path, cover) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/param/drive.js

@@ -488,7 +488,7 @@ Drive.prototype.main = function (model, value) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/pendant/drive.js

@@ -152,7 +152,7 @@ Drive.prototype.designOption = function (body) {
  */
 Drive.prototype.tpl = async function (ctx, db) {
   var html_file = this.config.template || './pendant.html';
-  return html_file.fullname(this._getDir()).loadText();
+  return html_file.fullname(this.getDir()).loadText();
 };
 
 /**
@@ -164,7 +164,7 @@ Drive.prototype.tpl = async function (ctx, db) {
 Drive.prototype.main = async function (ctx, db) {
   var model = {};
   var html_file = this.config.template || './pendant.html';
-  return db.tpl.view(html_file.fullname(this._getDir()), model);
+  return db.tpl.view(html_file.fullname(this.getDir()), model);
 };
 
 /**
@@ -173,7 +173,7 @@ Drive.prototype.main = async function (ctx, db) {
  * @returns {string} 打包成功返回压缩包文件地址
  */
 Drive.prototype.zip = async function (zip_dir = '/static/file/zip/') {
-  var dir = this._getDir();
+  var dir = this.getDir();
   var file = ('./' + this.config.name + '.zip').fullname(zip_dir);
   file.addDir();
   await compressing.zip.compressDir(dir, file);
@@ -190,7 +190,7 @@ Drive.prototype.zip = async function (zip_dir = '/static/file/zip/') {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/socket/drive.js

@@ -638,7 +638,7 @@ Drive.prototype.plugin = function (app, name) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/sql/drive.js

@@ -1246,7 +1246,7 @@ Drive.prototype.count = async function (db, query, body) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/static/drive.js

@@ -179,7 +179,7 @@ Drive.prototype._getName = function (file) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/task/drive.js

@@ -391,7 +391,7 @@ Drive.prototype.plugin = function (app, name) {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/com/template/drive.js

@@ -35,7 +35,7 @@ class Drive extends Item {
 Drive.prototype.zip = async function (zip_dir = "/static/file/zip/") {
 	var file = ("./" + this.config.name + '.zip').fullname(zip_dir);
 	file.addDir();
-	var done = await compressing.zip.compressDir(this._getDir(), file);
+	var done = await compressing.zip.compressDir(this.getDir(), file);
 	if (file.hasFile()) {
 		return file;
 	}
@@ -63,7 +63,7 @@ Drive.prototype.update = async function () {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/common/middleware/web_after/index.js

@@ -9,7 +9,10 @@ module.exports = {
    */
   async _init(apapter, eventer) {
     var event = $.admin.event('api', 'API事件');
-    await event.call('update');
+    // await event.call('update', 'app/');
+    await event.do('init');
+    await event.runAll('load');
+    event.runAll('init');
   },
   /**
    * 主要逻辑

package/common/middleware/web_static/index.js

@@ -63,7 +63,7 @@ module.exports = {
   _setupGlobalStatic(web) {
     if ($.admin.static) {
       $.static = new $.admin.static();
-      $.static.call('update');
+      $.static.call('update', 'app/');
 
       web.use(async (ctx, next) => {
         await $.static.run(ctx, next);