新增CRUD多项字段和表名识别,可自动生成下拉列表、筛选框、单选框、分类列表、日期时间型等等

新增启用nice-validator表单验证功能
新增后台增改时对数组和日期字段的处理
新增test表用于开发测试
新增表单生成禁用字符编码的方法
禁用开发模式的客户端JS和CSS缓存
修复微信支付初始化变量的错误
修复php think min在Win下的错误提示
修复不同语言下HTML的语言标识错误

application/admin/command/Crud.php

@@ -68,7 +68,7 @@ class Crud extends Command
         //非覆盖模式时如果存在控制器文件则报错
         if (is_file($controllerFile) && !$force)
         {
-            throw new Exception('controller already exists');
+            throw new Exception('controller already exists!\nIf you need to rebuild again, use the parameter --force=true ');
         }
 
         //模型默认以表名进行处理,以下划线进行分隔,如果需要自定义则需要传入model,不支持目录层级
@@ -89,9 +89,11 @@ class Crud extends Command
         //非覆盖模式时如果存在模型文件则报错
         if (is_file($modelFile) && !$force)
         {
-            throw new Exception('model already exists');
+            throw new Exception('model already exists!\nIf you need to rebuild again, use the parameter --force=true ');
         }
 
+        require $adminPath . 'common.php';
+
         //从数据库中获取表字段信息
         $columnList = Db::query("SELECT * FROM `information_schema`.`columns` WHERE TABLE_SCHEMA = ? AND table_name = ? ORDER BY ORDINAL_POSITION", [$dbname, $tableName]);
         $fields = [];
@@ -106,194 +108,256 @@ class Crud extends Command
         $langList = [];
         $field = 'id';
         $order = 'id';
+        $priDefined = FALSE;
 
