From ac6f656aefb747aa497769ceba54b0bc554b7d4a Mon Sep 17 00:00:00 2001
From: funadmin <994927909@qq.com>
Date: Sat, 16 Mar 2024 21:54:25 +0800
Subject: [PATCH] v5.5

---
 src/addons/Controller.php        |   2 +-
 src/addons/Service.php           |   4 +-
 src/builder/FormBuilder.php      |  15 ++-
 src/curd/Install.php             |   7 +-
 src/curd/service/CurdService.php | 203 ++++++++++++++++---------------
 src/curd/tpl/addon/plugin.tpl    |  19 ---
 src/curd/tpl/join.tpl            |   2 +-
 src/helper/FormHelper.php        | 136 ++++++++++++++-------
 8 files changed, 218 insertions(+), 170 deletions(-)

diff --git a/src/addons/Controller.php b/src/addons/Controller.php
index c44afb9..ad0c9b0 100644
--- a/src/addons/Controller.php
+++ b/src/addons/Controller.php
@@ -58,7 +58,7 @@ public function __construct(App $app)
         $this->action = $this->request->action();
         $this->addon =  $this->addon ? call_user_func($filter,  $this->addon) : app()->http->getName();
         $this->addon_path = $app->addons->getAddonsPath() . $this->addon;
-        $this->controller = $controller ? call_user_func($filter, $controller) : 'index';
+        $this->controller = $this->controller ? call_user_func($filter, $this->controller) : 'index';
         $this->action = $this->action ? call_user_func($filter, $this->action) : 'index';
         // 父类的调用必须放在设置模板路径之后
         $this->_initialize();
diff --git a/src/addons/Service.php b/src/addons/Service.php
index 753b394..bb0f9c7 100644
--- a/src/addons/Service.php
+++ b/src/addons/Service.php
@@ -178,7 +178,8 @@ private function loadEvent()
                     $values = (array)$values;
                 }
                 $hooks[$key] = array_filter(array_map(function ($v) use ($key) {
-                    return [get_addons_class($v),$key];
+                    $addon = get_addons_class($v);
+                    return $addon?[$addon,$key]:[];
                 }, $values));
             }
             Cache::set('hooks', $hooks);
@@ -192,7 +193,6 @@ private function loadEvent()
         }
     }
 
