文章可设置类型用于不同而类型

app/admin/controller/Category.php

@@ -19,7 +19,7 @@ class Category extends Common
   {
     //
 
-    $list = ModelCategory::getListLevel();
+    $list = ModelCategory::getListLevel('',$this->request->param('type',1));
 
     if($this->request->isAjax()){
       return json_message($list);
@@ -39,7 +39,7 @@ class Category extends Common
   {
     //
 
-    $list = ModelCategory::getListLevel();
+    $list = ModelCategory::getListLevel('',$this->request->param('type',1));
 
     View::assign('list_category',$list);
 
@@ -107,7 +107,7 @@ class Category extends Common
 
     $model_category = ModelCategory::find($id);
     
-    $list = ModelCategory::getListLevel();
+    $list = ModelCategory::getListLevel('',$this->request->param('type',1));
 
     View::assign('list_category',$list);
     View::assign('category',$model_category);

app/admin/controller/Post.php

@@ -23,7 +23,10 @@ class Post extends Common
   {
     //
 
-    $list = ModelPost::with(['categorys.category','tags.tag'])->order('id desc')->paginate();
+    $list = ModelPost::with(['categorys.category','tags.tag'])
+    ->where('type',$this->request->param('type',1))
+    ->order('id desc')
+    ->paginate();
 
     View::assign('list', $list);
 

app/admin/controller/Tag.php

@@ -19,7 +19,9 @@ class Tag extends Common
   {
     //
 
-    $list_tag = ModelTag::order('id desc')->paginate();
+    $list_tag = ModelTag::order('id desc')
+    ->where('type',$this->request->param('type',1))
+    ->paginate();
 
     if($this->request->isAjax()){
       return json_message($list_tag);

app/common/ColumnFormat.php

@@ -46,12 +46,12 @@ class ColumnFormat
         ->setDefault('');
     }
 
-    public static function integerTypeStatus($name)
+    public static function integerTypeStatus($name,$default = 0)
     {
         return Column::make($name,'integer')
         ->setLimit(10)
         ->setSigned(false)
-        ->setDefault(0);
+        ->setDefault($default);
     }
 
     public static function integer($name)

app/model/Category.php

@@ -23,7 +23,7 @@ class Category extends Model
    * @param string $id
    * @return void
    */
-  public static function getListLevel($id = '')
+  public static function getListLevel($id = '',$type = 1)
   {
 
     if(empty(self::$allCategory)){

database/migrations/20200418120809_create_table_post.php

@@ -45,7 +45,7 @@ class CreateTablePost extends Migrator
         $table->addColumn(ColumnFormat::stringUrl('jump_to_url')->setComment('跳转链接'));
         $table->addColumn(ColumnFormat::integerTypeStatus('jump_to_url_status')->setComment('0:不显示,1:显示连接,2:自动跳转'));
         $table->addColumn(ColumnFormat::integer('sort')->setComment('排序,越大越靠前'));
-        $table->addColumn(ColumnFormat::integerTypeStatus('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签'));
+        $table->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'));
         $table->addColumn(Column::make('files','text')->setComment('附件'));
         $table->addColumn(Column::make('pictures','text')->setComment('相册'));
         $table->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称'));

database/migrations/20200418120827_create_table_category.php

@@ -30,20 +30,22 @@ class CreateTableCategory extends Migrator
     public function change()
     {
         $table = $this->table('category')
-        ->setComment('分类表')
+            ->setComment('分类表')
-        ->addColumn(ColumnFormat::stringNormal('title'))
+            ->addColumn(ColumnFormat::stringNormal('title'))
-        ->addColumn(ColumnFormat::timestamp('create_time'))
+            ->addColumn(ColumnFormat::timestamp('create_time'))
-        ->addColumn(ColumnFormat::timestamp('update_time'))
+            ->addColumn(ColumnFormat::timestamp('update_time'))
-        ->addColumn(ColumnFormat::timestamp('delete_time'))
+            ->addColumn(ColumnFormat::timestamp('delete_time'))
-        ->addColumn(ColumnFormat::integer('pid')->setComment('上级id'))
+            ->addColumn(ColumnFormat::integer('pid')->setComment('上级id'))
-        ->addColumn(ColumnFormat::integer('level')->setDefault(1)->setComment('层级'))
+            ->addColumn(ColumnFormat::integer('level')->setDefault(1)->setComment('层级'))
-        ->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称'))
+            ->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称'))
-        ->addColumn(ColumnFormat::stringUrl('title_img')->setComment('附图'))
+            ->addColumn(ColumnFormat::stringUrl('title_img')->setComment('附图'))
-        ->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述'))
+            ->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述'))
-        ->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:不显示,1:显示'))
+            ->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:不显示,1:显示'))
-        ->addIndex('pid')
+            ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
-        ->addIndex('status')
+            ->addIndex('type')
-        ->addIndex('delete_time')
+            ->addIndex('pid')
-        ->create();
+            ->addIndex('status')
+            ->addIndex('delete_time')
+            ->create();
     }
 }

database/migrations/20200418120831_create_table_tag.php

@@ -30,11 +30,13 @@ class CreateTableTag extends Migrator
     public function change()
     {
         $table = $this->table('tag')
-        ->setComment('分类表')
+            ->setComment('分类表')
-        ->addColumn(ColumnFormat::stringNormal('title'))
+            ->addColumn(ColumnFormat::stringNormal('title'))
-        ->addColumn(ColumnFormat::timestamp('create_time'))
+            ->addColumn(ColumnFormat::timestamp('create_time'))
-        ->addColumn(ColumnFormat::timestamp('update_time'))
+            ->addColumn(ColumnFormat::timestamp('update_time'))
-        ->addColumn(ColumnFormat::timestamp('delete_time'))
+            ->addColumn(ColumnFormat::timestamp('delete_time'))
-        ->create();
+            ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
+            ->addIndex('type')
+            ->create();
     }
 }

view/admin/category/index.html

@@ -32,7 +32,7 @@
         </div>
         <div class="main-container">
           <div>
-            <a href="{:url('create')}" class="layui-btn">新增</a>
+            <a href="{:url('create',['type'=>$Request.param.type])}" class="layui-btn">新增</a>
           </div>
           <div>
             <table class="layui-table">
@@ -54,7 +54,7 @@
                   <td>{$vo.tpl_name}</td>
                   <td>
                     <div class="layui-btn-container">
-                      <a class="layui-btn layui-btn-sm" href="{:url('index/Category/read',['id'=>$vo.id])}">查看</a>
+                      <a class="layui-btn layui-btn-sm" href="{:url('index/Category/read',['id'=>$vo.id,'type'=>$Request.param.type])}">查看</a>
                       <a class="layui-btn layui-btn-sm" href="{:url('edit',['id'=>$vo.id])}">编辑</a>
                       <div class="layui-btn layui-btn-sm delete">删除</div>
                     </div>

view/admin/common/left_post.html

@@ -3,13 +3,13 @@
         <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
         <ul class="layui-nav layui-nav-tree" lay-filter="test">
           <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="post">
-              <a class="" href="{:url('Post/index')}">文章管理</a>
+              <a class="" href="{:url('Post/index',['type'=>1])}">文章管理</a>
           </li>
           <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="category">
-              <a class="" href="{:url('Category/index')}">分类管理</a>
+              <a class="" href="{:url('Category/index',['type'=>1])}">分类管理</a>
           </li>
           <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="tag">
-              <a class="" href="{:url('Tag/index')}">标签管理</a>
+              <a class="" href="{:url('Tag/index',['type'=>1])}">标签管理</a>
           </li>
       </ul>
     </div>

view/admin/post/create.html

@@ -366,7 +366,8 @@
       }
       function loadTags() {
         $.get('{:url("Tag/index")}', {
-          page: tagPage
+          page: tagPage,
+          type:'{$Request.param.type}'
         }, function (result) {
           tagPage++;
           result.data.data.forEach(tag => {

view/admin/post/edit.html

@@ -380,7 +380,8 @@
       }
       function loadTags() {
         $.get('{:url("Tag/index")}', {
-          page: tagPage
+          page: tagPage,
+          type:'{$Request.param.type}'
         }, function (result) {
           tagPage++;
           result.data.data.forEach(tag => {
@@ -426,7 +427,9 @@
       }
 
       function loadCategory() {
-        $.get('{:url("Category/index")}', function (result) {
+        $.get('{:url("Category/index")}', {
+          type:'{$Request.param.type}'
+        },function (result) {
 
           result.data.forEach(category => {
             var prefix = '';

view/admin/post/index.html

@@ -32,7 +32,7 @@
         </div>
         <div class="main-container">
           <div>
-            <a href="{:url('create')}" class="layui-btn">添加</a>
+            <a href="{:url('create',['type'=>$Request.param.type])}" class="layui-btn">添加</a>
           </div>
         </div>
         <div>
@@ -74,7 +74,7 @@
                 <td>
                   <div class="layui-btn-container">
                     <a class="layui-btn layui-btn-sm" href="{:url('index/Post/read',['id'=>$vo.id])}">查看</a>
-                    <a class="layui-btn layui-btn-sm" href="{:url('edit',['id'=>$vo.id])}">编辑</a>
+                    <a class="layui-btn layui-btn-sm" href="{:url('edit',['id'=>$vo.id,'type'=>$Request.param.type])}">编辑</a>
                     <div class="layui-btn layui-btn-sm delete">删除</div>
                   </div>
                 </td>

view/admin/tag/index.html

@@ -52,7 +52,7 @@
                   <td> {:str_repeat('|--',$vo.level)} <span class="tag-name">{$vo.title}</span></td>
                   <td>
                     <div class="layui-btn-container">
-                      <div class="layui-btn layui-btn-sm edit" data-href="{:url('update',['id'=>$vo.id])}">编辑</div>
+                      <div class="layui-btn layui-btn-sm edit" data-href="{:url('update',['id'=>$vo.id,'type'=>$Request.param.type])}">编辑</div>
                       <div class="layui-btn layui-btn-sm delete">删除</div>
                     </div>
                   </td>
@@ -82,6 +82,7 @@
       layer.confirm('确定要删除吗？', function () {
         $.get('{:url("delete")}', {
           id: $(item).parents('.item').data('id')
+          
         }, function (result) {
           layer.msg('删除成功');
 
@@ -95,7 +96,8 @@
         title: '请输入标签,空格分隔可添加多个'
       }, function (value, index) {
         $.post('{:url("save")}', {
-          tags: value
+          tags: value,
+          type:'{$Request.param.type}'
         }, function (result) {
           layer.msg('添加成功')
           setTimeout(() => {