mm_os 2.7.3 → 2.7.5

package/core/com/component/component.html

@@ -1,16 +1,16 @@
-<div class="mm_col col-12 col-sm-6 col-md-3 col-lg-2">
-	<div class="component_demo">
-		<div class="title">示例组件标题</div>
+<div class="mm_col ${' ' + @config.layout}">
+	<div id="${config.id}" class="component_demo ${' ' + @config.class}">
+		<div class="title">${@config.options.xxx}</div>
 		<div class="description">示例组件描述</div>
 	</div>
 </div>
 
 <style scoped>
+	/*[config.style]*/
+
 	.component_demo {}
 
 	.component_demo .title {}
 
-	.component_demo .description {
-		
-	}
+	.component_demo .description {}
 </style>

package/core/com/component/config.tpl.json

@@ -23,8 +23,8 @@
 	"options": [],
 	// 定位 由后台指定的展示位置
 	"location": [{
-		"page": "/admin/index",
+		"path": "/admin/index",
 		"position": "main",
-		"onoff": true
+		"available": 1
 	}]
 }

package/core/com/component/drive.js

@@ -1,3 +1,4 @@
+const compressing = require('compressing');
 const Item = require('mm_machine').Item;
 
 /**
@@ -75,9 +76,9 @@ Drive.prototype.model = function() {
 		"options": [],
 		// 定位 由后台指定的展示位置
 		"location": [{
-			"page": "/admin/index",
+			"path": "/admin/index",
 			"position": "main",
-			"onoff": true
+			"available": 1
 		}]
 	}
 };
@@ -109,6 +110,40 @@ Drive.prototype.new_script = function(file) {
 	}
 };
 
+/**
+ * 获取配置参数
+ * @param {Object} 设置配置
+ * @return {Object} 返回配置参数
+ */
+Drive.prototype.design_option = function(body) {
+	var cg = this.config;
+	if (Array.isArray(body)) {
+		cg.options = body;
+	} else {
+		var options = cg.options || [];
+		var option = options.getObj({
+			name: body.name
+		});
+		if (option) {
+			Object.assign(option, body);
+		} else {
+			options.push(body);
+		}
+		cg.options = options;
+	}
+}
+
+/**
+ * 挂件模板
+ * @param {Object} ctx 请求上下文
+ * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+ * @return {Object} 执行结果
+ */
+Drive.prototype.tpl = async function(ctx, db) {
+	var html_file = this.config.template || "./component.html";
+	return html_file.fullname(this.dir).loadText();
+};
+
 /**
  * 组件主函数
  * @param {Object} ctx 请求上下文
@@ -121,4 +156,20 @@ Drive.prototype.main = async function(ctx, db) {
 	return db.tpl.view(html_file.fullname(this.dir), model);
 };
 
+/**
+ * 压缩主题模板
+ * @param {String} 要压缩的目录
+ * @returns {String} 打包成功返回压缩包文件地址
+ */
+Drive.prototype.zip = async function(zip_dir = "/static/file/zip/") {
+	var dir = this.filename.dirname();
+	var file = ("./" + this.config.name + '.zip').fullname(zip_dir);
+	file.addDir();
+	var done = await compressing.zip.compressDir(dir, file);
+	if (file.hasFile()) {
+		return file;
+	}
+	return null;
+}
+
 module.exports = Drive;

package/core/com/component/index.js

@@ -71,16 +71,142 @@ Component.prototype.sort = function() {
 	});
 };
 
+/**
+ * 配置模型
+ * @param {Object} option 配置
+ * @param {Object} ctx 请求上下文
+ * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+ * @return {String} 返回html代码
+ */
+Component.prototype.option_model = function(block) {
+	var id = block.id || block.name;
+	var style = "";
+	if (block.style) {
+		var o = block.style.toJson();
+		style += `#${id} {`;
+
+		// 字体
+		if (o.font_size) {
+			style += `\n	font-size: ${o.font_size};`;
+		}
+		if (o.font_color) {
+			style += `\n	color: ${o.font_color};`;
+		}
+
+		// 边框
+		if (o.border_top_style !== 'none') {
+			style +=
+				`\n	border-top: ${o.border_top_size || 0} ${o.border_top_style || 'solid'} ${o.border_top_color || '#dbdbdb'};`;
+		}
+		if (o.border_right_style !== 'none') {
+			style +=
+				`\n	border-right: ${o.border_right_size || 0} ${o.border_right_style || 'solid'} ${o.border_right_color || '#dbdbdb'};`;
+		}
+		if (o.border_bottom_style !== 'none') {
+			style +=
+				`\n	border-bottom: ${o.border_bottom_size || 0} ${o.border_bottom_style || 'solid'} ${o.border_bottom_color || '#dbdbdb'};`;
+		}
+		if (o.border_left_style !== 'none') {
+			style +=
+				`\n	border-left: ${o.border_left_size || 0} ${o.border_left_style || 'solid'} ${o.border_left_color || '#dbdbdb'};`;
+		}
+
+		// 边距
+		style +=
+			`\n	margin-top: ${o.margin_top || 0};`;
+		style +=
+			`\n	margin-right: ${o.margin_right || 0};`;
+		style +=
+			`\n	margin-bottom: ${o.margin_bottom || 0};`;
+		style +=
+			`\n	margin-left: ${o.margin_left || 0};`;
+
+		// 填充
+		style +=
+			`\n	padding-top: ${o.padding_top || 0};`;
+		style +=
+			`\n	padding-right: ${o.padding_right || 0};`;
+		style +=
+			`\n	padding-bottom: ${o.padding_bottom || 0};`;
+		style +=
+			`\n	padding-left: ${o.padding_left || 0};`;
+
+		// 背景
+		if (o.bg_url) {
+			style += `\n	background-image: url(${o.bg_url});`;
+			style += `\n	background-size: 100% auto;`;
+			style += `\n	background-repeat: ${o.bg_repeat || 'no-repeat'};`;
+		}
+		if (o.bg_color) {
+			style +=
+				`\n	background-color: ${o.bg_color || ''};`;
+		}
+		style += `\n}`;
+
+		// 设置A样式
+		if (o.a_size || o.a_color) {
+			style += `\n#${id} a {`;
+			if (o.a_size) {
+				style += `\n	font-size: ${o.a_size};`;
+			}
+			if (o.a_color) {
+				style += `\n	color: ${o.a_color};`;
+			}
+			style += `\n}`;
+		}
+	} else {
+		style = "";
+	}
+	
+	var layout = "";
+
+	var data = (block.data || '[]').toJson();
+	var attr = (block.attr || '{}').toJson();
+	var options = (block.options || '{}').toJson();
+
+	return {
+		id,
+		class: block.class,
+		style,
+		data,
+		attr,
+		layout,
+		options
+	};
+}
+
+/**
+ * 渲染模块
+ * @param {Object} ctx 请求上下文
+ * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+ * @param {Array} blocks 模块
+ */
+Component.prototype.render_block = async function(ctx, db, blocks) {
+	var html = "";
+	for (var i = 0; i < blocks.length; i++) {
+		var block = blocks[i];
+		var o = this.get(block.component);
+		if (o) {
+			var option = this.option_model(block);
+			var ret = await o.run('main', ctx, db, option);
+			if (ret) {
+				html += "\n" + ret;
+			}
+		}
+	}
+	return html;
+}
+
 /**
  * 执行渲染
- * @param {String} page 页面
- * @param {String} position 位置
- * @param {String} position position
  * @param {Object} ctx 请求上下文
  * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
- * @return {String}
+ * @param {String} path 页面
+ * @param {String} position 位置
+ * @param {String} position position
+ * @return {String} 返回html代码
  */
-Component.prototype.render = async function(page, position, ctx, db) {
+Component.prototype.render = async function(ctx, db, path, position) {
 	var html = "";
 	var list = this.list;
 	for (var i = 0; i < list.length; i++) {
@@ -88,10 +214,10 @@ Component.prototype.render = async function(page, position, ctx, db) {
 		var cg = o.config;
 		if (cg.state) {
 			var obj = cg.location.getObj({
-				page,
+				path,
 				position
 			});
-			if (obj && obj.onoff) {
+			if (obj && obj.available) {
 				var ret = await o.run('main', ctx, db);
 				if (ret) {
 					html += "\n" + ret;

package/core/com/component/script.js

@@ -3,10 +3,13 @@ module.exports = {
 	 * 组件主函数
 	 * @param {Object} ctx 请求上下文
 	 * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+	 * @param {Object} config 模块配置 
 	 * @return {Object} 执行结果
 	 */
-	async main(ctx, db) {
-		var model = {};
+	async main(ctx, db, config) {
+		var model = {
+			config
+		};
 		return db.tpl.view("./component.html".fullname(__dirname), model);
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -45,7 +45,6 @@
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
     "mm_mysql": "^1.8.9",
-    "mm_os": "^2.6.4",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.8",