-        //循环所有字段,开始构造视图的HTML和JS信息
+        try
-        foreach ($columnList as $k => $v)
         {
-            $field = $v['COLUMN_NAME'];
+            Form::setEscapeHtml(false);
-            $fieldLang = ucfirst($field);
-            // 语言列表
-            if ($v['COLUMN_COMMENT'] != '')
-            {
-                $langList[] = $this->getLangItem($field, $v['COLUMN_COMMENT']);
-            }
-            if ($v['COLUMN_KEY'] != 'PRI')
-            {
-                $inputType = 'text';
-                $step = 0;
-                switch ($v['DATA_TYPE'])
-                {
-                    case 'bigint':
-                    case 'int':
-                    case 'mediumint':
-                    case 'smallint':
-                    case 'tinyint':
-                        $inputType = 'number';
-                        break;
-                    case 'enum':
-                    case 'set':
-                        $inputType = 'select';
-                        break;
-                    case 'decimal':
-                    case 'double':
-                    case 'float':
-                        $inputType = 'number';
-                        $step = "0." . str_repeat(0, $v['NUMERIC_SCALE'] - 1) . "1";
-                    case 'text':
-                        $inputType = 'textarea';
-                    default:
-                        break;
-                }
-                if (substr($field, -4) == 'time')
-                {
-                    $inputType = 'datetime';
-                }
 
-                if ($inputType == 'select')
+            //循环所有字段,开始构造视图的HTML和JS信息
+            foreach ($columnList as $k => $v)
+            {
+                $field = $v['COLUMN_NAME'];
+                $itemArr = [];
+                // 这里构建Enum和Set类型的列表数据
+                if (in_array($v['DATA_TYPE'], ['enum', 'set']))
                 {
-                    $itemlist = substr($v['COLUMN_TYPE'], strlen($v['DATA_TYPE']) + 1, -1);
+                    $itemArr = substr($v['COLUMN_TYPE'], strlen($v['DATA_TYPE']) + 1, -1);
-                    $itemlist = str_replace("'", '', $itemlist);
+                    $itemArr = explode(',', str_replace("'", '', $itemArr));
-                    $attr = "'id'=>'c-$field','class'=>'form-control selectpicker'";
+                }
-                    if ($v['DATA_TYPE'] == 'enum')
+                // 语言列表
-                    {
+                if ($v['COLUMN_COMMENT'] != '')
-                        $attr .= ",'multiple'=>''";
+                {
-                    }
+                    $langList[] = $this->getLangItem($field, $v['COLUMN_COMMENT']);
+                }
+                //createtime和updatetime是保留字段不能修改和添加
+                if ($v['COLUMN_KEY'] != 'PRI' && !in_array($field, ['createtime', 'updatetime']))
+                {
+                    $inputType = $this->getFieldType($v);
+
+                    // 如果是number类型时增加一个步长
+                    $step = $inputType == 'number' && $v['NUMERIC_SCALE'] > 0 ? "0." . str_repeat(0, $v['NUMERIC_SCALE'] - 1) . "1" : 0;
+
+                    $attrArr = ['id' => "c-{$field}"];
+                    $cssClassArr = ['form-control'];
+                    $fieldName = "row[{$field}]";
+                    $defaultValue = $v['COLUMN_DEFAULT'];
+                    $editValue = "{\$row.{$field}}";
+                    // 如果默认值为空,则是一个必选项
                     if ($v['COLUMN_DEFAULT'] == '')
                     {
-                        $attr .= ",'required'=>''";
+                        $attrArr['required'] = '';
                     }
-                    $formAddElement = "{:build_select('row[$field]', '{$itemlist}', null, [{$attr}])}";
+                    if ($field == 'status' && in_array($inputType, ['text', 'number']))
-                    $formEditElement = "{:build_select('row[$field]', '{$itemlist}', \$row['$field'], [{$attr}])}";
-                }
-                else
-                {
-                    //CSS类名
-                    $cssClass = ['form-control'];
-                    $cssClass[] = substr($field, -4) == 'time' ? 'datetimepicker' : '';
-                    $cssClass[] = $v['DATA_TYPE'] == 'text' ? 'summernote' : '';
-                    $cssClass[] = substr($field, -3) == '_id' ? 'typeahead' : '';
-                    $cssClass[] = substr($field, -4) == '_ids' ? 'tagsinput' : '';
-                    $cssClass = array_filter($cssClass);
-                    //因为有自动完成可输入其它内容
-                    if (array_intersect($cssClass, ['typeahead', 'tagsinput']))
                     {
-                        $inputType = 'text';
+                        //如果状态类型不是enum或set
-                        $step = 0;
+                        $itemArr = !$itemArr ? ['normal', 'hidden'] : $itemArr;
+                        $inputType = 'radio';
                     }
-                    $attr = ['id' => "c-{$field}", 'class' => implode(' ', $cssClass)];
+                    if ($inputType == 'select')
-                    if ($step)
                     {
-                        $attr['step'] = $step;
+                        $cssClassArr[] = 'selectpicker';
+                        $attrArr['class'] = implode(' ', $cssClassArr);
+                        if ($v['DATA_TYPE'] == 'set')
+                        {
+                            $attrArr['multiple'] = '';
+                            $fieldName.="[]";
+                        }
+                        $attrStr = $this->getArrayString($attrArr);
+                        $itemArr = $this->getLangArray($itemArr, FALSE);
+                        $itemString = $this->getArrayString($itemArr);
+                        $formAddElement = "{:build_select('{$fieldName}', [{$itemString}], '{$defaultValue}', [{$attrStr}])}";
+                        $formEditElement = "{:build_select('{$fieldName}', [{$itemString}], \$row.{$field}, [{$attrStr}])}";
                     }
-                    //如果是图片则额外附加
+                    else if ($inputType == 'datetime')
-                    if (substr($field, -5) == 'image' || substr($field, -6) == 'avatar')
                     {
-                        //$attr['data-plupload-id'] = "plupload-{$field}-text";
+                        $cssClassArr[] = 'datetimepicker';
-                        $attr['size'] = 50;
+                        $attrArr['class'] = implode(' ', $cssClassArr);
+                        $format = "YYYY-MM-DD HH:mm:ss";
+                        $phpFormat = "Y-m-d H:i:s";
+                        $fieldFunc = '';
+                        switch ($v['DATA_TYPE'])
+                        {
+                            case 'year';
+                                $format = "YYYY";
+                                $phpFormat = 'Y';
+                                break;
+                            case 'date';
+                                $format = "YYYY-MM-DD";
+                                $phpFormat = 'Y-m-d';
+                                break;
+                            case 'time';
+                                $format = "HH:mm:ss";
+                                $phpFormat = 'H:i:s';
+                                break;
+                            case 'timestamp';
+                                $fieldFunc = 'datetime';
+                            case 'datetime';
+                                $format = "YYYY-MM-DD HH:mm:ss";
+                                $phpFormat = 'Y-m-d H:i:s';
+                                break;
+                            default:
+                                $fieldFunc = 'datetime';
+                                break;
+                        }
+                        $defaultDateTime = "{:date('{$phpFormat}')}";
+                        $attrArr['data-date-format'] = $format;
+                        $attrArr['data-use-current'] = "true";
+                        $fieldFunc = $fieldFunc ? "|{$fieldFunc}" : "";
+                        $formAddElement = Form::text($fieldName, $defaultDateTime, $attrArr);
+                        $formEditElement = Form::text($fieldName, "{\$row.{$field}{$fieldFunc}}", $attrArr);
                     }
-                    $fieldFunc = substr($field, -4) == 'time' ? "|datetime" : "";
+                    else if ($inputType == 'checkbox')
-                    if ($inputType == 'textarea')
                     {
-                        $formAddElement = Form::textarea("row[{$field}]", $v['COLUMN_DEFAULT'], $attr);
+                        $fieldName.="[]";
-                        $formEditElement = Form::textarea("row[{$field}]", "{\$row.{$field}{$fieldFunc}}", $attr);
+                        $itemArr = $this->getLangArray($itemArr, FALSE);
+                        $itemString = $this->getArrayString($itemArr);
+                        $formAddElement = "{:build_checkboxs('{$fieldName}', [{$itemString}], '{$defaultValue}')}";
+                        $formEditElement = "{:build_checkboxs('{$fieldName}', [{$itemString}], \$row.{$field})}";
+                    }
+                    else if ($inputType == 'radio')
+                    {
+                        $itemArr = $this->getLangArray($itemArr, FALSE);
+                        $itemString = $this->getArrayString($itemArr);
+                        $defaultValue = $defaultValue ? $defaultValue : key($itemArr);
+                        $formAddElement = "{:build_radios('{$fieldName}', [{$itemString}], '{$defaultValue}')}";
+                        $formEditElement = "{:build_radios('{$fieldName}', [{$itemString}], \$row.{$field})}";
+                    }
+                    else if ($inputType == 'textarea' || ($inputType == 'text' && $v['CHARACTER_MAXIMUM_LENGTH'] >= 255))
+                    {
+                        $cssClassArr[] = substr($field, -7) == 'content' ? 'summernote' : '';
+                        $attrArr['class'] = implode(' ', $cssClassArr);
+                        $attrArr['rows'] = 5;
+                        $formAddElement = Form::textarea($fieldName, $defaultValue, $attrArr);
+                        $formEditElement = Form::textarea($fieldName, $editValue, $attrArr);
+                    }
+                    else if ($field == 'category_id' || $field == 'category_ids')
+                    {
+                        $type = $table;
+                        if ($field == 'category_ids')
+                        {
+                            $attrArr['multiple'] = '';
+                        }
+                        $attrStr = $this->getArrayString($attrArr);
+                        $formAddElement = "{:build_category_select('{$fieldName}', '{$type}', '{$defaultValue}', [{$attrStr}])}";
+                        $formEditElement = "{:build_category_select('{$fieldName}', '{$type}', \$row.{$field}, [{$attrStr}])}";
                     }
                     else
                     {
-                        $formAddElement = Form::input($inputType, "row[{$field}]", $v['COLUMN_DEFAULT'], $attr);
+                        //CSS类名
-                        $formEditElement = Form::input($inputType, "row[{$field}]", "{\$row.{$field}{$fieldFunc}}", $attr);
+                        $cssClassArr[] = substr($field, -3) == '_id' ? 'typeahead' : '';
-                    }
+                        $cssClassArr[] = substr($field, -4) == '_ids' ? 'tagsinput' : '';
+                        $cssClassArr = array_filter($cssClassArr);
+                        //因为有自动完成可输入其它内容
+                        $step = array_intersect($cssClassArr, ['typeahead', 'tagsinput']) ? 0 : $step;
+                        $attrArr['class'] = implode(' ', $cssClassArr);
 
-                    if (substr($field, -5) == 'image' || substr($field, -6) == 'avatar')
+                        $isUpload = substr($field, -4) == 'file' || substr($field, -5) == 'image' || substr($field, -6) == 'avatar' ? TRUE : FALSE;
-                    {
+                        //如果是步长则加上步长
-                        //如果是图片或头像
+                        if ($step)
-                        $formAddElement = $this->getImageUpload($field, $formAddElement);
+                        {
-                        $formEditElement = $this->getImageUpload($field, $formEditElement);
+                            $attrArr['step'] = $step;
-                    }
+                        }
-                    else if ($field == 'status')
+                        //如果是图片加上个size
-                    {
+                        if ($isUpload)
-                        //如果是状态字段
+                        {
-                        $formAddElement = "{:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}";
+                            $attrArr['size'] = 50;
-                        $formEditElement = "{:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], \$row['status'])}";
+                        }
+
+                        $formAddElement = Form::input($inputType, $fieldName, $defaultValue, $attrArr);
+                        $formEditElement = Form::input($inputType, $fieldName, $editValue, $attrArr);
+
+                        //如果是图片或文件
+                        if ($isUpload)
+                        {
+                            $formAddElement = $this->getImageUpload($field, $formAddElement);
+                            $formEditElement = $this->getImageUpload($field, $formEditElement);
+                        }
                     }
+                    //构造添加和编辑HTML信息
+                    $addList[] = $this->getFormGroup($field, $formAddElement);
+                    $editList[] = $this->getFormGroup($field, $formEditElement);
                 }
-                //构造添加和编辑HTML信息
-                $addList[] = $this->getFormGroup($field, $formAddElement);
-                $editList[] = $this->getFormGroup($field, $formEditElement);
-            }
 
-            //过滤text类型字段
+                //过滤text类型字段
-            if ($v['DATA_TYPE'] != 'text')
+                if ($v['DATA_TYPE'] != 'text')
-            {
-                //主键
-                if ($v['COLUMN_KEY'] == 'PRI')
                 {
-                    $javascriptList[] = "{field: 'state', checkbox: true}";
+                    //主键
+                    if ($v['COLUMN_KEY'] == 'PRI' && !$priDefined)
+                    {
+                        $priDefined = TRUE;
+                        $javascriptList[] = "{field: 'state', checkbox: true}";
+                    }
+                    //构造JS列信息
+                    $javascriptList[] = $this->getJsColumn($field);
+                    //排序方式,如果有weigh则按weigh,否则按主键排序
+                    $order = $field == 'weigh' ? 'weigh' : $order;
                 }
-                //构造JS列信息
+            }
-                $javascriptList[] = $this->getJsColumn($field);
+            //JS最后一列加上操作列
-                //排序方式,如果有weigh则按weigh,否则按主键排序
+            $javascriptList[] = str_repeat(" ", 24) . "{field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}";
-                $order = $field == 'weigh' ? 'weigh' : $order;
+            $addList = implode("\n", array_filter($addList));
+            $editList = implode("\n", array_filter($editList));
+            $javascriptList = implode(",\n", array_filter($javascriptList));
+            $langList = implode(",\n", array_filter($langList));
+
+            //表注释
+            $tableComment = $tableInfo['Comment'];
+            $tableComment = mb_substr($tableComment, -1) == '表' ? mb_substr($tableComment, 0, -1) . '管理' : $tableComment;
+
+            //最终将生成的文件路径
+            $controllerFile = $adminPath . 'controller' . DS . $controllerFile;
+            $javascriptFile = ROOT_PATH . 'public' . DS . 'assets' . DS . 'js' . DS . 'backend' . DS . $controllerUrl . '.js';
+            $addFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'add.html';
+            $editFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'edit.html';
+            $indexFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'index.html';
+            $langFile = $adminPath . 'lang' . DS . Lang::detect() . DS . $controllerUrl . '.php';
+
+            $appNamespace = Config::get('app_namespace');
+            $moduleName = 'admin';
+            $controllerNamespace = "{$appNamespace}\\{$moduleName}\\controller" . ($controllerDir ? "\\" : "") . str_replace('/', "\\", $controllerDir);
+            $modelNamespace = "{$appNamespace}\\" . ($local ? $moduleName : "common") . "\\model";
+
+            $data = [
+                'controllerNamespace'     => $controllerNamespace,
+                'modelNamespace'          => $modelNamespace,
+                'controllerUrl'           => $controllerUrl,
+                'controllerDir'           => $controllerDir,
+                'controllerName'          => $controllerName,
+                'modelName'               => $modelName,
+                'tableComment'            => $tableComment,
+                'iconName'                => $iconName,
+                'order'                   => $order,
+                'table'                   => $table,
+                'tableName'               => $tableName,
+                'addList'                 => $addList,
+                'editList'                => $editList,
+                'javascriptList'          => $javascriptList,
+                'langList'                => $langList,
+                'modelAutoWriteTimestamp' => in_array('createtime', $fields) || in_array('updatetime', $fields) ? "'int'" : 'false',
+                'createTime'              => in_array('createtime', $fields) ? "'createtime'" : 'false',
+                'updateTime'              => in_array('updatetime', $fields) ? "'updatetime'" : 'false',
+            ];
+
+            // 生成控制器文件
+            $result = $this->writeToFile('controller', $data, $controllerFile);
+            // 生成模型文件
+            $result = $this->writeToFile('model', $data, $modelFile);
+            // 生成视图文件
+            $result = $this->writeToFile('add', $data, $addFile);
+            $result = $this->writeToFile('edit', $data, $editFile);
+            $result = $this->writeToFile('index', $data, $indexFile);
+            // 生成JS文件
+            $result = $this->writeToFile('javascript', $data, $javascriptFile);
+            // 生成语言文件
+            if ($langList)
+            {
+                $result = $this->writeToFile('lang', $data, $langFile);
             }
         }
-        //JS最后一列加上操作列
+        catch (\think\exception\ErrorException $e)
-        $javascriptList[] = str_repeat(" ", 24) . "{field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}";
-        $addList = implode("\n", array_filter($addList));
-        $editList = implode("\n", array_filter($editList));
-        $javascriptList = implode(",\n", array_filter($javascriptList));
-        $langList = implode(",\n", array_filter($langList));
-
-        //表注释
-        $tableComment = $tableInfo['Comment'];
-        $tableComment = mb_substr($tableComment, -1) == '表' ? mb_substr($tableComment, 0, -1) . '管理' : $tableComment;
-
-        //最终将生成的文件路径
-        $controllerFile = $adminPath . 'controller' . DS . $controllerFile;
-        $javascriptFile = ROOT_PATH . 'public' . DS . 'assets' . DS . 'js' . DS . 'backend' . DS . $controllerUrl . '.js';
-        $addFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'add.html';
-        $editFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'edit.html';
-        $indexFile = $adminPath . 'view' . DS . $controllerUrl . DS . 'index.html';
-        $langFile = $adminPath . 'lang' . DS . Lang::detect() . DS . $controllerUrl . '.php';
-
-        $appNamespace = Config::get('app_namespace');
-        $moduleName = 'admin';
-        $controllerNamespace = "{$appNamespace}\\{$moduleName}\\controller" . ($controllerDir ? "\\" : "") . str_replace('/', "\\", $controllerDir);
-        $modelNamespace = "{$appNamespace}\\" . ($local ? $moduleName : "common") . "\\model";
-
-        $data = [
-            'controllerNamespace'     => $controllerNamespace,
-            'modelNamespace'          => $modelNamespace,
-            'controllerUrl'           => $controllerUrl,
-            'controllerDir'           => $controllerDir,
-            'controllerName'          => $controllerName,
-            'modelName'               => $modelName,
-            'tableComment'            => $tableComment,
-            'iconName'                => $iconName,
-            'order'                   => $order,
-            'table'                   => $table,
-            'tableName'               => $tableName,
-            'addList'                 => $addList,
-            'editList'                => $editList,
-            'javascriptList'          => $javascriptList,
-            'langList'                => $langList,
-            'modelAutoWriteTimestamp' => in_array('createtime', $fields) || in_array('updatetime', $fields) ? "'int'" : 'false',
-            'createTime'              => in_array('createtime', $fields) ? "'createtime'" : 'false',
-            'updateTime'              => in_array('updatetime', $fields) ? "'updatetime'" : 'false',
-        ];
-
-        // 生成控制器文件
-        $result = $this->writeToFile('controller', $data, $controllerFile);
-        // 生成模型文件
-        $result = $this->writeToFile('model', $data, $modelFile);
-        // 生成视图文件
-        $result = $this->writeToFile('add', $data, $addFile);
-        $result = $this->writeToFile('edit', $data, $editFile);
-        $result = $this->writeToFile('index', $data, $indexFile);
-        // 生成JS文件
-        $result = $this->writeToFile('javascript', $data, $javascriptFile);
-        // 生成语言文件
-        if ($langList)
         {
-            $result = $this->writeToFile('lang', $data, $langFile);
+            print_r($e);
         }
         $output->writeln("<info>Build Successed</info>");
     }
