develop

module/Cms/Docs/release/1.9.1.md

+详情页主题模板切换不生效
+
+---
+
+- 修复：修复CMS详情页主题模板切换不生效（感谢yurenzhen的反馈）
+ 

module/Cms/Web/Controller/DetailController.php

@@ -26,9 +26,9 @@ class DetailController extends ModuleBaseController
         $catRootChildren = CmsCatUtil::children($catRoot['id']);
         $paginateData = CmsContentUtil::paginateCat($catRoot['id'], 1, 10);
         $latestRecords = $paginateData['records'];
-        $view = $cat['listTemplate'];
+        $view = $cat['detailTemplate'];
         if (empty($view)) {
-            $view = $data['model']['listTemplate'];
+            $view = $data['model']['detailTemplate'];
         }
         BizException::throwsIfEmpty('模板未找到', $view);
         $viewData = [];

module/Cms/config.json

@@ -6,7 +6,7 @@
     "Member",
     "Banner:>=1.1.0"
   ],
-  "version": "1.9.0",
+  "version": "1.9.1",
   "modstartVersion": ">=1.4.0",
   "author": "ModStart",
   "description": "提供通用的动态模型内容管理系统",

module/Member/Docs/release/2.0.0.md

+页面SEO优化，用户后台优化
+
+---
 
 - 优化：全部页面SEO显示优化
 - 优化：演示账号显示功能优化

public/asset/vendor/ueditor/themes/iframe.css

-body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.4em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
+body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file

vendor/modstart/modstart/asset/vendor/ueditor/themes/iframe.css

-body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.4em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
+body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file

vendor/modstart/modstart/resources/asset/src/sui/bricks/component/html/html.less

@@ -66,7 +66,8 @@
     tab-size: 4;
     hyphens: none;
     text-align: left;
-    line-height: 1.4em;
+    line-height: 1.8em;
+    padding: 1em;
   }
 
   table {

vendor/modstart/modstart/src/Field/Concern/CanCascadeFields.php

@@ -150,14 +150,16 @@ trait CanCascadeFields
    };
    var cascadeGroups = $cascadeGroups;
    var cascadeChange = function(value){
+       cascadeGroups.forEach(function (group) {
+           var groupDom = $('#{$this->id()}_group_' + group.index);
+           groupDom.addClass('cascade-group-hide');
+       });
        cascadeGroups.forEach(function (group) {
            var groupDom = $('#{$this->id()}_group_' + group.index);
            var pass = compare(value, group.value, group.operator);
            // console.log(value, group.operator, group.value, pass);
            if (pass) {
                groupDom.removeClass('cascade-group-hide');
-           } else {
-               groupDom.addClass('cascade-group-hide');
            }
         });
    };

vendor/modstart/modstart/views/core/grid/index.blade.php

@@ -141,6 +141,7 @@
                         curr: data.page,
                         count: data.total,
                         limit: data.pageSize,
+                        limits: [10,20,50,100,500,1000],
                         layout: [ 'limit', 'prev', 'page', 'next','count',],
                         jump: function (obj, first) {
                             if (!first) {