mm_os 4.1.4 → 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'];
 
   // 是否设置数值类型为可查询
@@ -315,10 +315,10 @@ Drive.prototype.model = function (fields) {
  */
 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
   };
 };
 
@@ -385,7 +385,7 @@ Drive.prototype.updateFile = async function (db, cover) {
     list.push(field);
   }
   cg.fields = list;
-  cg.index‌ = await this._updateFile(db);
+  cg.index = await this._updateFile(db);
   if (!cg.name) {
     cg.name = cg.table;
   }
@@ -792,7 +792,7 @@ Drive.prototype._handleConfigFile = function (f, cover) {
       delete o.description;
     }
     $.push(jobj, o, true);
-    f.saveText(JSON.stringify(jobj, null, 2));
+    f.saveJson(jobj);
   }
 };
 
@@ -816,7 +816,11 @@ Drive.prototype.updateApp = async function (cover) {
     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) {
@@ -824,7 +828,9 @@ Drive.prototype.updateApp = async function (cover) {
     if (!dir_api) {
       dir_api = f.dirname().dirname();
     }
+    // 处理db配置文件，生成xxx.db.json文件
     this._handleConfigFile(f, cover);
+    // 更新API及相关配置文件
     this.updateApi(dir_api, cover);
   }
 };
@@ -886,7 +892,7 @@ Drive.prototype.updateApi = async function (dir, cover) {
   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);
 };
@@ -1048,7 +1054,6 @@ Drive.prototype._procFieldSel = function (field_name, field_type) {
   if (this.isCan(field_name, this.get_obj_not)) {
     res.field_obj += ',`' + field_name + '`';
   }
-
   return res;
 };
 
@@ -1159,7 +1164,7 @@ Drive.prototype._procFieldType = function (
 
 /**
  * 处理单个字段
- * @param {object} field 字段对象
+ * @param {object} o 字段对象
  * @param {object} query 查询对象
  * @param {object} update_obj 更新对象
  * @param {string} uid 用户ID
@@ -1170,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,
@@ -1185,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;
@@ -1249,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,
@@ -1287,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,
@@ -1314,7 +1317,7 @@ 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;
@@ -1364,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) {
@@ -1413,7 +1416,7 @@ Drive.prototype.newParam = 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);
@@ -1465,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,
@@ -1846,16 +1849,16 @@ Drive.prototype.isCan = function (name, arr, type) {
     return false;
   }
   if (!arr) {
-    return false;
+    return true;
   }
-  var bl = false;
+  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;
 };
 
 
@@ -1880,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,
@@ -1968,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.4",
+	"version": "4.1.5",
 	"main": "index.js",
 	"keywords": [
 		"AI",