实现view的扩展架构；调整think-view依赖；发布新版本

app/common/command/admin/Version.php

@@ -12,18 +12,20 @@ use think\console\Output;
 
 class Version extends Command
 {
-    public const VERSION = 'v2.0.43';
+    public const VERSION = 'v2.0.44';
 
     public const LAYUI_VERSION = '2.8.16';
 
     public const COMMENT = [
-        '调整更新逻辑',
+        '实现view的扩展架构',
+        '调整think-view依赖',
         '发布新版本',
     ];
 
     public const UPDATE_TIPS = [
-        '本次调整了append类型的更新文件列表，',
-        '建议删除以下目录的内容，再重新获取更新，以便初始化相关类，但如果您定制了相关文件，请不要删除，可以参考最新版本的代码调整文件',
+        '本次更新调整了composer依赖，请根据实际情况调整',
+        '删除 think-view',
+        '引入 topthink/think-template-view',
     ];
 
     protected function configure()

composer.json

@@ -22,7 +22,6 @@
         "topthink/framework": "^8.0",
         "topthink/think-orm": "^3.0",
         "topthink/think-multi-app": "^1.0",
-        "topthink/think-view": "^2.0",
         "topthink/think-captcha": "^3.0",
         "guzzlehttp/guzzle": "^7.4",
         "phpoffice/phpspreadsheet": "^1.22",
@@ -32,7 +31,8 @@
         "overtrue/flysystem-cos": "^5.0",
         "iidestiny/flysystem-oss": "^4.0",
         "czproject/git-php": "^4.2",
-        "localheinz/diff": "^1.1"
+        "localheinz/diff": "^1.1",
+        "topthink/think-template": "^3.0"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eabe0953a10d42f429663eb3c42834a5",
+    "content-hash": "cf930a793fc0588ec1f01c7e8bfb5ea6",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -2458,47 +2458,6 @@
                 "source": "https://github.com/top-think/think-template/tree/v3.0.0"
             },
             "time": "2023-02-25T12:11:14+00:00"
