Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for api.

Browse Source
This commit is contained in:
王怡栋
2021-11-12 13:51:26 +08:00
parent 9b51c138dc
commit 7dd4586d46
3 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/views.php
+8 -1
View File
@@ -20,12 +20,19 @@ class viewsEntry extends entry
public function get()
{
$position = $this->param('position', '');
$lite = $this->param('lite', '');
$tab = $this->param('tab', '');
$lite = $this->param('lite', '');
if(empty($position)) return $this->sendError(400, 'Need position param.');
if($position != 'header' and $position != 'footer') return $this->sendError(400, 'Value of position param only is header or footer.');
if(!empty($lite)) $lite .= 'lite.';
if($tab)
{
$_COOKIE['tab'] = $tab;
$this->app->setOpenApp();
}
$viewFile = $this->app->moduleRoot . "common/view/{$position}.{$lite}html.php";
if(!file_exists($viewFile)) return $this->sendError(400, 'This view file is not exists.');
framework/base/router.class.php
+33 -14
View File
@@ -1396,6 +1396,31 @@ class baseRouter
/* 如果扩展目录为空，不包含任何扩展文件。If there's no ext paths return false.*/
if(empty($moduleExtPaths)) return false;
/* 如果extensionLevel == 2，且扩展文件存在，返回该站点扩展文件。If extensionLevel == 2 and site extensionFile exists, return it. */
if($this->config->framework->extensionLevel == 2 and !empty( $moduleExtPaths['site']))
{
$this->extActionFile = $moduleExtPaths['site'] . $this->methodName . '.php';
if(file_exists($this->extActionFile)) return true;
}
/* 然后再尝试寻找公共扩展文件。Then try to find the common extension file. */
$this->extActionFile = $moduleExtPaths['common'] . $this->methodName . '.php';
return file_exists($this->extActionFile);
}
/**
* Check for API extend.
*
* @access public
* @return bool
*/
public function checkAPIFile()
{
$moduleExtPaths = $this->getModuleExtPath('', $this->moduleName, 'control');
/* 如果扩展目录为空，不包含任何扩展文件。If there's no ext paths return false.*/
if(empty($moduleExtPaths)) return false;
/* 如果extensionLevel == 2，且扩展文件存在，返回该站点扩展文件。If extensionLevel == 2 and site extensionFile exists, return it. */
if($this->config->framework->extensionLevel == 2 and !empty( $moduleExtPaths['site']))
{
@@ -1403,9 +1428,6 @@ class baseRouter
if(file_exists($locateFile)) $this->sendAPI($locateFile);
$requestFile = $moduleExtPaths['site'] . $this->methodName . '.api';
if(file_exists($requestFile)) $this->sendAPI($requestFile);
$this->extActionFile = $moduleExtPaths['site'] . $this->methodName . '.php';
if(file_exists($this->extActionFile)) return true;
}
/* 然后再尝试寻找公共扩展文件。Then try to find the common extension file. */
@@ -1414,8 +1436,7 @@ class baseRouter
$requestFile = $moduleExtPaths['common'] . $this->methodName . '.api';
if(file_exists($requestFile)) $this->sendAPI($requestFile);
$this->extActionFile = $moduleExtPaths['common'] . $this->methodName . '.php';
return file_exists($this->extActionFile);
return false;
}
/**
@@ -1707,19 +1728,16 @@ class baseRouter
$obLevel = ob_get_level();
for($i = 0; $i < $obLevel; $i++) ob_end_clean();
$controller = new control();
$viewFiles = $controller->setViewFile($this->moduleName, $this->methodName);
$viewFiles = $this->control->setViewFile($this->moduleName, $this->methodName);
$css = $controller->getCSS($this->moduleName, $this->methodName);
$js = $controller->getJS($this->moduleName, $this->methodName);
if($css) $controller->view->pageCSS = $css;
if($js) $controller->view->pageJS = $js;
if($css) $this->control->view->pageCSS = $css;
if($js) $this->control->view->pageJS = $js;
$output = '';
$output .= $controller->printViewFile($headFile);
$output .= $this->control->printViewFile($headFile);
$output .= $response;
if(isset($viewFiles['hookFiles'])) foreach($viewFiles['hookFiles'] as $hookFile) $output .= $controller->printViewFile($hookFile);
$output .= $controller->printViewFile($footFile);
if(isset($viewFiles['hookFiles'])) foreach($viewFiles['hookFiles'] as $hookFile) $output .= $this->control->printViewFile($hookFile);
$output .= $this->control->printViewFile($footFile);
die($output);
}
}
@@ -1893,6 +1911,7 @@ class baseRouter
/* 调用该方法 Call the method. */
call_user_func_array(array($module, $methodName), $this->params);
$this->checkAPIFile();
return $module;
}
framework/helper.class.php
+4 -1
View File
@@ -243,7 +243,10 @@ class helper extends baseHelper
$url .= (strpos($url, '?') !== false ? '&' : '?') . $config->sessionVar . '=' . session_id();
if(isset($_SESSION['user'])) $url .= '&account=' . $_SESSION['user']->account;
return common::http($url);
$response = common::http($url);
$jsonDecode = json_decode($response);
if(empty($jsonDecode)) return $response;
return $jsonDecode;
}
}