From d3a280c6b0baac7a1f402b3d9f6a2ef4b7423e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HID=E4=B8=A8emotion?= <i@hiders.cn>
Date: Fri, 20 Mar 2020 13:08:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=94=9F=E6=88=90CURD?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81text?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E8=A7=A3=E5=86=B3=E5=BD=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=A4=9A=E9=80=89=E9=A1=B9=E6=97=B6?=
 =?UTF-8?q?varchar(255)=E4=B8=8D=E5=A4=9F=E5=AD=98=E5=82=A8=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 04d1feb9c..8cd59c5c1 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)) {
                         $cssClassArr[] = $this->isMatchSuffix($field, $this->editorSuffix) ? $this->editorClass : '';
                         $attrArr['class'] = implode(' ', $cssClassArr);
                         $attrArr['rows'] = 5;
-- 
Gitee


From fd2481e25b21b4eddc92e8d13563818d3d4447c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HID=E4=B8=A8emotion?= <i@hiders.cn>
Date: Tue, 24 Mar 2020 11:44:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=BAURL=E6=97=B6=E5=80=BC=E4=B8=BANULL=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E4=B8=BAURL=E6=97=B6=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BANULL=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/require-table.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index fc9cf550e..009268254 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) + "'><i class='fa fa-toggle-on " + (value == yes ? 'text-' + color : 'fa-flip-horizontal text-gray') + " fa-2x'></i></a>";
                 },
                 url: function (value, row, index) {
+                    value = value === null ? '' : value.toString();
                     return '<div class="input-group input-group-sm" style="width:250px;margin:0 auto;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
                 },
                 search: function (value, row, index) {
-- 
Gitee


From 187bbdbdf390979912b5a5090119f8b86e1b89ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HID=E4=B8=A8emotion?= <i@hiders.cn>
Date: Tue, 24 Mar 2020 11:57:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=94=9F=E6=88=90CRUD?=
 =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81text?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=B8=80=E9=94=AE=E7=94=9F=E6=88=90CRUD?=
 =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81text?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 8cd59c5c1..589a8befe 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' && !$this->isMatchSuffix($field, $this->selectpagesSuffix)) {
+                    } 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;
-- 
Gitee