mm_os 4.1.3 → 4.1.5

package/com/db/drive.js

@@ -18,20 +18,20 @@ var keyword_default_tip = '昵称、手机号、钱包地址';
 class Drive extends Item {
   static config = {
     // 库表名称（唯一标识）
-    'name': 'db',
+    name: '',
     // 标题（中文名）
-    'title': '',
+    title: '',
     // 表名
-    'table': '',
+    table: '',
     // 主键，用于实体模型
-    'key': '',
+    key: '',
     // 字段
-    'fields': [
+    fields: [
       /* */
     ],
-    'index‌': [],
+    index: [],
     // 主程序文件 - 默认为空
-    'main': ''
+    main: ''
   };
 
   /**
@@ -48,7 +48,7 @@ class Drive extends Item {
 /**
  * 重置配置参数
  */
-Drive.prototype._reset = function () {
+Drive.prototype._preset = function () {
   this.query_string = ['name', 'title', 'keywords', 'tag', 'description', 'content'];
 
   // 是否设置数值类型为可查询
@@ -61,7 +61,7 @@ Drive.prototype._reset = function () {
   this.get_not = ['password', 'salt', 'content'];
 
   // 是否设置以下字段为getObj查对象SQL时不可见
-  this.getobj_not = ['password', 'salt', 'display'];
+  this.get_obj_not = ['password', 'salt', 'display'];
 
   // 是否设置默认该表仅用户可访问
   this.query_default_table = ['user'];
@@ -78,10 +78,10 @@ Drive.prototype._parseFieldType = function (type) {
   var max = 0;
   var decimal = 0;
   if (len) {
-    max = number(len.left(',', true));
+    max = Number(len.left(',', true));
     var d = len.right(',');
     if (d) {
-      decimal = number(d);
+      decimal = Number(d);
     }
   }
   return { tp, max, decimal };
@@ -110,11 +110,11 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
     if (range) {
       var min_str = range.left(',', true);
       if (min_str) {
-        min = number(min_str);
+        min = Number(min_str);
       }
       var max_str = range.right(',');
       if (max_str) {
-        var n = number(max_str);
+        var n = Number(max_str);
         if (tp === 'varchar') {
           if (n < local_max_length) {
             local_max_length = n;
@@ -126,8 +126,11 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
     }
     map = desc.between('(', ')');
   }
-
-  return { title, description, map, min, max, max_length: local_max_length };
+  let min_length = 0;
+  if (min > 0) {
+    min_length = min;
+  }
+  return { title, description, map, min, max, min_length, max_length: local_max_length };
 };
 
 /**
@@ -137,7 +140,7 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
  * @param {number} max_length 最大长度
  * @returns {number} 计算后的最大值
  */
-Drive.prototype._calculateMaxValue = function (tp, max, max_length) {
+Drive.prototype._calcMaxValue = function (tp, max, max_length) {
   var local_max = max;
   if (local_max === 0) {
     switch (tp) {
@@ -275,6 +278,7 @@ Drive.prototype.model = function (fields) {
     map,
     min,
     max: parsedMax,
+    min_length,
     max_length: parsedMaxLength
   } = this._parseFieldNote(note, tp, max_length);
 
@@ -309,12 +313,12 @@ Drive.prototype.model = function (fields) {
  * @property {string} o.Manager_comment 索引备注
  * @returns {object} 返回索引模型
  */
-Drive.prototype.modelmanager = function (o) {
+Drive.prototype.newIndexModel = function (o) {
   return {
-    'name': o.Key_name,
-    'type': o.Non_unique ? 'unique' : 'index',
-    'fields': o.Column_name.replace(/`/g, '').split(','),
-    'comment': o.Manager_comment
+    name: o.Key_name,
+    type: o.Non_unique ? 'unique' : 'index',
+    fields: o.Column_name.replace(/`/g, '').split(','),
+    comment: o.Manager_comment
   };
 };
 
@@ -323,16 +327,16 @@ Drive.prototype.modelmanager = function (o) {
  * @param {object} db 数据库管理器
  * @returns {Array} 索引列表
  */
-Drive.prototype.updateFilemanager = function (db) {
+Drive.prototype._updateFile = async function (db) {
   var sql = 'SHOW INDEX FROM `' + this.config.table + '`';
-  var rows = db.run(sql);
+  var rows = await db.run(sql);
   var dict = {};
   for (var i = 0; i < rows.length; i++) {
     var o = rows[i];
     if (o.Key_name !== 'PRIMARY') {
       if (!dict[o.Key_name]) {
         dict[o.Key_name] = {
-          column_name: []
+          Column_name: []
         };
       }
       dict[o.Key_name].Column_name.push(o.Column_name);
@@ -340,7 +344,7 @@ Drive.prototype.updateFilemanager = function (db) {
   }
   var list = [];
   for (var k in dict) {
-    var m = this.modelmanager(dict[k]);
+    var m = this.newIndexModel(dict[k]);
     list.push(m);
   }
 
@@ -381,7 +385,7 @@ Drive.prototype.updateFile = async function (db, cover) {
     list.push(field);
   }
   cg.fields = list;
-  cg.index‌ = await this.updateFilemanager(db);
+  cg.index = await this._updateFile(db);
   if (!cg.name) {
     cg.name = cg.table;
   }
@@ -392,14 +396,14 @@ Drive.prototype.updateFile = async function (db, cover) {
  * 更新索引
  * @param {object} db 数据库管理器
  */
-Drive.prototype.updateDbmanager = async function (db) {
+Drive.prototype._updateDb = async function (db) {
   var cg = this.config;
   let index = cg.index || [];
   // 更新索引
   if (index) {
     var len = index.length;
     for (var i = 0; i < len; i++) {
-      var o = index‌[i];
+      var o = index[i];
       var sql_start = '';
       if (o.type === 'unique') {
         sql_start = 'CREATE UNIQUE INDEX `';
@@ -470,7 +474,6 @@ Drive.prototype._generateFieldSql = function (o) {
   var notnull = this._getNotNullSql(o);
   var value = this._getValueSql(o);
   var note = this._getNoteSql(o);
-
   return this._buildFieldSql(o.name, type, notnull, value, note);
 };
 
@@ -715,8 +718,7 @@ Drive.prototype._addOrUpdateField = async function (db, table, o, fields) {
  */
 Drive.prototype.updateDb = async function (db) {
   var cg = this.config;
-  db.table = cg.table + '';
-  var table = cg.table;
+  var table = cg.table + '';
   var list = cg.fields;
 
   var fields = await this._initTable(db, cg, list);
@@ -742,14 +744,14 @@ Drive.prototype.updateDb = async function (db) {
  * @returns {object} 目录信息
  * @private
  */
-Drive.prototype._deteDire = function (cg) {
+Drive.prototype._deteDir = function (cg) {
+  var arr = cg.table.split('_');
+  var scope = arr[0];
   var p = './app/'.fullname();
-  var dir_arr = cg.table.split('_');
-  var scope = dir_arr[0];
-  var dir = p + scope;
-  var dir_api = dir + '/plugin/server';
-  var db_dir = dir_api + '/db';
-  var config_file = db_dir.fullname() + cg.table.replace(scope + '_', '') + '.db.json';
+  var dir = ('./' + scope).fullname(p);
+  var dir_api = ('./plugin/server').fullname(dir);
+  var db_dir = ('./db').fullname(dir_api);
+  var config_file = ('./' + cg.table.replace(scope + '_', '') + '.db.json').fullname(db_dir);
 
   return {
     scope,
@@ -790,7 +792,7 @@ Drive.prototype._handleConfigFile = function (f, cover) {
       delete o.description;
     }
     $.push(jobj, o, true);
-    f.saveText(JSON.stringify(jobj, null, 4));
+    f.saveJson(jobj);
   }
 };
 
@@ -804,33 +806,31 @@ Drive.prototype.updateApp = async function (cover) {
   var dir_api;
 
   if (!this.config_file) {
-    var dirs = this._deteDire(cg);
-
+    var dirs = this._deteDir(cg);
     this._ensureDir(dirs.dir);
     this._ensureDir(dirs.dir + '/plugin');
     this._ensureDir(dirs.dir_api);
     this._ensureDir(dirs.db_dir);
-
-    this.dir = dirs.db_dir.fullname();
+    this._dir = dirs.db_dir;
     this.config_file = dirs.config_file;
     f = dirs.config_file;
     dir_api = dirs.dir_api;
   } else {
-    f = this.config_file + '.db.json';
+    if (this.config_file.endsWith('.db.json')) {
+      f = this.config_file;
+    } else {
+      f = this.config_file + '.db.json';
+    }
   }
 
   if (f) {
-    if (!this.dir) {
-      this.dir = f.dirname();
-      if (!fs.existsSync(this.dir)) {
-        fs.mkdirSync(this.dir);
-      }
-    }
+    f.addDir();
     if (!dir_api) {
-      dir_api = this.dir.dirname();
+      dir_api = f.dirname().dirname();
     }
-
+    // 处理db配置文件，生成xxx.db.json文件
     this._handleConfigFile(f, cover);
+    // 更新API及相关配置文件
     this.updateApi(dir_api, cover);
   }
 };
@@ -855,9 +855,10 @@ Drive.prototype._ensureApiDir = function (dir) {
  * @returns {string} 完整目录路径
  * @private
  */
-Drive.prototype._deteApiDir = function (dir, app, type, name) {
+Drive.prototype._getApiDir = function (dir, app, type, name) {
   var l = $.slash;
-  var o = $.pool.api[app + '_' + type];
+  let event_api = $.admin.event('api');
+  var o = event_api.getMod(app + '_' + type);
   var api_dir;
 
   if (o) {
@@ -888,10 +889,10 @@ Drive.prototype.updateApi = async function (dir, cover) {
   }
   var app = arr[0];
 
-  var client = this._deteApiDir(dir, app, 'client', name);
-  var manage = this._deteApiDir(dir, app, 'manage', name);
+  var client = this._getApiDir(dir, app, 'client', name);
+  var manage = this._getApiDir(dir, app, 'manage', name);
 
-  this.newSql(client, manage, cover);
+  await this.newSql(client, manage, cover);
   await this.newParam(client, manage, cover);
   this.newApi(client, manage, cover);
 };
@@ -1050,10 +1051,9 @@ Drive.prototype._procFieldSel = function (field_name, field_type) {
   if (this.isCan(field_name, this.get_not, field_type)) {
     res.field += ',`' + field_name + '`';
   }
-  if (this.isCan(field_name, this.getObj_not)) {
+  if (this.isCan(field_name, this.get_obj_not)) {
     res.field_obj += ',`' + field_name + '`';
   }
-
   return res;
 };
 
@@ -1104,7 +1104,7 @@ Drive.prototype._procNumberQuery = function (
     update: { ...update_obj }
   };
 
-  if (!field_name.end('id')) {
+  if (!field_name.endsWith('id')) {
     query[field_name + '_min'] = '`' + field_name + '` >= {0}';
     query[field_name + '_max'] = '`' + field_name + '` <= {0}';
     res.update[field_name + '_add'] = '`' + field_name + '` = `' + field_name + '` + {0}';
@@ -1164,7 +1164,7 @@ Drive.prototype._procFieldType = function (
 
 /**
  * 处理单个字段
- * @param {object} field 字段对象
+ * @param {object} o 字段对象
  * @param {object} query 查询对象
  * @param {object} update_obj 更新对象
  * @param {string} uid 用户ID
@@ -1175,14 +1175,12 @@ Drive.prototype._procFieldType = function (
  * @private
  */
 Drive.prototype._procSingleField = async function (
-  field, query, update_obj, uid, query_default_user, orderby, keyword
+  o, query, update_obj, uid, query_default_user, orderby, keyword
 ) {
-  var o = field;
-  var p = o.type;
-  var n = o.name;
+  var { type, name } = o;
   var result = {
-    field: '',
-    field_obj: '',
+    field: '*',
+    field_obj: '*',
     keyword: keyword,
     orderby: orderby,
     update_obj: update_obj,
@@ -1190,12 +1188,12 @@ Drive.prototype._procSingleField = async function (
     format: []
   };
 
-  var field_sel = this._procFieldSel(n, p);
+  var field_sel = this._procFieldSel(name, type);
   result.field = field_sel.field;
   result.field_obj = field_sel.field_obj;
 
   var type_info = this._procFieldType(
-    p, n, query, update_obj, uid, query_default_user, orderby, keyword
+    type, name, query, update_obj, uid, query_default_user, orderby, keyword
   );
   result.keyword = type_info.keyword;
   result.orderby = type_info.orderby;
@@ -1254,8 +1252,8 @@ Drive.prototype._procFields = async function (fields, table) {
   return {
     query,
     update: update_obj,
-    field,
-    field_obj,
+    field: field.replace(',', ''),
+    field_obj: field_obj.replace(',', ''),
     query_default,
     format,
     orderby,
@@ -1292,7 +1290,7 @@ Drive.prototype._procKeyword = function (keyword, table) {
  * @returns {object} 基础模型
  * @private
  */
-Drive.prototype._createBaseModel = function (cg, processed, keyword_query) {
+Drive.prototype._createSqlConfig = function (cg, processed, keyword_query) {
   return {
     name: cg.table,
     title: cg.title,
@@ -1319,12 +1317,12 @@ Drive.prototype._createBaseModel = function (cg, processed, keyword_query) {
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveClientConfig = function (client, base_model, orderby, uid, table, cover) {
+Drive.prototype._saveClientConfig = function (client, base_model, cover, orderby, uid, table) {
   var oj = { ...base_model };
   if (orderby) {
     oj.orderby_default = orderby;
   }
-  if (oj.query_default[uid] && table.indexOf('user_') !== -1) {
+  if (oj.orderby_default && oj.query_default[uid] && table.indexOf('user_') !== -1) {
     oj.filter = {
       'table': 'table',
       'page': 'page',
@@ -1351,7 +1349,7 @@ Drive.prototype._saveManageConfig = function (manage, base_model, cover) {
   delete m.method;
   m.field_hide = [];
   m.name += 2;
-  m.field_obj = m.field_obj.replace(',`time_create`', '').replace(',`time_update`', '')
+  m.field_obj = (m.field_obj || '*').replace(',`time_create`', '').replace(',`time_update`', '')
     .replace(',`create_time`', '').replace(',`update_time`', '');
   delete m.query_default;
   this.saveFile(manage + '/sql.json', m, cover);
@@ -1369,10 +1367,10 @@ Drive.prototype.newSql = async function (client, manage, cover) {
 
   var processed = await this._procFields(cg.fields, cg.table);
   var keyword_query = this._procKeyword(processed.keyword, cg.table);
-  var base_model = this._createBaseModel(cg, processed, keyword_query);
+  var base_model = this._createSqlConfig(cg, processed, keyword_query);
 
   if (client) {
-    this._saveClientConfig(client, base_model, processed.orderby, uid, cg.table, cover);
+    this._saveClientConfig(client, base_model, cover, processed.orderby, uid, cg.table);
   }
 
   if (manage) {
@@ -1388,7 +1386,7 @@ Drive.prototype.newSql = async function (client, manage, cover) {
  */
 Drive.prototype.saveFile = function (file, model, cover) {
   if (!file.hasFile()) {
-    file.saveText(JSON.stringify(model, null, 4));
+    file.saveText(JSON.stringify(model, null, 2));
   } else if (cover) {
     var jobj = file.loadJson();
     for (var k in model) {
@@ -1398,7 +1396,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
       }
     }
     $.push(jobj, model, true);
-    file.saveText(JSON.stringify(jobj, null, 4));
+    file.saveText(JSON.stringify(jobj, null, 2));
   }
 };
 
@@ -1408,7 +1406,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
  * @param {string} manage 管理端配置保存路径
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.new = async function (client, manage, cover) {
+Drive.prototype.newParam = async function (client, manage, cover) {
   var cg = this.config;
   var lt = cg.fields;
   var cm = this._initParamConfig(cg);
@@ -1418,7 +1416,7 @@ Drive.prototype.new = async function (client, manage, cover) {
     var o = lt[i];
     var p = o.type;
     var n = o.name;
-    var m = this._createBaseModel(o, p, n);
+    var m = this._createParamModel(o, p, n);
 
     if (this._isStringType(p)) {
       keyword = this._processStringField(cm, m, o, n, keyword);
@@ -1470,14 +1468,14 @@ Drive.prototype._initParamConfig = function (cg) {
 };
 
 /**
- * 创建基础模型
+ * 创建参数模型
  * @param {object} field 字段对象
  * @param {string} type 字段类型
  * @param {string} name 字段名
- * @returns {object} 基础模型对象
+ * @returns {object} 参数模型对象
  * @private
  */
-Drive.prototype._createBaseModel = function (field, type, name) {
+Drive.prototype._createParamModel = function (field, type, name) {
   return {
     name: name,
     title: field.title,
@@ -1665,7 +1663,7 @@ Drive.prototype._addDateTimeRange = function (cm, m, n) {
  */
 Drive.prototype._processNumberField = function (cm, m, o, n, cg) {
   m.type = 'number';
-  m.default = number(o.default) + '';
+  m.default = Number(o.default) + '';
   m.number = {};
 
   this._addNumberRange(m, o);
@@ -1738,7 +1736,7 @@ Drive.prototype._processNonPrimaryKey = function (cm, m, n) {
  */
 Drive.prototype._processNonTinyInt = function (cm, m, n) {
   var ne = n;
-  if (!ne.end('id')) {
+  if (!ne.endsWith('id')) {
     this._addNumberRangeFields(cm, m, n);
   } else {
     cm.get.query.push(n);
@@ -1826,6 +1824,9 @@ Drive.prototype._saveParamFiles = function (cm, client, manage, cover) {
  * @returns {boolean} 是否设置
  */
 Drive.prototype.isSet = function (name, arr) {
+  if (!arr) {
+    return false;
+  }
   var bl = false;
   for (var i = 0; i < arr.length; i++) {
     if (name.indexOf(arr[i]) !== -1) {
@@ -1847,14 +1848,17 @@ Drive.prototype.isCan = function (name, arr, type) {
   if (type === 'longtext') {
     return false;
   }
-  var bl = false;
+  if (!arr) {
+    return true;
+  }
+  var bl = true;
   for (var i = 0; i < arr.length; i++) {
     if (name.indexOf(arr[i]) !== -1) {
-      bl = true;
+      bl = false;
       break;
     }
   }
-  return !bl;
+  return bl;
 };
 
 
@@ -1879,10 +1883,10 @@ Drive.prototype._deteApiPath = function (cg) {
  * 创建基础API配置
  * @param {object} cg 配置对象
  * @param {string} path API路径
- * @returns {object} 基础API配置
+ * @returns {object} API配置
  * @private
  */
-Drive.prototype._createBaseApiConfig = function (cg, path) {
+Drive.prototype._createApiConfig = function (cg, path) {
   return {
     'name': cg.table,
     'title': cg.title,
@@ -1967,7 +1971,7 @@ Drive.prototype._saveManageApiConfig = function (manage, base_config, cover) {
 Drive.prototype.newApi = async function (client, manage, cover) {
   var cg = this.config;
   var path = this._deteApiPath(cg);
-  var base_config = this._createBaseApiConfig(cg, path);
+  var base_config = this._createApiConfig(cg, path);
 
   if (client) {
     this._saveClientApiConfig(client, base_config, cg, cover);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mm_os",
 	"description": "MM_OS服务端架构，用于快速构建应用程序，支持网站建设、小程序后台、AI应用、物联网(IOT/AIOT)、游戏服务端等多种场景。",
-	"version": "4.1.3",
+	"version": "4.1.5",
 	"main": "index.js",
 	"keywords": [
 		"AI",