修改列设置关键字，user模板增加列定位信息develop

1 files changed, 5 insertions, 13 deletions

diff --git a/keyword/common/page.robot b/keyword/common/page.robot
index 0d745ff..bed0332 100644
--- a/keyword/common/page.robot
+++ b/keyword/common/page.robot
@@ -446,13 +446,6 @@ AssertPage
         Page Should Contain    ${text} 

     END

 

-TextContain

-    [Arguments]    ${columnList}    ${text}

-    [Documentation]    验证页面不存在文本关键字

-    FOR    ${column}    IN    @{columnList}

-        should not be equal    ${column}    ${text}

-    END

-

 CreatePageTextAssert

     [Arguments]    ${elementList}    ${dataList}    ${OpenCreateOrEditPage}

     [Documentation]    用于创建页面内文本断言

@@ -507,9 +500,8 @@ TestPageVerifyOperation
     OpenPage    ${openCreateOrEditPage}

     OperatPage    ${tempData}    ${data}

 

-

-ColumnSetup    

-    [Arguments]    ${openCreateOrEditPage}    ${data}    ${tempData}

+ColumnSetup

+    [Arguments]    ${openCreateOrEditPage}    ${data}    ${tempData}    ${ColumnPosition}

     [Documentation]    列设置验证关键字

     ...    ${openCreateOrEditPage}：模板文件中openCreateOrEditPage中数据，打开页面定位信息

     #登录后打开测试页面

@@ -517,10 +509,10 @@ ColumnSetup
     OperatPage    ${tempData}    ${data}

     # 断言页面不存在列

     ${columnList}    Get From Dictionary    ${data}    cancel_show

-    ${assertPosition}    Get From Dictionary    ${data}    assertPosition

-    FOR    ${position}    IN    @{assertPosition}

+    FOR    ${column}    IN    @{columnList}

+        ${position}    Get From Dictionary    ${ColumnPosition}    ${column}

         ${text}    Get text    ${position}

-        TextContain    ${columnList}    ${text}

+        should not be equal    ${text}    ${column}

     END

     

 TurnPage