diff --git a/module/Cms/Admin/Controller/TemplateController.php b/module/Cms/Admin/Controller/TemplateController.php
index 8193289fb8c8b9064d494f0681798373659a037f..c353da19efcdb33f92056346f09e019dbb04b074 100644
--- a/module/Cms/Admin/Controller/TemplateController.php
+++ b/module/Cms/Admin/Controller/TemplateController.php
@@ -13,8 +13,6 @@ class TemplateController extends Controller
     public function index()
     {
         $viewData = [];
-        $viewData['template'] = modstart_config()->getWithEnv('siteTemplate', 'default');
-        $viewData['provider'] = SiteTemplateProvider::get($viewData['template']);
         $viewData['templateRoot'] = CmsTemplateUtil::templateRoot();
         return view('module::Cms.View.admin.template.index', $viewData);
     }
diff --git a/module/Cms/Traits/CmsSiteTemplateFillDataTrait.php b/module/Cms/Traits/CmsSiteTemplateFillDataTrait.php
index f62bb1b786ad8b5880cf9fb6f94029eb113d85fd..3b261cf45a96a70e6143abb786bb3668bc915e30 100644
--- a/module/Cms/Traits/CmsSiteTemplateFillDataTrait.php
+++ b/module/Cms/Traits/CmsSiteTemplateFillDataTrait.php
@@ -3,6 +3,7 @@
 
 namespace Module\Cms\Traits;
 
+use ModStart\Admin\Auth\AdminPermission;
 use ModStart\Admin\Layout\AdminConfigBuilder;
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Exception\BizException;
@@ -44,6 +45,7 @@ trait CmsSiteTemplateFillDataTrait
         $builder->useDialog();
         $builder->pageTitle('初始化演示数据');
         return $builder->perform(false, function (Form $form) use ($recordFields, $demoData) {
+            AdminPermission::demoPostCheck();
             $data = $form->dataForming();
             $filterRecordFields = [];
             foreach ($recordFields as $field => $title) {
diff --git a/module/Cms/View/admin/template/index.blade.php b/module/Cms/View/admin/template/index.blade.php
index c092731c5bc3f2af36e890dc21361eb16b7a3a45..bba1308c2801533f25b972f65ad7ac635bfb11cf 100644
--- a/module/Cms/View/admin/template/index.blade.php
+++ b/module/Cms/View/admin/template/index.blade.php
@@ -7,10 +7,6 @@
         <i class="iconfont icon-warning"></i>
         请使用专业IDE对模板进行操作。
     </div>
-    <div class="ub-alert ub-alert-warning">
-        <i class="iconfont icon-warning"></i>
-        当前使用的模板是 <b>{{$provider?$provider->title():'[未知]'}}</b>，模板文件位于 <code class="tw-bg-transparent tw-border-0 tw-text-red-400">{{$templateRoot}}</code>。
-    </div>
     <div class="ub-panel">
         <div class="head">
             <div class="title">列表模板</div>
@@ -81,4 +77,74 @@
             </table>
         </div>
     </div>
+    <div class="ub-panel">
+        <div class="head">
+            <div class="title">单页模板</div>
+        </div>
+        <div class="body">
+            <table class="ub-table border">
+                <thead>
+                <tr>
+                    <td width="200">模板</td>
+                    <td>视图使用优先级</td>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach(\Module\Cms\Util\CmsTemplateUtil::allPageTemplates() as $k=>$fs)
+                    <tr>
+                        <td><code>{{$k}}</code></td>
+                        <td>
+                            @foreach($fs as $i=>$f)
+                                <div class="tw-py-2">
+                                    @if($i==0)
+                                        <span><i class="iconfont icon-checked tw-text-lg ub-text-success"></i></span>
+                                        <code>{{$f['_path']}}</code>
+                                    @else
+                                        <span><i class="iconfont icon-checked tw-text-lg ub-text-muted"></i></span>
+                                        <code class="ub-text-muted">{{$f['_path']}}</code>
+                                    @endif
+                                </div>
+                            @endforeach
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="ub-panel">
+        <div class="head">
+            <div class="title">表单模板</div>
+        </div>
+        <div class="body">
+            <table class="ub-table border">
+                <thead>
+                <tr>
+                    <td width="200">模板</td>
+                    <td>视图使用优先级</td>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach(\Module\Cms\Util\CmsTemplateUtil::allFormTemplates() as $k=>$fs)
+                    <tr>
+                        <td><code>{{$k}}</code></td>
+                        <td>
+                            @foreach($fs as $i=>$f)
+                                <div class="tw-py-2">
+                                    @if($i==0)
+                                        <span><i class="iconfont icon-checked tw-text-lg ub-text-success"></i></span>
+                                        <code>{{$f['_path']}}</code>
+                                    @else
+                                        <span><i class="iconfont icon-checked tw-text-lg ub-text-muted"></i></span>
+                                        <code class="ub-text-muted">{{$f['_path']}}</code>
+                                    @endif
+                                </div>
+                            @endforeach
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
 @endsection
diff --git a/module/Cms/View/pc/cms/form/default.blade.php b/module/Cms/View/pc/cms/form/default.blade.php
index a5adf95e004b3a9ba373c56cd5f410080596d685..62f389780993a9e0ff1ae8215496437a218d0bb3 100644
--- a/module/Cms/View/pc/cms/form/default.blade.php
+++ b/module/Cms/View/pc/cms/form/default.blade.php
@@ -42,9 +42,78 @@
                                 <div class="field">
                                     @if($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::TEXT)
                                         <input class="form" type="text" name="{{$customField['name']}}" />
-                                    @endif
-                                    @if($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::TEXTAREA)
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::TEXTAREA)
                                         <textarea class="form" style="height:3rem;" name="{{$customField['name']}}"></textarea>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::RADIO)
+                                        @if(!empty($customField['fieldData']['options']))
+                                            @foreach($customField['fieldData']['options'] as $option)
+                                                <label>
+                                                    <input type="radio" name="{{$customField['name']}}" value="{{$option}}" />
+                                                    {{$option}}
+                                                </label>
+                                            @endforeach
+                                        @endif
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::RADIO)
+                                        @foreach($customField['fieldData']['options'] as $option)
+                                            <label>
+                                                <input type="radio" name="{{$customField['name']}}" value="{{$option}}" />
+                                                {{$option}}
+                                            </label>
+                                        @endforeach
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::SELECT)
+                                        <select name="{{$customField['name']}}">
+                                            @foreach($customField['fieldData']['options'] as $option)
+                                                <option value="{{$option}}">
+                                                    {{$option}}
+                                                </option>
+                                            @endforeach
+                                        </select>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::CHECKBOX)
+                                        @foreach($customField['fieldData']['options'] as $option)
+                                            <label>
+                                                <input type="checkbox" name="{{$customField['name']}}" value="{{$option}}" />
+                                                {{$option}}
+                                            </label>
+                                        @endforeach
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::IMAGE)
+                                        <div class="ub-text-muted">暂不支持</div>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::FILE)
+                                        <div class="ub-text-muted">暂不支持</div>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::DATE)
+                                        <input type="text"
+                                               class="form"
+                                               style="width:12em;"
+                                               name="{{$customField['name']}}"
+                                               id="{{$customField['name']}}Input"
+                                               autocomplete="off" />
+                                        <script>
+                                            layui.use('laydate', function () {
+                                                var laydate = layui.laydate;
+                                                laydate.render({
+                                                    elem: '#{{$customField['name']}}Input'
+                                                });
+                                            });
+                                        </script>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::DATETIME)
+                                        <input type="text"
+                                               class="form"
+                                               style="width:12em;"
+                                               name="{{$customField['name']}}"
+                                               id="{{$customField['name']}}Input"
+                                               autocomplete="off" />
+                                        <script>
+                                            layui.use('laydate', function () {
+                                                var laydate = layui.laydate;
+                                                laydate.render({
+                                                    elem: '#{{$customField['name']}}Input',
+                                                    type: 'datetime'
+                                                });
+                                            });
+                                        </script>
+                                    @elseif($customField['fieldType']==\Module\Cms\Type\CmsModelFieldType::RICH_TEXT)
+                                        <div class="ub-text-muted">暂不支持</div>
+                                    @else
+                                        <pre>{{json_encode($customField,JSON_PRETTY_PRINT)}}</pre>
                                     @endif
                                 </div>
                             </div>
