From 8074c83bbf4e87260e3246ccbb9ab76750c994f3 Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Mon, 16 Apr 2018 17:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BCdiv.pre=E5=90=AF=E7=94=A8slimScroll=E7=BE=8E=E5=8C=96?=
=?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=20=E3=80=90=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E3=80=91=E4=BA=94=E7=AD=89=E5=88=86=E6=A0=85=E6=A0=BC=E5=B8=83?=
=?UTF-8?q?=E5=B1=80=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=E8=AE=B0=E5=BD=95extparam=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91crud=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91nice-validator=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/command/Crud.php | 10 ++-
application/admin/command/Crud/stubs/add.stub | 10 ++-
.../admin/command/Crud/stubs/edit.stub | 8 +--
application/admin/controller/Ajax.php | 17 +++--
application/admin/lang/zh-cn.php | 2 +
public/assets/css/backend.css | 57 ++++++++++++++++-
public/assets/css/backend.min.css | 2 +-
public/assets/js/require-table.js | 5 ++
public/assets/less/backend.less | 63 +++++++++++++++++--
9 files changed, 146 insertions(+), 28 deletions(-)
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index d4a5dd3a..15222d96 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -454,6 +454,7 @@ class Crud extends Command
//循环所有字段,开始构造视图的HTML和JS信息
foreach ($columnList as $k => $v) {
$field = $v['COLUMN_NAME'];
+ $langField = mb_ucfirst($field);
$itemArr = [];
// 这里构建Enum和Set类型的列表数据
if (in_array($v['DATA_TYPE'], ['enum', 'set', 'tinyint'])) {
@@ -509,6 +510,7 @@ class Crud extends Command
$formEditElement = $this->getReplacedStub('html/select', ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => "\$row.{$field}"]);
} else if ($inputType == 'datetime') {
$cssClassArr[] = 'datetimepicker';
+ $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}";
$attrArr['class'] = implode(' ', $cssClassArr);
$format = "YYYY-MM-DD HH:mm:ss";
$phpFormat = "Y-m-d H:i:s";
@@ -564,6 +566,7 @@ class Crud extends Command
$formEditElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => "\$row.{$field}"]);
} else if ($inputType == 'textarea') {
$cssClassArr[] = substr($field, -7) == 'content' ? $this->editorClass : '';
+ $attrArr['placeholder'] = "{:__('Please input')}{:__('{$langField}')}";
$attrArr['class'] = implode(' ', $cssClassArr);
$attrArr['rows'] = 5;
$formAddElement = Form::textarea($fieldName, $defaultValue, $attrArr);
@@ -583,17 +586,20 @@ class Crud extends Command
$formEditElement .= sprintf(Form::label("{$attrArr['id']}", "%s {:__('Yes')}", ['class' => 'control-label']), Form::checkbox($fieldName, $yes, 0, $attrArr));
$formEditElement = str_replace('type="checkbox"', 'type="checkbox" {in name="' . "\$row.{$field}" . '" value="' . $yes . '"}checked{/in}', $formEditElement);
} else if ($inputType == 'citypicker') {
+ $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}";
$attrArr['class'] = implode(' ', $cssClassArr);
$attrArr['data-toggle'] = "city-picker";
$formAddElement = sprintf("%s
", Form::input('text', $fieldName, $defaultValue, $attrArr));
$formEditElement = sprintf("%s
", Form::input('text', $fieldName, $editValue, $attrArr));
} else {
+ $attrArr['placeholder'] = "{:__('Please input')}{:__('{$langField}')}";
$search = $replace = '';
//特殊字段为关联搜索
if ($this->isMatchSuffix($field, $this->selectpageSuffix)) {
$inputType = 'text';
$defaultValue = '';
$attrArr['data-rule'] = 'required';
+ $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}";
$cssClassArr[] = 'selectpage';
$selectpageController = str_replace('_', '/', substr($field, 0, strripos($field, '_')));
$attrArr['data-source'] = $selectpageController . "/index";
@@ -1141,8 +1147,8 @@ EOD;
$langField = mb_ucfirst($field);
return <<
-
-
+
+
{$content}