diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 04d1feb9c8ba67e4958437739a6a23dcb7a12f95..589a8befe0d4e15b496452f56182a4cc5984d55b 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -678,7 +678,7 @@ class Crud extends Command $formAddElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => $defaultValue]); $formEditElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => "\$row.{$field}"]); - } elseif ($inputType == 'textarea') { + } elseif ($inputType == 'textarea' && !$this->isMatchSuffix($field, $this->selectpagesSuffix) && !$this->isMatchSuffix($field, $this->imageField)) { $cssClassArr[] = $this->isMatchSuffix($field, $this->editorSuffix) ? $this->editorClass : ''; $attrArr['class'] = implode(' ', $cssClassArr); $attrArr['rows'] = 5; diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index fc9cf550e632e4b8ac8a07de53b801d195534380..009268254e7b3d1872eb333132c753ddc07e602f 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -538,6 +538,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table + row[pk] + "' " + (url ? "data-url='" + url + "'" : "") + " data-params='" + this.field + "=" + (value == yes ? no : yes) + "'>"; }, url: function (value, row, index) { + value = value === null ? '' : value.toString(); return '
'; }, search: function (value, row, index) {