diff --git a/module/Cms/Web/Controller/FormController.php b/module/Cms/Web/Controller/FormController.php
index d2366245bc201c7ed7109a1a1550786450f6b13a..681b2c0f3f80ab62ffe166df19c1790f0bcfa81d 100644
--- a/module/Cms/Web/Controller/FormController.php
+++ b/module/Cms/Web/Controller/FormController.php
@@ -20,7 +20,7 @@ class FormController extends BaseCatController
         $view = $this->getView($data, 'formTemplate');
         $viewData = $data;
         $viewData['model'] = $data['cat']['_model'];
-        return $viewData;
+        // return $viewData;
         return $this->view('cms.form.' . CmsTemplateUtil::toBladeView($view), $viewData);
     }
 
diff --git a/vendor/modstart/modstart/views/core/field/date.blade.php b/vendor/modstart/modstart/views/core/field/date.blade.php
index 8a34ab72b7be3cbe89cbf3bc1f48205db40ca573..fa4e214843383304e479dc1ba4cadcf19b315737 100644
--- a/vendor/modstart/modstart/views/core/field/date.blade.php
+++ b/vendor/modstart/modstart/views/core/field/date.blade.php
@@ -10,7 +10,6 @@
                style="width:12em;"
                name="{{$name}}"
                id="{{$id}}Input"
-               autocomplete="off"
                placeholder="{{$placeholder}}"
                autocomplete="off"
                value="{{$value}}" />