From b26080b2b0bdc343d3a42117185d1ce4ccd0673c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@chandao.com>
Date: Wed, 23 Apr 2025 09:55:08 +0800
Subject: [PATCH]  * [task#141983,doing,1h] Modify the problem of code review.

---
 module/doc/config/form.php                  | 2 ++
 module/doc/control.php                      | 6 ++----
 module/doc/js/browsetemplate.ui.js          | 1 +
 module/doc/ui/setdocbasic.template.html.php | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/doc/config/form.php b/module/doc/config/form.php
index 907fe16847..e49ff1ec12 100644
--- a/module/doc/config/form.php
+++ b/module/doc/config/form.php
@@ -64,6 +64,7 @@ $config->doc->form->create['templateType'] = array('type' => 'string',   'requir
 $config->doc->form->create['chapterType']  = array('type' => 'string',   'required' => false, 'default' => '');
 
 $config->doc->form->createtemplate = $config->doc->form->create;
+$config->doc->form->createtemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
 
 $config->doc->form->edit['title']      = array('type' => 'string',   'required' => true,  'default' => '', 'filter' => 'trim');
 $config->doc->form->edit['product']    = array('type' => 'int',      'required' => false, 'default' => 0);
@@ -88,6 +89,7 @@ $config->doc->form->edit['editedBy']   = array('type' => 'string',   'required'
 $config->doc->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
 
 $config->doc->form->edittemplate = $config->doc->form->edit;
+$config->doc->form->edittemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
 
 $config->doc->form->movelib['space']  = array('type' => 'string',   'required' => true,  'default' => '');
 $config->doc->form->movelib['acl']    = array('type' => 'string',   'required' => true,  'default' => '');
diff --git a/module/doc/control.php b/module/doc/control.php
index 7f948cfe7e..be37c7d299 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -658,7 +658,6 @@ class doc extends control
                 ->setDefault('addedBy', $this->app->user->account)
                 ->setDefault('editedBy', $this->app->user->account)
                 ->get();
-            $docData->templateDesc = zget($_POST, 'desc', '');
 
             $_POST['type'] = 'docTemplate';
 
@@ -673,7 +672,7 @@ class doc extends control
                 $docData->templateType = $parentTemplate->templateType;
             }
 
-            $docResult = $this->doc->create($docData, $this->post->labels);
+            $docResult = $this->doc->create($docData);
             if(!$docResult || dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             return $this->docZen->responseAfterCreate($docResult, 'docTemplate');
         }
@@ -701,7 +700,6 @@ class doc extends control
                 ->setIF(!isset($_POST['parent']), 'parent', $doc->parent)
                 ->setIF(strpos(",$doc->editedList,", ",{$this->app->user->account},") === false, 'editedList', $doc->editedList . ",{$this->app->user->account}")
                 ->get();
-            if(isset($_POST['desc'])) $docData->templateDesc = $_POST['desc'];
 
             $_POST['type'] = 'docTemplate';
             $result  = $this->doc->update($docID, $docData);
@@ -838,7 +836,7 @@ class doc extends control
                 $docData->module = $parentDoc->module;
             }
 
-            $docResult = $this->doc->create($docData, $this->post->labels);
+            $docResult = $this->doc->create($docData);
             if(!$docResult || dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             return $this->docZen->responseAfterCreate($docResult);
         }
diff --git a/module/doc/js/browsetemplate.ui.js b/module/doc/js/browsetemplate.ui.js
index 2c41c134ae..4197b92837 100644
--- a/module/doc/js/browsetemplate.ui.js
+++ b/module/doc/js/browsetemplate.ui.js
@@ -1,5 +1,6 @@
 const savingDocData = {};
 let docBasicModal   = {};
+let currentUser     = null;
 /**
  * 获取文档界面上的表格初始化选项。
  * Get the table initialization options on the doc UI.
diff --git a/module/doc/ui/setdocbasic.template.html.php b/module/doc/ui/setdocbasic.template.html.php
index 632dc67860..61d6277853 100644
--- a/module/doc/ui/setdocbasic.template.html.php
+++ b/module/doc/ui/setdocbasic.template.html.php
@@ -60,7 +60,7 @@ formPanel
     $modalType != 'chapter' ? formGroup
     (
         set::label($lang->docTemplate->desc),
-        textarea(set::name('desc'), set::value($docID ? $doc->templateDesc : ''), set::rows(3))
+        textarea(set::name('templateDesc'), set::value($docID ? $doc->templateDesc : ''), set::rows(3))
     ) : null,
     empty($parentID) ? formGroup
     (