diff --git a/module/api/config/form.php b/module/api/config/form.php index 1e1a0fef40..a91b1c2f45 100644 --- a/module/api/config/form.php +++ b/module/api/config/form.php @@ -65,4 +65,4 @@ $config->api->form->edit['paramsExample'] = array('type' => 'string', 'require $config->api->form->edit['response'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor'); $config->api->form->edit['responseExample'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->api->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor'); -$config->api->form->edit['editedDate'] = array('type' => 'date', 'required' => true, 'default' => ''); +$config->api->form->edit['editedDate'] = array('type' => 'date', 'required' => false, 'default' => ''); diff --git a/module/api/control.php b/module/api/control.php index 2543fd3430..2005ad6a89 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -137,7 +137,7 @@ class api extends control $this->view->apiID = $apiID; $this->view->api = $api; $this->view->linkParams = $linkParams; - $this->view->typeList = $this->api->getTypeList($api->lib); + $this->view->typeList = $this->apiZen->getTypeList($api->lib); $this->view->users = $this->user->getPairs('noclosed,noletter'); $this->view->actions = $apiID ? $this->action->getList('api', $apiID) : array(); $this->display(); diff --git a/module/api/model.php b/module/api/model.php index 90bbd465c6..b3cb31501f 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -142,8 +142,8 @@ class apiModel extends model ->data($formData) ->autoCheck() ->batchCheck($this->config->api->edit->requiredFields, 'notempty') - ->check('title', 'unique', "id != $formData->id AND lib = $formData->lib AND module = $formData->module") - ->check('path', 'unique', "id != $formData->id AND lib = $formData->lib AND module = $formData->module AND method = '$formData->method'") + ->check('title', 'unique', "id != $oldApi->id AND lib = $oldApi->lib AND module = $formData->module") + ->check('path', 'unique', "id != $oldApi->id AND lib = $oldApi->lib AND module = $formData->module AND method = '$formData->method'") ->where('id')->eq($formData->id) ->exec(); @@ -577,31 +577,6 @@ class apiModel extends model return $result; } - /** - * Get Type list. - * - * @param int $libID - * @access public - * @return void - */ - public function getTypeList($libID) - { - $typeList = array(); - foreach($this->lang->api->paramsTypeOptions as $key => $item) - { - $typeList[$key] = $item; - } - - /* Get all struct by libID. */ - $structs = $this->getStructListByLibID($libID); - foreach($structs as $struct) - { - $typeList[$struct->id] = $struct->name; - } - - return $typeList; - } - /** * Create demo data. * diff --git a/module/api/ui/create.html.php b/module/api/ui/create.html.php index 29ee0924f3..73c60e68be 100644 --- a/module/api/ui/create.html.php +++ b/module/api/ui/create.html.php @@ -343,7 +343,7 @@ formPanel ) ) ), - formHidden('params', '{"header":[],"params":[],"paramsType":"fromData","query":[]}'), + formHidden('params', '{"header":[],"params":[],"paramsType":"formData","query":[]}'), formGroup ( set::width('1/2'), diff --git a/module/api/ui/edit.html.php b/module/api/ui/edit.html.php index 68b2ae87f7..c6c02c8dd1 100644 --- a/module/api/ui/edit.html.php +++ b/module/api/ui/edit.html.php @@ -521,7 +521,7 @@ formPanel ( set::name('type'), set::inline(true), - set::value($api->params['paramsType']), + set::value(!empty($api->params['paramsType']) ? $api->params['paramsType'] : ''), set::items($lang->struct->typeOptions) ) ), diff --git a/module/api/zen.php b/module/api/zen.php index 04e5c574fa..86aeade631 100644 --- a/module/api/zen.php +++ b/module/api/zen.php @@ -197,4 +197,30 @@ class apiZen extends api return array('url' => $url, 'content' => $content); } + + /** + * 获取接口类型数据。 + * Get Type list. + * + * @param int $libID + * @access public + * @return array + */ + public function getTypeList(int $libID): array + { + $typeList = array(); + foreach($this->lang->api->paramsTypeOptions as $key => $item) + { + $typeList[$key] = $item; + } + + /* Get all struct by libID. */ + $structs = $this->api->getStructListByLibID($libID); + foreach($structs as $struct) + { + $typeList[$struct->id] = $struct->name; + } + + return $typeList; + } }