From 3782d7d627395f89cc37587504ce987a6db9b580 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 17 Oct 2019 19:24:33 +0800
Subject: [PATCH] feat(app-plus):  ANI_CLOSE

---
 packages/uni-app-plus/dist/view.umd.js                 |  1 +
 .../bridge/subscribe/api/request-component-info.js     |  3 ++-
 src/platforms/app-plus/service/constants.js            | 10 ++++++----
 .../h5/service/api/ui/create-selector-query.js         |  3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/uni-app-plus/dist/view.umd.js b/packages/uni-app-plus/dist/view.umd.js
index 2c9f8f36d..512910edb 100644
--- a/packages/uni-app-plus/dist/view.umd.js
+++ b/packages/uni-app-plus/dist/view.umd.js
@@ -12453,6 +12453,7 @@ function getNodeInfo(el, fields) {
 
 function getNodesInfo(pageVm, component, selector, single, fields) {
   /* eslint-disable no-mixed-operators */
+  // TODO 判断 component 是否是 _$id,如果是，从 pageVm 中递归查找该组件实例
   var $el = component && component.$el || pageVm.$el;
 
   if (single) {
diff --git a/src/core/view/bridge/subscribe/api/request-component-info.js b/src/core/view/bridge/subscribe/api/request-component-info.js
index 1ad7c50e2..0f5a0b40e 100644
--- a/src/core/view/bridge/subscribe/api/request-component-info.js
+++ b/src/core/view/bridge/subscribe/api/request-component-info.js
@@ -74,7 +74,8 @@ function getNodeInfo (el, fields) {
 }
 
 function getNodesInfo (pageVm, component, selector, single, fields) {
-  /* eslint-disable no-mixed-operators */
+  /* eslint-disable no-mixed-operators */
+  // TODO 判断 component 是否是 _$id,如果是，从 pageVm 中递归查找该组件实例
   const $el = component && component.$el || pageVm.$el
   if (single) {
     const node = $el && ($el.matches(selector) ? $el : $el.querySelector(selector))
diff --git a/src/platforms/app-plus/service/constants.js b/src/platforms/app-plus/service/constants.js
index 3db63b452..f65db60b9 100644
--- a/src/platforms/app-plus/service/constants.js
+++ b/src/platforms/app-plus/service/constants.js
@@ -1,7 +1,9 @@
-export const ANI_SHOW = plus.os.name === 'Android' && parseInt(plus.os.version) < 6 ? 'slide-in-right' : 'pop-in'
-export const ANI_DURATION = 300
-
-export const ANI_CLOSE = 'pop-out'
+const downgrade = plus.os.name === 'Android' && parseInt(plus.os.version) < 6
+
+export const ANI_SHOW = downgrade ? 'slide-in-right' : 'pop-in'
+export const ANI_DURATION = 300
+
+export const ANI_CLOSE = downgrade ? 'slide-out-right' : 'pop-out'
 
 export const TITLEBAR_HEIGHT = 44
 
diff --git a/src/platforms/h5/service/api/ui/create-selector-query.js b/src/platforms/h5/service/api/ui/create-selector-query.js
index ca60692ed..2860a2b76 100644
--- a/src/platforms/h5/service/api/ui/create-selector-query.js
+++ b/src/platforms/h5/service/api/ui/create-selector-query.js
@@ -83,7 +83,8 @@ class SelectorQuery {
     })
   }
 
-  ['in'] (component) {
+  ['in'] (component) {
+    // TODO 跨平台，非 h5 平台传递 component._$id
     this._component = component
     return this
   }
-- 
GitLab