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

* Fix bug #50426, #50427, #50428, #50429, #50430, #50432, #50433, #50459, #50472.

Browse Source
This commit is contained in:
liumengyi
2024-06-03 08:35:49 +08:00
committed by caoyanyi
parent 5ad9715edc
commit 0a85590997
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tutorial/config/tasks.php
+2 -2
View File
@@ -11,7 +11,7 @@ $config->tutorial->tasksConfig['createAccount']['nav']['module'] = 'user
$config->tutorial->tasksConfig['createAccount']['nav']['method'] = 'create';
$config->tutorial->tasksConfig['createAccount']['nav']['menuModule'] = 'company';
$config->tutorial->tasksConfig['createAccount']['nav']['menu'] = 'browseUser';
$config->tutorial->tasksConfig['createAccount']['nav']['form'] = '#createUser';
$config->tutorial->tasksConfig['createAccount']['nav']['form'] = '#mainContent';
$config->tutorial->tasksConfig['createAccount']['nav']['requiredFields'] = 'account,realname,verifyPassword,password1,password2';
$config->tutorial->tasksConfig['createAccount']['nav']['submit'] = 'button[type=submit]';
$config->tutorial->tasksConfig['createAccount']['nav']['target'] = '.create-user-btn';
@@ -27,7 +27,7 @@ $config->tutorial->tasksConfig['createProgram']['nav']['module'] = 'prog
$config->tutorial->tasksConfig['createProgram']['nav']['method'] = 'create';
$config->tutorial->tasksConfig['createProgram']['nav']['menuModule'] = 'program';
$config->tutorial->tasksConfig['createProgram']['nav']['menu'] = '.create-program-btn';
$config->tutorial->tasksConfig['createProgram']['nav']['form'] = '#createProgram';
$config->tutorial->tasksConfig['createProgram']['nav']['form'] = '#form-program-create';
$config->tutorial->tasksConfig['createProgram']['nav']['submit'] = 'button[type=submit]';
$config->tutorial->tasksConfig['createProgram']['nav']['target'] = '.create-program-btn';
$config->tutorial->tasksConfig['createProgram']['nav']['targetPageName'] = $lang->tutorial->tasks->createProgram->targetPageName;
module/tutorial/js/index.ui.js
+8 -5
View File
@@ -530,7 +530,8 @@ $(function()
requiredFields = requiredFields.split(',');
$.each(requiredFields, function(_, requiredId)
{
var $required = $$('[name^=' + requiredId);
if(requiredId === '') return true;
var $required = $$('input[name="' + requiredId + '"]');
var $authBlock = !$required.is('input') ? $required.find('input').last() : $required;
if($authBlock.length)
{
@@ -538,7 +539,8 @@ $(function()
if(val === undefined || val === null || val === '' || val === '0')
{
targetStatus.submitOK = false;
if(!targetStatus.waitField) targetStatus.waitField = $required;
if(task.nav.module == 'program' && task.nav.method == 'create' && requiredId === 'end' && $$('[name="longTime"]').val() == 'on') targetStatus.submitOK = true;
if(!targetStatus.submitOK && !targetStatus.waitField) targetStatus.waitField = $required;
}
}
});
@@ -549,9 +551,10 @@ $(function()
var onFormSubmit = function(e)
{
var iWindow = getAppWindow();
var iWindow = getAppWindow();
var fieldSelector = getFieldSelector(task, iWindow);
var status = checkFieldStatusReady(iWindow, fieldSelector);
var status = checkFieldStatusReady(iWindow, fieldSelector);
debugger;
if(status.submitOK)
{
setTaskStatus(true, true, true, true);
@@ -583,7 +586,7 @@ $(function()
else if(requiredFields)
{
requiredFields = requiredFields.split(',');
$.each(requiredFields, function(_, requiredId){ fieldSelector += ',' + '#' + requiredId;});
$.each(requiredFields, function(_, requiredId){ fieldSelector += ',' + '[name="' + requiredId + '"]';});
if(fieldSelector.length > 1) fieldSelector = fieldSelector.substring(1);
}