mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化CRUD自定义删除字段 

优化CRUD无符号字段
pull/331/MERGE
Karson 2021-07-05 11:23:13 +08:00
parent bba702bd18
commit 9a7e29a080
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/admin/command/Crud.php
View File

@ -604,6 +604,11 @@ class Crud extends Command
$attrArr['data-rule'] = 'required'; $attrArr['data-rule'] = 'required';
} }
//如果字段类型为无符号型，则设置<input min=0>
if (stripos($v['COLUMN_TYPE'], 'unsigned') !== false) {
$attrArr['min'] = 0;
}
if ($inputType == 'select') { if ($inputType == 'select') {
$cssClassArr[] = 'selectpicker'; $cssClassArr[] = 'selectpicker';
$attrArr['class'] = implode(' ', $cssClassArr); $attrArr['class'] = implode(' ', $cssClassArr);
@ -957,7 +962,7 @@ class Crud extends Command
$this->writeToFile('recyclebin', $data, $recyclebinFile); $this->writeToFile('recyclebin', $data, $recyclebinFile);
$recyclebinTitle = in_array('title', $fieldArr) ? 'title' : (in_array('name', $fieldArr) ? 'name' : ''); $recyclebinTitle = in_array('title', $fieldArr) ? 'title' : (in_array('name', $fieldArr) ? 'name' : '');
$recyclebinTitleJs = $recyclebinTitle ? "\n {field: '{$recyclebinTitle}', title: __('" . (ucfirst($recyclebinTitle)) . "'), align: 'left'}," : ''; $recyclebinTitleJs = $recyclebinTitle ? "\n {field: '{$recyclebinTitle}', title: __('" . (ucfirst($recyclebinTitle)) . "'), align: 'left'}," : '';
$data['recyclebinJs'] = $this->getReplacedStub('mixins/recyclebinjs', ['recyclebinTitleJs' => $recyclebinTitleJs, 'controllerUrl' => $controllerUrl]); $data['recyclebinJs'] = $this->getReplacedStub('mixins/recyclebinjs', ['deleteTimeField' => $this->deleteTimeField, 'recyclebinTitleJs' => $recyclebinTitleJs, 'controllerUrl' => $controllerUrl]);
} }
// 生成JS文件 // 生成JS文件
$this->writeToFile('javascript', $data, $javascriptFile); $this->writeToFile('javascript', $data, $javascriptFile);
@ -1453,9 +1458,9 @@ EOD;
// 文件、图片、权重等字段默认不加入搜索栏，字符串类型默认LIKE // 文件、图片、权重等字段默认不加入搜索栏，字符串类型默认LIKE
$noSearchFiles = ['file$', 'files$', 'image$', 'images$', '^weigh$']; $noSearchFiles = ['file$', 'files$', 'image$', 'images$', '^weigh$'];
if(preg_match("/" . implode('|', $noSearchFiles) . "/i", $field)){ if (preg_match("/" . implode('|', $noSearchFiles) . "/i", $field)) {
$html .= ", operate: false"; $html .= ", operate: false";
}else if(in_array($datatype, ['varchar'])) { } else if (in_array($datatype, ['varchar'])) {
$html .= ", operate: 'LIKE'"; $html .= ", operate: 'LIKE'";
} }

4
application/admin/command/Crud/stubs/mixins/recyclebinjs.stub
View File

@ -19,7 +19,7 @@
{checkbox: true}, {checkbox: true},
{field: 'id', title: __('Id')},{%recyclebinTitleJs%} {field: 'id', title: __('Id')},{%recyclebinTitleJs%}
{ {
field: 'deletetime', field: '{%deleteTimeField%}',
title: __('Deletetime'), title: __('Deletetime'),
operate: 'RANGE', operate: 'RANGE',
addclass: 'datetimerange', addclass: 'datetimerange',
@ -57,4 +57,4 @@
// 为表格绑定事件 // 为表格绑定事件
Table.api.bindevent(table); Table.api.bindevent(table);
}, },