diff --git a/module/program/ui/browse.html.php b/module/program/ui/browse.html.php index fe399e7680..864f877f4e 100644 --- a/module/program/ui/browse.html.php +++ b/module/program/ui/browse.html.php @@ -1,147 +1,11 @@ $menuItem->text, - 'url' => \commonModel::createMenuLink($menuItem, $app->tab), - 'active' => $menuItem->order === 1, - ); -} - -/* Generate dropdown menus. */ -$userMenu = dropdown(setId('userMenu')); -foreach(\commonModel::printUserBarZin() as $item) $userMenu->append(item($item)); - -$globalCreateMenu = dropdown(setId('globalCreateMenu')); -foreach(\commonModel::printCreateListZin() as $item) $globalCreateMenu->append(item($item)); - -$switcherMenu = dropdown(setId('switcherMenu')); -foreach(\commonModel::printVisionSwitcherZin() as $item) $switcherMenu->append(item($item)); - -$cols = array_values($config->program->dtable->fieldList); -$fields = array_keys($config->program->dtable->fieldList); -$data = array_values($programs); - -foreach($data as $row) -{ - if(!property_exists($row, 'progress')) - { - if(isset($progressList[$row->id])) $row->progress = $progressList[$row->id]; - else $row->progress = ''; - } - - if(!property_exists($row, 'actions')) - { - $row->actions = array(); - } -} - -\common::sortFeatureMenu(); -$statuses = array(); -foreach($lang->program->featureBar['browse'] as $key => $text) -{ - $statuses[] = array( - 'text' => $text, - 'active' => $key === $status, - 'url' => \helper::createLink('browse', "status=$key&orderBy=$orderBy"), - ); -} - -$others = array(); -if(\common::hasPriv('project', 'batchEdit') and $programType != 'bygrid' and $hasProject === true) -{ - $others[] = array( - 'text' => $lang->project->edit, - 'checked' => $this->cookie->editProject, - 'type' => 'checkbox' - ); -} - -$others[] = array( - 'type' => 'button', - 'icon' => 'search', - 'text' => $lang->user->search, - 'class' => 'ghost' -); - -$btnGroup = array(); -if(\common::hasPriv('project', 'create')) -{ - $btnGroup[] = array( - 'text' => $lang->project->create, - 'icon' => 'plus', - 'class' => 'btn secondary', - 'url' => \helper::createLink('project', 'createGuide', "programID=0&from=PGM"), - ); -} - -if(\common::hasPriv('program', 'create')) -{ - $btnGroup[] = array( - 'text' => $lang->program->create, - 'icon' => 'plus', - 'class' => 'btn primary', - 'url' => \helper::createLink('program', 'create') - ); -} - -Page( - set('title', $title), - Pageheader( - Pageheading( - $lang->{$app->tab}->common, - set('icon', $app->tab), - set('url', \helper::createLink($app->tab, 'browse')), - ), - Pagenavbar( - Zuinav( - set('js-render', false), - set('items', $navItems), - ), - ), - PageToolbar( - set('globalCreate', array( - 'data-arrow' => true, - 'data-toggle' => 'dropdown', - 'data-trigger' => 'hover', - 'href' => '#globalCreateMenu', - )), - set('avatar', array( - 'name' => $app->user->account, - 'avatar' => $app->user->avatar, - 'href' => '#userMenu' - )), - set('switcher', array( - 'text' => '研发管理界面', - 'data-arrow' => true, - 'data-toggle' => 'dropdown', - 'data-trigger' => 'hover', - 'href' => '#switcherMenu', - )) - ), - ), - - Pagemain( - Mainmenu( - set('statuses', array('items' => $statuses)), - set('others', $others), - set('btnGroup', $btnGroup), - ), - - Dtable( - set('js-render', true), - set('cols', $cols), - set('width', '100%'), - set('data', $data), - ) - ), - $userMenu, - $globalCreateMenu, - $switcherMenu, -); +page +( + div('Hello world!', icon('flag', 'test')), + icon('star', setClass('text-red'), 'ha', '123'), + setClass('text-primary'), + 'Hello world!', + btn('Click me', set('type', 'primary')) +)->print(); diff --git a/zin/core/wg.class.php b/zin/core/wg.class.php index f8abed11e3..dac42ed0f3 100644 --- a/zin/core/wg.class.php +++ b/zin/core/wg.class.php @@ -217,10 +217,9 @@ class wg return $this; } - if(is_string($prop) && $value === '%%%NULL%%%') - { - return $this->props->get($prop); - } + if(!is_string($prop) || empty($prop)) return $this; + + if($value === '%%%NULL%%%') return $this->props->get($prop); if($prop[0] === '#') {