Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ModStart
ModStartCMS
提交
1b54dac9
ModStartCMS
项目概览
ModStart
/
ModStartCMS
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ModStartCMS
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b54dac9
编写于
1月 08, 2022
作者:
ModStart
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
develop
上级
efff2c40
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
71 addition
and
16 deletion
+71
-16
module/Cms/Admin/Controller/CatController.php
module/Cms/Admin/Controller/CatController.php
+15
-0
module/Cms/Admin/Controller/ContentController.php
module/Cms/Admin/Controller/ContentController.php
+7
-0
module/Cms/Type/CatUrlMode.php
module/Cms/Type/CatUrlMode.php
+16
-0
module/Cms/Type/ContentUrlMode.php
module/Cms/Type/ContentUrlMode.php
+3
-0
module/Cms/Util/CmsCatUtil.php
module/Cms/Util/CmsCatUtil.php
+2
-1
module/Cms/Util/CmsRouteUtil.php
module/Cms/Util/CmsRouteUtil.php
+14
-0
module/Cms/Util/UrlModeUtil.php
module/Cms/Util/UrlModeUtil.php
+0
-10
module/Cms/View/pc/cms/list/news.blade.php
module/Cms/View/pc/cms/list/news.blade.php
+3
-3
module/Cms/Web/Controller/ListController.php
module/Cms/Web/Controller/ListController.php
+10
-1
module/Cms/Web/routes.php
module/Cms/Web/routes.php
+1
-1
未找到文件。
module/Cms/Admin/Controller/CatController.php
浏览文件 @
1b54dac9
...
...
@@ -7,9 +7,12 @@ namespace Module\Cms\Admin\Controller;
use
Illuminate\Routing\Controller
;
use
ModStart\Admin\Concern\HasAdminQuickCRUD
;
use
ModStart\Admin\Layout\AdminCRUDBuilder
;
use
ModStart\Field\AbstractField
;
use
ModStart\Field\Type\FieldRenderMode
;
use
ModStart\Form\Form
;
use
ModStart\Grid\GridFilter
;
use
ModStart\Support\Concern\HasFields
;
use
Module\Cms\Type\CatUrlMode
;
use
Module\Cms\Type\CmsMode
;
use
Module\Cms\Util\CmsCatUtil
;
use
Module\Cms\Util\CmsModelUtil
;
...
...
@@ -28,8 +31,20 @@ class CatController extends Controller
$builder
->
id
(
'id'
,
'ID'
);
$builder
->
text
(
'title'
,
'名称'
)
->
required
()
->
width
(
200
);
$builder
->
text
(
'url'
,
'URL'
)
->
required
()
->
hookRendering
(
function
(
AbstractField
$field
,
$item
,
$index
)
{
if
(
$field
->
renderMode
()
==
FieldRenderMode
::
GRID
)
{
return
CatUrlMode
::
url
(
$item
->
toArray
());
}
return
null
;
})
->
help
(
'字母数字下划线,如,demo 可以通过URL访问 /demo 访问'
)
->
ruleUnique
(
'cms_cat'
)
->
ruleRegex
(
'/^[a-zA-Z0-9_\\/]+$/'
);
if
(
modstart_config
(
'CmsUrlMix_Enable'
,
false
))
{
$builder
->
text
(
'fullUrl'
,
'[增强]全路径'
)
->
listable
(
false
)
->
help
(
'如 product/list'
);
$builder
->
text
(
'pageFullUrl'
,
'[增强]全路径分页'
)
->
listable
(
false
)
->
help
(
'分页请使用 {page} 占位,如 product/list/{page},product/list?page={page}'
);
}
$modelField
=
$builder
->
select
(
'modelId'
,
'模型'
)
->
optionModel
(
'cms_model'
,
'id'
,
'title'
)
->
required
();
$modelModeMap
=
CmsModelUtil
::
listModeMap
();
$modelField
->
when
(
'in'
,
$modelModeMap
[
CmsMode
::
LIST_DETAIL
],
function
(
$builder
)
{
...
...
module/Cms/Admin/Controller/ContentController.php
浏览文件 @
1b54dac9
...
...
@@ -190,6 +190,10 @@ class ContentController extends Controller
->
ruleRegex
(
'/^[a-z0-9_]*[a-z][a-z0-9_]*$/'
)
->
help
(
'数字字母下划线组成,不能是纯数字,可以通过 <code>a/别名</code> 别名访问内容'
);
}
if
(
modstart_config
(
'CmsUrlMix_Enable'
,
false
))
{
$form
->
text
(
'fullUrl'
,
'[增强]全路径'
)
->
listable
(
false
)
->
help
(
'如 product/view/1.html'
);
}
$form
->
richHtml
(
'content'
,
'内容'
);
if
(
in_array
(
$this
->
model
[
'mode'
],
[
CmsMode
::
LIST_DETAIL
,
CmsMode
::
PAGE
]))
{
$form
->
textarea
(
'summary'
,
'摘要'
);
...
...
@@ -215,6 +219,9 @@ class ContentController extends Controller
'catId'
,
'title'
,
'alias'
,
'title'
,
'summary'
,
'cover'
,
'postTime'
,
'status'
,
'isRecommend'
,
'isTop'
,
'tags'
,
'author'
,
'source'
,
]);
if
(
modstart_config
(
'CmsUrlMix_Enable'
,
false
))
{
$recordValue
[
'fullUrl'
]
=
(
empty
(
$data
[
'fullUrl'
])
?
null
:
$data
[
'fullUrl'
]);
}
if
(
empty
(
$recordValue
[
'alias'
]))
{
$recordValue
[
'alias'
]
=
null
;
}
...
...
module/Cms/Type/CatUrlMode.php
0 → 100644
浏览文件 @
1b54dac9
<?php
namespace
Module\Cms\Type
;
class
CatUrlMode
{
public
static
function
url
(
$cat
)
{
if
(
!
empty
(
$cat
[
'fullUrl'
]))
{
return
modstart_web_url
(
$cat
[
'fullUrl'
]);
}
return
modstart_web_url
(
$cat
[
'url'
]);
}
}
\ No newline at end of file
module/Cms/Type/ContentUrlMode.php
浏览文件 @
1b54dac9
...
...
@@ -22,6 +22,9 @@ class ContentUrlMode implements BaseType
public
static
function
url
(
$content
)
{
if
(
!
empty
(
$content
[
'fullUrl'
]))
{
return
modstart_web_url
(
$content
[
'fullUrl'
]);
}
if
(
empty
(
$content
[
'alias'
]))
{
$content
[
'alias'
]
=
$content
[
'id'
];
}
...
...
module/Cms/Util/CmsCatUtil.php
浏览文件 @
1b54dac9
...
...
@@ -7,6 +7,7 @@ namespace Module\Cms\Util;
use
Illuminate\Support\Facades\Cache
;
use
ModStart\Core\Dao\ModelUtil
;
use
ModStart\Core\Util\TreeUtil
;
use
Module\Cms\Type\CatUrlMode
;
/**
* Class CmsCatUtil
...
...
@@ -36,7 +37,7 @@ class CmsCatUtil
ModelUtil
::
decodeRecordsJson
(
$records
,
[
'visitMemberGroups'
,
'visitMemberVips'
]);
foreach
(
$records
as
$k
=>
$v
)
{
$records
[
$k
][
'_model'
]
=
CmsModelUtil
::
get
(
$v
[
'modelId'
]);
$records
[
$k
][
'_url'
]
=
modstart_web_url
(
$v
[
'url'
]
);
$records
[
$k
][
'_url'
]
=
CatUrlMode
::
url
(
$v
);
}
return
$records
;
});
...
...
module/Cms/Util/CmsRouteUtil.php
0 → 100644
浏览文件 @
1b54dac9
<?php
namespace
Module\Cms\Util
;
class
CmsRouteUtil
{
public
static
function
rewrite
(
$url
,
$param
=
[],
$method
=
'GET'
)
{
$request
=
\
Illuminate\Http\Request
::
create
(
$url
,
$method
,
$param
);
return
app
()
->
handle
(
$request
);
}
}
\ No newline at end of file
module/Cms/Util/UrlModeUtil.php
已删除
100644 → 0
浏览文件 @
efff2c40
<?php
namespace
Module\Cms\Util
;
class
UrlModeUtil
{
}
\ No newline at end of file
module/Cms/View/pc/cms/list/news.blade.php
浏览文件 @
1b54dac9
...
...
@@ -24,7 +24,7 @@
<
a
href
=
"
{
{modstart_web_url('')}
}
"
>
首页
</
a
>
@
foreach
(
$catChain
as
$i
=>
$c
)
<
a
class
=
"@if(count(
$catChain
)==
$i
+1) active @endif"
href
=
"
{
{
modstart_web_url($c['url'])
}}">{{$c['title']}
}
</a>
href
=
"
{
{
$c['_url']
}}">{{$c['title']}
}
</a>
@endforeach
</div>
</div>
...
...
@@ -36,10 +36,10 @@
<div class="
ub
-
menu
simple
margin
-
bottom
">
<a class="
title
@
if
(
$catRoot
[
'url'
]
==
\
ModStart\Core\Input\Request
::
path
())
active
@
endif
"
href="
{{
modstart_web_url
(
$catRoot
[
'url'
])
}}
">全部</a>
href="
{{
$catRoot
[
'_url'
]
}}
">全部</a>
@foreach(
$catRootChildren
as
$c
)
<a class="
title
@
if
(
\
ModStart\Core\Input\Request
::
path
()
==
$c
[
'url'
])
active
@
endif
"
href="
{{
modstart_web_url
(
$c
[
'url'
])
}}
">
{
{$c['title']}
}
</a>
href="
{{
$c
[
'_url'
]
}}
">
{
{$c['title']}
}
</a>
@endforeach
</div>
</div>
...
...
module/Cms/Web/Controller/ListController.php
浏览文件 @
1b54dac9
...
...
@@ -20,13 +20,22 @@ class ListController extends BaseCatController
$input
=
InputPackage
::
buildFromInput
();
$page
=
$input
->
getPage
();
$pageSize
=
$input
->
getPageSize
(
'pageSize'
);
$pageSize
=
2
;
$paginateData
=
CmsContentUtil
::
paginateCat
(
$cat
[
'id'
],
$page
,
$pageSize
);
$viewData
=
$data
;
$viewData
[
'page'
]
=
$page
;
$viewData
[
'pageSize'
]
=
$pageSize
;
$viewData
[
'records'
]
=
$paginateData
[
'records'
];
$viewData
[
'pageHtml'
]
=
PageHtmlUtil
::
render
(
$paginateData
[
'total'
],
$pageSize
,
$page
,
'?page={page}'
);
$pageTemplate
=
'?page={page}'
;
if
(
!
empty
(
$cat
[
'pageFullUrl'
]))
{
$pageTemplate
=
modstart_web_url
(
$cat
[
'pageFullUrl'
]);
}
$viewData
[
'pageHtml'
]
=
PageHtmlUtil
::
render
(
$paginateData
[
'total'
],
$pageSize
,
$page
,
$pageTemplate
);
// return $viewData;
return
$this
->
view
(
'cms.list.'
.
CmsTemplateUtil
::
toBladeView
(
$view
),
$viewData
);
}
}
module/Cms/Web/routes.php
浏览文件 @
1b54dac9
...
...
@@ -14,7 +14,7 @@ $router->group([
$router
->
match
([
'get'
,
'post'
],
'a/{alias_url}'
,
'DetailController@index'
);
$router
->
match
([
'get'
,
'post'
],
'c/{id}'
,
'ListController@index'
);
$router
->
match
([
'get'
,
'post'
],
'search'
,
'SearchController@index'
);
$router
->
match
([
'get'
,
'post'
],
'search'
,
'SearchController@index'
)
->
name
(
'aaaaa'
)
;
$cats
=
CmsCatUtil
::
allSafelyHavingUrl
();
foreach
(
$cats
as
$item
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录