From 6f5ea38b67da2f3c2fe77e63cbc918beca6bbece Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 19 Jun 2023 13:57:54 +0800
Subject: [PATCH] * Refactor caselib::create.

---
 module/caselib/control.php        |  4 ++--
 module/caselib/model.php          |  1 +
 module/caselib/ui/browse.html.php |  1 +
 module/caselib/ui/create.html.php |  2 +-
 module/caselib/zen.php            | 17 -----------------
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/module/caselib/control.php b/module/caselib/control.php
index 810dc39bd7..e014285ff1 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -40,8 +40,8 @@ class caselib extends control
             $libID = $this->caselib->create($lib, $this->post->uid);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $response = $this->caselibZen->responseAfterCreate($libID);
-            return $this->send($response);
+            if($this->viewType == 'json') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $libID);
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('caselib', 'browse', "libID=$libID")));
         }
 
         $this->caselibZen->setCreateMenu();
diff --git a/module/caselib/model.php b/module/caselib/model.php
index a58b6468be..12322f1b0b 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -196,6 +196,7 @@ class caselibModel extends model
         {
             $libID = $this->dao->lastInsertID();
             $this->loadModel('file')->updateObjectID($uid, $libID, 'caselib');
+            $this->loadModel('action')->create('caselib', $libID, 'opened');
             return $libID;
         }
         return false;
diff --git a/module/caselib/ui/browse.html.php b/module/caselib/ui/browse.html.php
index ff17deb5bc..bf34be7612 100644
--- a/module/caselib/ui/browse.html.php
+++ b/module/caselib/ui/browse.html.php
@@ -68,6 +68,7 @@ toolbar
         setClass('btn secondary'),
         set::icon('plus'),
         set::url(helper::createLink('caselib', 'create')),
+        set('data-toggle', 'modal'),
         $lang->caselib->create
     ) : '',
     $canCreateCase && $canBatchCreateCase ? btngroup
diff --git a/module/caselib/ui/create.html.php b/module/caselib/ui/create.html.php
index 24fc339893..9de2061106 100644
--- a/module/caselib/ui/create.html.php
+++ b/module/caselib/ui/create.html.php
@@ -33,4 +33,4 @@ $formItems['desc'] = $descGroup;
 /* TODO:printExtendFields */
 formPanel($formItems);
 
-render();
+render(isAjaxRequest('modal') ? 'modalDialog' : 'page');
diff --git a/module/caselib/zen.php b/module/caselib/zen.php
index c1b0f159cd..9b0dc4717e 100644
--- a/module/caselib/zen.php
+++ b/module/caselib/zen.php
@@ -50,21 +50,4 @@ class caselibZen extends caselib
 
         return $this->loadModel('file')->processImgURL($lib, $this->config->caselib->editor->create['id'], $uid);
     }
-
-    /**
-     * 构建创建产品页面数据。
-     * Build form fields for create.
-     *
-     * @param  int  $libID
-     * @access protected
-     * @return array
-     */
-    protected function responseAfterCreate(int $libID): array
-    {
-        $this->loadModel('action')->create('caselib', $libID, 'opened');
-
-        if($this->viewType == 'json') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $libID);
-        return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('caselib', 'browse', "libID=$libID"));
-    }
-
 }