-
     /**
      * 自动载入钩子插件
      * @return bool
diff --git a/src/builder/FormBuilder.php b/src/builder/FormBuilder.php
index 087c5b5..f305930 100644
--- a/src/builder/FormBuilder.php
+++ b/src/builder/FormBuilder.php
@@ -504,7 +504,16 @@ public  function closebtn($reset = true, $options = [])
         return $this;
     }
 
-
+    /**
+     * @param bool $reset
+     * @param array $options
+     * @return string
+     */
+    public  function close($reset = true, $options = [])
+    {
+        $this->formHtml[] = Form::closebtn($reset,$options);
+        return $this;
+    }
     /**
      * @param bool $reset
      * @param array $options
@@ -559,8 +568,8 @@ public function script(string $name,$options=[]){
      */
     public function extrajs($js,$options=[]){
         $reg = '/<script.*?>([\s\S]*?)<\/script>/im';
-        preg_match($reg, $script,$match);
-        $this->extraJs = empty($match)?$script:$match[1];
+        preg_match($reg, $js,$match);
+        $this->extraJs = empty($match)?$js:$match[1];
         return $this;
     }
     public function style(string $name,$options=[]){
diff --git a/src/curd/Install.php b/src/curd/Install.php
index 582433f..42b9ad4 100644
--- a/src/curd/Install.php
+++ b/src/curd/Install.php
@@ -5,7 +5,7 @@
  * 版权所有 2017-2028 FunAdmin，并保留所有权利。
  * 网站地址: https://www.FunAdmin.com
  * ----------------------------------------------------------------------------
- * 采用最新Thinkphp6实现
+ * 采用最新Thinkphp8实现
  * ============================================================================
  * Author: yuege
  * Date: 2020/9/21
@@ -30,7 +30,7 @@ class Install extends Command
     //sql 文件
     protected $sqlFile = '';
     //mysql版本
-    protected $mysqlVersion = '5.6';
+    protected $mysqlVersion = '5.7';
     //database模板
     protected $databaseTpl = '';
 
@@ -160,10 +160,11 @@ protected function install($input): void{
             $db["username"] = $env['DATABASE']['USERNAME']  ;
             $db["password"] = $env['DATABASE']['PASSWORD']  ;
         }
+        $prefix = env('DB_PREFIX');
         $db["host"] = strtolower($this->output->ask($this->input, '👉 Set mysql hostname default(127.0.01)'))?:$db["host"];
         $db["port"] = strtolower($this->output->ask($this->input, '👉 Set mysql hostport default (3306)'))?:$db["port"] ;
         $db['database'] = strtolower($this->output->ask($this->input, '👉 Set mysql database default (funadmin)'))?:$db["database"];
-        $db['prefix'] = strtolower($this->output->ask($this->input, '👉 Set mysql table prefix default (fun_)'))?:$db["prefix"];
+        $db['prefix'] = strtolower($this->output->ask($this->input, "👉 Set mysql table prefix default( $prefix )"))?:$db["prefix"];
         $db["charset"] = strtolower($this->output->ask($this->input, '👉 Set mysql table charset default (utf8mb4)'))?:$db["charset"];
         $db['username'] = strtolower($this->output->ask($this->input, '👉 Set mysql username default (root)'))?:$db["username"];
         $db['password'] = strtolower($this->output->ask($this->input, '👉 Set mysql password required'))?: $db["password"];
diff --git a/src/curd/service/CurdService.php b/src/curd/service/CurdService.php
index 7db7794..bf5c3a9 100644
--- a/src/curd/service/CurdService.php
+++ b/src/curd/service/CurdService.php
@@ -5,7 +5,7 @@
  * 版权所有 2017-2028 FunAdmin，并保留所有权利。
  * 网站地址: http://www.FunAdmin.com
  * ----------------------------------------------------------------------------
- * 采用最新Thinkphp6实现
+ * 采用最新Thinkphp8实现
  * ============================================================================
  * Author: yuege
  * Date: 2017/8/2
@@ -25,6 +25,7 @@ class CurdService
     protected $config = [
         'keepField' => ['admin_id', 'member_id'],//保留字段
         'fields' => [],//显示的字段
+        'formFields' => [],//添加的字段
         'ignoreFields' => ['create_time', 'status', 'update_time', 'delete_time'],//忽略字段
         'tagsSuffix' => ['tags', 'tag'],//识别为tag类型
         'urlSuffix' => ['url', 'urls'],//识别为url类型
@@ -48,7 +49,7 @@ class CurdService
      * 表前缀
      * @var string
      */
-    protected $tablePrefix = 'fun_';
+    protected $tablePrefix = '';
     /**
      * 数据库名
      * @var string
@@ -85,9 +86,9 @@ class CurdService
     protected $joinName;
     protected $joinModel;
     protected $joinTable;
-    protected $joinForeignKey;
+    protected $joinForeignKey = [];
     protected $primaryKey = 'id';
-    protected $joinPrimaryKey;
+    protected $joinPrimaryKey = [] ;
     protected $selectFields;
     protected $jsCols;
     protected $jsColsRecycle;
@@ -109,11 +110,12 @@ class CurdService
 
     public function __construct(array $config)
     {
+        $config['driver'] = $config['driver']??$this->driver;
         $this->tablePrefix = config('database.connections.' . $config['driver'] . '.prefix');
         $this->database = Config::get('database.connections' . '.' . $config['driver'] . '.database');
         $this->rootPath = root_path();
         $this->dir = __DIR__;
-        $this->tplPath = $this->rootPath . 'vendor' . '/' . 'funadmin' . '/' . 'fun-addons' . '/' . 'src' . '/' . 'curd' . '/' . 'tpl' . '/';
+        $this->tplPath = $this->rootPath . 'vendor/funadmin/fun-addons/src/curd/tpl/';
         $this->setParam($config);
         $this->driver = $config['driver'];
         return $this;
@@ -159,36 +161,36 @@ public function setParam($config)
      */
     protected function setArg()
     {
-        $this->table = $this->config['table'];
+        $this->table = !empty($this->config['table'])?$this->config['table']:'';
         $this->table = str_replace($this->tablePrefix, '', $this->table);
-        $this->addon = isset($this->config['addon']) && $this->config['addon'] ? $this->config['addon'] : '';
-        $this->force = $this->config['force'];
-        $this->app = $this->config['app'];
-        $this->title = $this->config['title']?:$this->addon;
-        $this->description = $this->config['description']?:$this->addon;
-        $this->requires = $this->config['requires']?:3.0;
-        $this->author = $this->config['author']?:$this->addon;
-        $this->version = $this->config['version']?:1.0;
-        $this->jump = $this->config['jump'];
-        $this->limit = $this->config['limit'] ?: 15;
-        $this->page = ($this->config['page']==null ||  $this->config['page'] == 1) ? "true" : 'false';
-        $this->joinTable = $this->config['joinTable'];
+        $this->addon = $this->config['addon']?? '';
+        $this->force = $this->config['force']??$this->force;
+        $this->app = $this->config['app']??$this->app;
+        $this->title = $this->config['title']??$this->addon;
+        $this->description = $this->config['description']??$this->addon;
+        $this->requires = $this->config['requires']??'3.0';
+        $this->author = $this->config['author']??$this->addon;
+        $this->version = $this->config['version']??'1.0';
+        $this->jump = $this->config['jump']??$this->jump;
+        $this->limit = $this->config['limit']?? 15;
+        $this->page = (!isset($this->config['page']) ||  $this->config['page']==null ||  $this->config['page'] == 1 ) ? "true" : 'false';
+        $this->joinTable = $this->config['joinTable']??[];
         foreach ($this->joinTable as $k => $v) {
             $this->joinTable[$k] = str_replace($this->tablePrefix, '', $v);
         }
-        $this->joinName = $this->config['joinName'] ?: $this->joinTable;
-        $this->joinModel = $this->config['joinModel'] ?: $this->joinTable;
-        $this->joinMethod = $this->config['joinMethod'];
-        $this->joinForeignKey = $this->config['joinForeignKey'];
-        if ($this->joinForeignKey && count($this->joinForeignKey) == 1 && strpos($this->joinForeignKey[0], ',')) {
+        $this->joinName = empty($this->config['joinName']) ? $this->joinTable:$this->config['joinName'];
+        $this->joinModel = empty( $this->config['joinModel']) ? $this->joinTable: $this->config['joinModel'];
+        $this->joinMethod = $this->config['joinMethod']??'';
+        $this->joinForeignKey = $this->config['joinForeignKey']??[];
+        if (!empty($this->joinForeignKey) && count($this->joinForeignKey) == 1 && strpos($this->joinForeignKey[0], ',')) {
             $this->joinForeignKey = array_filter(explode(',', ($this->joinForeignKey[0])));
         }
-        $this->joinPrimaryKey = $this->config['joinPrimaryKey'];
-        if ($this->joinForeignKey && count($this->joinPrimaryKey) == 1 && strpos($this->joinPrimaryKey[0], ',')) {
+        $this->joinPrimaryKey = $this->config['joinPrimaryKey']??[];
+        if (!empty($this->joinPrimaryKey) && count($this->joinPrimaryKey) == 1 && strpos($this->joinPrimaryKey[0], ',')) {
             $this->joinPrimaryKey = array_filter(explode(',', ($this->joinPrimaryKey[0])));
         }
-        $this->selectFields = $this->config['selectFields'];
-        $controllerStr = $this->config['controller'] ?: Str::studly($this->table);
+        $this->selectFields = !empty($this->config['selectFields'])?$this->config['selectFields']:'';
+        $controllerStr = !empty($this->config['controller']) ? $this->config['controller'] : Str::studly($this->table);
         $controllerArr = explode('/', $controllerStr);
         foreach ($controllerArr as $k => &$v) {
             $v = ucfirst(Str::studly($v));
@@ -196,7 +198,7 @@ protected function setArg()
         unset($v);
         $this->controllerName = array_pop($controllerArr);
         $this->controllerArr = $controllerArr;
-        $modelStr = $this->config['model'] ?: Str::studly($this->table);
+        $modelStr = !empty($this->config['model']) ?$this->config['model']: Str::studly($this->table);
         $modelArr = explode('/', $modelStr);
         foreach ($modelArr as $k => &$v) {
             $v = ucfirst(Str::studly($v));
@@ -205,7 +207,7 @@ protected function setArg()
         $this->modelName = array_pop($modelArr);
         $modelArr ? $modelArr[0] = Str::lower($modelArr[0]) : '';
         $this->modelArr = $modelArr;
-        $this->validateName = $this->config['validate'] ?: $this->modelName;
+        $this->validateName = !empty($this->config['validate']) ? $this->config['validate'] : $this->modelName;
         $this->validateName = Str::studly($this->validateName);
         $this->controllerUrl = $controllerArr ? Str::lower($controllerArr[0]) . '.' . Str::camel($this->controllerName) : Str::camel($this->controllerName);
         if (isset($this->config['method']) and $this->config['method']) {
@@ -303,12 +305,13 @@ protected function makeController()
         $controllerTpl = $this->tplPath . 'controller.tpl';
         $modelTpl = $this->tplPath . 'model.tpl';
         $attrTpl = $this->tplPath . 'attr.tpl';
+        $joinTpl = $this->tplPath . 'join.tpl';
         $indexTpl = '';
         $recycleTpl = '';
         $relationSearch = '';
         $statusResult = Db::connect($this->driver)->query("SELECT COUNT(*) FROM information_schema.columns WHERE table_name ='" . $this->tablePrefix . $this->table . "' AND column_name ='status'");
         $status = $statusResult[0]['COUNT(*)'];
-        if ($this->joinTable) {
+        if (!empty($this->joinTable)) {
             $relationSearch = '$this->relationSearch = true;';
             $joinIndexMethod = "withJoin([";
             foreach ($this->joinTable as $k => $v) {
@@ -333,21 +336,21 @@ protected function makeController()
                 $joinclass = str_replace(DS, '\\', $joinclass);
                 if (file_exists($joinModelFile)) include_once $joinModelFile;
                 if ($assign) {
-                    foreach ($assign as $key => $val) {
-                        $kk = Str::studly($key);
-                        if (!$this->hasSuffix($k, $this->config['priSuffix'])) {
+                    foreach ($assign as $k => $v) {
+                        $kk = Str::studly($k);
+                        $tempKey = $k;
+                        if(Str::endsWith($k,'List')){
+                            $tempKey = substr($k, 0, strlen($k) - 4);
+                        }
+                        if ($v) {
                             $joinMethod = 'get' . $kk;
                             if (class_exists($joinclass)) {
                                 $joinClassMethods = get_class_methods($joinclass);
                                 if(!in_array($joinMethod,$joinClassMethods)){
-                                    $joinTplStr .= str_replace(['{{$method}}', '{{$values}}'],
-                                            ['get' . $kk, $val],
-                                            file_get_contents($attrTpl)) . PHP_EOL;
+                                    $joinTplStr .= str_replace(['{{$method}}', '{{$values}}'], ['get' . $kk, $v], file_get_contents($attrTpl)) . PHP_EOL;
                                 }
                             }else{
-                                $joinTplStr .= str_replace(['{{$method}}', '{{$values}}'],
-                                        ['get' . $kk, $val],
-                                        file_get_contents($attrTpl)) . PHP_EOL;
+                                $joinTplStr .= str_replace(['{{$method}}', '{{$values}}'], ['get' . $kk, $v], file_get_contents($attrTpl)) . PHP_EOL;
                             }
                         }
                     }
@@ -355,7 +358,7 @@ protected function makeController()
                 $attrStr = $this->modifyAttr($fieldsList);
                 //生成关联表的模型
                 $connection = $this->driver == 'mysql' ? "" : "protected \$connection = '" . $this->driver . "';";
-                if (!$this->force && class_exists($joinclass) && $joinTplStr) {
+                if (class_exists($joinclass) && $joinTplStr) {
                     $content = str_replace('?>','',file_get_contents($joinModelFile));
                     $content = substr($content,0,strrpos($content,'}',0)).$joinTplStr .PHP_EOL .'}';
                     file_put_contents($joinModelFile,$content);
@@ -418,13 +421,14 @@ protected function makeController()
         $scriptStr = '<script>';
         foreach ($this->assign as $k => $v) {
             $kk = Str::studly($k);
-            if (!$this->hasSuffix($k, $this->config['priSuffix'])) {
+            $tempKey = $k;
+            if(Str::endsWith($k,'List')){
+                $tempKey = substr($k, 0, strlen($k) - 4);
+            }
+            if ($v) {
                 $assignStr .= str_replace(['{{$name}}', '{{$method}}'], [lcfirst($kk), 'get' . $kk], $assignTpl) . PHP_EOL;
                 $scriptStr .= str_replace(['{{$name}}', '{{$method}}'], [lcfirst($kk), lcfirst($kk)], $scriptTpl) . PHP_EOL;
-            } elseif ($this->hasSuffix($k, $this->config['priSuffix'])
-                and $this->joinTable
-                and in_array(substr($k, 0, strlen($k) - 4), $this->joinForeignKey)
-            ) {
+            } elseif (in_array($tempKey, $this->joinForeignKey) && !$v) {
                 $assignStr .= str_replace(['{{$name}}', '{{$method}}'], [lcfirst($kk), 'get' . $kk], $assignTpl) . PHP_EOL;
                 $scriptStr .= str_replace(['{{$name}}', '{{$method}}'], [lcfirst($kk), lcfirst($kk)], $scriptTpl) . PHP_EOL;
             }
@@ -493,13 +497,13 @@ protected function makeModel()
         $joinAttrTpl = $this->tplPath . 'joinAttr.tpl';
         //单模型
         $joinTplStr = '';
-        if ($this->joinTable) {
+        if (!empty($this->joinTable)) {
             foreach ($this->joinTable as $k => $v) {
                 $method = 'hasOne';
                 if (isset($this->joinMethod[$k])) $method = $this->joinMethod[$k];
-                if ($method == 'hasOne') {
+                if (in_array($method,['hasOne','hasMany']) ) {
                     list($joinPrimaryKey, $joinForeignKey) = array($this->joinForeignKey[$k], $this->joinPrimaryKey[$k]);
-                } else {
+                } elseif('belongsTo') {
                     list($joinPrimaryKey, $joinForeignKey) = array($this->joinPrimaryKey[$k], $this->joinForeignKey[$k]);
                 }
                 $joinTpl = $this->tplPath . 'join.tpl';
@@ -519,30 +523,25 @@ protected function makeModel()
             }
         }
         //变量分配
-        $i = 0;
         if ($this->assign) {
             foreach ($this->assign as $k => $v) {
                 $kk = Str::studly($k);
-                if (!$this->hasSuffix($k, $this->config['priSuffix'])) {
+                $tempKey = $k;
+                if(Str::endsWith($k,'List')){
+                    $tempKey = substr($k, 0, strlen($k) - 4);
+                }
+                if ($v) {
                     $joinTplStr .= str_replace(['{{$method}}', '{{$values}}'],
                             ['get' . $kk, $v],
                             file_get_contents($attrTpl)) . PHP_EOL;
-                } elseif ($this->hasSuffix($k, $this->config['priSuffix'])
-                    and  $this->joinTable
-                    and in_array(substr($k, 0, strlen($k) - 4), $this->joinForeignKey)
-                ) {
+                } elseif (in_array($tempKey, $this->joinForeignKey) && !$v) {
                     //关联模型搜索属性
-                    $model = isset($this->joinModel[$i]) ? $this->joinModel[$i] : $this->joinModel[0];
-                    if ($this->joinTable && count($this->joinTable) == 1) {
-                        $value = isset($this->selectFields[0]) ? $this->selectFields[0] : 'title';
-                    } else {
-                        $value = isset($this->selectFields[$i]) ? $this->selectFields[$i] : 'title';
-                    }
-                    $k = str_replace(['_id', '_ids'], ['', ''], $k);
+                    $index = array_search($tempKey,$this->joinForeignKey);
+                    $model = $this->joinModel[$index];
+                    $value = isset($this->selectFields[$index]) ? $this->selectFields[$index] : 'title';
                     $joinTplStr .= str_replace(['{{$method}}', '{{$values}}', '{{$joinModel}}'],
                             ['get' . ucfirst($kk), $value, ucfirst(Str::studly($model))],
                             file_get_contents($joinAttrTpl)) . PHP_EOL;
-                    $i++;
                 }
             }
         }
@@ -766,10 +765,12 @@ protected function buildMenu($menuListArr, $type = 1)
                     $menu->restore();
                 }
             } else {
-                $child = AuthRule::withTrashed()->where('href', 'not in', $this->childMethod)
-                    ->where('pid', $menu['id'])->where('module', $module)->find();
-                if (!$child) {
-                    $menu && $menu->delete();
+                if($menu){
+                    $child = AuthRule::withTrashed()->where('href', 'not in', $this->childMethod)
+                        ->where('pid', $menu['id'])->where('module', $module)->find();
+                    if (!$child) {
+                        $menu && $menu->delete();
+                    }
                 }
             }
             foreach ($v['menulist'] as $kk => $vv) {
@@ -819,88 +820,92 @@ protected function getFormData()
             $name = Str::studly($vo['name']);
             switch ($vo['type']) {
                 case "text":
-                    $formFieldData .= "{:form_input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "tags":
-                    $formFieldData .= "{:form_tags('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::tags('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "number":
-                    $formFieldData .= "{:form_input('{$vo['name']}', 'number', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::input('{$vo['name']}', 'number', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "switch":
                     $vo['name_list'] = lcfirst(Str::studly($vo['name']));
 //                    $formFieldData .= "{:form_switch('{$vo['name']}', \${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}') }" . PHP_EOL;
-                    $formFieldData .= "{:form_radio('{$vo['name']}' ,\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::radio('{$vo['name']}' ,\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "array":
-                    $formFieldData .= "{:form_textarea('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::textarea('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'])}" . PHP_EOL;
                     break;
                 case "checkbox":
                     $vo['name_list'] = lcfirst(Str::studly($vo['name']));
-                    $formFieldData .= "{:form_checkbox('{$vo['name']}', \${$vo['name_list']}List,['label' => '{$name}', 'verify' => '{$vo['required']}'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::checkbox('{$vo['name']}', \${$vo['name_list']}List,['label' => '{$name}', 'verify' => '{$vo['required']}'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "radio":
                     $vo['name_list'] = lcfirst(Str::studly($vo['name']));
-                    $formFieldData .= "{:form_radio('{$vo['name']}' ,\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::radio('{$vo['name']}' ,\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "_id":
-                    if ($this->joinTable) {
+                    if (!empty($this->joinTable)) {
                         $vo['name_list'] = lcfirst(Str::studly($vo['name']));
                         if (strpos($vo['name'], '_ids') and in_array($vo['name'], $this->joinForeignKey)) {
-                            $formFieldData .= "{:form_select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}','multiple'=>1, 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
+                            $formFieldData .= "{:Form::select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}','multiple'=>1, 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
                         } elseif (strpos($vo['name'], '_id') and in_array($vo['name'], $this->joinForeignKey)) {
-                            $formFieldData .= "{:form_select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
+                            $formFieldData .= "{:Form::select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
                         } else {
-                            $formFieldData .= "{:form_input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                            $formFieldData .= "{:Form::input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                         }
                     } else {
-                        $formFieldData .= "{:form_input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                        $formFieldData .= "{:Form::input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
                     }
                     break;
                 case "select":
                     $vo['name_list'] = lcfirst(Str::studly($vo['name']));
                     if (in_array($vo['DATA_TYPE'], ['set', 'varchar', 'char'])) {
-                        $formFieldData .= "{:form_select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'multiple'=>1,'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
+                        $formFieldData .= "{:Form::select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'multiple'=>1,'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
                     } else {
-                        $formFieldData .= "{:form_select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
+                        $formFieldData .= "{:Form::select('{$vo['name']}',\${$vo['name_list']}List, ['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1], [], '{$vo['value']}')}" . PHP_EOL;
                     }
                     break;
                 case "color":
-                    $formFieldData .= "{:form_color('{$vo['name']}',['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::color('{$vo['name']}',['label' => '{$name}', 'verify' => '{$vo['required']}', 'search' => 1])}" . PHP_EOL;
                     break;
                 case "timestamp":
                 case "datetime":
-                    $formFieldData .= "{:form_date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}'])}" . PHP_EOL;
                     break;
                 case "year":
-                    $formFieldData .= "{:form_date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'year'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'year'])}" . PHP_EOL;
                     break;
                 case "date":
-                    $formFieldData .= "{:form_date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'date'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'date'])}" . PHP_EOL;
                     break;
                 case "time":
-                    $formFieldData .= "{:form_date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'time'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'time'])}" . PHP_EOL;
                     break;
                 case "range":
-                    $formFieldData .= "{:form_date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}','range' => 'range'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::date('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}','range' => 'range'])}" . PHP_EOL;
                     break;
                 case "textarea":
-                    $formFieldData .= "{:form_textarea('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}',], '{$vo['value']}')}" . PHP_EOL;
+                    $formFieldData .= "{:Form::textarea('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}',], '{$vo['value']}')}" . PHP_EOL;
                     break;
                 case "image":
-                    $formFieldData .= "{:form_upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'radio', 'mime' => 'image', 'path' => '{$this->modelName}', 'num' => '1'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
+                    $formFieldData .= "{:Form::upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'radio', 'mime' => 'image', 'path' => '{$this->modelName}', 'num' => '1'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
                     break;
                 case "images":
-                    $formFieldData .= "{:form_upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'checkbox', 'mime' => 'image', 'path' =>'{$this->modelName}', 'num' => '*'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
+                    $formFieldData .= "{:Form::upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'checkbox', 'mime' => 'image', 'path' =>'{$this->modelName}', 'num' => '*'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
                     break;
                 case "file":
-                    $formFieldData .= "{:form_upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'radio', 'mime' => 'file', 'path' =>'{$this->modelName}', 'num' => '1'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
+                    $formFieldData .= "{:Form::upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'radio', 'mime' => 'file', 'path' =>'{$this->modelName}', 'num' => '1'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
                     break;
                 case "files":
-                    $formFieldData .= "{:form_upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'checkbox', 'mime' => 'file', 'path' => '{$this->modelName}', 'num' => '*'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
+                    $formFieldData .= "{:Form::upload('{$vo['name']}', ['label' => '{$name}', 'verify' => '{$vo['required']}', 'type' => 'checkbox', 'mime' => 'file', 'path' => '{$this->modelName}', 'num' => '*'], \$formData?\$formData['{$vo['name']}']:'{$vo['value']}', )}" . PHP_EOL;
                     break;
                 case "editor":
-                    $formFieldData .= "{:form_editor('{$vo['name']}', ['label'=>'{$name}','verify' => '{$vo['required']}'])}" . PHP_EOL;
+                    $formFieldData .= "{:Form::editor('{$vo['name']}', ['label'=>'{$name}','verify' => '{$vo['required']}'])}" . PHP_EOL;
+                    break;
+                default :
+                    $formFieldData .= "{:Form::input('{$vo['name']}', 'text', ['label' => '{$name}', 'verify' => '{$vo['required']}'], '{$vo['value']}')}" . PHP_EOL;
+                    break;
             }
         }
         return $formFieldData;
@@ -923,7 +928,7 @@ protected function getCols()
                     $listName = lcfirst(Str::studly($v['name']));
                     switch ($v['type']) {
                         case '_id':
-                            if ($this->joinTable and in_array($v['name'], $this->joinForeignKey)) { //
+                            if (!empty($this->joinTable) and in_array($v['name'], $this->joinForeignKey)) { //
                                 $this->jsCols .= $space . "{field:'{$v['name']}',search: true,title: __('{$name}'),selectList:{$listName}List,sort:true,templet: Table.templet.tags}," . PHP_EOL;;
                             } else {
                                 $this->jsCols .= $space . "{field:'{$v['name']}', title: __('{$name}'),align: 'center',sort:true}," . PHP_EOL;
@@ -1074,7 +1079,7 @@ protected function getFieldList($model='',$field = '*')
             $fieldsName = $v['COLUMN_NAME'];
             // 指定后缀说明也是个时间字段
             if ($this->hasSuffix($fieldsName, $this->config['jsonSuffix'])) {
-                    $v['type'] = "array";
+                $v['type'] = "array";
             }
             // 指定后缀说明也是个时间字段
             if ($this->hasSuffix($fieldsName, $this->config['fileSuffix'])) {
@@ -1207,10 +1212,10 @@ protected function getFieldList($model='',$field = '*')
                 $space = $k == 0 ? '' : '                    ';
                 if (!in_array($v, ['restore'])) {
                     $space = $k == 0 ? '' : '                    ';
-                    $requests .= $space . $v . '_url:' . "'{$prefix_url}/{$v}'" . ',' . PHP_EOL;
+                    $requests .= $space . $v . '_url:' . "'{$prefix_url}/{$v}'" . '+location.search,' . PHP_EOL;
                 }
                 if (in_array($v, ['recycle', 'restore', 'delete'])) {
-                    $requestsRecycle .= $v . '_url:' . "'{$prefix_url}/{$v}'" . ',' . PHP_EOL . $space;
+                    $requestsRecycle .= $v . '_url:' . "'{$prefix_url}/{$v}'" . '+location.search,' . PHP_EOL . $space;
                 }
             }
         }
@@ -1243,8 +1248,8 @@ protected function modifyAttr($fieldList = '')
             $this->tplPath . 'attrmutiget.tpl',
             $this->tplPath . 'attrmutiset.tpl',
         ];
-        $fieldList = $fieldsList?:$this->fieldsList;
-        foreach ($fieldsList as $k => $vo) {
+        $fieldList = $fieldList?:$this->fieldsList;
+        foreach ($fieldList as $k => $vo) {
             if ($vo['COLUMN_KEY'] == 'PRI') continue;
             if (in_array($vo['name'], $this->config['ignoreFields']) and $vo['name'] != 'status') continue;
             $name = Str::studly($vo['name']);
@@ -1358,7 +1363,7 @@ protected function hasSuffix($field, $suffix)
     {
         $suffix = is_array($suffix) ? $suffix : explode(',', $suffix);
         foreach ($suffix as $v) {
-            if (strpos($field, $v) !== false) {
+            if (Str::endsWith($field, $v)) {
                 return true;
             }
         }
diff --git a/src/curd/tpl/addon/plugin.tpl b/src/curd/tpl/addon/plugin.tpl
index 6fe44b2..3046189 100644
--- a/src/curd/tpl/addon/plugin.tpl
+++ b/src/curd/tpl/addon/plugin.tpl
@@ -46,23 +46,4 @@ class Plugin extends Addons
     {
         return true;
     }
-
-    /**
-     * 实现初始化钩子方法
-     * @return mixed
-     */
-    public function AddonsInit($param)
-    {
-
-    }
-
-    /**
-     * 实现化钩子方法
-     * @return mixed
-     */
-    public function demoHook($param)
-    {
-        return true;
-    }
-
 }
diff --git a/src/curd/tpl/join.tpl b/src/curd/tpl/join.tpl
index cd7e241..a7df479 100644
--- a/src/curd/tpl/join.tpl
+++ b/src/curd/tpl/join.tpl
@@ -1,4 +1,4 @@
-public function {{$joinName}}()
+    public function {{$joinName}}()
     {
         return $this->{{$joinMethod}}('{{$joinModel}}','{{$joinForeignKey}}','{{$joinPrimaryKey}}');
     }
diff --git a/src/helper/FormHelper.php b/src/helper/FormHelper.php
index eb5eb7f..eec53e0 100644
--- a/src/helper/FormHelper.php
+++ b/src/helper/FormHelper.php
@@ -243,7 +243,7 @@ public function input(string $name = '', string $type = 'text', array $options =
         }
         $options['affix'] = $options['affix']??'clear';
         $str = <<<EOF
-<div class="layui-form-item ">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
         <div class="layui-input-block">
          <input  type="{$type}" {$this->getDataPropAttr($name, $value, $options)}  autocomplete="off"
           {$this->getStyle($options)}  class="layui-input  {$this->getClass($options)}  $disorread "/>
@@ -277,6 +277,7 @@ public function password(string $name, array $options = [], $value = '')
     {
         $options['verify'] = $options['verify'] ?? 'pass';
         $options['type'] = 'password';
+        $options['affix'] = $options['affix'] ?? 'eye';
         return $this->input($name, 'password', $options, $value);
     }
 
@@ -294,7 +295,7 @@ public function range($name, $options = [], $value = null)
 
         $disorread = $this->readonlyOrdisabled($options);
         $str = <<<EOF
-                <div class="layui-form-item">{$this->label($name, $options)}
+                <div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
             <div class="layui-input-block">
               <div class="layui-input-inline" style="width: 100px;">
                 <input {$this->getOptionsAttr($name, $options)} type="text" name="{$name}_min" autocomplete="off"  class="layui-input {$this->getClass($options)}  {$disorread} "/>
@@ -366,6 +367,7 @@ public function tel($name, $options = [], $value = null)
     public function number($name, $options = [], $value = null)
     {
         $options['verify'] = $options['verify'] ?? 'number';
+        $options['affix'] = $options['affix'] ?? 'number';
         return $this->input($name, 'number', $options, $value);
     }
 
@@ -395,7 +397,7 @@ public function rate($name = '', $options = [], $value = '')
     {
         $options['filter'] = $options['filter'] ?? 'rate';
         $str = <<<EOF
-<div class='layui-form-item {$this->getClass($options)}' > 
+<div class='layui-form-item {$this->getClass($options,'outclass')}' > 
     {$this->label($name, $options)}
     <div class='layui-input-block'>
         <input readonly type='text' {$this->layverify($options)} {$this->getNameValueAttr($name, $value, $options)} class='layui-input'>
@@ -422,7 +424,7 @@ public function slider($name = '', $options = [], $value = '')
         $options['filter'] = $options['filter'] ?? 'slider';
         $disorread = $this->readonlyOrdisabled($options) ? 'layui-disabled' : '';
         $str = <<<EOF
-<div class='layui-form-item {$this->getClass($options)}'>{$this->label($name, $options)}
+<div class='layui-form-item {$this->getClass($options,'outclass')}'>{$this->label($name, $options)}
     <div class='layui-input-block' >
         <div {$this->getDataPropAttr($name,$value, $options)} style='top:16px'   class='{$disorread} {$this->getClass($options)}'>
         {$this->tips($options)}
@@ -464,7 +466,7 @@ public function radio($name = '', $radiolist = [], $options = [], $value = '')
 EOF;
         }
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
      {$input}
     {$this->tips($options)}
@@ -490,7 +492,7 @@ public function switchs($name = '', $switch = [], $options = [], $value = '')
         $switchStr = $switchArr ? $this->__($switchArr[1]) . '|' . $this->__($switchArr[0]) : $this->__('open') . '|' . 'close';
         $checked = $value ? 'checked="true"' : '';
         $str = <<<EOF
-        <div class="layui-form-item"> {$this->label($name, $options)} 
+        <div class="layui-form-item {$this->getClass($options,'outclass')}"> {$this->label($name, $options)} 
             <div class="layui-input-block">
             <input {$this->getDataPropAttr($name, $value, $options)} class="{$this->getClass($options)}" type="checkbox" {$checked} lay-skin="switch" lay-text="{$switchStr}"  data-text="{$this->__($value)}"/>
             {$this->tips($options)} 
@@ -552,7 +554,7 @@ public function checkbox($name = '', $list = [], $options = [], $value = '')
 EOF;
         }
         $str = <<<EOF
-<div class="layui-form-item">
+<div class="layui-form-item {$this->getClass($options,'outclass')}">
 {$this->label($name, $options)}
     <div class="layui-input-block">
      {$input} {$this->tips($options)}
@@ -624,7 +626,7 @@ public function arrays($name = '', $list = [], $options = [])
 EOF;
         }
         $arr .= <<<EOF
-     <div class="layui-form-item" >
+     <div class="layui-form-item {$this->getClass($options,'outclass')}" >
     {$this->label($name, $options)}
         <div class="layui-input-block">
                 <table class="layui-table" filter="array">
@@ -656,7 +658,7 @@ public function arrays($name = '', $list = [], $options = [])
     public function textarea($name = '', $options = [], $value = '')
     {
         $str = <<<EOF
- <div class="layui-form-item layui-form-text">{$this->label($name, $options)}
+ <div class="layui-form-item layui-form-text {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
             <textarea {$this->getDataPropAttr($name, $value, $options)} class="layui-textarea {$this->getClass($options)}" 
             >{$value}</textarea>
@@ -677,6 +679,9 @@ public function textarea($name = '', $options = [], $value = '')
      */
     public function selectn($name = '', $select = [], $options = [], $attr = [], $value = '')
     {
+        if(is_object($select)){
+            $select = json_decode(json_encode($select),true);
+        }
         $name = $options['formname'] ?? $name;
         $label = $options['label'] ?? $name;
         $options['url'] = $options['url'] ?? '';
@@ -684,14 +689,17 @@ public function selectn($name = '', $select = [], $options = [], $attr = [], $va
         $options['search'] = isset($options['search']) ? true : '';
         $options['num'] = $options['num'] ?? 3;
         $options['last'] = $options['last'] ?? '';
-        if ($attr) {
-            $attr = is_array($attr) ? implode(',', $attr) : $attr;
+        if (!empty($attr)) {
+            $attr = is_array($attr) ? implode(',', $attr) : $attr ;
         }
         $options['filter'] = $options['filter'] ?? 'selectN';
         $options['data'] = json_encode((array)$select, JSON_UNESCAPED_UNICODE);
         $options['attr'] = $attr;
+        if(!isset($options['search'])){
+            $options['search'] = true;
+        }
         $str = <<<EOF
-<div class="layui-form-item layui-form" lay-filter="{$name}">{$this->label($name, $options)}
+<div class="layui-form-item layui-form {$this->getClass($options,'outclass')}" lay-filter="{$name}">{$this->label($name, $options)}
     <div class="layui-input-block">
       <div  
 {$this->getDataPropAttr($name, $value, $options)}  class="{$this->getClass($options)}" {$this->laysearch($options)} {$this->readonlyOrdisabled($options)} >
@@ -714,6 +722,9 @@ public function selectn($name = '', $select = [], $options = [], $attr = [], $va
      */
     public function selectplus($name = '', $select = [], $options = [], $attr = [], $value = '')
     {
+        if(is_object($select)){
+            $select = json_decode(json_encode($select),true);
+        }
         list($name, $id) = $this->getNameId($name, $select);
         $options['url'] = $options['url'] ?? '';
         $options['delimiter'] = $options['delimiter'] ?? '';
@@ -722,14 +733,14 @@ public function selectplus($name = '', $select = [], $options = [], $attr = [],
         $multiple = !empty($options['multiple']) ? 'multiple="multiple"' : '';
 
         $options['multiple'] = $multiple ? 1 : '';
-        if ($attr) {
-            $attr = is_array($attr) ? implode(',', $attr) : $attr;
+        if (!empty($attr)) {
+            $attr = is_array($attr) ?implode(',', $attr)  : $attr;
         }
         $options['attr'] = $attr;
         $options['data'] = json_encode((array)$select, JSON_UNESCAPED_UNICODE);
         $options['filter'] = $options['filter'] ?? "selectPlus";
         $str = <<<EOF
-    <div class="layui-form-item">{$this->label($name, $options)}
+    <div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
         <div class="layui-input-block">
           <div class="{$this->getClass($options)}" {$this->getDataPropAttr($name, $value, $options)}    {$multiple} >
           </div>
@@ -749,7 +760,7 @@ public function autocomplete($name = '', $list = [], $options = [], $attr = [],
         $data = json_encode($list);
         $attr = json_encode($attr);
         $str = <<<EOF
-<div class="layui-form-item ">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
      <input data-data='{$data}' data-attr="{$attr}" type="search" dir="ltr" spellcheck=false autocorrect="off" autocomplete="off" autocapitalize="off" maxlength="2048" tabindex="1"
         {$this->getDataPropAttr($name, $value, $options)} 
@@ -787,18 +798,22 @@ public function multiselect($name = '', $select = [], $options = [], $attr = [],
         list($name, $id) = $this->getNameId($name, $options);
         $op = '';
         if ($select) {
+            if(is_object($select)){
+                $select = json_decode(json_encode($select),true);
+            }
+            $attr = is_array($attr)?$attr:explode(',',$attr);
+            $value = is_array($value)?$value:explode(',',$value);
             foreach ($select as $k => $v) {
                 $selected = '';
-                if (is_array($v) && (is_array($value) && is_array($attr) && !empty($attr) && in_array($v[$attr[0]], $value) || (is_array($attr) && !empty($attr) && $v[$attr[0]] == $value))) {
+                if (is_array($v) && !empty($attr) && in_array($v[$attr[0]], $value)) {
                     $selected = 'selected';
                 }
-                if (is_array($value) && in_array($k, $value) && !$attr) {
+                if (in_array($k, $value) && empty($attr)) {
                     $selected = 'selected';
                 }
-                if (is_string($v)) {
+                if (!is_array($v)) {
                     $op .= '<option ' . $selected . ' value="' . $k . '">' . $this->__($v) . '</option>';
-                }
-                if (!empty($attr) && (is_array($v) || is_object($v))) {
+                }elseif (is_array($v) && !empty($attr)) {
                     $op .= '<option ' . $selected . ' value="' . $v[$attr[0]] . '">' . $this->__($v[$attr[1]]) . '</option>';
                 }
             }
@@ -814,8 +829,14 @@ public function multiselect($name = '', $select = [], $options = [], $attr = [],
         }
         $attr = is_array($attr) ? implode(',', $attr) : $attr;
         $options['attr'] = $attr;
+        if(!isset($options['search'])){
+            $options['search'] = true;
+        }
+        if(!isset($options['create'])){
+            $options['create'] = true;
+        }
         $str = <<<EOF
-<div class="layui-form-item"> {$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}"> {$this->label($name, $options)}
     <div class="layui-input-block">
       <select {$this->getDataPropAttr($name, $value, $options)}  class="layui-select-url layui-select {$this->getClass($options)}"  {$multiple}    >
         <option value="">{$this->__($default)}</option>
@@ -848,7 +869,7 @@ public function xmselect($name = '', $select = [], $options = [], $attr = [], $v
             $op .= " data-data='" . json_encode((array)$select, JSON_UNESCAPED_UNICODE) . "'";
         }
         $attr = is_array($attr) ? implode(',', $attr) : $attr;
-        $value = is_array($value) ? implode($value) : $value;
+        $value = is_array($value) ? implode(',',$value) : $value;
         $options['attr'] = $options['attr'] ?? $attr;
         $options['lang'] = $options['lang'] ?? '';
         $options['tips'] = $options['tips'] ?? '';
@@ -884,7 +905,7 @@ public function xmselect($name = '', $select = [], $options = [], $attr = [], $v
         $options['filter'] = 'xmSelect';
         $options['toolbar'] = isset($options['toolbar']) ? json_encode($options['toolbar'], JSON_UNESCAPED_UNICODE) : '';
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $options)}    
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}    
     <div {$this->getDataPropAttr($name, $value, $options)} class="layui-input-block {$this->getClass($options)} "  {$op}>
      {$this->tips($options)}
     </div>
@@ -905,7 +926,7 @@ public function selectpage(string $name, array $lists = [], array $options = [],
     {
         list($name, $id) = $this->getNameId($name, $options);
         $options['filter'] = 'selectPage';
-        $options['data'] = empty($lists) ? '' : json_encode($lists);
+        $options['data'] = empty($lists) ? '' : json_encode($lists,JSON_UNESCAPED_UNICODE);
         $options['field'] = $options['field'] ?? 'title';
         $options['primaryKey'] = $options['field'] ?? 'id';
         $options['multiple'] = $options['multiple'] ?? '';
@@ -923,8 +944,8 @@ public function selectpage(string $name, array $lists = [], array $options = [],
     public function tags($name = '', $options = [], $value = '')
     {
         list($name, $id) = $this->getNameId($name, $options);
-        $options['filter'] = $options['filter'] ?? 'tags';
-        $options['placeholder'] = $options['placeholder'] ?? 'Space To Generate Tags';
+        $options['filter'] = $options['filter'] ?? 'inputtags';
+        $options['placeholder'] = $options['placeholder'] ?? '';
         $labelOptions = $options;
         $verify = '';
         if (isset($options['verify'])) {
@@ -932,11 +953,12 @@ public function tags($name = '', $options = [], $value = '')
             unset($options['verify']);
         }
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $labelOptions)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $labelOptions)}
     <div class="layui-input-block">
-        <div class="tags" >
-            <input id="{$id}" {$this->getOptionsAttr($name, $options)} class="{$this->getClass($options)}"   type="text"  />
-            <input type="text" class="layui-input layui-form-required-hidden" name="{$name}" value="{$value}" {$verify} />
+        <div class="layui-tag-container">
+            <input type="text" {$this->getOptionsAttr($name,$options)}  class="layui-input layui-tag-input {$this->getClass($options)}" type="text" />
+            <input class="layui-input layui-form-required-hidden" type="text" name="{$name}" value="{$value}" {$verify}>
+
         </div>
     </div>
 </div>
@@ -959,7 +981,7 @@ public function color($name = '', $options = [], $value = '')
         $options['filter'] = $options['filter'] ?? 'colorPicker';
         $options['verify'] = $options['verify'] ?? '';
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
         <input {$this->getNameValueAttr($name, $value, $options)} lay-verify="{$options['verify']}" lay-vertype="tips" class="layui-input layui-input-inline {$this->getClass($options)}"  type="text" />
         <div {$this->getOptionsAttr($name, $options)}   data-format = "{$format}" ></div>
@@ -982,9 +1004,9 @@ public function icon($name = '', $options = [], $value = '')
         $value = $value ?: 'layui-icon layui-icon-app';
         $options['filter'] = 'iconPicker';
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
-        <input {$this->getDataPropAttr($name, $value, $options)} type="text" name="' class="hide layui-input layui-hide {$this->getClass($options)}" />
+        <input {$this->getDataPropAttr($name, $value, $options)} type="text" class="hide layui-input layui-hide {$this->getClass($options)}" />
     </div>
 </div>
 EOF;
@@ -1004,7 +1026,7 @@ public function date($name = '', $options = [], $value = '')
         $options['placeholder'] = $options['placeholder'] ?? 'yyyy-MM-dd HH:mm:ss';
         $options['filter'] = $options['filter'] ?? 'date';
         $str = <<<EOF
-<div class="layui-form-item"> {$this->label($name, $options)}       
+<div class="layui-form-item {$this->getClass($options,'outclass')}"> {$this->label($name, $options)}       
     <div class="layui-input-block layui-input-wrap">
     <div class="layui-input-prefix"><i class="layui-icon layui-icon-date"></i></div>
     <input {$this->getDataPropAttr($name, $value, $options)}  class="layui-input {$this->getClass($options)} {$this->readonlyOrdisabled($options)}" type="text" />
@@ -1033,7 +1055,7 @@ public function city($name = 'cityPicker', $options = [], $value = '')
         $options['readonly'] = $options['readonly'] ?? 'readonly';
         $options['placeholder'] = $options['placeholder'] ?? '请选择';
         $str = <<<EOF
-<div class="layui-form-item">
+<div class="layui-form-item {$this->getClass($options,'outclass')}">
 <label class="layui-form-label width_auto text-r" style="margin-top:2px">省市县：</label>
     <div class="layui-input-block">
         <input data-toggle="city-picker" {$this->getDataPropAttr($name, $value, $options)} type="text" autocomplete="off" class="layui-input layui-form-required-hidden {$this->getClass($options)} "  />
@@ -1055,7 +1077,7 @@ public function region($name = 'region', $options = [], $value = '')
         list($name, $id) = $this->getNameId($name, $options);
         $options['filter'] = 'region';
         $str = <<<EOF
- <div class="layui-form-item">{$this->label($name, $options)}
+ <div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
     <div class="layui-input-block">
         <input type="text" class="layui-input" name="{$name}" value="{$value}" {$this->layverify($options)} />
         <div {$this->getOptionsAttr($name, $options)}  class="{$this->getClass($options)}" id="{$id}" name="{$name}">
@@ -1111,7 +1133,7 @@ public function editor($name = 'container', $options = [], $value = '')
 EOF;
         }
         $str = <<<EOF
-<div class="layui-form-item">{$this->label($name, $options)}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$this->label($name, $options)}
      <div class="layui-input-block">
     {$content}
     </div>
@@ -1244,7 +1266,7 @@ public function upload($name = 'avatar', $options = [], $value = '')
 {$css};
 }
 </style>
-<div class="layui-form-item">{$label}
+<div class="layui-form-item {$this->getClass($options,'outclass')}">{$label}
     <div class="layui-input-block">
         <div class="layui-upload">
             <input {$this->getNameValueAttr($name, $value, $options)} lay-verify="{$verify}"  type="text"  class="layui-input layui-input-upload attach {$this->getClass($options)}" />
@@ -1356,6 +1378,9 @@ public function style(string $style, $options = [])
      */
     public function js($name = [], $options = [])
     {
+        if(Str::contains($name,'</script>')){
+            return $name;
+        }
         if (is_string($name)) {
             $name = explode(',', $name);
         }
@@ -1376,6 +1401,9 @@ public function js($name = [], $options = [])
      */
     public function link($name = [], $options = [])
     {
+        if(Str::contains($name,'<link')){
+            return $name;
+        }
         if (is_string($name)) {
             $name = explode(',', $name);
         }
@@ -1532,6 +1560,15 @@ protected function laystep($options = [])
         return $str;
     }
 
+    protected function layprecision($options = [])
+    {
+        $str = ' ';
+        if (isset($options['precision'])) {
+            $str = ' lay-precision="' . $options['precision'] . '"';
+        }
+        return $str;
+    }
+
     /**搜索
      * @return string
      */
@@ -1553,6 +1590,15 @@ protected function layskin($options = [])
         return $str;
     }
 
+    protected function laycreatable($options = [])
+    {
+        $str = '';
+        if (!isset($options['creatable']) || $options['creatable'] == true) {
+            $str = ' lay-creatable';
+        }
+        return $str;
+
+    }
     /**
      * @param $ops
      * @param $val
@@ -1590,10 +1636,10 @@ protected function readonlyOrdisabled($options = [])
     }
 
     //自定义class属性
-    protected function getClass($options = [])
+    protected function getClass($options = [],$className= 'class')
     {
-        if (isset($options['class']) && $options['class']) {
-            $classArr = is_array($options['class']) ? $options['class'] : explode(',', $options['class']);
+        if (isset($options[$className]) && $options[$className]) {
+            $classArr = is_array($options[$className]) ? $options[$className] : explode(',', $options[$className]);
             return ' ' . implode(' ', $classArr) . ' ';
         }
         return '';
@@ -1683,6 +1729,9 @@ public function getOptionsAttr($name = '', $options = [])
                     case 'ignore':
                         $attr .= $this->layignore($options);
                         break;
+                    case 'precision':
+                        $attr .= $this->layprecision($options);
+                        break;
                     case 'style':
                         $attr .= $this->getStyle($options);
                     case 'readonly':
@@ -1692,6 +1741,9 @@ public function getOptionsAttr($name = '', $options = [])
                     case 'search':
                         $attr .= $this->laysearch($options);
                         break;
+                    case 'creatable':
+                        $attr .= $this->laycreatable($options);
+                        break;
                     case 'skin':
                         $attr .= $this->layskin($options);
                         break;