!195 更新标签

Merge pull request !195 from 灰色DT/4.7.2

doc/4.7.1-to-4.7.2-mysql.sql

@@ -3,3 +3,5 @@ UPDATE `model` SET `model_icon` = 'icon-huiyuanzhongxin' WHERE `model_id` = 22;
 UPDATE `model` SET `model_icon` = 'icon-quanxianguanli' WHERE `model_id` = 23;
 UPDATE `model` SET `model_icon` = 'icon-xitongguanli' WHERE `model_id` = 84;
 UPDATE `model` SET `model_icon` = 'icon-zidingyiguanli' WHERE `model_id` = 104;
+
+UPDATE `mdiy_tag_sql` SET `tag_sql`='<#assign _typeid=\"\"/>\r\n<#if column?? && column.categoryId gt 0>\r\n	<#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n	<#assign  _typeid=\"${typeid}\">\r\n</#if>\r\nselect \r\n	@rownum := @rownum + 1 AS typeindex,\r\n	category_id as id,\r\n	category_id as typeid,\r\n	category_title as typetitle,\r\n	(select count(*) from category c where c.category_categoryid=typeid and c.del=0) as childsize,\r\n	<#--返回父id集合-->\r\n	category_parent_id as pids,\r\n	<#--栏目选中的样式-->\r\n	IF(<#if column?? && column.categoryId gt 0>${column.categoryId}<#else>${_typeid}</#if> = category_id ,\"${class!\'\'}\",\"\") as class,\r\n	<#--动态链接-->\r\n	<#if isDo?? && isDo>\r\n	CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n	<#else>\r\n	CONCAT(column_path,\"/index.html\") as typelink,\r\n	</#if>\r\n	column_keyword as typekeyword,\r\n	column_diy_url as typeurl,\r\n	column_flag as flag,\r\n	column_descrip as typedescrip,\r\n	category_smallimg as typelitpic  \r\n	from (SELECT @rownum := 0) r,category  \r\n	LEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n	category.del=0 \r\n	<#--根据站点编号查询-->\r\n	<#if appId?? >\r\n		and category.category_appid=${appId}\r\n	</#if>\r\n	<#--根据模块编号查询分类-->\r\n	<#if column?? && column.categoryModelId?has_content>\r\n		and category_modelid=${column.categoryModelId}\r\n	</#if>\r\n	<#--栏目属性-->\r\n	<#if flag?? && flag != \'\'>\r\n		and bc.column_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n	</#if>\r\n	<#if noflag?? && noflag != \'\'>\r\n		and bc.column_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n	</#if>\r\n<#if type?has_content>\r\n	<#--顶级栏目（单个）-->\r\n	<#if type==\"top\">\r\n		and category_id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from category where category_id = ${_typeid})\r\n	<#elseif type==\"nav\">\r\n		and(category_categoryid=0 or category_categoryid is null)\r\n	<#--同级栏目（多个）-->\r\n	<#elseif type==\"level\">\r\n		and\r\n		<#if _typeid?has_content>\r\n		 category_categoryid=(select category_categoryid from category where category_id=${_typeid})\r\n		<#else>\r\n		 1=1\r\n		</#if>\r\n  	<#--当前栏目（单个）-->\r\n	<#elseif type==\"self\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n		  category_id=${_typeid}\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	<#--当前栏目的所属栏目（多个）-->\r\n	<#elseif type==\"path\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   category_id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},</#if>${_typeid})\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n	<#--子栏目（多个）-->\r\n	<#elseif type==\"son\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		  category_categoryid=${_typeid}\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n		 <#--上一级栏目没有则取当前栏目（单个）-->\r\n	<#elseif type==\"parent\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   <#if column?? && column.categoryCategoryId?? && column.categoryCategoryId!=0>\r\n				category_id=${column.categoryCategoryId}\r\n			 <#else>\r\n			  category_id=${_typeid}\r\n			 </#if>\r\n		 <#else>\r\n		  1=1\r\n	</#if>\r\n	<#--子栏目或同级栏目（多个）-->\r\n	<#elseif type==\"sonOrLevel\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n	 	 category_categoryid= if((SELECT count(*) FROM category\r\n		 LEFT JOIN basic_column bc ON bc.column_category_id = category.category_id \r\n		 WHERE category_categoryid=${_typeid})>0,${_typeid},(select category_categoryid from category where category_id=${_typeid}))\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	</#if>\r\n<#else> <#--默认son-->\r\n	 and\r\n	<#if _typeid?has_content>\r\n	 category_categoryid=${_typeid}\r\n	<#else>\r\n	 (category_categoryid=0 or category_categoryid is null)\r\n	</#if>\r\n</#if>\r\n<#if order?? >\r\n      <#if order==\"desc\"> desc</#if>\r\n      <#if order==\"asc\"> asc</#if>\r\n  </#if>' WHERE (`id`='6')
\ No newline at end of file

src/main/webapp/static/ms-admin/4.7.2/css/app.css

@@ -39,6 +39,7 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
 }
 
 .ms-select{
+
     display: block;
 }
 
@@ -46,6 +47,7 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
     width: 100% !important;
 }
 #index .ms-search{
+    padding: 20px 0;
     background: #fff;
 }
 #index .ms-search .ms-search-footer{