mm_os 2.7.5 → 2.7.6

package/core/com/component/component.html

@@ -1,5 +1,5 @@
-<div class="mm_col ${' ' + @config.layout}">
-	<div id="${config.id}" class="component_demo ${' ' + @config.class}">
+<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>

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

@@ -12,7 +12,7 @@
 	// 分组, 可以将特有的分一个组, 方便用户查询
 	"group": "default",
 	// 分类, 例如: 查询生活类、监测类、便民类
-	"type": "监测",
+	"type": "默认",
 	// 脚本文件, 非必传，可和渲染文件二选一传
 	"func_file": "./component.js",
 	// 渲染, 非必传，可和脚本文件二选一传

package/core/com/component/drive.js

@@ -32,7 +32,7 @@ class Drive extends Item {
 			// 分组, 可以将特有的分一个组, 方便用户查询
 			"group": "default",
 			// 分类, 例如: 查询生活类、监测类、便民类
-			"type": "监测",
+			"type": "默认",
 			// 脚本文件
 			"func_file": "./component.js",
 			// 渲染

package/core/com/component/index.js

@@ -112,24 +112,46 @@ Component.prototype.option_model = function(block) {
 		}
 
 		// 边距
-		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};`;
+		if (o.margin_top) {
+			style += `\n	margin-top: ${o.margin_top};`;
+		}
+		if (o.margin_right) {
+			style += `\n	margin-right: ${o.margin_right};`;
+		}
+		if (o.margin_bottom) {
+			style += `\n	margin-bottom: ${o.margin_bottom};`;
+		}
+		if (o.margin_left) {
+			style += `\n	margin-left: ${o.margin_left};`;
+		}
 
 		// 填充
-		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.padding_top) {
+			style += `\n	padding-top: ${o.padding_top};`;
+		}
+		if (o.padding_right) {
+			style += `\n	padding-right: ${o.padding_right};`;
+		}
+		if (o.padding_bottom) {
+			style += `\n	padding-bottom: ${o.padding_bottom};`;
+		}
+		if (o.padding_left) {
+			style += `\n	padding-left: ${o.padding_left};`;
+		}
+
+		// 圆角
+		if (o.radius_top_right) {
+			style += `\n	border-top-right-radius: ${o.radius_top_right};`;
+		}
+		if (o.radius_top_left) {
+			style += `\n	border-top-left-radius: ${o.radius_top_left};`;
+		}
+		if (o.radius_bottom_right) {
+			style += `\n	border-bottom-right-radius: ${o.radius_bottom_right};`;
+		}
+		if (o.radius_bottom_left) {
+			style += `\n	border-bottom-left-radius: ${o.radius_bottom_left};`;
+		}
 
 		// 背景
 		if (o.bg_url) {
@@ -157,8 +179,30 @@ Component.prototype.option_model = function(block) {
 	} else {
 		style = "";
 	}
-	
+
 	var layout = "";
+	if (block.layout) {
+		var o = block.layout.toJson();
+		if (o.default) {
+			layout += " col-" + o.default;
+		}
+		if (o.pc) {
+			layout += " col-xxl-" + o.pc;
+		}
+		if (o.note) {
+			layout += " col-xl-" + o.note;
+		}
+		if (o.pad) {
+			layout += " col-lg-" + o.pad;
+		}
+		if (o.pad_mini) {
+			layout += " col-sm-" + o.pad_mini;
+		}
+		if (o.phone) {
+			layout += " col-xs-" + o.phone;
+		}
+		layout = layout.trim();
+	}
 
 	var data = (block.data || '[]').toJson();
 	var attr = (block.attr || '{}').toJson();

package/core/com/component/script.js

@@ -10,6 +10,9 @@ module.exports = {
 		var model = {
 			config
 		};
+		if (config.diy) {
+			return db.tpl.render(config.diy, model);
+		}
 		return db.tpl.view("./component.html".fullname(__dirname), model);
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {