From 352f3d9b5bcb229299456b1bd8205d9548604a97 Mon Sep 17 00:00:00 2001 From: wangxuepeng Date: Thu, 9 Nov 2023 17:38:17 +0800 Subject: [PATCH] * Fiexed the show error in tutorial mode. --- module/product/js/browse.ui.js | 5 +++++ module/program/ui/create.html.php | 1 + module/tutorial/js/index.js | 6 +++++- module/tutorial/lang/zh-cn.php | 7 ++++--- module/user/ui/create.html.php | 1 + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/module/product/js/browse.ui.js b/module/product/js/browse.ui.js index 032716e639..1a07c275c0 100644 --- a/module/product/js/browse.ui.js +++ b/module/product/js/browse.ui.js @@ -50,6 +50,11 @@ window.renderCell = function(result, info) if(info.col.name == 'title' && result) { const story = info.row.data; + if(story.color) + { + let storyUrl = $.createLink('story', 'view', 'storyID=' + story.id); + result[0] = {html: '' + story.title + ''}; + } let html = ''; if(showBranch) html += "" + story.branch + " "; if(typeof modulePairs[story.rawModule] != 'undefined') html += "" + modulePairs[story.rawModule] + " "; diff --git a/module/program/ui/create.html.php b/module/program/ui/create.html.php index 8110d4f4d0..148d361752 100644 --- a/module/program/ui/create.html.php +++ b/module/program/ui/create.html.php @@ -18,6 +18,7 @@ jsVar('budgetOverrun', $lang->project->budgetOverrun); set::title($parentID ? $lang->program->children : $lang->program->create); formPanel ( + set::id('createProgram'), to::heading ( div diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js index 51a1ebf0dd..d3088674df 100644 --- a/module/tutorial/js/index.js +++ b/module/tutorial/js/index.js @@ -258,7 +258,7 @@ $(function() if(targetStatus.nav) { var $form = $$(task.nav.form); - var $formWrapper = $form.closest('.main-content'); + var $formWrapper = $form.closest('#mainContent'); if(!$formWrapper.length) $formWrapper = $form; highlight($formWrapper); showToolTip($formWrapper, $formTarget.text()); @@ -369,6 +369,7 @@ $(function() if(targetStatus.form) { + clearTips(); $submitTarget.addClass('active'); if(task.nav.submit) showToolTip($form.find(task.nav.submit), $submitTarget.text(), {placement: 'top'}); } @@ -588,6 +589,9 @@ $(function() $(document).on('click', '.btn-task', function() { + iWindow = getAppWindow(); + iWindow.$('.hl-tutorial').removeClass('hl-tutorial hl-in'); + iWindow.$('.popover').remove(); showTask($(this).data('name')); /* Code for task #51133. */ diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index d2c8729ffd..2e4bcd7466 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -43,7 +43,7 @@ $lang->tutorial->tasks['createAccount']['nav']['module'] = 'user'; $lang->tutorial->tasks['createAccount']['nav']['method'] = 'create'; $lang->tutorial->tasks['createAccount']['nav']['menuModule'] = 'company'; $lang->tutorial->tasks['createAccount']['nav']['menu'] = 'browseUser'; -$lang->tutorial->tasks['createAccount']['nav']['form'] = '#mainContent'; +$lang->tutorial->tasks['createAccount']['nav']['form'] = '#createUser'; $lang->tutorial->tasks['createAccount']['nav']['requiredFields'] = 'account,realname,verifyPassword,password1,password2'; $lang->tutorial->tasks['createAccount']['nav']['submit'] = 'button[type=submit]'; $lang->tutorial->tasks['createAccount']['nav']['target'] = '.create-user-btn'; @@ -60,7 +60,7 @@ $lang->tutorial->tasks['createProgram']['nav']['module'] = 'program'; $lang->tutorial->tasks['createProgram']['nav']['method'] = 'create'; $lang->tutorial->tasks['createProgram']['nav']['menuModule'] = 'program'; $lang->tutorial->tasks['createProgram']['nav']['menu'] = '.create-program-btn'; -$lang->tutorial->tasks['createProgram']['nav']['form'] = '#mainContent'; +$lang->tutorial->tasks['createProgram']['nav']['form'] = '#createProgram'; $lang->tutorial->tasks['createProgram']['nav']['submit'] = 'button[type=submit]'; $lang->tutorial->tasks['createProgram']['nav']['target'] = '.create-program-btn'; $lang->tutorial->tasks['createProgram']['nav']['targetPageName'] = '添加项目集'; @@ -140,9 +140,10 @@ $lang->tutorial->tasks['createProjectExecution']['nav']['app'] = 'pro $lang->tutorial->tasks['createProjectExecution']['nav']['module'] = 'execution'; $lang->tutorial->tasks['createProjectExecution']['nav']['method'] = 'create'; $lang->tutorial->tasks['createProjectExecution']['nav']['menuModule'] = ''; -$lang->tutorial->tasks['createProjectExecution']['nav']['menu'] = '#heading > .toolbar > .toolbar-item, .create-execution-btn'; +$lang->tutorial->tasks['createProjectExecution']['nav']['menu'] = '#heading > .toolbar > .toolbar-item, #table-tutorial-wizard > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"] > .dtable-cell-content > a, .create-execution-btn'; $lang->tutorial->tasks['createProjectExecution']['nav']['form'] = '#mainContent'; $lang->tutorial->tasks['createProjectExecution']['nav']['submit'] = 'button[type=submit]'; +$lang->tutorial->tasks['createProjectExecution']['nav']['targetPageName'] = "添加{$lang->executionCommon}"; $lang->tutorial->tasks['createProjectExecution']['desc'] = "

在系统创建一个新的{$lang->executionCommon}：

"; diff --git a/module/user/ui/create.html.php b/module/user/ui/create.html.php index f24ec0eb69..ce2afb3068 100644 --- a/module/user/ui/create.html.php +++ b/module/user/ui/create.html.php @@ -31,6 +31,7 @@ foreach($visionList as $key => $label) formPanel ( + set::id('createUser'), on::change('input[name=type]', 'changeType'), on::change('input[name=role]', 'changeRole'), on::change('#addCompany', 'changeAddCompany'),