diff --git a/module/ai/control.php b/module/ai/control.php index 6f1597f554..6ec709c26e 100644 --- a/module/ai/control.php +++ b/module/ai/control.php @@ -141,9 +141,13 @@ class ai extends control * @access public * @return void */ - public function miniPrograms($category = '', $status = '') + public function miniPrograms($category = '', $status = '', $orderBy = 'createdDate_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) { - $programs = $this->ai->getMiniPrograms($category, $status); + $this->app->loadClass('pager', true); + $pager = new pager($recTotal, $recPerPage, $pageID); + $order = common::appendOrder($orderBy); + + $programs = $this->ai->getMiniPrograms($category, $status, $order, $pager); foreach($programs as $program) { $program->canPublish = empty($program->published) && $this->ai->canPublishMiniProgram($program); @@ -158,6 +162,8 @@ class ai extends control $this->view->miniPrograms = $programs; $this->view->category = $category; $this->view->status = $status; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; $this->display(); } diff --git a/module/ai/lang/zh-cn.php b/module/ai/lang/zh-cn.php index 7880643dde..bda6f214c8 100644 --- a/module/ai/lang/zh-cn.php +++ b/module/ai/lang/zh-cn.php @@ -482,6 +482,8 @@ $lang->ai->miniPrograms->statuses = array( 'createdByMe' => '由我创建' ); +$lang->ai->miniPrograms->summary = '本页共 %s 个小程序。'; + $lang->ai->models = new stdclass(); $lang->ai->models->title = '语言模型配置'; $lang->ai->models->common = '语言模型'; diff --git a/module/ai/model.php b/module/ai/model.php index fba55d2066..01755d790f 100644 --- a/module/ai/model.php +++ b/module/ai/model.php @@ -330,7 +330,7 @@ class aiModel extends model * @access public * @return array */ - public function getMiniPrograms($category, $status) + public function getMiniPrograms($category = '', $status = '', $order = 'createdDate_desc', $pager = null) { return $this->dao->select('*') ->from(TABLE_MINIPROGRAM) @@ -339,6 +339,8 @@ class aiModel extends model ->beginIF($status === 'active')->andWhere('published')->eq('1')->fi() ->beginIF($status === 'draft')->andWhere('published')->ne('1')->fi() ->beginIF($status === 'createdByMe')->andWhere('createdBy')->eq($this->app->user->account)->fi() + ->orderBy($order) + ->page($pager) ->fetchAll(); } diff --git a/module/ai/view/miniprograms.html.php b/module/ai/view/miniprograms.html.php index 803cfeee3d..212e274c71 100644 --- a/module/ai/view/miniprograms.html.php +++ b/module/ai/view/miniprograms.html.php @@ -93,14 +93,15 @@
| ID | -= $lang->prompt->name; ?> | -= $lang->prompt->status; ?> | -= $lang->prompt->module; ?> | -= $lang->prompt->createdBy; ?> | -= $lang->prompt->createdDate; ?> | -= $lang->ai->miniPrograms->latestPublishedDate; ?> | -actions; ?> | + recTotal}&recPerPage={$pager->recPerPage}";?> ++ | = $lang->prompt->name; ?> | += $lang->prompt->status; ?> | += $lang->prompt->module; ?> | += $lang->prompt->createdBy; ?> | +prompt->createdDate); ?> | +ai->miniPrograms->latestPublishedDate); ?> | +actions; ?> |
|---|