-        },
-        {
-            "name": "topthink/think-view",
-            "version": "v2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/think-view.git",
-                "reference": "d2a076011c96d2edd8016703a827fb54b2683c62"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-view/zipball/d2a076011c96d2edd8016703a827fb54b2683c62",
-                "reference": "d2a076011c96d2edd8016703a827fb54b2683c62",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0",
-                "topthink/think-template": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "think\\view\\driver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "liu21st",
-                    "email": "liu21st@gmail.com"
-                }
-            ],
-            "description": "thinkphp template driver",
-            "support": {
-                "issues": "https://github.com/top-think/think-view/issues",
-                "source": "https://github.com/top-think/think-view/tree/v2.0.0"
-            },
-            "time": "2023-02-25T12:18:09+00:00"
         }
     ],
     "packages-dev": [

extend/think/view/driver/Think.php

@@ -0,0 +1,235 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2019 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+declare(strict_types=1);
+
+namespace think\view\driver;
+
+use think\App;
+use think\helper\Str;
+use think\Template;
+use think\template\exception\TemplateNotFoundException;
+
+class Think
+{
+    // 模板引擎实例
+    private $template;
+
+    // 模板引擎参数
+    protected $config = [
+        // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
+        'auto_rule' => 1,
+        // 视图目录名
+        'view_dir_name' => 'view',
+        // 模板起始路径
+        'view_path' => '',
+        // 模板文件后缀
+        'view_suffix' => 'html',
+        // 模板文件名分隔符
+        'view_depr' => DIRECTORY_SEPARATOR,
+        // 是否开启模板编译缓存,设为false则每次都会重新编译
+        'tpl_cache' => true,
+    ];
+
+    public function __construct(private App $app, array $config = [])
+    {
+        $this->config = array_merge($this->config, (array) $config);
+
+        if (empty($this->config['cache_path'])) {
+            $this->config['cache_path'] = $app->getRuntimePath() . 'temp' . DIRECTORY_SEPARATOR;
+        }
+
+        $this->template = new Template($this->config);
+        $this->template->setCache($app->cache);
+        $this->template->extend('$Think', function (array $vars) {
+            $type = strtoupper(trim(array_shift($vars)));
+            $param = implode('.', $vars);
+
+            return match ($type) {
+                'CONST' => strtoupper($param),
+                'CONFIG' => 'config(\'' . $param . '\')',
+                'LANG' => 'lang(\'' . $param . '\')',
+                'NOW' => "date('Y-m-d g:i a',time())",
+                'LDELIM' => '\'' . ltrim($this->getConfig('tpl_begin'), '\\') . '\'',
+                'RDELIM' => '\'' . ltrim($this->getConfig('tpl_end'), '\\') . '\'',
+                default => defined($type) ? $type : '\'\'',
+            };
+        });
+
+        $this->template->extend('$Request', function (array $vars) {
+            // 获取Request请求对象参数
+            $method = array_shift($vars);
+            if (!empty($vars)) {
+                $params = implode('.', $vars);
+                if ('true' != $params) {
+                    $params = '\'' . $params . '\'';
+                }
+            } else {
+                $params = '';
+            }
+
+            return 'app(\'request\')->' . $method . '(' . $params . ')';
+        });
+    }
+
+    /**
+     * 检测是否存在模板文件.
+     * @param  string $template 模板文件或者模板规则
+     * @return bool
+     */
+    public function exists(string $template): bool
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        return is_file($template);
+    }
+
+    /**
+     * 渲染模板文件.
+     * @param  string $template 模板文件
+     * @param  array  $data 模板变量
+     * @return void
+     */
+    public function fetch(string $template, array $data = []): void
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        // 模板不存在 抛出异常
+        if (!is_file($template)) {
+            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+        }
+
+        $this->template->fetch($template, $data);
+    }
+
+    /**
+     * 渲染模板内容.
+     * @param  string $template 模板内容
+     * @param  array  $data 模板变量
+     * @return void
+     */
+    public function display(string $template, array $data = []): void
+    {
+        $this->template->display($template, $data);
+    }
+
+    /**
+     * 自动定位模板文件.
+     * @param  string $template 模板文件规则
+     * @return string
+     */
+    private function parseTemplate(string $template): string
+    {
+        // 分析模板文件规则
+        $request = $this->app['request'];
+
+        // 获取视图根目录
+        if (strpos($template, '@')) {
+            // 跨模块调用
+            list($app, $template) = explode('@', $template);
+        } else {
+            $app = $this->app->http->getName();
+        }
+
+        $view = $this->config['view_dir_name'];
+
+        $app_path = $this->app->getAppPath() . $view . DIRECTORY_SEPARATOR;
+        $base_app_path = $this->app->getRootPath() . 'extend' . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR . $view . DIRECTORY_SEPARATOR;
+        $view_app_path = $this->app->getRootPath() . $view . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+
+        $depr = $this->config['view_depr'];
+
+        if (0 !== strpos($template, '/')) {
+            $template = str_replace(['/', ':'], $depr, $template);
+            $controller = $request->controller();
+
+            if (strpos($controller, '.')) {
+                $pos = strrpos($controller, '.');
+                $controller = substr($controller, 0, $pos) . '.' . Str::snake(substr($controller, $pos + 1));
+            } else {
+                $controller = Str::snake($controller);
+            }
+
+            if ($controller) {
+                if ('' == $template) {
+                    // 如果模板文件名为空 按照默认模板渲染规则定位
+                    if (2 == $this->config['auto_rule']) {
+                        $template = $request->action(true);
+                    } elseif (3 == $this->config['auto_rule']) {
+                        $template = $request->action();
+                    } else {
+                        $template = Str::snake($request->action());
+                    }
+
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                } elseif (false === strpos($template, $depr)) {
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                }
+            }
+        } else {
+            $template = str_replace(['/', ':'], $depr, substr($template, 1));
+        }
+
+        $view_file_path = ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+
+        $view_path = '';
+        $file_path = '';
+        if (is_file($app_path . $view_file_path)) {
+            // 优先app下的view
+            $view_path = $app_path;
+            $file_path = $app_path . $view_file_path;
+        } elseif (is_file($base_app_path . $view_file_path)) {
+            // 查找extend下的view
+            $view_path = $base_app_path;
+            $file_path = $base_app_path . $view_file_path;
+        } else {
+            // 查找根目录下的view
+            $view_path = $view_app_path;
+            $file_path = $view_app_path . $view_file_path;
+        }
+
+        $this->template->view_path = $view_path;
+
+        return $file_path;
+    }
+
+    /**
+     * 配置模板引擎.
+     * @param  array  $config 参数
+     * @return void
+     */
+    public function config(array $config): void
+    {
+        $this->template->config($config);
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 获取模板引擎配置.
+     * @param  string  $name 参数名
+     * @return void|string
+     */
+    public function getConfig(string $name)
+    {
+        return $this->template->getConfig($name);
+    }
+
+    public function __call($method, $params)
+    {
+        return call_user_func_array([$this->template, $method], $params);
+    }
+}