@@ -347,6 +411,99 @@ EOD;
         }
     }
 
+    /**
+     * 读取数据和语言数组列表
+     * @param array $arr
+     * @return array
+     */
+    protected function getLangArray($arr, $withTpl = TRUE)
+    {
+        $langArr = [];
+        foreach ($arr as $k => $v)
+        {
+            $langArr[(is_numeric($k) ? $v : $k)] = is_numeric($k) ? ($withTpl ? "{:" : "") . "__('" . ucfirst($v) . "')" . ($withTpl ? "}" : "") : $v;
+        }
+        return $langArr;
+    }
+
+    /**
+     * 将数据转换成带字符串
+     * @param array $arr
+     * @return string
+     */
+    protected function getArrayString($arr)
+    {
+        $stringArr = [];
+        foreach ($arr as $k => $v)
+        {
+            $is_var = in_array(substr($v, 0, 1), ['$', '_']);
+            if (!$is_var)
+            {
+                $v = str_replace("'", "\'", $v);
+                $k = str_replace("'", "\'", $k);
+            }
+            $stringArr[] = "'" . (is_numeric($k) ? $v : $k) . "' => " . (is_numeric($k) ? "__('" . ucfirst($k) . "')" : $is_var ? $v : "'{$v}'");
+        }
+        return implode(",", $stringArr);
+    }
+
+    protected function getFieldType(& $v)
+    {
+        $inputType = 'text';
+        switch ($v['DATA_TYPE'])
+        {
+            case 'bigint':
+            case 'int':
+            case 'mediumint':
+            case 'smallint':
+            case 'tinyint':
+                $inputType = 'number';
+                break;
+            case 'enum':
+            case 'set':
+                $inputType = 'select';
+                break;
+            case 'decimal':
+            case 'double':
+            case 'float':
+                $inputType = 'number';
+                break;
+            case 'longtext':
+            case 'text':
+            case 'mediumtext':
+            case 'smalltext':
+            case 'tinytext':
+                $inputType = 'textarea';
+                break;
+            case 'year';
+            case 'date';
+            case 'time';
+            case 'datetime';
+            case 'timestamp';
+                $inputType = 'datetime';
+                break;
+            default:
+                break;
+        }
+        $fieldsName = $v['COLUMN_NAME'];
+        // 如果后缀以time结尾说明也是个时间字段
+        if (substr($fieldsName, -4) == 'time')
+        {
+            $inputType = 'datetime';
+        }
+        // 如果后缀以data结尾且类型为enum,说明是个单选框
+        if (substr($fieldsName, -4) == 'data' && $v['DATA_TYPE'] == 'enum')
+        {
+            $inputType = "radio";
+        }
+        // 如果后缀以data结尾且类型为set,说明是个复选框
+        if (substr($fieldsName, -4) == 'data' && $v['DATA_TYPE'] == 'set')
+        {
+            $inputType = "checkbox";
+        }
+        return $inputType;
+    }
+
     /**
      * 获取表单分组数据
      * @param string $field
@@ -374,10 +531,11 @@ EOD;
      */
     protected function getImageUpload($field, $content)
     {
+        $filter = substr($field, -4) == 'avatar' || substr($field, -5) == 'image' ? 'data-mimetype="image/*"' : "";
         return <<<EOD
 <div class="form-inline">
                 {$content}
-                <span><button id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                <span><button id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"{$filter}><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
             </div>
 EOD;
     }

