search默认col为3

判断mysql版本，高版本使用utf8mb4
hi-tpext · Apr 18, 2024 · 75e8f9a · 75e8f9a
1 parent 5e1134b
commit 75e8f9a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/src/admin/controller/Creator.php b/src/admin/controller/Creator.php
@@ -321,7 +321,7 @@ protected function buildForm($isEdit, &$data = [])
      * @param integer $id
      * @return mixed
      */
-    private function save($id = 0)
+    protected function save($id = 0)
     {
         $data = request()->post();
 
@@ -412,7 +412,7 @@ private function save($id = 0)
      *
      * @return void
      */
-    protected function buildTable(&$data = [])
+    protected function buildTable(&$data = [], $isExporting = false)
     {
         $table = $this->table;
 
@@ -526,7 +526,7 @@ public function relations()
             $form->show('TABLE_NAME', '表名称')->value($id);
             $form->raw('model_namespace', 'model命名空间')->value('<b>app\\' . Module::getInstance()->config('model_namespace') . '\\model\\</b>可在扩展配置中修改');
             if (is_file($modelFileName)) {
-                $form->raw('tips', '提示')->value('已存在模型文件，将覆被盖：<b>' . str_replace(App::getRootPath(), '', $modelFileName) . '</b>');
+                $form->raw('tips', '提示')->value('已存在模型文件，将被覆盖：<b>' . str_replace(App::getRootPath(), '', $modelFileName) . '</b>');
             }
             $form->text('model_title', 'model注释')->default($tableInfo['TABLE_COMMENT'])->required();
 

diff --git a/src/admin/controller/Dbtable.php b/src/admin/controller/Dbtable.php
@@ -281,7 +281,7 @@ protected function buildForm($isEdit, &$data = [])
      * @param integer $id
      * @return mixed
      */
-    private function save($id = 0)
+    protected function save($id = 0)
     {
         $data = request()->only([
             'TABLE_NAME',
@@ -336,7 +336,7 @@ private function save($id = 0)
      *
      * @return void
      */
-    protected function buildTable(&$data = [])
+    protected function buildTable(&$data = [], $isExporting = false)
     {
         $protectedTables = $this->getProtectedTables();
         $table = $this->table;

diff --git a/src/admin/controller/Extension.php b/src/admin/controller/Extension.php
@@ -411,7 +411,7 @@ protected function buildDataList($where = [], $sortOrder = '', $page = 1, &$tota
      *
      * @return void
      */
-    protected function buildTable(&$data = [])
+    protected function buildTable(&$data = [], $isExporting = false)
     {
         $table = $this->table;
 

diff --git a/src/common/logic/CreatorLogic.php b/src/common/logic/CreatorLogic.php
@@ -444,6 +444,7 @@ public function buildSearch($data)
         $this->lines[] = '    protected function buildSearch()';
         $this->lines[] = '    {';
         $this->lines[] = '        $search = $this->search;';
+        $this->lines[] = '        $search->defaultDisplayerColSize(3);';
         $this->lines[] = '';
         if (!empty($data['TABLE_FIELDS'])) {
 

diff --git a/src/common/logic/DbLogic.php b/src/common/logic/DbLogic.php
@@ -279,9 +279,11 @@ public function createTable($tableName, $data)
             }
         }
 
+        $charset = preg_match('/^[1-5]\.[0-5]/', $this->getMysqlVersion()) ? 'utf8' : 'utf8mb4';
+
         $sql = "CREATE TABLE IF NOT EXISTS `$tableName`(
             `{$pkinfo['COLUMN_NAME']}` {$attr} primary key COMMENT '{$pkinfo['COLUMN_COMMENT']}'{$create_time_column}{$update_time_column}
-            )ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='{$data['TABLE_COMMENT']}'";
+            )ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET={$charset} COMMENT='{$data['TABLE_COMMENT']}'";
         try {
             Db::execute($sql);
         } catch (\Exception $ex) {
@@ -294,6 +296,11 @@ public function createTable($tableName, $data)
         return true;
     }
 
+    public function getMysqlVersion()
+    {
+        return Db::query("SELECT VERSION() AS ver")[0]['ver'];
+    }
+
     /**
      * Undocumented function
      *