diff --git a/composer.lock b/composer.lock index 0e28e20a..c9dcd42d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3dd0118e5d08ef728cb0c2f4f7de15a5", + "content-hash": "ae2e50326d8e83fd299c3350bb0f87d1", "packages": [ { "name": "doctrine/cache", @@ -1078,16 +1078,16 @@ }, { "name": "tp5er/tp5-databackup", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/tp5er/tp5-databackup.git", - "reference": "101477abe810fb91bad5c1304a93c5f461db6dc8" + "reference": "10abd4383cf78844e1c22584fd823ef1d18e75dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tp5er/tp5-databackup/zipball/101477abe810fb91bad5c1304a93c5f461db6dc8", - "reference": "101477abe810fb91bad5c1304a93c5f461db6dc8", + "url": "https://api.github.com/repos/tp5er/tp5-databackup/zipball/10abd4383cf78844e1c22584fd823ef1d18e75dc", + "reference": "10abd4383cf78844e1c22584fd823ef1d18e75dc", "shasum": "" }, "require": { @@ -1110,20 +1110,20 @@ } ], "description": "Implement the database backup restore", - "time": "2018-04-07T11:20:53+00:00" + "time": "2017-12-29T05:36:58+00:00" }, { "name": "xaboy/form-builder", - "version": "1.2.5", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/xaboy/form-builder.git", - "reference": "73cb5be3d9f57680f64d01ab424c4ac5c462f1b8" + "reference": "43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xaboy/form-builder/zipball/73cb5be3d9f57680f64d01ab424c4ac5c462f1b8", - "reference": "73cb5be3d9f57680f64d01ab424c4ac5c462f1b8", + "url": "https://api.github.com/repos/xaboy/form-builder/zipball/43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf", + "reference": "43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf", "shasum": "" }, "require": { @@ -1148,15 +1148,13 @@ ], "description": "PHP表单生成器,快速生成现代化的form表单。包含复选框、单选框、输入框、下拉选择框等元素以及,省市区三级联动,时间选择,日期选择,颜色选择,文件/图片上传等功能。", "homepage": "https://github.com/xaboy/form-builder", - "time": "2018-11-13T12:44:31+00:00" + "time": "2018-12-12T12:20:38+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "tp5er/tp5-databackup": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9a7c4bed..add6e245 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1111,23 +1111,23 @@ }, { "name": "tp5er/tp5-databackup", - "version": "dev-master", - "version_normalized": "9999999-dev", + "version": "1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", "url": "https://github.com/tp5er/tp5-databackup.git", - "reference": "101477abe810fb91bad5c1304a93c5f461db6dc8" + "reference": "10abd4383cf78844e1c22584fd823ef1d18e75dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tp5er/tp5-databackup/zipball/101477abe810fb91bad5c1304a93c5f461db6dc8", - "reference": "101477abe810fb91bad5c1304a93c5f461db6dc8", + "url": "https://api.github.com/repos/tp5er/tp5-databackup/zipball/10abd4383cf78844e1c22584fd823ef1d18e75dc", + "reference": "10abd4383cf78844e1c22584fd823ef1d18e75dc", "shasum": "" }, "require": { "php": ">=5.4.0" }, - "time": "2018-04-07T11:20:53+00:00", + "time": "2017-12-29T05:36:58+00:00", "type": "library", "installation-source": "source", "autoload": { @@ -1149,24 +1149,24 @@ }, { "name": "xaboy/form-builder", - "version": "1.2.5", - "version_normalized": "1.2.5.0", + "version": "1.2.7", + "version_normalized": "1.2.7.0", "source": { "type": "git", "url": "https://github.com/xaboy/form-builder.git", - "reference": "73cb5be3d9f57680f64d01ab424c4ac5c462f1b8" + "reference": "43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xaboy/form-builder/zipball/73cb5be3d9f57680f64d01ab424c4ac5c462f1b8", - "reference": "73cb5be3d9f57680f64d01ab424c4ac5c462f1b8", + "url": "https://api.github.com/repos/xaboy/form-builder/zipball/43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf", + "reference": "43d5c0a8f1f1f0fc1f6430b827fbe2b7b0d5b5cf", "shasum": "" }, "require": { "ext-json": "*", "php": ">=5.4.0" }, - "time": "2018-11-13T12:44:31+00:00", + "time": "2018-12-12T12:20:38+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/xaboy/form-builder/README.md b/vendor/xaboy/form-builder/README.md index 798c3e0d..c7c40b4a 100644 --- a/vendor/xaboy/form-builder/README.md +++ b/vendor/xaboy/form-builder/README.md @@ -21,12 +21,21 @@ PHP表单生成器,快速生成现代化的form表单。包含复选框、单选框、输入框、下拉选择框等元素以及省市区三级联动、时间选择、日期选择、颜色选择、树型、文件/图片上传等功能。

-> 1.2.4 版本支持简单字段验证 +> 1.2.4 版本支持字段验证 #### 如果对您有帮助,您可以点右上角 "Star" 支持一下 谢谢! #### 本项目还在不断开发完善中,如有建议或问题请[在这里提出](https://github.com/xaboy/form-builder/issues/new) + +## 更新说明 + +#### 1.2.7 (2018-12-12) +- 完善时间选择组件,日期选择组件验证规则 +- 新增 fields 类型验证规则 +- 新增 使用 view 方法生成时,表单只能被创建一次 +- 修复一些小问题 + ## 安装 `composer require xaboy/form-builder` diff --git a/vendor/xaboy/form-builder/src/Form.php b/vendor/xaboy/form-builder/src/Form.php index 74ca2956..77af87ce 100644 --- a/vendor/xaboy/form-builder/src/Form.php +++ b/vendor/xaboy/form-builder/src/Form.php @@ -11,6 +11,7 @@ use FormBuilder\components\Cascader; use FormBuilder\components\FormStyle; use FormBuilder\components\Hidden; use FormBuilder\components\Row; +use FormBuilder\exception\FormBuilderException; use FormBuilder\traits\form\FormCascaderTrait; use FormBuilder\traits\form\FormCheckBoxTrait; use FormBuilder\traits\form\FormColorPickerTrait; @@ -33,6 +34,7 @@ use FormBuilder\traits\form\FormValidateTrait; /** * Class Form + * * @package FormBuilder */ class Form @@ -59,12 +61,14 @@ class Form /** * 三级联动 加载省市数据 + * * @var bool */ protected $loadCityData = false; /** * 三级联动 加载省市区数据 + * * @var bool */ protected $loadCityAreaData = false; @@ -96,18 +100,21 @@ class Form /** * 加载 jquery + * * @var bool */ protected $linkJq = true; /** * 加载 vue + * * @var bool */ protected $linkVue = true; /** * 加载 iview + * * @var bool */ protected $linkIview = true; @@ -119,24 +126,28 @@ class Form /** * 网页标题 + * * @var string */ protected $title = 'formBuilder'; /** * 提交地址 + * * @var string */ protected $action = ''; /** * 表单id + * * @var string */ protected $id = ''; /** * 提交方式 + * * @var string */ protected $method = 'post'; @@ -147,6 +158,7 @@ class Form /** * 表单配置 + * * @var array|mixed */ protected $config = [ @@ -162,8 +174,9 @@ class Form /** * Form constructor. + * * @param string $action 提交地址 - * @param array $components 组件 + * @param array $components 组件 */ public function __construct($action = '', array $components = []) { @@ -171,6 +184,11 @@ class Form $this->action = $action; } + public static function json() + { + return new Json(); + } + /** * @param bool $linkJq */ @@ -217,7 +235,7 @@ class Form */ public function components(array $components = []) { - foreach ($components as $component){ + foreach ($components as $component) { $this->append($component); } return $this; @@ -254,6 +272,7 @@ class Form /** * 表单提交后成功执行的js地址 * formCreate.formSuccess(formData,$f) + * * @param string $successScript * @return $this */ @@ -292,6 +311,7 @@ class Form /** * 提交地址 + * * @param string $action * @return $this */ @@ -315,7 +335,7 @@ class Form */ public function getConfig($key = '') { - if($key =='') + if ($key == '') return $this->config; else return isset($this->config[$key]) ? $this->config[$key] : null; @@ -323,6 +343,7 @@ class Form /** * 提交方式 + * * @param string $method * @return $this */ @@ -334,6 +355,7 @@ class Form /** * 标题 + * * @return string */ public function getTitle() @@ -354,13 +376,14 @@ class Form /** * 追加组件 + * * @param FormComponentDriver $component * @return $this */ public function append(FormComponentDriver $component) { $field = $component->getField(); - if(!isset($this->components[$field])) + if (!isset($this->components[$field])) $this->fields[] = $field; $this->components[$field] = $component; $this->checkLoadData($component); @@ -369,13 +392,14 @@ class Form /** * 开头插入组件 + * * @param FormComponentDriver $component * @return $this */ public function prepend(FormComponentDriver $component) { $field = $component->getField(); - if(!isset($this->components[$field])) + if (!isset($this->components[$field])) array_unshift($this->fields, $field); $this->components[$field] = $component; $this->checkLoadData($component); @@ -384,14 +408,15 @@ class Form /** * 是否需要引入省市区数据 + * * @param FormComponentDriver $component */ protected function checkLoadData(FormComponentDriver $component) { - if( + if ( $component instanceof Cascader && ($this->loadCityData == false || $this->loadCityAreaData == false) - ){ + ) { $type = $component->getType(); if ($type == Cascader::TYPE_CITY) $this->loadCityData = true; @@ -402,18 +427,26 @@ class Form /** * 获得表单规则 + * * @return array + * @throws FormBuilderException */ public function getRules() { $rules = []; + $fields = []; foreach ($this->fields as $field) { $component = $this->components[$field]; if (!($component instanceof FormComponentDriver)) continue; + $field = $component->getField(); + if (in_array($field, $fields)) + throw new FormBuilderException($field . '字段已重复,请保证组件 field 无重复'); + + $fields[] = $field; $rule = $component->build(); - if(!$component instanceof Hidden) - $rule['validate'] = array_merge(isset($rule['validate']) ? $rule['validate'] : [],$component->validate()->build()); + if (!$component instanceof Hidden) + $rule['validate'] = array_merge(isset($rule['validate']) ? $rule['validate'] : [], $component->validate()->build()); $rules[] = $rule; } return $rules; @@ -422,6 +455,7 @@ class Form /** * 获取表单视图 + * * @return string */ public function view() @@ -435,6 +469,7 @@ class Form /** * 获取表单生成器所需全部js + * * @return array */ public function script() @@ -444,6 +479,7 @@ class Form /** * 获取生成表单的js代码 + * * @return string */ public function formScript() @@ -458,6 +494,7 @@ class Form /** * 获取表单生成器所需js + * * @return array */ public function getScript() @@ -470,19 +507,20 @@ class Form $script[] = $_script['city-area-data']; if ($this->loadCityData == true) $script[] = $_script['city-data']; - if($this->linkJq) + if ($this->linkJq) $script[] = $_script['jq']; - if($this->linkIview){ + if ($this->linkIview) { $script[] = $_script['iview']; $script[] = $_script['iview-css']; } - if($this->linkVue) + if ($this->linkVue) $script[] = $_script['vue']; return array_reverse($script); } /** * 是否隐藏提交按钮(默认显示) + * * @param bool $isShow * @return Form */ @@ -495,6 +533,7 @@ class Form /** * 是否隐藏重置按钮(默认隐藏) + * * @param bool $isShow * @return Form */ @@ -523,12 +562,13 @@ class Form /** * 生成表单快捷方法 + * * @param string $action - * @param array $components + * @param array $components * @return Form */ public static function create($action, array $components = []) { - return new static($action, $components); + return new self($action, $components); } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/Helper.php b/vendor/xaboy/form-builder/src/Helper.php index be744dd3..450ff2c7 100644 --- a/vendor/xaboy/form-builder/src/Helper.php +++ b/vendor/xaboy/form-builder/src/Helper.php @@ -8,6 +8,8 @@ namespace FormBuilder; +use FormBuilder\exception\FormBuilderException; + class Helper { public static function toType($var, $type = 'string') @@ -42,6 +44,7 @@ class Helper return "unknown type"; } + public static function verifyType($var, $verify, $title = '') { if (!is_array($verify)) $verify = [$verify]; @@ -51,7 +54,7 @@ class Helper } $type = self::getVarType($var); if (!in_array($type, $verify)) - throw new \Exception($title . '类型需为' . implode(',', $verify)); + throw new FormBuilderException($title . '类型需为' . implode(',', $verify)); } public static function getDate($date) diff --git a/vendor/xaboy/form-builder/src/Json.php b/vendor/xaboy/form-builder/src/Json.php index a999015e..24a123a3 100644 --- a/vendor/xaboy/form-builder/src/Json.php +++ b/vendor/xaboy/form-builder/src/Json.php @@ -17,22 +17,22 @@ class Json public static function succ($msg, $data = []) { - return static::result(200, $msg, $data); + return self::result(200, $msg, $data); } public static function fail($msg, $data = []) { - return static::result(400, $msg, $data); + return self::result(400, $msg, $data); } public static function uploadSucc($filePath, $msg = '上传成功', $data = []) { $data['filePath'] = $filePath; - return static::succ($msg, $data); + return self::succ($msg, $data); } public static function uploadFail($msg = '上传失败', $data = []) { - return static::fail($msg, $data); + return self::fail($msg, $data); } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Cascader.php b/vendor/xaboy/form-builder/src/components/Cascader.php index 2fe67875..a5daf57b 100644 --- a/vendor/xaboy/form-builder/src/components/Cascader.php +++ b/vendor/xaboy/form-builder/src/components/Cascader.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 多级联动组件 * Class Cascader + * * @package FormBuilder\components * @method $this type(String $type) 数据类型, 支持 city_area(省市区三级联动), city (省市二级联动), other (自定义) * @method $this disabled(Boolean $bool) 是否禁用选择器 @@ -70,9 +71,6 @@ class Cascader extends FormComponentDriver 'notFoundText' => 'string', ]; - /** - * - */ protected function init() { $this->placeholder($this->getPlaceHolder()); @@ -96,13 +94,14 @@ class Cascader extends FormComponentDriver * "value":"东城区", "label":"东城区" * }] * } + * * @param array $data * @return $this */ public function data(array $data) { - if(!is_array($this->props['data'])) $this->props['data'] = []; - $this->props['data'] = array_merge($this->props['data'],$data); + if (!is_array($this->props['data'])) $this->props['data'] = []; + $this->props['data'] = array_merge($this->props['data'], $data); return $this; } @@ -112,12 +111,13 @@ class Cascader extends FormComponentDriver */ public function jsData($var) { - $this->props['data'] = 'js.'.$var; + $this->props['data'] = 'js.' . $var; return $this; } /** * 获取组件类型 + * * @return mixed */ public function getType() @@ -128,7 +128,7 @@ class Cascader extends FormComponentDriver /** * @return Validate */ - protected function getValidateHandler() + public function getValidateHandler() { return Validate::arr(); } @@ -145,7 +145,7 @@ class Cascader extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Checkbox.php b/vendor/xaboy/form-builder/src/components/Checkbox.php index e2beee01..5af9ac75 100644 --- a/vendor/xaboy/form-builder/src/components/Checkbox.php +++ b/vendor/xaboy/form-builder/src/components/Checkbox.php @@ -15,6 +15,7 @@ use FormBuilder\traits\component\ComponentOptionsTrait; /** * 复选框组件 * Class Checkbox + * * @package FormBuilder\components * @method $this size(String $size) 多选框组的尺寸,可选值为 large、small、default 或者不设置 */ @@ -36,7 +37,7 @@ class Checkbox extends FormComponentDriver * @var array */ protected static $propsRule = [ - 'size'=>'string' + 'size' => 'string' ]; /** @@ -45,18 +46,18 @@ class Checkbox extends FormComponentDriver */ public function value($value) { - if($value === null) return $this; - if(!is_array($value)) + if ($value === null) return $this; + if (!is_array($value)) $this->value[] = (string)$value; - else{ - foreach ($value as $v){ - $this->value[] = (string) $v; + else { + foreach ($value as $v) { + $this->value[] = (string)$v; } } return $this; } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::arr(); } @@ -67,23 +68,23 @@ class Checkbox extends FormComponentDriver public function build() { $options = []; - foreach ($this->options as $option){ + foreach ($this->options as $option) { if ($option instanceof Option) $options[] = $option->build(); } $value = array_unique($this->value); - foreach ($value as $k=>$v){ + foreach ($value as $k => $v) { $value[$k] = (string)$v; } return [ - 'type'=>$this->name, - 'field'=>$this->field, - 'title'=>$this->title, - 'value'=>$value, - 'props'=>(object)$this->props, - 'options'=>$options, - 'validate'=>$this->validate, - 'col'=>$this->col + 'type' => $this->name, + 'field' => $this->field, + 'title' => $this->title, + 'value' => $value, + 'props' => (object)$this->props, + 'options' => $options, + 'validate' => $this->validate, + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/Col.php b/vendor/xaboy/form-builder/src/components/Col.php index 53ac97d3..9bbf9af1 100644 --- a/vendor/xaboy/form-builder/src/components/Col.php +++ b/vendor/xaboy/form-builder/src/components/Col.php @@ -14,18 +14,19 @@ use FormBuilder\traits\component\CallPropsTrait; /** * col栅格规则 * Class Col + * * @package FormBuilder\components * @method $this span(Number $span) 栅格的占位格数,可选值为0~24的整数,为 0 时,相当于display:none * @method $this order(Number $order) 栅格的顺序,在flex布局模式下有效 * @method $this offset(Number $offset) 栅格左侧的间隔格数,间隔内不可以有栅格 * @method $this push(Number $push) 栅格向右移动格数 * @method $this pull(Number $pull) 栅格向左移动格数 - * @method $this labelWidth(Number $labelWidth) 表单域标签的的宽度,默认150px + * @method $this labelWidth(Number $labelWidth) 表单域标签的的宽度, 默认150px * @method $this className(String $className) 自定义的class名称 - * @method $this xs(Number|Col $span) <768px 响应式栅格,可为栅格数或一个包含其他属性的对象 - * @method $this sm(Number|Col $span) ≥768px 响应式栅格,可为栅格数或一个包含其他属性的对象 - * @method $this md(Number|Col $span) ≥992px 响应式栅格,可为栅格数或一个包含其他属性的对象 - * @method $this lg(Number|Col $span) ≥1200px 响应式栅格,可为栅格数或一个包含其他属性的对象 + * @method $this xs(Number | Col $span) <768px 响应式栅格,可为栅格数或一个包含其他属性的对象 + * @method $this sm(Number | Col $span) ≥768px 响应式栅格,可为栅格数或一个包含其他属性的对象 + * @method $this md(Number | Col $span) ≥992px 响应式栅格,可为栅格数或一个包含其他属性的对象 + * @method $this lg(Number | Col $span) ≥1200px 响应式栅格,可为栅格数或一个包含其他属性的对象 */ class Col implements FormComponentInterFace { @@ -56,10 +57,11 @@ class Col implements FormComponentInterFace /** * @var array */ - protected static $model = ['xs','sm','md','lg']; + protected static $model = ['xs', 'sm', 'md', 'lg']; /** * Col constructor. + * * @param int $span */ public function __construct($span = 24) @@ -72,8 +74,8 @@ class Col implements FormComponentInterFace */ public function build() { - foreach (self::$model as $m){ - if(isset($this->props[$m]) && $this->props[$m] instanceof Col){ + foreach (self::$model as $m) { + if (isset($this->props[$m]) && $this->props[$m] instanceof Col) { $this->props[$m] = $this->props[$m]->build(); } } diff --git a/vendor/xaboy/form-builder/src/components/ColorPicker.php b/vendor/xaboy/form-builder/src/components/ColorPicker.php index 241eb996..bbcf85cd 100644 --- a/vendor/xaboy/form-builder/src/components/ColorPicker.php +++ b/vendor/xaboy/form-builder/src/components/ColorPicker.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 颜色选择器组件 * Class ColorPicker + * * @package FormBuilder\components * @method $this disabled(Boolean $bool) 是否禁用 * @method $this alpha(Boolean $bool) 是否支持透明度选择, 默认为false @@ -50,6 +51,7 @@ class ColorPicker extends FormComponentDriver /** * 自定义颜色预设 + * * @param $colors * @return $this */ @@ -77,7 +79,7 @@ class ColorPicker extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/DatePicker.php b/vendor/xaboy/form-builder/src/components/DatePicker.php index 219f15a0..98501518 100644 --- a/vendor/xaboy/form-builder/src/components/DatePicker.php +++ b/vendor/xaboy/form-builder/src/components/DatePicker.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 日期选择器组件 * Class DatePicker + * * @package FormBuilder\components * @method $this type(String $type) 显示类型,可选值为 date、daterange、datetime、datetimerange、year、month * @method $this format(String $format) 展示的日期格式, 默认为yyyy-MM-dd HH:mm:ss @@ -67,7 +68,8 @@ class DatePicker extends FormComponentDriver */ protected $props = [ 'type' => self::TYPE_DATE, - 'editable' => false + 'editable' => false, + 'multiple' => false ]; /** @@ -86,7 +88,7 @@ class DatePicker extends FormComponentDriver 'editable' => 'boolean', 'transfer' => 'boolean', 'splitPanels' => 'boolean', - 'showWeekNumbers' => 'boolean', + 'showWeekNumbers' => 'boolean' ]; /** @@ -97,6 +99,22 @@ class DatePicker extends FormComponentDriver $this->placeholder($this->getPlaceHolder()); } + /** + * 开启后, 可以选择多个日期, 仅在 date 下可用, 默认为false + * + * @param bool $bool + * @return $this + */ + public function multiple($bool = true) + { + if ($this->props['type'] == 'date') + $this->props['multiple'] = (bool)$bool; + else + $this->props['multiple'] = false; + + return $this; + } + /** * @param $value * @return $this @@ -116,12 +134,25 @@ class DatePicker extends FormComponentDriver public function getValidateHandler() { - if(in_array($this->props['type'],['datetimerange','daterange'])) + if (in_array($this->props['type'], ['datetimerange', 'daterange']) || $this->props['multiple']) return Validate::arr(); else return Validate::date(); } + public function required($message = null) + { + $message = $message ?: $this->getPlaceHolder(); + if (in_array($this->props['type'], ['datetimerange', 'daterange'])) { + $this->validate()->fields([ + '0' => ['required' => true, 'type' => 'date', 'message' => $message], + '1' => ['required' => true, 'type' => 'date', 'message' => $message] + ], true, $message); + return $this; + } else + return parent::required($message); + } + /** * @return array */ @@ -134,7 +165,7 @@ class DatePicker extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/FormStyle.php b/vendor/xaboy/form-builder/src/components/FormStyle.php index c49d2a2b..f2819249 100644 --- a/vendor/xaboy/form-builder/src/components/FormStyle.php +++ b/vendor/xaboy/form-builder/src/components/FormStyle.php @@ -14,6 +14,7 @@ use FormBuilder\traits\component\CallPropsTrait; /** * form表单样式 * Class FormStyle + * * @package FormBuilder\components * @method $this inline(Boolean $bool) 是否开启行内表单模式 * @method $this labelPosition(String $labelPosition) 表单域标签的位置,可选值为 left、right、top @@ -41,20 +42,22 @@ class FormStyle implements FormComponentInterFace /** * FormStyle constructor. - * @param bool $inline + * + * @param bool $inline * @param string $labelPosition - * @param int $labelWidth - * @param bool $showMessage + * @param int $labelWidth + * @param bool $showMessage * @param string $autocomplete */ public function __construct($inline = false, $labelPosition = 'right', $labelWidth = 125, $showMessage = true, $autocomplete = 'off') { - $this->props = compact('inline','labelPosition','labelWidth','showMessage'); + $this->props = compact('inline', 'labelPosition', 'labelWidth', 'showMessage'); $this->autocomplete($autocomplete); } /** * 原生的 autocomplete 属性,可选值为 true = off 或 false = on + * * @param bool $bool * @return $this */ diff --git a/vendor/xaboy/form-builder/src/components/Frame.php b/vendor/xaboy/form-builder/src/components/Frame.php index 72660d16..0778330d 100644 --- a/vendor/xaboy/form-builder/src/components/Frame.php +++ b/vendor/xaboy/form-builder/src/components/Frame.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 框架组件 * Class Frame + * * @package FormBuilder\components * @method $this type(String $type) frame类型, 有input, file, image, 默认为input * @method $this src(String $src) iframe地址 @@ -90,7 +91,7 @@ class Frame extends FormComponentDriver $this->frameTitle($this->getPlaceHolder()); } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::arr(); } @@ -111,7 +112,7 @@ class Frame extends FormComponentDriver 'value' => $value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Hidden.php b/vendor/xaboy/form-builder/src/components/Hidden.php index 1487b44a..3c1388c4 100644 --- a/vendor/xaboy/form-builder/src/components/Hidden.php +++ b/vendor/xaboy/form-builder/src/components/Hidden.php @@ -13,6 +13,7 @@ use FormBuilder\FormComponentDriver; /** * hidden组件 * Class Hidden + * * @package FormBuilder\components */ class Hidden extends FormComponentDriver @@ -25,6 +26,7 @@ class Hidden extends FormComponentDriver /** * Hidden constructor. + * * @param String $field * @param String $value */ diff --git a/vendor/xaboy/form-builder/src/components/Input.php b/vendor/xaboy/form-builder/src/components/Input.php index 9afe84c8..0ba73d42 100644 --- a/vendor/xaboy/form-builder/src/components/Input.php +++ b/vendor/xaboy/form-builder/src/components/Input.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * Input组件,支持类型text、password、textarea、url、email、date * Class Input + * * @package FormBuilder\components * @method $this type(String $type) 输入框类型,可选值为 text、password、textarea、url、email、date; * @method $this size(String $size) 输入框尺寸,可选值为large、small、default或者不设置; @@ -102,7 +103,7 @@ class Input extends FormComponentDriver return parent::getPlaceHolder($pre); } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::str(Validate::TRIGGER_BLUR); } @@ -110,6 +111,7 @@ class Input extends FormComponentDriver /** * 自适应内容高度,仅在 textarea 类型下有效 + * * @param Bool|Number $minRows * @param null|Number $maxRows * @return $this @@ -117,12 +119,13 @@ class Input extends FormComponentDriver public function autoSize($minRows = false, $maxRows = null) { - $this->props['autosize'] = $maxRows === null ? boolval($minRows) : compact('minRows', 'maxRows'); + $this->props['autosize'] = $maxRows === null ? boolval($minRows) : compact('minRows', 'maxRows'); return $this; } /** * 生成表单规则 + * * @return array */ public function build() @@ -134,7 +137,7 @@ class Input extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/InputNumber.php b/vendor/xaboy/form-builder/src/components/InputNumber.php index cad234b6..6809539f 100644 --- a/vendor/xaboy/form-builder/src/components/InputNumber.php +++ b/vendor/xaboy/form-builder/src/components/InputNumber.php @@ -13,6 +13,7 @@ use FormBuilder\FormComponentDriver; /** * 数字输入框组件 * Class InputNumber + * * @package FormBuilder\components * @method $this max(float $max) 最大值 * @method $this min(float $min) 最小值 @@ -59,7 +60,7 @@ class InputNumber extends FormComponentDriver return parent::getPlaceHolder($pre); } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::num(Validate::TRIGGER_BLUR); } @@ -76,7 +77,7 @@ class InputNumber extends FormComponentDriver 'value' => $this->value === '' ? '' : (float)$this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/Option.php b/vendor/xaboy/form-builder/src/components/Option.php index 207499c0..7229c1f0 100644 --- a/vendor/xaboy/form-builder/src/components/Option.php +++ b/vendor/xaboy/form-builder/src/components/Option.php @@ -13,6 +13,7 @@ use FormBuilder\Helper; /** * Class Option + * * @package FormBuilder\components */ class Option implements FormComponentInterFace @@ -25,9 +26,11 @@ class Option implements FormComponentInterFace /** * Option constructor. - * @param $value + * + * @param $value * @param string $label - * @param bool $disabled + * @param bool $disabled + * @throws \FormBuilder\exception\FormBuilderException */ public function __construct($value, $label = '', $disabled = false) { @@ -40,6 +43,7 @@ class Option implements FormComponentInterFace /** * @param $value * @param $label + * @throws \FormBuilder\exception\FormBuilderException */ public static function verify($value, $label) { diff --git a/vendor/xaboy/form-builder/src/components/Radio.php b/vendor/xaboy/form-builder/src/components/Radio.php index c3c12c17..6df00496 100644 --- a/vendor/xaboy/form-builder/src/components/Radio.php +++ b/vendor/xaboy/form-builder/src/components/Radio.php @@ -15,6 +15,7 @@ use FormBuilder\traits\component\ComponentOptionsTrait; /** * 单选框组件 * Class Radio + * * @package FormBuilder\components * @method $this size(String $size) 单选框的尺寸,可选值为 large、small、default 或者不设置 * @method $this vertical(Boolean $bool) 是否垂直排列,按钮样式下无效 @@ -38,6 +39,7 @@ class Radio extends FormComponentDriver /** * 使用按钮样式 + * * @return $this */ public function button() @@ -46,7 +48,7 @@ class Radio extends FormComponentDriver return $this; } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::str(); } @@ -69,7 +71,7 @@ class Radio extends FormComponentDriver 'props' => (object)$this->props, 'options' => $options, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Rate.php b/vendor/xaboy/form-builder/src/components/Rate.php index 021cd67d..6ee73015 100644 --- a/vendor/xaboy/form-builder/src/components/Rate.php +++ b/vendor/xaboy/form-builder/src/components/Rate.php @@ -13,6 +13,7 @@ use FormBuilder\FormComponentDriver; /** * 评分组件 * Class Rate + * * @package FormBuilder\components * @method $this count(int $star) star 总数, 默认为 5 * @method $this allowHalf(Boolean $bool) 是否允许半选, 默认为 false @@ -39,7 +40,7 @@ class Rate extends FormComponentDriver 'clearable' => 'boolean', ]; - protected function getValidateHandler() + public function getValidateHandler() { return Validate::num(); } @@ -56,7 +57,7 @@ class Rate extends FormComponentDriver 'value' => (float)$this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Row.php b/vendor/xaboy/form-builder/src/components/Row.php index a55313ed..2649e6af 100644 --- a/vendor/xaboy/form-builder/src/components/Row.php +++ b/vendor/xaboy/form-builder/src/components/Row.php @@ -14,6 +14,7 @@ use FormBuilder\traits\component\CallPropsTrait; /** * row栅格规则 * Class Row + * * @package FormBuilder\components * @method $this gutter(Number $gutter) 栅格间距,单位 px,左右平分 * @method $this type(String $type) 栅格的顺序,在flex布局模式下有效 @@ -43,7 +44,8 @@ class Row implements FormComponentInterFace /** * Row constructor. - * @param int $gutter + * + * @param int $gutter * @param string $type * @param string $align * @param string $justify @@ -51,7 +53,7 @@ class Row implements FormComponentInterFace */ public function __construct($gutter = 0, $type = '', $align = '', $justify = '', $className = '') { - $this->props = compact('gutter','type','align','justify','className'); + $this->props = compact('gutter', 'type', 'align', 'justify', 'className'); } /** diff --git a/vendor/xaboy/form-builder/src/components/Select.php b/vendor/xaboy/form-builder/src/components/Select.php index 433f4b54..589aa039 100644 --- a/vendor/xaboy/form-builder/src/components/Select.php +++ b/vendor/xaboy/form-builder/src/components/Select.php @@ -15,6 +15,7 @@ use FormBuilder\traits\component\ComponentOptionsTrait; /** * 选择器组件 * Class Select + * * @package FormBuilder\components * @method $this multiple(Boolean $bool) 是否支持多选, 默认为false * @method $this disabled(Boolean $bool) 是否禁用, 默认为false @@ -63,9 +64,6 @@ class Select extends FormComponentDriver 'notFoundText' => 'string', ]; - /** - * - */ protected function init() { $this->placeholder($this->getPlaceHolder()); @@ -89,9 +87,9 @@ class Select extends FormComponentDriver } - protected function getValidateHandler() + public function getValidateHandler() { - if($this->props['multiple'] == true) + if ($this->props['multiple'] == true) return Validate::arr(); else return Validate::str(); @@ -111,9 +109,9 @@ class Select extends FormComponentDriver $isArr = is_array($value); if ($this->props['multiple'] == false && $isArr) $value = isset($value[0]) ? $value[0] : ''; - else if($isArr){ + else if ($isArr) { $value = array_unique($value); - foreach ($value as $k=>$v){ + foreach ($value as $k => $v) { $value[$k] = (string)$v; } } @@ -125,7 +123,7 @@ class Select extends FormComponentDriver 'props' => (object)$this->props, 'options' => $options, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Slider.php b/vendor/xaboy/form-builder/src/components/Slider.php index 3296f5fa..07025b3e 100644 --- a/vendor/xaboy/form-builder/src/components/Slider.php +++ b/vendor/xaboy/form-builder/src/components/Slider.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 滑块组件 * Class Slider + * * @package FormBuilder\components * @method $this min(float $min) 最小值, 默认 0 * @method $this max(float $max) 最大值, 默认 100 @@ -65,9 +66,9 @@ class Slider extends FormComponentDriver return $this; } - protected function getValidateHandler() + public function getValidateHandler() { - if($this->props['range'] == true) + if ($this->props['range'] == true) return Validate::arr(); else return Validate::num(); @@ -96,7 +97,7 @@ class Slider extends FormComponentDriver 'value' => $value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Switches.php b/vendor/xaboy/form-builder/src/components/Switches.php index 628e945e..175fd03f 100644 --- a/vendor/xaboy/form-builder/src/components/Switches.php +++ b/vendor/xaboy/form-builder/src/components/Switches.php @@ -12,6 +12,7 @@ use FormBuilder\FormComponentDriver; /** * 开关组件 * Class Switches + * * @package FormBuilder\components * @method $this size(String $size) 开关的尺寸,可选值为large、small、default或者不写。建议开关如果使用了2个汉字的文字,使用 large。 * @method $this disabled(Boolean $bool) 禁用开关, 默认为false @@ -50,6 +51,7 @@ class Switches extends FormComponentDriver /** * 自定义显示打开时的内容 + * * @param $open * @return $this */ @@ -61,6 +63,7 @@ class Switches extends FormComponentDriver /** * 自定义显示关闭时的内容 + * * @param $close * @return $this */ @@ -70,7 +73,7 @@ class Switches extends FormComponentDriver return $this; } - protected function getValidateHandler() + public function getValidateHandler() { return Validate::str(); } @@ -88,7 +91,7 @@ class Switches extends FormComponentDriver 'props' => (object)$this->props, 'slot' => (object)$this->slot, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/TimePicker.php b/vendor/xaboy/form-builder/src/components/TimePicker.php index 3eb21f9d..8a2ca7e1 100644 --- a/vendor/xaboy/form-builder/src/components/TimePicker.php +++ b/vendor/xaboy/form-builder/src/components/TimePicker.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 时间选择器组件 * Class TimePicker + * * @package FormBuilder\components * @method $this type(String $type) 显示类型,可选值为 time、timerange * @method $this format(String $format) 展示的时间格式, 默认为HH:mm:ss @@ -81,7 +82,8 @@ class TimePicker extends FormComponentDriver /** * 下拉列表的时间间隔,数组的三项分别对应小时、分钟、秒。 * 例如设置为 [1, 15] 时,分钟会显示:00、15、30、45。 - * @param $h + * + * @param $h * @param int $i * @param int $s * @return $this @@ -109,14 +111,28 @@ class TimePicker extends FormComponentDriver return $this; } - protected function getValidateHandler() + public function getValidateHandler() { - if($this->props['type'] == 'timerange') + if ($this->props['type'] == 'timerange') return Validate::arr(); else return Validate::str(); } + + public function required($message = null) + { + $message = $message ?: $this->getPlaceHolder(); + if ($this->props['type'] == 'timerange') { + $this->validate()->fields([ + '0' => ['required' => true, 'message' => $message], + '1' => ['required' => true, 'message' => $message] + ], true, $message); + return $this; + } else + return parent::required($message); + } + /** * @return array */ diff --git a/vendor/xaboy/form-builder/src/components/Tree.php b/vendor/xaboy/form-builder/src/components/Tree.php index 31f1eaac..03129d4a 100644 --- a/vendor/xaboy/form-builder/src/components/Tree.php +++ b/vendor/xaboy/form-builder/src/components/Tree.php @@ -13,11 +13,12 @@ use FormBuilder\FormComponentDriver; /** * 树型组件 * Class Tree + * * @package FormBuilder\components * @method $this type(String $type) 类型,可选值为 checked、selected - * @method $this multiple(Boolean $bool) 是否支持多选,当`type=selected`并且`multiple=false`,默认为false,值为String或Number类型,其他情况为Array类型 - * @method $this showCheckbox(Boolean $bool) 是否显示多选框,默认为false - * @method $this emptyText(String $emptyText) 没有数据时的提示,默认为'暂无数据' + * @method $this multiple(Boolean $bool) 是否支持多选, 当`type=selected`并且`multiple=false`, 默认为false, 值为String或Number类型,其他情况为Array类型 + * @method $this showCheckbox(Boolean $bool) 是否显示多选框, 默认为false + * @method $this emptyText(String $emptyText) 没有数据时的提示, 默认为'暂无数据' */ class Tree extends FormComponentDriver { @@ -41,7 +42,7 @@ class Tree extends FormComponentDriver protected $props = [ 'type' => self::TYPE_CHECKED, 'data' => [], - 'multiple'=>true + 'multiple' => true ]; /** @@ -60,8 +61,8 @@ class Tree extends FormComponentDriver */ public function data(array $treeData) { - if(!is_array($this->props['data'])) $this->props['data'] = []; - foreach ($treeData as $child){ + if (!is_array($this->props['data'])) $this->props['data'] = []; + foreach ($treeData as $child) { $this->props['data'][] = $child instanceof TreeData ? $child->build() : $child; @@ -75,7 +76,7 @@ class Tree extends FormComponentDriver */ public function jsData($var) { - $this->props['data'] = 'js.'.$var; + $this->props['data'] = 'js.' . $var; return $this; } @@ -85,20 +86,20 @@ class Tree extends FormComponentDriver */ public function value($value) { - if(is_array($value)){ - foreach ($value as $k=>$v){ + if (is_array($value)) { + foreach ($value as $k => $v) { $value[$k] = (string)$v; } - }else{ + } else { $value = (string)$value; } $this->value = $value; return $this; } - protected function getValidateHandler() + public function getValidateHandler() { - if($this->props['multiple']) + if ($this->props['multiple']) return Validate::arr(); else return Validate::str(); @@ -116,7 +117,7 @@ class Tree extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } diff --git a/vendor/xaboy/form-builder/src/components/TreeData.php b/vendor/xaboy/form-builder/src/components/TreeData.php index 5a07cd4b..46eaaf92 100644 --- a/vendor/xaboy/form-builder/src/components/TreeData.php +++ b/vendor/xaboy/form-builder/src/components/TreeData.php @@ -13,11 +13,12 @@ use FormBuilder\traits\component\CallPropsTrait; /** * Class TreeData + * * @package FormBuilder\components - * @method $this id(String $id) Id,必须唯一 + * @method $this id(String $id) Id, 必须唯一 * @method $this title(String $title) 标题 - * @method $this expand(Boolean $bool) 是否展开直子节点,默认为false - * @method $this disabled(Boolean $bool) 禁掉响应,默认为false + * @method $this expand(Boolean $bool) 是否展开直子节点, 默认为false + * @method $this disabled(Boolean $bool) 禁掉响应, 默认为false * @method $this disableCheckbox(Boolean $bool) 禁掉 checkbox * @method $this selected(Boolean $bool) 是否选中子节点 * @method $this checked(Boolean $bool) 是否勾选(如果勾选,子节点也会全部勾选) @@ -51,8 +52,9 @@ class TreeData implements FormComponentInterFace /** * TreeData constructor. - * @param $id - * @param $title + * + * @param $id + * @param $title * @param array $children */ public function __construct($id, $title, array $children = []) @@ -68,7 +70,7 @@ class TreeData implements FormComponentInterFace */ public function children(array $children) { - $this->children = array_merge($this->children,$children); + $this->children = array_merge($this->children, $children); return $this; } @@ -88,7 +90,7 @@ class TreeData implements FormComponentInterFace public function build() { $children = []; - foreach ($this->children as $child){ + foreach ($this->children as $child) { $children[] = $child instanceof TreeData ? $child->build() : $child; diff --git a/vendor/xaboy/form-builder/src/components/Upload.php b/vendor/xaboy/form-builder/src/components/Upload.php index 3a1a7411..764ec3b2 100644 --- a/vendor/xaboy/form-builder/src/components/Upload.php +++ b/vendor/xaboy/form-builder/src/components/Upload.php @@ -14,6 +14,7 @@ use FormBuilder\Helper; /** * 上传组件 * Class Upload + * * @package FormBuilder\components * @method $this uploadType(String $uploadType) 上传文件类型,可选值为 image(图片上传),file(文件上传) * @method $this action(String $action) 上传的地址 @@ -79,6 +80,7 @@ class Upload extends FormComponentDriver /** * 设置上传的请求头部 + * * @param array $headers * @return $this */ @@ -92,6 +94,7 @@ class Upload extends FormComponentDriver * 支持的文件类型,与 accept 不同的是, * format 是识别文件的后缀名,accept 为 input 标签原生的 accept 属性, * 会在选择文件时过滤,可以两者结合使用 + * * @param array $headers * @return $this */ @@ -103,6 +106,7 @@ class Upload extends FormComponentDriver /** * 上传时附带的额外参数 + * * @param array $headers * @return $this */ @@ -112,7 +116,7 @@ class Upload extends FormComponentDriver return $this; } - protected function getPlaceHolder($pre = '请上传') + public function getPlaceHolder($pre = '请上传') { return parent::getPlaceHolder($pre); } @@ -129,10 +133,7 @@ class Upload extends FormComponentDriver protected function getValidateHandler() { - if($this->props['maxLength'] == 1) - return Validate::str(); - else - return Validate::arr(); + return Validate::arr(); } /** @@ -147,7 +148,7 @@ class Upload extends FormComponentDriver 'value' => $this->value, 'props' => (object)$this->props, 'validate' => $this->validate, - 'col'=>$this->col + 'col' => $this->col ]; } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/components/Validate.php b/vendor/xaboy/form-builder/src/components/Validate.php index fc4e8916..d624cebb 100644 --- a/vendor/xaboy/form-builder/src/components/Validate.php +++ b/vendor/xaboy/form-builder/src/components/Validate.php @@ -39,61 +39,78 @@ class Validate implements FormComponentInterFace public static function str($trigger = self::TRIGGER_CHANGE) { - return new static(self::TYPE_STRING,$trigger); + return new self(self::TYPE_STRING, $trigger); } public static function arr($trigger = self::TRIGGER_CHANGE) { - return new static(self::TYPE_ARRAY,$trigger); + return new self(self::TYPE_ARRAY, $trigger); } public static function num($trigger = self::TRIGGER_CHANGE) { - return new static(self::TYPE_NUMBER,$trigger); + return new self(self::TYPE_NUMBER, $trigger); } public static function date($trigger = self::TRIGGER_CHANGE) { - return new static(self::TYPE_DATE,$trigger); + return new self(self::TYPE_DATE, $trigger); } - protected function set($validate, $message = null) + public function set($validate, $message = null) { $this->validate[] = $validate + [ 'trigger' => $this->trigger, 'type' => $this->type, 'message' => $message ]; + + return $this; + } + + public function fields(array $fields, $required = null, $message = null) + { + $data = []; + if (!is_null($required)) + $data['required'] = $required; + if (is_null($message)) + $data['message'] = $message; + $data['fields'] = (object)$fields; + + return $this->set($data); } /** * 必须为链接 + * * @param string|null $message * @return $this */ public function url($message = null) { $this->set([ - 'type'=>'url' - ],$message); + 'type' => 'url' + ], $message); return $this; } /** * 必须为邮箱 + * * @param string|null $message * @return $this */ public function email($message = null) { $this->set([ - 'type'=>'email' - ],$message); + 'type' => 'email' + ], $message); return $this; } /** * 必填 + * * @param string|null $message * @return $this */ @@ -107,6 +124,7 @@ class Validate implements FormComponentInterFace /** * 长度或值必须在这个范围内 + * * @param int $min * @param int $max * @param string|null $message @@ -123,6 +141,7 @@ class Validate implements FormComponentInterFace /** * 长度或值必须大于这个值 + * * @param int $min * @param string|null $message * @return $this @@ -137,6 +156,7 @@ class Validate implements FormComponentInterFace /** * 长度或值必须小于这个值 + * * @param int $max * @param string|null $message * @return $this @@ -151,6 +171,7 @@ class Validate implements FormComponentInterFace /** * 长度或值必须等于这个值 + * * @param int $length * @param string|null $message * @return $this @@ -158,13 +179,14 @@ class Validate implements FormComponentInterFace public function length($length, $message = null) { $this->set([ - 'length' => (int)$length + 'len' => (int)$length ], $message); return $this; } /** * 值必须在 list 中 + * * @param array $list * @param string|null $message * @return $this @@ -172,7 +194,7 @@ class Validate implements FormComponentInterFace public function enum($list, $message = null) { $this->set([ - 'type'=>'enum', + 'type' => 'enum', 'enum' => (array)$list ], $message); return $this; diff --git a/vendor/xaboy/form-builder/src/exception/FormBuilderException.php b/vendor/xaboy/form-builder/src/exception/FormBuilderException.php new file mode 100644 index 00000000..5a2feec9 --- /dev/null +++ b/vendor/xaboy/form-builder/src/exception/FormBuilderException.php @@ -0,0 +1,20 @@ +props[$name] = $arguments[0]; } else if (is_array(static::$propsRule[$name])) { $this->props[static::$propsRule[$name][1]] = Helper::toType( @@ -41,7 +44,7 @@ trait CallPropsTrait } return $this; } else { - throw new \Exception($name . '方法不存在'); + throw new FormBuilderException($name . '方法不存在'); } } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/traits/component/ComponentOptionsTrait.php b/vendor/xaboy/form-builder/src/traits/component/ComponentOptionsTrait.php index edc10422..bbd8b06c 100644 --- a/vendor/xaboy/form-builder/src/traits/component/ComponentOptionsTrait.php +++ b/vendor/xaboy/form-builder/src/traits/component/ComponentOptionsTrait.php @@ -12,6 +12,7 @@ use FormBuilder\components\Option; /** * Class ComponentOptionsTrait + * * @package FormBuilder\traits\component */ trait ComponentOptionsTrait @@ -23,10 +24,12 @@ trait ComponentOptionsTrait /** * 设置的选项 - * @param $value - * @param $label + * + * @param $value + * @param $label * @param bool $disabled * @return $this + * @throws \FormBuilder\exception\FormBuilderException */ public function option($value, $label, $disabled = false) { @@ -37,9 +40,11 @@ trait ComponentOptionsTrait /** * 批量设置的选项 + * * @param array $options - * @param bool $disabled + * @param bool $disabled * @return $this + * @throws \FormBuilder\exception\FormBuilderException */ public function options(array $options, $disabled = false) { @@ -59,16 +64,17 @@ trait ComponentOptionsTrait /** * 批量设置选项 支持匿名函数 - * @param $options + * + * @param $options * @param bool $disabled * @return $this */ public function setOptions($options, $disabled = false) { - if(is_callable($options)) - return $this->setOptions($options($this),$disabled); - else if(is_array($options)) - return $this->options($options,$disabled); + if (is_callable($options)) + return $this->setOptions($options($this), $disabled); + else if (is_array($options)) + return $this->options($options, $disabled); else return $this; } diff --git a/vendor/xaboy/form-builder/src/traits/form/FormCascaderTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormCascaderTrait.php index c3ea95ed..1f27d732 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormCascaderTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormCascaderTrait.php @@ -12,15 +12,17 @@ use FormBuilder\components\Cascader; /** * Class FormCascaderTrait + * * @package FormBuilder\traits\form */ trait FormCascaderTrait { /** * 多级联动组件 - * @param $field - * @param $title - * @param array $value + * + * @param $field + * @param $title + * @param array $value * @param string $type * @return Cascader */ @@ -34,15 +36,16 @@ trait FormCascaderTrait /** * 省市二级联动 - * @param $field - * @param $title + * + * @param $field + * @param $title * @param array|string $province - * @param string $city + * @param string $city * @return Cascader */ public static function city($field, $title, $province = [], $city = '') { - if(is_array($province)) + if (is_array($province)) $value = $province; else $value = [(string)$province, (string)$city]; @@ -55,16 +58,17 @@ trait FormCascaderTrait /** * 省市区三级联动 - * @param $field - * @param $title + * + * @param $field + * @param $title * @param array|string $province - * @param string $city - * @param string $area + * @param string $city + * @param string $area * @return Cascader */ public static function cityArea($field, $title, $province = [], $city = '', $area = '') { - if(is_array($province)) + if (is_array($province)) $value = $province; else $value = [(string)$province, (string)$city, (string)$area]; diff --git a/vendor/xaboy/form-builder/src/traits/form/FormCheckBoxTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormCheckBoxTrait.php index 1c19928b..fd0d4f6e 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormCheckBoxTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormCheckBoxTrait.php @@ -11,13 +11,16 @@ use FormBuilder\components\Checkbox; /** * Class FormCheckBoxTrait + * * @package FormBuilder\traits\form */ trait FormCheckBoxTrait { /** - * @param $field - * @param $title + * 多选框组件 + * + * @param $field + * @param $title * @param array $value * @return Checkbox */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormColorPickerTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormColorPickerTrait.php index 8c03ad34..1df3bc7b 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormColorPickerTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormColorPickerTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\ColorPicker; /** * Class FormColorPickerTrait + * * @package FormBuilder\traits\form */ trait FormColorPickerTrait { /** - * @param $field - * @param $title + * 颜色选择组件 + * + * @param $field + * @param $title * @param string $value * @return ColorPicker */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormDatePickerTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormDatePickerTrait.php index b4e87899..60d52287 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormDatePickerTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormDatePickerTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\DatePicker; /** * Class FormDatePickerTrait + * * @package FormBuilder\traits\form */ trait FormDatePickerTrait { /** - * @param $field - * @param $title + * 日期组件 + * + * @param $field + * @param $title * @param string $value * @param string $type * @return DatePicker @@ -31,8 +34,10 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 单选日期 + * + * @param $field + * @param $title * @param string $value * @return DatePicker */ @@ -42,8 +47,24 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 多选日期 + * + * @param $field + * @param $title + * @param array $value + * @return DatePicker + */ + public static function dateMultiple($field, $title, array $value) + { + $date = self::datePicker($field, $title, $value, DatePicker::TYPE_DATE); + return $date->multiple(); + } + + /** + * 日期区间选择 + * + * @param $field + * @param $title * @param string $startDate * @param string $endDate * @return DatePicker @@ -54,8 +75,10 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 单选日期时间 + * + * @param $field + * @param $title * @param string $value * @return DatePicker */ @@ -65,8 +88,10 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 日期时间区间选择 + * + * @param $field + * @param $title * @param string $startDate * @param string $endDate * @return DatePicker @@ -77,8 +102,10 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 选择年 + * + * @param $field + * @param $title * @param string $value * @return DatePicker */ @@ -88,8 +115,10 @@ trait FormDatePickerTrait } /** - * @param $field - * @param $title + * 选择月 + * + * @param $field + * @param $title * @param string $value * @return DatePicker */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormFrameTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormFrameTrait.php index 169992ed..1883b598 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormFrameTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormFrameTrait.php @@ -12,14 +12,17 @@ use FormBuilder\components\Frame; /** * Class FormFrameTrait + * * @package FormBuilder\traits\form */ trait FormFrameTrait { /** - * @param $field - * @param $title - * @param $src + * 框架组件 + * + * @param $field + * @param $title + * @param $src * @param string $value * @param string $type * @return Frame @@ -33,9 +36,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用input 类型显示,多选 + * value为Array类型 + * + * @param $field + * @param $title + * @param $src * @param array $value * @return Frame */ @@ -45,9 +51,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用文件类型显示,多选 + * value为Array类型 + * + * @param $field + * @param $title + * @param $src * @param array $value * @return Frame */ @@ -57,9 +66,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用文件类型显示,多选 + * value为Array类型 + * + * @param $field + * @param $title + * @param $src * @param array $value * @return Frame */ @@ -69,9 +81,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用input 类型显示,单选 + * value为String类型 + * + * @param $field + * @param $title + * @param $src * @param string $value * @return Frame */ @@ -81,9 +96,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用文件类型显示,单选 + * value为String类型 + * + * @param $field + * @param $title + * @param $src * @param string $value * @return Frame */ @@ -93,9 +111,12 @@ trait FormFrameTrait } /** - * @param $field - * @param $title - * @param $src + * 使用文件类型显示,单选 + * value为String类型 + * + * @param $field + * @param $title + * @param $src * @param string $value * @return Frame */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormHiddenTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormHiddenTrait.php index 5f543c82..f02ccd75 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormHiddenTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormHiddenTrait.php @@ -12,11 +12,14 @@ use FormBuilder\components\Hidden; /** * Class FormHiddenTrait + * * @package FormBuilder\traits\form */ trait FormHiddenTrait { /** + * 隐藏组件 + * * @param $field * @param $value * @return Hidden diff --git a/vendor/xaboy/form-builder/src/traits/form/FormInputNumberTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormInputNumberTrait.php index b0ce5909..112785af 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormInputNumberTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormInputNumberTrait.php @@ -12,14 +12,17 @@ use FormBuilder\components\InputNumber; /** * Class FormInputNumberTrait + * * @package FormBuilder\traits\form */ trait FormInputNumberTrait { /** - * @param $field - * @param $title + * 数字输入框组件 + * + * @param $field + * @param $title * @param null $value * @return InputNumber */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormInputTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormInputTrait.php index e8b87138..5ba00271 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormInputTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormInputTrait.php @@ -12,14 +12,16 @@ use FormBuilder\components\Input; /** * Class FormInputTrait + * * @package FormBuilder\traits\form */ trait FormInputTrait { /** - * 获取input组件 - * @param $field - * @param $title + * input输入框组件 + * + * @param $field + * @param $title * @param string $value * @param string $type * @return Input @@ -32,8 +34,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * text 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ @@ -43,8 +47,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * password 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ @@ -54,8 +60,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * textarea 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ @@ -65,8 +73,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * url 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ @@ -76,8 +86,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * email 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ @@ -87,8 +99,10 @@ trait FormInputTrait } /** - * @param $field - * @param $title + * date 类型输入框 + * + * @param $field + * @param $title * @param string $value * @return Input */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormOptionTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormOptionTrait.php index 4d580128..aa229fd7 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormOptionTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormOptionTrait.php @@ -12,18 +12,22 @@ use FormBuilder\components\Option; /** * Class FormOptionTrait + * * @package FormBuilder\traits\form */ trait FormOptionTrait { /** - * @param $value + * 获取选择类组件 option 类 + * + * @param $value * @param string $label - * @param bool $disabled + * @param bool $disabled * @return Option + * @throws \FormBuilder\exception\FormBuilderException */ public static function option($value, $label = '', $disabled = false) { - return new Option($value,$label,$disabled); + return new Option($value, $label, $disabled); } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/traits/form/FormRadioTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormRadioTrait.php index dd65d284..8a8d19f9 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormRadioTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormRadioTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\Radio; /** * Class FormRadioTrait + * * @package FormBuilder\traits\form */ trait FormRadioTrait { /** - * @param $field - * @param $title + * 单选框组件 + * + * @param $field + * @param $title * @param string $value * @return Radio */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormRateTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormRateTrait.php index b153261a..1b627ac7 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormRateTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormRateTrait.php @@ -12,17 +12,20 @@ use FormBuilder\components\Rate; /** * Class FormRateTrait + * * @package FormBuilder\traits\form */ trait FormRateTrait { /** - * @param $field - * @param $title - * @param number $value + * 评分选择组件 + * + * @param $field + * @param $title + * @param float $value * @return Rate */ - public static function rate($field, $title, $value = 0) + public static function rate($field, $title, $value = 0.0) { return new Rate($field, $title, (float)$value); } diff --git a/vendor/xaboy/form-builder/src/traits/form/FormSelectTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormSelectTrait.php index 1a110d4c..3e77bdc8 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormSelectTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormSelectTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\Select; /** * Class FormSelectTrait + * * @package FormBuilder\traits\form */ trait FormSelectTrait { /** - * @param $field - * @param $title + * 下拉选择组件 + * + * @param $field + * @param $title * @param string $value * @return Select */ @@ -31,8 +34,10 @@ trait FormSelectTrait } /** - * @param $field - * @param $title + * 多选 + * + * @param $field + * @param $title * @param array $value * @return Select */ @@ -42,8 +47,10 @@ trait FormSelectTrait } /** - * @param $field - * @param $title + * 单选 + * + * @param $field + * @param $title * @param string $value * @return Select */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormSliderTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormSliderTrait.php index e2c0fa5b..1ee17e26 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormSliderTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormSliderTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\Slider; /** * Class FormSliderTrait + * * @package FormBuilder\traits\form */ trait FormSliderTrait { /** - * @param $field - * @param $title + * 滑块组件 + * + * @param $field + * @param $title * @param int $value * @return Slider */ @@ -28,8 +31,10 @@ trait FormSliderTrait } /** - * @param $field - * @param $title + * 区间选择 + * + * @param $field + * @param $title * @param int $start * @param int $end * @return Slider diff --git a/vendor/xaboy/form-builder/src/traits/form/FormStyleTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormStyleTrait.php index e72550d1..a6226c3f 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormStyleTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormStyleTrait.php @@ -14,12 +14,15 @@ use FormBuilder\components\Row; /** * Class FormStyleTrait + * * @package FormBuilder\traits\form */ trait FormStyleTrait { /** + * 组件布局规则类 + * * @param int $span * @return Col */ @@ -29,7 +32,9 @@ trait FormStyleTrait } /** - * @param int $gutter + * 表格布局规则类 + * + * @param int $gutter * @param string $type * @param string $align * @param string $justify @@ -38,19 +43,21 @@ trait FormStyleTrait */ public static function row($gutter = 0, $type = '', $align = '', $justify = '', $className = '') { - return new Row($gutter,$type,$align,$justify,$className); + return new Row($gutter, $type, $align, $justify, $className); } /** - * @param bool $inline + * 表格样式类 + * + * @param bool $inline * @param string $labelPosition - * @param int $labelWidth - * @param bool $showMessage + * @param int $labelWidth + * @param bool $showMessage * @param string $autocomplete * @return FormStyle */ public static function style($inline = false, $labelPosition = 'right', $labelWidth = 125, $showMessage = true, $autocomplete = 'off') { - return new FormStyle($inline,$labelPosition,$labelWidth,$showMessage,$autocomplete); + return new FormStyle($inline, $labelPosition, $labelWidth, $showMessage, $autocomplete); } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/traits/form/FormSwitchesTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormSwitchesTrait.php index 5a829b55..254fb2ba 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormSwitchesTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormSwitchesTrait.php @@ -12,13 +12,16 @@ use FormBuilder\components\Switches; /** * Class FormSwitchesTrait + * * @package FormBuilder\traits\form */ trait FormSwitchesTrait { /** - * @param $field - * @param $title + * 开关组件 + * + * @param $field + * @param $title * @param string $value * @return Switches */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormTimePickerTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormTimePickerTrait.php index 3e3f6023..bfb2d59f 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormTimePickerTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormTimePickerTrait.php @@ -12,15 +12,18 @@ use FormBuilder\components\TimePicker; /** * Class FormTimePickerTrait + * * @package FormBuilder\traits\form */ trait FormTimePickerTrait { /** - * @param $field - * @param $title - * @param string $value - * @param string $type + * 时间选择组件 + * + * @param $field + * @param $title + * @param string|int $value + * @param string $type * @return TimePicker */ public static function timePicker($field, $title, $value = '', $type = TimePicker::TYPE_TIME) @@ -29,9 +32,11 @@ trait FormTimePickerTrait } /** - * @param $field - * @param $title - * @param string $value + * 事件选择 + * + * @param $field + * @param $title + * @param string|int $value * @return TimePicker */ public static function time($field, $title, $value = '') @@ -40,10 +45,12 @@ trait FormTimePickerTrait } /** - * @param $field - * @param $title - * @param string $startTime - * @param string $endTime + * 时间区间选择 + * + * @param $field + * @param $title + * @param string|int $startTime + * @param string|int $endTime * @return TimePicker */ public static function timeRange($field, $title, $startTime = '', $endTime = '') diff --git a/vendor/xaboy/form-builder/src/traits/form/FormTreeTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormTreeTrait.php index 12cff8f7..c81affdc 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormTreeTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormTreeTrait.php @@ -13,14 +13,17 @@ use FormBuilder\components\TreeData; /** * Class FormTreeTrait + * * @package FormBuilder\traits\form */ trait FormTreeTrait { /** - * @param $field - * @param $title - * @param array $value + * 树形组件 + * + * @param $field + * @param $title + * @param array $value * @param string $type * @return Tree */ @@ -30,19 +33,23 @@ trait FormTreeTrait } /** - * @param $field - * @param $title + * 获取选中的值 + * + * @param $field + * @param $title * @param array $value * @return Tree */ public static function treeSelected($field, $title, $value = []) { - return self::tree($field, $title, $value,Tree::TYPE_SELECTED); + return self::tree($field, $title, $value, Tree::TYPE_SELECTED); } /** - * @param $field - * @param $title + * 获取勾选的值 + * + * @param $field + * @param $title * @param array $value * @return Tree */ @@ -52,13 +59,15 @@ trait FormTreeTrait } /** - * @param $id - * @param $title + * 树形组件数据 date 类 + * + * @param $id + * @param $title * @param array $children * @return TreeData */ public static function treeData($id, $title, array $children = []) { - return new TreeData($id,$title,$children); + return new TreeData($id, $title, $children); } } \ No newline at end of file diff --git a/vendor/xaboy/form-builder/src/traits/form/FormUploadTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormUploadTrait.php index f4851a75..9c50e2f4 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormUploadTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormUploadTrait.php @@ -12,14 +12,17 @@ use FormBuilder\components\Upload; /** * Class FormUploadTrait + * * @package FormBuilder\traits\form */ trait FormUploadTrait { /** - * @param $field - * @param $title - * @param $action + * 上传组件 + * + * @param $field + * @param $title + * @param $action * @param string $value * @param string $type * @return Upload @@ -32,24 +35,30 @@ trait FormUploadTrait } /** - * @param $field - * @param $title - * @param $action + * 图片上传 + * value 为 Array类型 + * + * @param $field + * @param $title + * @param $action * @param array $value * @return Upload */ public static function uploadImages($field, $title, $action, array $value = []) { $upload = self::upload($field, $title, $action, $value, Upload::TYPE_IMAGE); - $upload->format(['jpg','jpeg','png','gif'])->accept('image/*'); + $upload->format(['jpg', 'jpeg', 'png', 'gif'])->accept('image/*'); return $upload; } /** - * @param $field - * @param $title - * @param $action + * 文件上传 + * value 为 Array类型 + * + * @param $field + * @param $title + * @param $action * @param array $value * @return Upload */ @@ -59,23 +68,29 @@ trait FormUploadTrait } /** - * @param $field - * @param $title - * @param $action + * 图片上传 + * value 为 String类型 + * + * @param $field + * @param $title + * @param $action * @param string $value * @return Upload */ public static function uploadImageOne($field, $title, $action, $value = '') { $upload = self::upload($field, $title, $action, $value, Upload::TYPE_IMAGE); - $upload->format(['jpg','jpeg','png','gif'])->accept('image/*')->maxLength(1); + $upload->format(['jpg', 'jpeg', 'png', 'gif'])->accept('image/*')->maxLength(1); return $upload; } /** - * @param $field - * @param $title - * @param $action + * 文件上传 + * value 为 String类型 + * + * @param $field + * @param $title + * @param $action * @param string $value * @return Upload */ diff --git a/vendor/xaboy/form-builder/src/traits/form/FormValidateTrait.php b/vendor/xaboy/form-builder/src/traits/form/FormValidateTrait.php index 63651e1d..8efa26e8 100644 --- a/vendor/xaboy/form-builder/src/traits/form/FormValidateTrait.php +++ b/vendor/xaboy/form-builder/src/traits/form/FormValidateTrait.php @@ -12,36 +12,71 @@ use FormBuilder\components\Validate; trait FormValidateTrait { + /** + * string 类型验证器 + * + * @return Validate + */ public static function validateStr() { return Validate::str(); } + /** + * input 组件验证器 + * + * @return Validate + */ public static function validateInput() { return Validate::str(Validate::TRIGGER_BLUR); } + /** + * array 类型验证器 + * + * @return Validate + */ public static function validateArr() { return Validate::arr(); } + /** + * number 类型验证器 + * + * @return Validate + */ public static function validateNum() { return Validate::num(); } + /** + * inputNumber 组件验证器 + * + * @return Validate + */ public static function validateNumInput() { return Validate::num(Validate::TRIGGER_BLUR); } + /** + * date 类型验证器 + * + * @return Validate + */ public static function validateDate() { return Validate::date(); } + /** + * frame 组件验证器 + * + * @return Validate + */ public static function validateFrame() { return self::ValidateArr(); diff --git a/vendor/xaboy/form-builder/src/view/formScript.php b/vendor/xaboy/form-builder/src/view/formScript.php index 716e4794..accff2bb 100644 --- a/vendor/xaboy/form-builder/src/view/formScript.php +++ b/vendor/xaboy/form-builder/src/view/formScript.php @@ -10,10 +10,12 @@ }); return rule; }, vm = new Vue,name = 'formBuilderExecgetId() ? '' : '_'.$form->getId() ?>'; - + var _b = false; window[name] = function create(el, callback) { + if(_b) return ; + _b = true; if (!el) el = document.body; - $f = formCreate.create(getRule(), { + var $f = formCreate.create(getRule(), { el: el, form:getConfig('form'))?>, row:getConfig('row'))?>, @@ -48,12 +50,10 @@ success: function (res) { if (res.code == 200) { vm.$Message.success(res.msg); - $f.submitStatus({loading: false}); - formCreate.formSuccess && formCreate.formSuccess(res, $f, formData); callback && callback(0, res, $f, formData); //TODO 表单提交成功! } else { - vm.$Message.error(res.msg); + vm.$Message.error(res.msg || '表单提交失败'); $f.btn.finish(); callback && callback(1, res, $f, formData); //TODO 表单提交失败