application/admin/command/Install/fastadmin.sql

@@ -261,6 +261,40 @@ CREATE TABLE `fa_page` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='单页表';
 
+-- ----------------------------
+--  Table structure for `fa_test`
+-- ----------------------------
+DROP TABLE IF EXISTS `fa_test`;
+CREATE TABLE `fa_test` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `category_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '分类ID(单选)',
+  `category_ids` varchar(100) NOT NULL DEFAULT '' COMMENT '分类ID(多选)',
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID',
+  `user_ids` varchar(100) NOT NULL DEFAULT '' COMMENT '多会员ID',
+  `week` enum('monday','tuesday','wednesday') NOT NULL COMMENT '星期(单选)',
+  `flag` set('hot','index','recommend') NOT NULL DEFAULT '' COMMENT '标志(多选)',
+  `genderdata` enum('male','female') NOT NULL DEFAULT 'male' COMMENT '性别(单选)',
+  `hobbydata` set('music','reading','swimming') NOT NULL COMMENT '爱好(多选)',
+  `title` varchar(50) NOT NULL DEFAULT '' COMMENT '标题',
+  `content` text NOT NULL COMMENT '内容',
+  `image` varchar(100) NOT NULL DEFAULT '' COMMENT '图片',
+  `attachfile` varchar(100) NOT NULL DEFAULT '' COMMENT '附件',
+  `keywords` varchar(100) NOT NULL DEFAULT '' COMMENT '关键字',
+  `description` varchar(255) NOT NULL DEFAULT '' COMMENT '描述',
+  `price` float(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '价格',
+  `views` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '点击',
+  `startdate` date DEFAULT NULL COMMENT '开始日期',
+  `activitydate` datetime DEFAULT NULL COMMENT '活动时间(datetime)',
+  `year` year(4) DEFAULT NULL COMMENT '年',
+  `times` time DEFAULT NULL COMMENT '时间',
+  `refreshtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '刷新时间(int)',
+  `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
+  `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重',
+  `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='测试表';
+
 -- ----------------------------
 --  Table structure for `fa_user`
 -- ----------------------------

application/admin/command/Min.php

@@ -51,17 +51,28 @@ class Min extends Command
         $publicPath = ROOT_PATH . 'public' . DS;
         $tempFile = $minPath . 'temp.js';
 
-        try
+        // Winsows下请手动配置配置该值
+        $nodeExec = "";
+
+        if (!$nodeExec)
         {
-            $nodeExec = exec("which node");
+            if (IS_WIN)
-            if (!$nodeExec)
             {
-                throw new Exception("node environment not found!please install node first!");
+                throw new Exception("node environment require nodejs!please check http://doc.fastadmin.net/322813 !");
+            }
+
+            try
+            {
+                $nodeExec = exec("which node");
+                if (!$nodeExec)
+                {
+                    throw new Exception("node environment not found!please install node first!");
+                }
+            }
+            catch (Exception $e)
+            {
+                throw new Exception($e->getMessage());
             }
-        }
-        catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
         }
 
         foreach ($moduleArr as $mod)

application/admin/common.php

@@ -1,27 +1,24 @@
 <?php
 
 use app\admin\library\Auth;
+use app\common\model\Category;
 use app\common\model\Configvalue;
 use fast\Form;
+use fast\Tree;
 use think\Db;
 
-function get_upload_multipart($savekey = '', $mimetype = '', $maxsize = '')
+/**
+ * 重新生成上传的参数配置
+ * @return type
+ */
+function get_upload_multipart($params = [])
 {
     // 加载配置
     $configvalue = new Configvalue;
     // 上传参数配置配置
-    $uploadcfg = $configvalue->upload($savekey, $mimetype, $maxsize);
+    $uploadcfg = $configvalue->upload($params);
 
-    return json_encode(['policy' => $uploadcfg['policy'], 'signature' => $uploadcfg['signature']]);
+    return json_encode(isset($uploadcfg['multipart']) ? $uploadcfg['multipart'] : []);
-}
-
-function get_flag_list()
-{
-    return [
-        'h' => __('Hot'),
-        'i' => __('Index'),
-        'r' => __('Recommend'),
-    ];
 }
 
 /**
@@ -50,9 +47,10 @@ function build_radios($name, $list = [], $selected = null)
 {
     $html = [];
     $selected = is_null($selected) ? key($list) : $selected;
+    $selected = is_array($selected) ? $selected : explode(',', $selected);
     foreach ($list as $k => $v)
     {
-        $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, $k == $selected, ['id' => "{$name}-{$k}"]));
+        $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
     }
     return implode(' ', $html);
 }
@@ -68,13 +66,36 @@ function build_checkboxs($name, $list = [], $selected = null)
 {
     $html = [];
     $selected = is_null($selected) ? [] : $selected;
+    $selected = is_array($selected) ? $selected : explode(',', $selected);
     foreach ($list as $k => $v)
     {
-        $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox($name, $k, $k == $selected, ['id' => "{$name}-{$k}"]));
+        $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
     }
     return implode(' ', $html);
 }
 
+/**
+ * 生成分类下拉列表框
+ * @param string $name
+ * @param string $type
+ * @param mixed $selected
+ * @param array $attr
+ * @return string
+ */
+function build_category_select($name, $type, $selected = null, $attr = [])
+{
+    $tree = Tree::instance();
+    $tree->init(Category::getCategoryArray($type), 'pid');
+    $categorylist = $tree->getTreeList($tree->getTreeArray(0), 'name');
+    $categorydata = [0 => __('None')];
+    foreach ($categorylist as $k => $v)
+    {
+        $categorydata[$v['id']] = $v['name'];
+    }
+    $attr = array_merge(['id' => "c-{$name}", 'class' => 'form-control selectpicker'], $attr);
+    return build_select($name, $categorydata, $selected, $attr);
+}
+
 /**
  * 生成表格操作按钮栏
  * @param array $btns

application/admin/library/traits/Backend.php

@@ -43,6 +43,11 @@ trait Backend
             $params = $this->request->post("row/a");
             if ($params)
             {
+                foreach ($params as $k => &$v)
+                {
+                    $v = is_array($v) ? implode(',', $v) : $v;
+                    $v = substr($k, -4) == 'time' && !is_numeric($v) ? strtotime($v) : $v;
+                }
                 $this->model->create($params);
                 AdminLog::record(__('Add'), $this->model->getLastInsID());
                 $this->code = 1;
@@ -67,6 +72,11 @@ trait Backend
             $params = $this->request->post("row/a");
             if ($params)
             {
+                foreach ($params as $k => &$v)
+                {
+                    $v = is_array($v) ? implode(',', $v) : $v;
+                    $v = substr($k, -4) == 'time' && !is_numeric($v) ? strtotime($v) : $v;
+                }
                 $row->save($params);
                 AdminLog::record(__('Edit'), $ids);
                 $this->code = 1;

application/admin/view/layout/default.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{$config.language}">
     <head>
         {include file="common/meta" /}
     </head>

application/admin/view/page/add.html

@@ -1,5 +1,4 @@
 <form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
     <div class="form-group">
         <label for="c-category_id" class="control-label col-xs-12 col-sm-2">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -48,7 +47,7 @@
     <div class="form-group">
         <label for="c-views" class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-views" class="form-control" name="row[views]" type="number" value="0">
+            <input id="c-views" class="form-control" name="row[views]" type="text" value="0">
         </div>
     </div>
     <div class="form-group">

application/common/behavior/Common.php

@@ -20,6 +20,11 @@ class Common
         {
             Config::set('site.cdnurl', $cdnurl);
         }
+        // 如果是调试模式将version置为当前的时间戳可避免缓存
+        if (!Config::get('app_debug'))
+        {
+            Config::set('site.version', time());
+        }
     }
 
 }

extend/fast/Form.php

@@ -89,6 +89,12 @@ class FormBuilder
      * @var array
      */
     protected $skipValueTypes = array('file', 'password', 'checkbox', 'radio');
+
+    /**
+     * Escape html
+     * @var boolean
+     */
+    protected $escapeHtml = true;
     protected static $instance;
 
     /**
@@ -179,6 +185,32 @@ class FormBuilder
         $this->model = $model;
     }
 
+    /**
+     * Set the escape html mode
+     * @param boolean $escape
+     */
+    public function setEscapeHtml($escape)
+    {
+        $this->escapeHtml = $escape;
+    }
+
+    /**
+     * Escape HTML special characters in a string.
+     * @return string
+     */
+    public function escape($value)
+    {
+        if (!$this->escapeHtml)
+        {
+            return $value;
+        }
+        if (is_array($value))
+        {
+            $value = json_encode($value, JSON_UNESCAPED_UNICODE);
+        }
+        return htmlspecialchars($value, ENT_QUOTES, 'UTF-8', false);
+    }
+
     /**
      * Close the current form.
      *
@@ -222,7 +254,7 @@ class FormBuilder
 
         $options = $this->attributes($options);
 
-        $value = e($this->formatLabel($name, $value));
+        $value = $this->escape($this->formatLabel($name, $value));
 
         return '<label for="' . $name . '"' . $options . '>' . $value . '</label>';
     }
@@ -378,7 +410,7 @@ class FormBuilder
         // the element. Then we'll create the final textarea elements HTML for us.
         $options = $this->attributes($options);
 
-        return '<textarea' . $options . '>' . e($value) . '</textarea>';
+        return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
     }
 
     /**
@@ -547,7 +579,7 @@ class FormBuilder
             $html[] = $this->option($display, $value, $selected);
         }
 
-        return '<optgroup label="' . e($label) . '">' . implode('', $html) . '</optgroup>';
+        return '<optgroup label="' . $this->escape($label) . '">' . implode('', $html) . '</optgroup>';
     }
 
     /**
@@ -562,9 +594,9 @@ class FormBuilder
     {
         $selected = $this->getSelectedValue($value, $selected);
 
-        $options = array('value' => e($value), 'selected' => $selected);
+        $options = array('value' => $this->escape($value), 'selected' => $selected);
 
-        return '<option' . $this->attributes($options) . '>' . e($display) . '</option>';
+        return '<option' . $this->attributes($options) . '>' . $this->escape($display) . '</option>';
     }
 
     /**

extend/fast/payment/Wechat.php

@@ -50,7 +50,7 @@ class Wechat
     {
         if ($config = Config::get('payment.wechat'))
         {
-            $this->config = array_merge($this->config, $config);
+            $this->_config = array_merge($this->_config, $config);
         }
         $this->_config = array_merge($this->_config, is_array($options) ? $options : []);
     }

public/assets/css/backend-func.css

@@ -287,6 +287,9 @@ body {
 .fixed-table-container {
   border: none!important;
 }
+.note-editor .note-editing-area .note-editable {
+  display: block !important;
+}
 .pjax-loader-bar .progress {
   position: fixed;
   top: 0;

public/assets/js/backend/page.js

@@ -54,6 +54,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         api: {
             bindevent: function () {
+                $("form[role=form]").validator({
+                    rules: {
+                        mobile: [/^1[3-9]\d{9}$/, "请填写有效的手机号"],
+                        chinese: [/^[\u0391-\uFFE5]+$/, "请填写中文字符"],
+                        // 使用函数定义规则
+                        phone: function (elem, param) {
+                            return /^1[3458]\d{9}$/.test($(elem).val()) || '请检查手机号格式';
+                        },
+                        image: function (elem, param) {
+                            return /^\/(.*)\.(jpg|jpeg|png|gif)$/.test($(elem).val()) || '请上传有并行的图片文件';
+                        }
+                    },
+                    messages: {
+                    },
+                    fields: {
+                        'row[title]': "required;length(3~16)",
+                        'row[image]': "required;image",
+                        'row[views]': "required;range[0~100]",
+                        'row[content]': "required"
+                    },
+                });
                 Form.api.bindevent($("form[role=form]"));
             }
         }

public/assets/js/require-form.js

@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'upload', 'bootstrap-validator', 'bootstrap-checkbox', 'bootstrap-radio', 'bootstrap-switch'], function ($, undefined, Backend, Config, Toastr, Upload, undefined) {
+define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'upload', 'validator'], function ($, undefined, Backend, Config, Toastr, Upload, Validator) {
     var Form = {
         config: {
         },
@@ -64,11 +64,14 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'upload', 'bootstr
                 return false;
             },
             bindevent: function (form, onBeforeSubmit, onAfterSubmit) {
-                form.validator().on('submit', function (e) {
+                form.validator({
-                    if (e.isDefaultPrevented()) {
+                    validClass: 'has-success',
-                        //验证不通过
+                    invalidClass: 'has-error',
-                        Toastr.error("验证失败,请检查表单输入是否正确");
+                    bindClassTo: '.form-group',
-                    } else {
+                    formClass: 'n-default n-bootstrap',
+                    msgClass: 'n-right',
+                    stopOnError: true,
+                    valid: function (ret) {
                         //验证通过提交表单
                         Form.api.submit(form, onBeforeSubmit, function (data) {
                             if (typeof onAfterSubmit == 'function') {
@@ -86,16 +89,6 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'upload', 'bootstr
                     }
                 });
 
-                // Activate the switches with icons
-                if ($('.switch').length != 0) {
-                    $('.switch')['bootstrapSwitch']();
-                }
-
-                // Activate regular switches
-                if ($("[data-toggle='switch']").length != 0) {
-                    $("[data-toggle='switch']").wrap('<div class="switch" />').parent().bootstrapSwitch();
-                }
-
                 //绑定select元素事件
                 if ($(".selectpicker", form).size() > 0) {
                     require(['bootstrap-select'], function () {

public/assets/less/backend-func.less

@@ -317,6 +317,10 @@ body {
     border:none!important;
 }
 
+.note-editor .note-editing-area .note-editable{
+    display: block !important;
+}
+
 .pjax-loader-bar .progress {
     position: fixed;
     top: 0;