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

Merge branch 'master' into epic

Browse Source
This commit is contained in:
sunguangming
2024-06-03 17:34:19 +08:00
parent 8801cd2e90 b1a68368ca
commit 8edd173d68
81 changed files with 682 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib/webdriver/webdriver.class.php
+30 -14
View File
@@ -461,7 +461,6 @@ class dom
foreach($this->element as $element)
{
$text = $element->getText();
var_dump($text);
if(!$text) continue;
$id = $element->getAttribute('id');
@@ -967,21 +966,38 @@ class dom
$picker->click();
sleep(1);
try
{
$pickerInput = $picker->findElement(WebDriverBy::xpath('//*[@class="picker-search"]/input'));
}
catch (Exception $selectionException)
{
$pickerInput = $picker->findElement(WebDriverBy::xpath('//*[@class="picker-selections"]/input'));
}
$pickerInput->click();
$pickerInput->sendKeys(trim($value));
$pickerList = array(
'search' => '//*[@class="picker-search"]/input',
'selections' => '//*[@class="picker-selections"]/input',
'form' =>'//*[@class="form-group-wrapper"]/div[@class="pick pick-pri form-control is-open focus"]',
);
sleep(1);
foreach($pickerList as $xpath => $xpathValue)
{
try
{
$pickerInput = $picker->findElement(WebDriverBy::xpath($xpathValue));
$pickerInput->click();
$pickerInput->sendKeys(trim($value));
sleep(1);
$pickerID = substr($picker->getAttribute('id'), 5);
$this->driver->findElement(WebDriverBy::xpath("//*[@id='pick-pop-$pickerID']//span[@class='is-match-keys']"))->click();
$pickerID = substr($picker->getAttribute('id'), 5);
if($xpath != 'form')
{
$this->driver->findElement(WebDriverBy::xpath("//*[@id='pick-pop-$pickerID']//span[@class='is-match-keys']"))->click();
}
else
{
$this->driver->findElement(WebDriverBy::xpath("//button[@data-pick-value=$value]"))->click();
}
break;
}
catch (Exception $selectionException)
{
continue;
}
}
return $this;
}