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

* Optimize the codes of loadModel function.

Browse Source
This commit is contained in:
Guan Xiying
2022-10-18 16:28:10 +08:00
parent ca19766cbc
commit 8dce21799f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+4 -4
View File
@@ -281,7 +281,7 @@ class baseControl
if(isset($loadedModels[$type][$appName][$moduleName]))
{
$this->$objectName = $loadedModels[$type][$appName][$moduleName];
$this->dao = $this->$objectName->dao;
if($type == 'model') $this->dao = $this->$objectName->dao;
return $this->$objectName;
}
@@ -314,9 +314,9 @@ class baseControl
* 初始化model对象，在control对象中可以通过$this->$objectName来引用。同时将dao对象赋为control对象的成员变量，方便引用。
* Init the model object thus you can try $this->$objectName to access it. Also assign the $dao object as a member of control object.
*/
$loadedModels[$appName][$moduleName] = new $modelClass($appName);
$this->$objectName = $loadedModels[$appName][$moduleName];
$this->dao = $this->$objectName->dao;
$this->$objectName = new $modelClass($appName);
if($type == 'model') $this->dao = $this->$objectName->dao;
$loadedModels[$type][$appName][$moduleName] = $this->$objectName;
return $this->$objectName;
}
framework/base/model.class.php
+3 -2
View File
@@ -221,6 +221,7 @@ class baseModel
$modelFile = $this->app->setModelFile($moduleName, $appName, $type);
if(!helper::import($modelFile)) return false;
$modelClass = class_exists('ext' . $appName . $moduleName. $type) ? 'ext' . $appName . $moduleName . $type : $appName . $moduleName . $type;
if(!class_exists($modelClass))
{
@@ -228,8 +229,8 @@ class baseModel
if(!class_exists($modelClass)) $this->app->triggerError(" The $type $modelClass not found", __FILE__, __LINE__, $exit = true);
}
$loadedModels[$type][$appName][$moduleName] = new $modelClass($appName);
$this->$objectName = $loadedModels[$type][$appName][$moduleName];
$this->$objectName = new $modelClass($appName);
$loadedModels[$type][$appName][$moduleName] = $this->$objectName;
return $this->$objectName;
}