jufubao-base 1.0.378 → 1.0.381

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.378",
+  "version": "1.0.381",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -65,7 +65,7 @@
           </view>
           <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
           <input
-            v-if="useSearch==='Y'"
+            v-if="inputCanSearch"
             :placeholder="placeholder"
             class="search_input"
             :value="keyword"
@@ -153,6 +153,10 @@
           width: this.quickImgSize.width + 'rpx',
           height: this.quickImgSize.height + 'rpx'
         }
+      },
+      inputCanSearch(){
+        if(this.search_focus_back === 'Y') return true;
+        return this.useSearch === 'Y'
       }
     },
     data() {
@@ -162,6 +166,7 @@
         loaded: false,
         keyword: "",
         isPreview: false,
+        search_focus_back: "",  //搜索框聚焦时返回， Y:是;  N:否
 
         //面板
         showLocation: "",
@@ -239,6 +244,7 @@
     methods: {
       ...mapMutations(['setShowSwitchCity', 'setCityInfo']),
       onJfbLoad(options) {
+        this.search_focus_back = options.search_focus_back;
         if(options.keyword) this.keyword = options.keyword;
         this.loaded = true;
       },
@@ -316,6 +322,10 @@
         }
       },
       handleFocus(){
+        if(this.search_focus_back === "Y") {
+          this.$xdUniHelper.navigateBack();
+          return;
+        }
         jfbRootFnExec(this, 'onCustomEvent')("baseHeader@focus");
       },
       handleBlur(){

package/src/components/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -71,11 +71,12 @@
             </view>
             <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
             <input
-              v-if="useSearch==='Y'"
+              v-if="inputCanSearch"
               :placeholder="placeholder"
               class="search_input"
               :value="keyword"
               @input="handleInput"
+              @focus="handleFocus"
               @click="toSearch"
               :placeholder-style="'color:' + inputTextColor"
             />
@@ -165,6 +166,10 @@
           width: this.quickImgSize.width + 'rpx',
           height: this.quickImgSize.height + 'rpx'
         }
+      },
+      inputCanSearch(){
+        if(this.search_focus_back === 'Y') return true;
+        return this.useSearch === 'Y'
       }
     },
     data() {
@@ -174,6 +179,7 @@
         loaded: false,
         keyword: "",
         isPreview: false,
+        search_focus_back: "",  //搜索框聚焦时返回， Y:是;  N:否
 
         //面板
         showLocation: "",
@@ -254,6 +260,7 @@
     methods: {
       ...mapMutations(['setShowSwitchCity', 'setCityInfo']),
       onJfbLoad(options) {
+        this.search_focus_back = options.search_focus_back;
         if(options.keyword) this.keyword = options.keyword;
         this.loaded = true;
       },
@@ -341,6 +348,13 @@
           jfbRootFnExec(this, 'onCustomEvent')("baseHeader@search", e.detail.value);
         }, 300)
       },
+      handleFocus(){
+        if(this.search_focus_back === "Y") {
+          this.$xdUniHelper.navigateBack();
+          return;
+        }
+        jfbRootFnExec(this, 'onCustomEvent')("baseHeader@focus");
+      },
       doSearch(){
         if(this.useSearch === "N"){
           this.$xdUniHelper.navigateTo({