提交 55e62003 编写于 作者: DCloud-yyl's avatar DCloud-yyl

Merge branch 'dev' into alpha

# Conflicts:
#	pages.json
...@@ -41,5 +41,6 @@ ...@@ -41,5 +41,6 @@
justify-content: space-between; justify-content: space-between;
padding: 10px; padding: 10px;
border-bottom: 1px solid rgba(0, 0, 0, .06); border-bottom: 1px solid rgba(0, 0, 0, .06);
align-items: center;
} }
</style> </style>
{ {
"pages": [ "pages": [
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/tabBar/component", "path": "pages/tabBar/component",
"style": { "style": {
"navigationBarTitleText": "内置组件", "navigationBarTitleText": "内置组件",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
} }
}, },
{ {
"path": "pages/component/view/view", "path": "pages/component/view/view",
"style": { "style": {
"navigationBarTitleText": "view" "navigationBarTitleText": "view"
} }
}, },
{ {
"path": "pages/component/scroll-view/scroll-view", "path": "pages/component/scroll-view/scroll-view",
"style": { "style": {
"navigationBarTitleText": "scroll-view" "navigationBarTitleText": "scroll-view"
} }
}, },
{ {
"path": "pages/component/scroll-view/scroll-view-refresher", "path": "pages/component/scroll-view/scroll-view-refresher",
"style": { "style": {
"navigationBarTitleText": "scroll-view-refresher" "navigationBarTitleText": "scroll-view-refresher"
} }
}, },
{ {
"path": "pages/component/scroll-view/scroll-view-props", "path": "pages/component/scroll-view/scroll-view-props",
"style": { "style": {
...@@ -78,18 +78,18 @@ ...@@ -78,18 +78,18 @@
} }
}, },
//#endif //#endif
{ {
"path": "pages/component/text/text", "path": "pages/component/text/text",
"style": { "style": {
"navigationBarTitleText": "text" "navigationBarTitleText": "text"
} }
}, },
{ {
"path": "pages/component/text/text-props", "path": "pages/component/text/text-props",
"style": { "style": {
"navigationBarTitleText": "text-props" "navigationBarTitleText": "text-props"
} }
}, },
{ {
"path": "pages/component/rich-text/rich-text", "path": "pages/component/rich-text/rich-text",
"style": { "style": {
...@@ -108,131 +108,131 @@ ...@@ -108,131 +108,131 @@
"navigationBarTitleText": "rich-text-complex" "navigationBarTitleText": "rich-text-complex"
} }
}, },
{ {
"path": "pages/component/progress/progress", "path": "pages/component/progress/progress",
"style": { "style": {
"navigationBarTitleText": "progress" "navigationBarTitleText": "progress"
} }
}, },
{ {
"path": "pages/component/form/form", "path": "pages/component/form/form",
"style": { "style": {
"navigationBarTitleText": "form" "navigationBarTitleText": "form"
} }
}, },
{ {
"path": "pages/component/button/button", "path": "pages/component/button/button",
"style": { "style": {
"navigationBarTitleText": "button" "navigationBarTitleText": "button"
} }
}, },
{ {
"path": "pages/component/radio/radio", "path": "pages/component/radio/radio",
"style": { "style": {
"navigationBarTitleText": "radio" "navigationBarTitleText": "radio"
} }
}, },
{ {
"path": "pages/component/checkbox/checkbox", "path": "pages/component/checkbox/checkbox",
"style": { "style": {
"navigationBarTitleText": "checkbox" "navigationBarTitleText": "checkbox"
} }
}, },
{ {
"path": "pages/component/input/input", "path": "pages/component/input/input",
"style": { "style": {
"navigationBarTitleText": "input" "navigationBarTitleText": "input"
} }
}, },
{ {
"path": "pages/component/textarea/textarea", "path": "pages/component/textarea/textarea",
"style": { "style": {
"navigationBarTitleText": "textarea" "navigationBarTitleText": "textarea"
} }
}, },
{ {
"path": "pages/component/slider/slider", "path": "pages/component/slider/slider",
"style": { "style": {
"navigationBarTitleText": "slider" "navigationBarTitleText": "slider"
} }
}, },
{ {
"path": "pages/component/picker-view/picker-view", "path": "pages/component/picker-view/picker-view",
"style": { "style": {
"navigationBarTitleText": "picker-view" "navigationBarTitleText": "picker-view"
} }
}, },
{ {
"path": "pages/component/slider-100/slider-100", "path": "pages/component/slider-100/slider-100",
"style": { "style": {
"navigationBarTitleText": "slider x 100" "navigationBarTitleText": "slider x 100"
} }
}, },
{ {
"path": "pages/component/switch/switch", "path": "pages/component/switch/switch",
"style": { "style": {
"navigationBarTitleText": "switch" "navigationBarTitleText": "switch"
} }
}, },
{ {
"path": "pages/component/image/image", "path": "pages/component/image/image",
"style": { "style": {
"navigationBarTitleText": "image" "navigationBarTitleText": "image"
} }
}, },
{ {
"path": "pages/component/image/image-format", "path": "pages/component/image/image-format",
"style": { "style": {
"navigationBarTitleText": "image-format" "navigationBarTitleText": "image-format"
} }
}, },
{ {
"path": "pages/component/image/image-mode", "path": "pages/component/image/image-mode",
"style": { "style": {
"navigationBarTitleText": "image-mode" "navigationBarTitleText": "image-mode"
} }
}, },
{ {
"path": "pages/component/image/image-path", "path": "pages/component/image/image-path",
"style": { "style": {
"navigationBarTitleText": "image-path" "navigationBarTitleText": "image-path"
} }
}, },
{ {
"path": "pages/component/image/image-large", "path": "pages/component/image/image-large",
"style": { "style": {
"navigationBarTitleText": "大图测试" "navigationBarTitleText": "大图测试"
} }
}, },
{ {
"path": "pages/component/video/video", "path": "pages/component/video/video",
"style": { "style": {
"navigationBarTitleText": "video" "navigationBarTitleText": "video"
} }
}, },
{ {
"path": "pages/component/video/video-format", "path": "pages/component/video/video-format",
"style": { "style": {
"navigationBarTitleText": "video-format" "navigationBarTitleText": "video-format"
} }
}, },
{ {
"path": "pages/component/navigator/navigator", "path": "pages/component/navigator/navigator",
"style": { "style": {
"navigationBarTitleText": "navigator" "navigationBarTitleText": "navigator"
} }
}, },
{ {
"path": "pages/component/navigator/navigate", "path": "pages/component/navigator/navigate",
"style": { "style": {
"navigationBarTitleText": "navigatePage" "navigationBarTitleText": "navigatePage"
} }
}, },
{ {
"path": "pages/component/navigator/redirect", "path": "pages/component/navigator/redirect",
"style": { "style": {
"navigationBarTitleText": "redirectPage" "navigationBarTitleText": "redirectPage"
} }
}, },
{ {
"path": "pages/component/web-view/web-view", "path": "pages/component/web-view/web-view",
...@@ -276,18 +276,18 @@ ...@@ -276,18 +276,18 @@
"style": { "style": {
"navigationBarTitleText": "mixinDatacom" "navigationBarTitleText": "mixinDatacom"
} }
}, },
{ {
"path": "pages/component/general-attribute/general-attribute", "path": "pages/component/general-attribute/general-attribute",
"style": { "style": {
"navigationBarTitleText": "general-attribute" "navigationBarTitleText": "general-attribute"
} }
}, },
{ {
"path": "pages/component/general-event/general-event", "path": "pages/component/general-event/general-event",
"style": { "style": {
"navigationBarTitleText": "general-event" "navigationBarTitleText": "general-event"
} }
}, },
{ {
"path": "pages/component/general-event/transition-event", "path": "pages/component/general-event/transition-event",
...@@ -301,31 +301,31 @@ ...@@ -301,31 +301,31 @@
"navigationBarTitleText": "touch-event" "navigationBarTitleText": "touch-event"
} }
}, },
{ {
"path": "pages/tabBar/API", "path": "pages/tabBar/API",
"style": { "style": {
"navigationBarTitleText": "接口", "navigationBarTitleText": "接口",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
} }
}, },
// { // {
// "path": "pages/API/canvas/canvas", // "path": "pages/API/canvas/canvas",
// "style": { // "style": {
// "navigationBarTitleText": "创建绘画" // "navigationBarTitleText": "创建绘画"
// } // }
// }, // },
{ {
"path": "pages/API/get-app/get-app", "path": "pages/API/get-app/get-app",
"style": { "style": {
"navigationBarTitleText": "getApp" "navigationBarTitleText": "getApp"
} }
}, },
// #ifdef APP-ANDROID // #ifdef APP-ANDROID
{ {
"path": "pages/API/exit/exit", "path": "pages/API/exit/exit",
"style": { "style": {
"navigationBarTitleText": "exit" "navigationBarTitleText": "exit"
} }
}, },
{ {
"path": "pages/API/install-apk/install-apk", "path": "pages/API/install-apk/install-apk",
...@@ -334,895 +334,895 @@ ...@@ -334,895 +334,895 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
// #endif // #endif
{ {
"path": "pages/API/get-current-pages/get-current-pages", "path": "pages/API/get-current-pages/get-current-pages",
"style": { "style": {
"navigationBarTitleText": "getCurrentPages" "navigationBarTitleText": "getCurrentPages"
} }
}, },
{ {
"path": "pages/API/get-launch-options-sync/get-launch-options-sync", "path": "pages/API/get-launch-options-sync/get-launch-options-sync",
"style": { "style": {
"navigationBarTitleText": "getLaunchOptionsSync" "navigationBarTitleText": "getLaunchOptionsSync"
} }
}, },
{ {
"path": "pages/API/navigator/navigator", "path": "pages/API/navigator/navigator",
"style": { "style": {
"navigationBarTitleText": "页面跳转" "navigationBarTitleText": "页面跳转"
} }
}, },
{ {
"path": "pages/API/set-navigation-bar-color/set-navigation-bar-color", "path": "pages/API/set-navigation-bar-color/set-navigation-bar-color",
"style": { "style": {
"navigationBarTitleText": "设置导航条颜色" "navigationBarTitleText": "设置导航条颜色"
} }
}, },
{ {
"path": "pages/API/set-navigation-bar-title/set-navigation-bar-title", "path": "pages/API/set-navigation-bar-title/set-navigation-bar-title",
"style": { "style": {
"navigationBarTitleText": "设置导航条标题" "navigationBarTitleText": "设置导航条标题"
} }
}, },
{ {
"path": "pages/API/navigator/new-page/new-page-1", "path": "pages/API/navigator/new-page/new-page-1",
"style": { "style": {
"navigationBarTitleText": "新页面-1" "navigationBarTitleText": "新页面-1"
} }
}, },
{ {
"path": "pages/API/navigator/new-page/new-page-3", "path": "pages/API/navigator/new-page/new-page-3",
"style": { "style": {
"navigationBarTitleText": "新页面-3" "navigationBarTitleText": "新页面-3"
} }
}, },
{ {
"path": "pages/API/navigator/new-page/onLoad", "path": "pages/API/navigator/new-page/onLoad",
"style": { "style": {
"navigationBarTitleText": "onLoad 生命周期测试" "navigationBarTitleText": "onLoad 生命周期测试"
} }
}, },
{ {
"path": "pages/API/pull-down-refresh/pull-down-refresh", "path": "pages/API/pull-down-refresh/pull-down-refresh",
"style": { "style": {
"navigationBarTitleText": "页面级下拉刷新", "navigationBarTitleText": "页面级下拉刷新",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{ {
"path": "pages/API/get-element-by-id/get-element-by-id", "path": "pages/API/get-element-by-id/get-element-by-id",
"style": { "style": {
"navigationBarTitleText": "获取节点" "navigationBarTitleText": "获取节点"
} }
}, },
{ {
"path": "pages/API/get-element-by-id/get-element-by-id-multiple-root-node", "path": "pages/API/get-element-by-id/get-element-by-id-multiple-root-node",
"style": { "style": {
"navigationBarTitleText": "获取节点-多根节点" "navigationBarTitleText": "获取节点-多根节点"
} }
}, },
{ {
"path": "pages/API/nodes-info/nodes-info", "path": "pages/API/nodes-info/nodes-info",
"style": { "style": {
"navigationBarTitleText": "查询节点信息的对象" "navigationBarTitleText": "查询节点信息的对象"
} }
}, },
{ {
"path": "pages/API/storage/storage", "path": "pages/API/storage/storage",
"style": { "style": {
"navigationBarTitleText": "数据存储" "navigationBarTitleText": "数据存储"
} }
}, },
// #ifndef WEB // #ifndef WEB
{ {
"path": "pages/API/get-file-system-manager/get-file-system-manager", "path": "pages/API/get-file-system-manager/get-file-system-manager",
"style": { "style": {
"navigationBarTitleText": "文件管理" "navigationBarTitleText": "文件管理"
} }
},
// #endif
{
"path": "pages/API/action-sheet/action-sheet",
"style": {
"navigationBarTitleText": "操作菜单"
}
},
{
"path": "pages/API/modal/modal",
"style": {
"navigationBarTitleText": "模态弹窗"
}
},
{
"path": "pages/API/loading/loading",
"style": {
"navigationBarTitleText": "加载提示框"
}
},
{
"path": "pages/API/toast/toast",
"style": {
"navigationBarTitleText": "消息提示框"
}
},
{
"path": "pages/API/load-font-face/load-font-face",
"style": {
"navigationBarTitleText": "动态加载字体"
}
},
{
"path": "pages/API/load-font-face/load-font-face-child",
"style": {
"navigationBarTitleText": "动态加载字体-子页面"
}
},
{
"path": "pages/API/get-location/get-location",
"style": {
"navigationBarTitleText": "获取定位"
}
},
{
"path": "pages/API/interceptor/interceptor",
"style": {
"navigationBarTitleText": "拦截器"
}
},
{
"path": "pages/API/interceptor/page1",
"style": {
"navigationBarTitleText": "拦截器测试页面 1"
}
},
{
"path": "pages/API/interceptor/page2",
"style": {
"navigationBarTitleText": "拦截器测试页面 2"
}
},
{
"path": "pages/API/request/request",
"style": {
"navigationBarTitleText": "request"
}
},
{
"path": "pages/API/upload-file/upload-file",
"style": {
"navigationBarTitleText": "upload-file"
}
},
{
"path": "pages/API/download-file/download-file",
"style": {
"navigationBarTitleText": "download-file"
}
},
{
"path": "pages/API/websocket-socketTask/websocket-socketTask",
"style": {
"navigationBarTitleText": "websocket-socketTask"
}
},
{
"path": "pages/API/websocket-global/websocket-global",
"style": {
"navigationBarTitleText": "websocket-global"
}
},
{
"path": "pages/API/unicloud-call-function/unicloud-call-function",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/unicloud-import-object/unicloud-import-object",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/get-system-info/get-system-info",
"style": {
"navigationBarTitleText": "get-system-info"
}
},
{
"path": "pages/API/get-device-info/get-device-info",
"style": {
"navigationBarTitleText": "get-device-info"
}
},
{
"path": "pages/API/get-app-base-info/get-app-base-info",
"style": {
"navigationBarTitleText": "get-app-base-info"
}
},
// #ifdef APP
{
"path": "pages/API/get-system-setting/get-system-setting",
"style": {
"navigationBarTitleText": "get-system-setting"
}
}, },
// #endif // #endif
// #ifndef WEB
{
"path": "pages/API/get-app-authorize-setting/get-app-authorize-setting",
"style": {
"navigationBarTitleText": "get-app-authorize-setting"
}
},
// #endif
{
"path": "pages/API/preview-image/preview-image",
"style": {
"navigationBarTitleText": "图片预览"
}
},
{
"path": "pages/API/save-image-to-photos-album/save-image-to-photos-album",
"style": {
"navigationBarTitleText": "保存图片到相册"
}
},
{
"path": "pages/API/choose-image/choose-image",
"style": {
"navigationBarTitleText": "图片"
}
},
{
"path": "pages/API/get-network-type/get-network-type",
"style": {
"navigationBarTitleText": "get-network-type"
}
},
{
"path": "pages/API/page-scroll-to/page-scroll-to",
"style": {
"navigationBarTitleText": "pageScrollTo"
}
},
{
"path": "pages/API/event-bus/event-bus",
"style": {
"navigationBarTitleText": "event-bus"
}
},
{
"path": "pages/API/unicloud-file-api/unicloud-file-api",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/unicloud-database/unicloud-database",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/get-battery-info/get-battery-info",
"style": {
"navigationBarTitleText": "电量"
}
},
{
"path": "pages/API/get-window-info/get-window-info",
"style": {
"navigationBarTitleText": "get-window-info"
}
},
// #ifdef APP
{
"path": "pages/API/facial-recognition-verify/facial-recognition-verify",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/element-takesnapshot/element-takesnapshot",
"style": {
"navigationBarTitleText": "takeSnapshot",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/element-draw/element-draw",
"style": {
"navigationBarTitleText": "getDrawableContext",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/get-univerify-manager/get-univerify-manager",
"style": {
"navigationBarTitleText": "uni-verify",
"enablePullDownRefresh": false
}
},
// #endif
{
"path": "pages/tabBar/CSS",
"style": {
"navigationBarTitleText": "CSS",
"backgroundColor": "#F8F8F8"
}
},
{
"path": "pages/CSS/background/background-color",
"style": {
"navigationBarTitleText": "background-color"
}
},
{
"path": "pages/CSS/background/background-image",
"style": {
"navigationBarTitleText": "background-image"
}
},
{
"path": "pages/CSS/border/border-bottom",
"style": {
"navigationBarTitleText": "border-bottom"
}
},
{
"path": "pages/CSS/border/border-color",
"style": {
"navigationBarTitleText": "border-color"
}
},
{
"path": "pages/CSS/border/border-left",
"style": {
"navigationBarTitleText": "border-left"
}
},
{
"path": "pages/CSS/border/border-radius",
"style": {
"navigationBarTitleText": "border-radius"
}
},
{
"path": "pages/CSS/border/border-right",
"style": {
"navigationBarTitleText": "border-right"
}
},
{
"path": "pages/CSS/border/border-style",
"style": {
"navigationBarTitleText": "border-style"
}
},
{
"path": "pages/CSS/border/border-top",
"style": {
"navigationBarTitleText": "border-top"
}
},
{
"path": "pages/CSS/border/border-width",
"style": {
"navigationBarTitleText": "border-width"
}
},
{
"path": "pages/CSS/border/border",
"style": {
"navigationBarTitleText": "border"
}
},
{ {
"path": "pages/API/action-sheet/action-sheet", "path": "pages/CSS/border/complex-border/complex-border",
"style": {
"navigationBarTitleText": "操作菜单"
}
},
{
"path": "pages/API/modal/modal",
"style": {
"navigationBarTitleText": "模态弹窗"
}
},
{
"path": "pages/API/loading/loading",
"style": {
"navigationBarTitleText": "加载提示框"
}
},
{
"path": "pages/API/toast/toast",
"style": {
"navigationBarTitleText": "消息提示框"
}
},
{
"path": "pages/API/load-font-face/load-font-face",
"style": {
"navigationBarTitleText": "动态加载字体"
}
},
{
"path": "pages/API/load-font-face/load-font-face-child",
"style": {
"navigationBarTitleText": "动态加载字体-子页面"
}
},
{
"path": "pages/API/get-location/get-location",
"style": {
"navigationBarTitleText": "获取定位"
}
},
{
"path": "pages/API/interceptor/interceptor",
"style": {
"navigationBarTitleText": "拦截器"
}
},
{
"path": "pages/API/interceptor/page1",
"style": {
"navigationBarTitleText": "拦截器测试页面 1"
}
},
{
"path": "pages/API/interceptor/page2",
"style": {
"navigationBarTitleText": "拦截器测试页面 2"
}
},
{
"path": "pages/API/request/request",
"style": { "style": {
"navigationBarTitleText": "request" "navigationBarTitleText": "border属性组合示例"
} }
}, },
{
"path": "pages/CSS/box-shadow/box-shadow",
"style": {
"navigationBarTitleText": "box-shadow"
}
},
{
"path": "pages/CSS/display/flex",
"style": {
"navigationBarTitleText": "display:flex"
}
},
{
"path": "pages/CSS/display/none",
"style": {
"navigationBarTitleText": "display:none"
}
},
{
"path": "pages/CSS/flex/align-content",
"style": {
"navigationBarTitleText": "align-content"
}
},
{
"path": "pages/CSS/flex/align-items",
"style": {
"navigationBarTitleText": "align-items"
}
},
{
"path": "pages/CSS/flex/flex-basis",
"style": {
"navigationBarTitleText": "flex-basis"
}
},
{
"path": "pages/CSS/flex/flex-direction",
"style": {
"navigationBarTitleText": "flex-direction"
}
},
{
"path": "pages/CSS/flex/flex-flow",
"style": {
"navigationBarTitleText": "flex-flow"
}
},
{
"path": "pages/CSS/flex/flex-grow",
"style": {
"navigationBarTitleText": "flex-grow"
}
},
{
"path": "pages/CSS/flex/flex-shrink",
"style": {
"navigationBarTitleText": "flex-shrink"
}
},
{
"path": "pages/CSS/flex/flex",
"style": {
"navigationBarTitleText": "flex"
}
},
{
"path": "pages/CSS/flex/justify-content",
"style": {
"navigationBarTitleText": "justify-content"
}
},
{
"path": "pages/CSS/layout/height",
"style": {
"navigationBarTitleText": "height"
}
},
{
"path": "pages/CSS/layout/max-height",
"style": {
"navigationBarTitleText": "max-height"
}
},
{
"path": "pages/CSS/layout/max-width",
"style": {
"navigationBarTitleText": "max-width"
}
},
{
"path": "pages/CSS/layout/min-height",
"style": {
"navigationBarTitleText": "min-height"
}
},
{
"path": "pages/CSS/layout/min-width",
"style": {
"navigationBarTitleText": "min-width"
}
},
{
"path": "pages/CSS/layout/position",
"style": {
"navigationBarTitleText": "position"
}
},
{
"path": "pages/CSS/layout/width",
"style": {
"navigationBarTitleText": "width"
}
},
{
"path": "pages/CSS/layout/z-index",
"style": {
"navigationBarTitleText": "z-index"
}
},
{
"path": "pages/CSS/layout/visibility",
"style": {
"navigationBarTitleText": "visibility"
}
},
{
"path": "pages/CSS/margin/margin-bottom",
"style": {
"navigationBarTitleText": "margin-bottom"
}
},
{
"path": "pages/CSS/margin/margin-left",
"style": {
"navigationBarTitleText": "margin-left"
}
},
{
"path": "pages/CSS/margin/margin-right",
"style": {
"navigationBarTitleText": "margin-right"
}
},
{
"path": "pages/CSS/margin/margin-top",
"style": {
"navigationBarTitleText": "margin-top"
}
},
{
"path": "pages/CSS/margin/margin",
"style": {
"navigationBarTitleText": "margin"
}
},
{ {
"path": "pages/API/upload-file/upload-file", "path": "pages/CSS/overflow/overflow",
"style": { "style": {
"navigationBarTitleText": "upload-file" "navigationBarTitleText": "overflow"
} }
}, },
{
"path": "pages/CSS/padding/padding-bottom",
"style": {
"navigationBarTitleText": "padding-bottom"
}
},
{
"path": "pages/CSS/padding/padding-left",
"style": {
"navigationBarTitleText": "padding-left"
}
},
{
"path": "pages/CSS/padding/padding-right",
"style": {
"navigationBarTitleText": "padding-right"
}
},
{
"path": "pages/CSS/padding/padding-top",
"style": {
"navigationBarTitleText": "padding-top"
}
},
{
"path": "pages/CSS/padding/padding",
"style": {
"navigationBarTitleText": "padding"
}
},
{
"path": "pages/CSS/text/color",
"style": {
"navigationBarTitleText": "color"
}
},
{
"path": "pages/CSS/text/font-family",
"style": {
"navigationBarTitleText": "font-family"
}
},
{
"path": "pages/CSS/text/font-size",
"style": {
"navigationBarTitleText": "font-size"
}
},
{
"path": "pages/CSS/text/font-style",
"style": {
"navigationBarTitleText": "font-style"
}
},
{
"path": "pages/CSS/text/font-weight",
"style": {
"navigationBarTitleText": "font-weight"
}
},
{
"path": "pages/CSS/text/letter-spacing",
"style": {
"navigationBarTitleText": "letter-spacing"
}
},
{
"path": "pages/CSS/text/line-height",
"style": {
"navigationBarTitleText": "line-height"
}
},
{
"path": "pages/CSS/text/text-align",
"style": {
"navigationBarTitleText": "text-align"
}
},
{
"path": "pages/CSS/text/text-overflow",
"style": {
"navigationBarTitleText": "text-overflow"
}
},
{
"path": "pages/CSS/text/text-decoration-line",
"style": {
"navigationBarTitleText": "text-decoration-line"
}
},
{
"path": "pages/CSS/transition/transition",
"style": {
"navigationBarTitleText": "Transition"
}
},
{
"path": "pages/CSS/transform/translate",
"style": {
"navigationBarTitleText": "Translate"
}
},
{
"path": "pages/CSS/transform/scale",
"style": {
"navigationBarTitleText": "Scale"
}
},
{ {
"path": "pages/API/download-file/download-file", "path": "pages/CSS/transform/rotate",
"style": { "style": {
"navigationBarTitleText": "download-file" "navigationBarTitleText": "Rotate"
} }
}, },
{ {
"path": "pages/API/websocket-socketTask/websocket-socketTask", "path": "pages/CSS/variable/variable",
"style": { "style": {
"navigationBarTitleText": "websocket-socketTask" "navigationBarTitleText": "css 变量"
} }
}, },
{ {
"path": "pages/API/websocket-global/websocket-global", "path": "pages/tabBar/template",
"style": { "style": {
"navigationBarTitleText": "websocket-global" "navigationBarTitleText": "模板"
} }
}, },
{ // #ifdef APP
"path": "pages/API/unicloud-call-function/unicloud-call-function", {
"style": { "path": "pages/template/list-news/list-news",
"navigationBarTitleText": "" "style": {
} "navigationBarTitleText": "列表到详情示例"
}
},
{
"path": "pages/template/list-news/detail/detail",
"style": {
"navigationBarTitleText": "详情示例"
}
},
// #endif
{
"path": "pages/template/drop-card/drop-card",
"style": {
"navigationBarTitleText": "drop-card"
}
},
{
"path": "pages/template/swiper-list/swiper-list",
"style": {
"navigationBarTitleText": "swiper-list"
}
},
{
"path": "pages/template/swiper-list2/swiper-list2",
"style": {
"navigationBarTitleText": "swiper-list2"
}
},
{
"path": "pages/template/swiper-vertical-video/swiper-vertical-video",
"style": {
"navigationStyle": "custom"
}
},
// #ifdef APP
{
"path": "pages/template/scroll-sticky/scroll-sticky",
"style": {
"navigationBarTitleText": "scroll-view自定义滚动吸顶"
}
},
// #endif
{
"path": "pages/template/scroll-fold-nav/scroll-fold-nav",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "black"
}
},
{
"path": "pages/template/custom-refresher/custom-refresher",
"style": {
"navigationBarTitleText": "自定义下拉刷新"
}
},
{
"path": "pages/template/half-screen/half-screen",
"style": {
"navigationBarTitleText": "半屏弹窗"
}
},
// #ifdef APP
{
"path": "pages/template/long-list/long-list",
"style": {
"navigationBarTitleText": "顶部搜索框随时下移长列表",
"enablePullDownRefresh": true
}
},
{
"path": "pages/template/long-list2/long-list2",
"style": {
"navigationBarTitleText": "顶部banner长列表",
"enablePullDownRefresh": true
}
},
// #endif
{
"path": "pages/template/pull-zoom-image/pull-zoom-image",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/template/navbar-lite/navbar-lite",
"style": {
"navigationBarTitleText": "自定义导航栏",
"navigationStyle": "custom"
}
},
{
"path": "pages/template/custom-tab-bar/custom-tab-bar",
"style": {
"navigationBarTitleText": "自定义TabBar"
}
}, },
// #ifdef WEB
{ {
"path": "pages/API/unicloud-import-object/unicloud-import-object", "path": "pages/template/browser-canvas/browser-canvas",
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": "如何使用浏览器 canvas"
} }
}, },
// #endif
// #ifdef APP
{ {
"path": "pages/API/get-system-info/get-system-info", "path": "pages/template/calendar/calendar",
"style": { "style": {
"navigationBarTitleText": "get-system-info" "navigationBarTitleText": "日历"
} }
}, },
{
"path": "pages/template/schema/schema",
"style": {
"navigationBarTitleText": "打开schema示例"
}
},
{
"path": "pages/template/share/share",
"style": {
"navigationBarTitleText": "分享",
"enablePullDownRefresh": false
}
},
// #endif
{ {
"path": "pages/API/get-device-info/get-device-info", "path": "pages/webview-screenshot-comparison/webview-screenshot-comparison",
"style": { "style": {
"navigationBarTitleText": "get-device-info" "navigationBarTitleText": "截图对比测试",
"navigationStyle": "custom"
} }
}, },
{ {
"path": "pages/API/get-app-base-info/get-app-base-info", "path": "pages/webview-screenshot/webview-screenshot",
"style": { "style": {
"navigationBarTitleText": "get-app-base-info" "navigationBarTitleText": "webview 截图测试",
"navigationStyle": "custom"
} }
}, },
// #ifdef APP // #ifdef APP
{ {
"path": "pages/API/get-system-setting/get-system-setting", "path": "pages/API/rewarded-video-ad/rewarded-video-ad",
"style": { "style": {
"navigationBarTitleText": "get-system-setting" "navigationBarTitleText": "激励视频广告",
"enablePullDownRefresh": false
} }
}, },
// #endif
// #ifndef WEB
{ {
"path": "pages/API/get-app-authorize-setting/get-app-authorize-setting", "path": "pages/API/create-request-permission-listener/create-request-permission-listener",
"style": { "style": {
"navigationBarTitleText": "get-app-authorize-setting" "navigationBarTitleText": "权限申请监听",
} "enablePullDownRefresh": false
},
// #endif
{
"path": "pages/API/preview-image/preview-image",
"style": {
"navigationBarTitleText": "图片预览"
}
},
{
"path": "pages/API/save-image-to-photos-album/save-image-to-photos-album",
"style": {
"navigationBarTitleText": "保存图片到相册"
}
},
{
"path": "pages/API/choose-image/choose-image",
"style": {
"navigationBarTitleText": "图片"
}
},
{
"path": "pages/API/get-network-type/get-network-type",
"style": {
"navigationBarTitleText": "get-network-type"
}
},
{
"path": "pages/API/page-scroll-to/page-scroll-to",
"style": {
"navigationBarTitleText": "pageScrollTo"
}
},
{
"path": "pages/API/event-bus/event-bus",
"style": {
"navigationBarTitleText": "event-bus"
}
},
{
"path": "pages/API/unicloud-file-api/unicloud-file-api",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/unicloud-database/unicloud-database",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/API/get-battery-info/get-battery-info",
"style": {
"navigationBarTitleText": "电量"
}
},
{
"path": "pages/API/get-window-info/get-window-info",
"style": {
"navigationBarTitleText": "get-window-info"
}
},
// #ifdef APP
{
"path": "pages/API/facial-recognition-verify/facial-recognition-verify",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/element-takesnapshot/element-takesnapshot",
"style": {
"navigationBarTitleText": "takeSnapshot",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/element-draw/element-draw",
"style": {
"navigationBarTitleText": "getDrawableContext",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/get-univerify-manager/get-univerify-manager",
"style": {
"navigationBarTitleText": "uni-verify",
"enablePullDownRefresh": false
}
},
// #endif
{
"path": "pages/tabBar/CSS",
"style": {
"navigationBarTitleText": "CSS",
"backgroundColor": "#F8F8F8"
}
},
{
"path": "pages/CSS/background/background-color",
"style": {
"navigationBarTitleText": "background-color"
}
},
{
"path": "pages/CSS/background/background-image",
"style": {
"navigationBarTitleText": "background-image"
}
},
{
"path": "pages/CSS/border/border-bottom",
"style": {
"navigationBarTitleText": "border-bottom"
}
},
{
"path": "pages/CSS/border/border-color",
"style": {
"navigationBarTitleText": "border-color"
}
},
{
"path": "pages/CSS/border/border-left",
"style": {
"navigationBarTitleText": "border-left"
}
},
{
"path": "pages/CSS/border/border-radius",
"style": {
"navigationBarTitleText": "border-radius"
}
},
{
"path": "pages/CSS/border/border-right",
"style": {
"navigationBarTitleText": "border-right"
}
},
{
"path": "pages/CSS/border/border-style",
"style": {
"navigationBarTitleText": "border-style"
}
},
{
"path": "pages/CSS/border/border-top",
"style": {
"navigationBarTitleText": "border-top"
}
},
{
"path": "pages/CSS/border/border-width",
"style": {
"navigationBarTitleText": "border-width"
}
},
{
"path": "pages/CSS/border/border",
"style": {
"navigationBarTitleText": "border"
}
},
{
"path": "pages/CSS/border/complex-border/complex-border",
"style": {
"navigationBarTitleText": "border属性组合示例"
}
},
{
"path": "pages/CSS/box-shadow/box-shadow",
"style": {
"navigationBarTitleText": "box-shadow"
}
},
{
"path": "pages/CSS/display/flex",
"style": {
"navigationBarTitleText": "display:flex"
}
},
{
"path": "pages/CSS/display/none",
"style": {
"navigationBarTitleText": "display:none"
}
},
{
"path": "pages/CSS/flex/align-content",
"style": {
"navigationBarTitleText": "align-content"
}
},
{
"path": "pages/CSS/flex/align-items",
"style": {
"navigationBarTitleText": "align-items"
}
},
{
"path": "pages/CSS/flex/flex-basis",
"style": {
"navigationBarTitleText": "flex-basis"
}
},
{
"path": "pages/CSS/flex/flex-direction",
"style": {
"navigationBarTitleText": "flex-direction"
}
},
{
"path": "pages/CSS/flex/flex-flow",
"style": {
"navigationBarTitleText": "flex-flow"
}
},
{
"path": "pages/CSS/flex/flex-grow",
"style": {
"navigationBarTitleText": "flex-grow"
}
},
{
"path": "pages/CSS/flex/flex-shrink",
"style": {
"navigationBarTitleText": "flex-shrink"
}
},
{
"path": "pages/CSS/flex/flex",
"style": {
"navigationBarTitleText": "flex"
}
},
{
"path": "pages/CSS/flex/justify-content",
"style": {
"navigationBarTitleText": "justify-content"
}
},
{
"path": "pages/CSS/layout/height",
"style": {
"navigationBarTitleText": "height"
}
},
{
"path": "pages/CSS/layout/max-height",
"style": {
"navigationBarTitleText": "max-height"
}
},
{
"path": "pages/CSS/layout/max-width",
"style": {
"navigationBarTitleText": "max-width"
}
},
{
"path": "pages/CSS/layout/min-height",
"style": {
"navigationBarTitleText": "min-height"
}
},
{
"path": "pages/CSS/layout/min-width",
"style": {
"navigationBarTitleText": "min-width"
}
},
{
"path": "pages/CSS/layout/position",
"style": {
"navigationBarTitleText": "position"
}
},
{
"path": "pages/CSS/layout/width",
"style": {
"navigationBarTitleText": "width"
}
},
{
"path": "pages/CSS/layout/z-index",
"style": {
"navigationBarTitleText": "z-index"
}
},
{
"path": "pages/CSS/layout/visibility",
"style": {
"navigationBarTitleText": "visibility"
}
},
{
"path": "pages/CSS/margin/margin-bottom",
"style": {
"navigationBarTitleText": "margin-bottom"
}
},
{
"path": "pages/CSS/margin/margin-left",
"style": {
"navigationBarTitleText": "margin-left"
}
},
{
"path": "pages/CSS/margin/margin-right",
"style": {
"navigationBarTitleText": "margin-right"
}
},
{
"path": "pages/CSS/margin/margin-top",
"style": {
"navigationBarTitleText": "margin-top"
}
},
{
"path": "pages/CSS/margin/margin",
"style": {
"navigationBarTitleText": "margin"
}
},
{
"path": "pages/CSS/overflow/overflow",
"style": {
"navigationBarTitleText": "overflow"
}
},
{
"path": "pages/CSS/padding/padding-bottom",
"style": {
"navigationBarTitleText": "padding-bottom"
}
},
{
"path": "pages/CSS/padding/padding-left",
"style": {
"navigationBarTitleText": "padding-left"
}
},
{
"path": "pages/CSS/padding/padding-right",
"style": {
"navigationBarTitleText": "padding-right"
}
},
{
"path": "pages/CSS/padding/padding-top",
"style": {
"navigationBarTitleText": "padding-top"
}
},
{
"path": "pages/CSS/padding/padding",
"style": {
"navigationBarTitleText": "padding"
}
},
{
"path": "pages/CSS/text/color",
"style": {
"navigationBarTitleText": "color"
}
},
{
"path": "pages/CSS/text/font-family",
"style": {
"navigationBarTitleText": "font-family"
}
},
{
"path": "pages/CSS/text/font-size",
"style": {
"navigationBarTitleText": "font-size"
}
},
{
"path": "pages/CSS/text/font-style",
"style": {
"navigationBarTitleText": "font-style"
}
},
{
"path": "pages/CSS/text/font-weight",
"style": {
"navigationBarTitleText": "font-weight"
}
},
{
"path": "pages/CSS/text/letter-spacing",
"style": {
"navigationBarTitleText": "letter-spacing"
}
},
{
"path": "pages/CSS/text/line-height",
"style": {
"navigationBarTitleText": "line-height"
}
},
{
"path": "pages/CSS/text/text-align",
"style": {
"navigationBarTitleText": "text-align"
}
},
{
"path": "pages/CSS/text/text-overflow",
"style": {
"navigationBarTitleText": "text-overflow"
}
},
{
"path": "pages/CSS/text/text-decoration-line",
"style": {
"navigationBarTitleText": "text-decoration-line"
}
},
{
"path": "pages/CSS/transition/transition",
"style": {
"navigationBarTitleText": "Transition"
}
},
{
"path": "pages/CSS/transform/translate",
"style": {
"navigationBarTitleText": "Translate"
}
},
{
"path": "pages/CSS/transform/scale",
"style": {
"navigationBarTitleText": "Scale"
}
},
{
"path": "pages/CSS/transform/rotate",
"style": {
"navigationBarTitleText": "Rotate"
}
},
{
"path": "pages/CSS/variable/variable",
"style": {
"navigationBarTitleText": "css 变量"
}
},
{
"path": "pages/tabBar/template",
"style": {
"navigationBarTitleText": "模板"
}
},
// #ifdef APP
{
"path": "pages/template/list-news/list-news",
"style": {
"navigationBarTitleText": "列表到详情示例"
}
},
{
"path": "pages/template/list-news/detail/detail",
"style": {
"navigationBarTitleText": "详情示例"
}
},
// #endif
{
"path": "pages/template/drop-card/drop-card",
"style": {
"navigationBarTitleText": "drop-card"
}
},
{
"path": "pages/template/swiper-list/swiper-list",
"style": {
"navigationBarTitleText": "swiper-list"
}
},
{
"path": "pages/template/swiper-list2/swiper-list2",
"style": {
"navigationBarTitleText": "swiper-list2"
}
},
{
"path": "pages/template/swiper-vertical-video/swiper-vertical-video",
"style": {
"navigationStyle": "custom"
}
},
// #ifdef APP
{
"path": "pages/template/scroll-sticky/scroll-sticky",
"style": {
"navigationBarTitleText": "scroll-view自定义滚动吸顶"
}
},
// #endif
{
"path": "pages/template/scroll-fold-nav/scroll-fold-nav",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "black"
}
},
{
"path": "pages/template/custom-refresher/custom-refresher",
"style": {
"navigationBarTitleText": "自定义下拉刷新"
}
},
{
"path": "pages/template/half-screen/half-screen",
"style": {
"navigationBarTitleText": "半屏弹窗"
}
},
// #ifdef APP
{
"path": "pages/template/long-list/long-list",
"style": {
"navigationBarTitleText": "顶部搜索框随时下移长列表",
"enablePullDownRefresh": true
}
},
{
"path": "pages/template/long-list2/long-list2",
"style": {
"navigationBarTitleText": "顶部banner长列表",
"enablePullDownRefresh": true
}
},
// #endif
{
"path": "pages/template/pull-zoom-image/pull-zoom-image",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/template/navbar-lite/navbar-lite",
"style": {
"navigationBarTitleText": "自定义导航栏",
"navigationStyle": "custom"
}
},
{
"path": "pages/template/custom-tab-bar/custom-tab-bar",
"style": {
"navigationBarTitleText": "自定义TabBar"
}
},
// #ifdef WEB
{
"path": "pages/template/browser-canvas/browser-canvas",
"style": {
"navigationBarTitleText": "如何使用浏览器 canvas"
}
},
// #endif
// #ifdef APP
{
"path": "pages/template/calendar/calendar",
"style": {
"navigationBarTitleText": "日历"
}
},
{
"path": "pages/template/schema/schema",
"style": {
"navigationBarTitleText": "打开schema示例"
}
},
{
"path": "pages/template/share/share",
"style": {
"navigationBarTitleText": "分享",
"enablePullDownRefresh": false
}
},
// #endif
{
"path": "pages/webview-screenshot-comparison/webview-screenshot-comparison",
"style": {
"navigationBarTitleText": "截图对比测试",
"navigationStyle": "custom"
}
},
{
"path": "pages/webview-screenshot/webview-screenshot",
"style": {
"navigationBarTitleText": "webview 截图测试",
"navigationStyle": "custom"
}
},
// #ifdef APP
{
"path": "pages/API/rewarded-video-ad/rewarded-video-ad",
"style": {
"navigationBarTitleText": "激励视频广告",
"enablePullDownRefresh": false
}
},
{
"path": "pages/API/create-request-permission-listener/create-request-permission-listener",
"style": {
"navigationBarTitleText": "权限申请监听",
"enablePullDownRefresh": false
} }
} }
// #endif // #endif
], ],
"globalStyle": { "globalStyle": {
"pageOrientation": "portrait", "pageOrientation": "portrait",
"navigationBarTitleText": "Hello uniapp x", "navigationBarTitleText": "Hello uniapp x",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#007AFF", "navigationBarBackgroundColor": "#007AFF",
"backgroundColorContent": "#efeff4", "backgroundColorContent": "#efeff4",
"backgroundColor": "#efeff4", "backgroundColor": "#efeff4",
"backgroundColorTop": "#F4F5F6", "backgroundColorTop": "#F4F5F6",
"backgroundColorBottom": "#F4F5F6" "backgroundColorBottom": "#F4F5F6"
}, },
"tabBar": { "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
"selectedColor": "#007AFF", "selectedColor": "#007AFF",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8",
"list": [{ "list": [{
"pagePath": "pages/tabBar/component", "pagePath": "pages/tabBar/component",
"iconPath": "static/component.png", "iconPath": "static/component.png",
"selectedIconPath": "static/componentHL.png", "selectedIconPath": "static/componentHL.png",
"text": "内置组件" "text": "内置组件"
}, },
{ {
"pagePath": "pages/tabBar/API", "pagePath": "pages/tabBar/API",
"iconPath": "static/api.png", "iconPath": "static/api.png",
"selectedIconPath": "static/apiHL.png", "selectedIconPath": "static/apiHL.png",
"text": "接口" "text": "接口"
}, },
{ {
"pagePath": "pages/tabBar/CSS", "pagePath": "pages/tabBar/CSS",
"iconPath": "static/css.png", "iconPath": "static/css.png",
"selectedIconPath": "static/cssHL.png", "selectedIconPath": "static/cssHL.png",
"text": "CSS" "text": "CSS"
}, },
{ {
"pagePath": "pages/tabBar/template", "pagePath": "pages/tabBar/template",
"iconPath": "static/template.png", "iconPath": "static/template.png",
"selectedIconPath": "static/templateHL.png", "selectedIconPath": "static/templateHL.png",
"text": "模板" "text": "模板"
} }
] ]
}, },
"condition": { "condition": {
//模式配置,仅开发期间生效 //模式配置,仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项) "current": 0, //当前激活的模式(list 的索引项)
"list": [{ "list": [{
"name": "", //模式名称 "name": "", //模式名称
"path": "", //启动页面,必选 "path": "", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}] }]
} }
} }
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<!-- #endif --> <!-- #endif -->
<page-head title="权限申请监听"></page-head> <page-head title="权限申请监听"></page-head>
<view class="permission-alert" id="permission-alert" :style="{'transform':isPermissionAlertShow ? 'translateY(0)':'translateY(-110px)'}"> <view class="permission-alert" id="permission-alert" :style="{'transform':isPermissionAlertShow ? 'translateY(0)':'translateY(-110px)'}">
<text style="font-size: 20px;margin-bottom: 10px;margin-top: 5px;">手机状态权限申请说明:</text> <text style="font-size: 20px;margin-bottom: 10px;margin-top: 5px;">日历权限申请说明:</text>
<text style="color: darkgray;">uni-app x正在申请手机状态权限,允许或拒绝均不会获取任何隐私信息。</text> <text style="color: darkgray;">uni-app x正在申请日历权限,允许或拒绝均不会获取任何隐私信息。</text>
</view> </view>
<button type="primary" style="margin: 10px;" @click="requestPermission">点击申请权限</button> <button type="primary" style="margin: 10px;" @click="requestPermission">点击申请日历权限</button>
<!-- #ifdef APP --> <!-- #ifdef APP -->
</scroll-view> </scroll-view>
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
}, },
requestPermission() { requestPermission() {
// #ifdef APP-ANDROID // #ifdef APP-ANDROID
if (UTSAndroid.checkSystemPermissionGranted(UTSAndroid.getUniActivity()!, ["android.permission.READ_PHONE_STATE"])) { if (UTSAndroid.checkSystemPermissionGranted(UTSAndroid.getUniActivity()!, ["android.permission.READ_CALENDAR"])) {
uni.showToast({ uni.showToast({
title: "权限已经同意了,不需要再申请", title: "权限已经同意了,不需要再申请",
position: "bottom" position: "bottom"
}) })
return return
} }
UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, ["android.permission.READ_PHONE_STATE"], (_ : boolean, p : string[]) => { UTSAndroid.requestSystemPermission(UTSAndroid.getUniActivity()!, ["android.permission.READ_CALENDAR"], (_ : boolean, p : string[]) => {
console.log(p) console.log(p)
}, (_ : boolean, p : string[]) => { }, (_ : boolean, p : string[]) => {
uni.showToast({ uni.showToast({
......
...@@ -22,15 +22,27 @@ describe('ExtApi-DownloadFile', () => { ...@@ -22,15 +22,27 @@ describe('ExtApi-DownloadFile', () => {
expect(res).toBe(true); expect(res).toBe(true);
}); });
it('Check Set Cookie', async () => { it('Check Set Cookie', async () => {
res = await page.callMethod('jest_set_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(1000); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_set_cookie')
await page.waitFor(1000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
it('Check Delete Cookie', async () => { it('Check Delete Cookie', async () => {
res = await page.callMethod('jest_delete_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(1000); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_delete_cookie')
await page.waitFor(1000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
}); });
...@@ -12,7 +12,7 @@ describe('page-scroll-to', () => { ...@@ -12,7 +12,7 @@ describe('page-scroll-to', () => {
await btnScrollTo.tap() await btnScrollTo.tap()
await page.waitFor(600) await page.waitFor(600)
const scrollTop = await page.scrollTop() const scrollTop = await page.scrollTop()
// 设备精度问题,允许上下浮动 1px // 设备精度问题,允许上下浮动 1px
expect(scrollTop > 99 && scrollTop < 101).toBe(true) expect(scrollTop > 99 && scrollTop < 101).toBe(true)
}) })
...@@ -21,12 +21,12 @@ describe('page-scroll-to', () => { ...@@ -21,12 +21,12 @@ describe('page-scroll-to', () => {
const scrollToElement = await page.$('.custom-element') const scrollToElement = await page.$('.custom-element')
await btnScrollTo.tap() await btnScrollTo.tap()
await page.waitFor(600) await page.waitFor(1000)
const offset = await scrollToElement.offset() const offset = await scrollToElement.offset()
// android 6 分辨率为 720*1280,需要调整期望数值 // android 6 分辨率为 720*1280,需要调整期望数值
if (!process.env.uniTestPlatformInfo.startsWith('android 6')) { if (!process.env.uniTestPlatformInfo.startsWith('android 6')) {
expect(offset.top >= 1188).toBe(true) expect(offset.top >= 1180).toBe(true)
} }
}) })
}) })
\ No newline at end of file
...@@ -82,16 +82,28 @@ describe('ExtApi-Request', () => { ...@@ -82,16 +82,28 @@ describe('ExtApi-Request', () => {
if (process.env.uniTestPlatformInfo.indexOf('web') === -1) { if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
it('Check Set Cookie', async () => { it('Check Set Cookie', async () => {
res = await page.callMethod('jest_set_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(500); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_set_cookie')
await page.waitFor(500);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
it('Check Delete Cookie', async () => { it('Check Delete Cookie', async () => {
res = await page.callMethod('jest_delete_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(1000); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_delete_cookie')
await page.waitFor(1000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
} }
}); });
...@@ -23,16 +23,28 @@ describe('ExtApi-UploadFile', () => { ...@@ -23,16 +23,28 @@ describe('ExtApi-UploadFile', () => {
}); });
it('Check Set Cookie', async () => { it('Check Set Cookie', async () => {
res = await page.callMethod('jest_set_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(1000); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_set_cookie')
await page.waitFor(1000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
it('Check Delete Cookie', async () => { it('Check Delete Cookie', async () => {
res = await page.callMethod('jest_delete_cookie') if (process.env.uniTestPlatformInfo.startsWith('android')) {
await page.waitFor(1000); let version = process.env.uniTestPlatformInfo
res = await page.data('jest_result'); version = version.split(" ")[1]
expect(res).toBe(true) if(version > 9){
res = await page.callMethod('jest_delete_cookie')
await page.waitFor(1000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
}
}); });
it('Check files upload', async () => { it('Check files upload', async () => {
res = await page.callMethod('jest_files_upload') res = await page.callMethod('jest_files_upload')
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
style="width: 50px; height: 50px; background-color: red" style="width: 50px; height: 50px; background-color: red"
></view> ></view>
<view class="common" style="position: relative"> <view class="common" style="position: relative">
<text>relative</text> <text class="text">relative</text>
</view> </view>
<view <view
style="width: 50px; height: 50px; background-color: blue" style="width: 50px; height: 50px; background-color: blue"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
style="width: 50px; height: 50px; background-color: red" style="width: 50px; height: 50px; background-color: red"
></view> ></view>
<view class="common" style="position: absolute"> <view class="common" style="position: absolute">
<text>absolute</text> <text class="text">absolute</text>
</view> </view>
<view <view
style="width: 50px; height: 50px; background-color: blue" style="width: 50px; height: 50px; background-color: blue"
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
style="width: 50px; height: 50px; background-color: red" style="width: 50px; height: 50px; background-color: red"
></view> ></view>
<view class="common fixed" style="position: fixed"> <view class="common fixed" style="position: fixed">
<text>fixed</text> <text class="text">fixed</text>
</view> </view>
<view <view
style="width: 50px; height: 50px; background-color: blue" style="width: 50px; height: 50px; background-color: blue"
...@@ -131,4 +131,8 @@ ...@@ -131,4 +131,8 @@
/* #endif */ /* #endif */
} }
.text {
white-space: nowrap;
width: 100%;
}
</style> </style>
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
}, },
// 工具方法,用于快速设置 Element 的 style // 工具方法,用于快速设置 Element 的 style
setElementStyle(refName : string, propertyName : string, propertyStyle : any) : void { setElementStyle(refName : string, propertyName : string, propertyStyle : any) : void {
const elementMap = this.$data['$elementMap'] as Map<string, Element> const elementMap = this.$data['$elementMap'] as Map<string, UniElement>
let element : Element | null = elementMap.get(refName) let element : UniElement | null = elementMap.get(refName)
if (element == null) { if (element == null) {
element = this.$refs[refName] as UniElement; element = this.$refs[refName] as UniElement;
elementMap.set(refName, element) elementMap.set(refName, element)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册