jufubao-third 1.0.8 → 1.0.9-beta1

package/src/mixins/locationMixins.js

@@ -1,10 +1,22 @@
 'use strict';
-import {mapActions} from 'vuex';
+import {mapActions, mapMutations} from 'vuex';
+import storage from "@/common/storage";
 
 export default {
   data() {
     return {
-      locationStatus: false
+      locationStatus: false,
+      currentLocationCity: 'jfb_current_ajax_location_city',
+      useSelectCity: 'xd_user_current_access_city',
+      timeoutLocationTime: null,
+      timeoutLocationStatus: false,
+    }
+  },
+
+  destroyed() {
+    if(this.timeoutLocationTime) {
+      clearTimeout(this.timeoutLocationTime)
+      this.timeoutLocationTime = null;
     }
   },
 
@@ -13,23 +25,95 @@ export default {
     ...mapActions('wxAuthorize', [
       'getLoadingCityInfoByLocationLv4'
     ]),
+    ...mapMutations(['setCityInfo']),
 
-    //==开启定位============
     async getCityInfoByLocation(options, cb) {
       try {
+        this.$xdLog.setProject('Layout.getCity.start.open.in', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...options
+        });
         let locationInfo = await this.getLoadingCityInfoByLocationLv4(options);
-        this.$xdLog.setProject('location.getCity.success', locationInfo);
+        storage.set('console_Layout.getCity.done',locationInfo)
+        this.$xdLog.setProject('Layout.getCity.done', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...locationInfo
+        });
         cb(locationInfo);
       } catch (e) {
-        this.$xdLog.setARMSCustomError('get_city_info_by_location_loading', this.$runtime.getErrorInfo(e));
-        this.$xdLog.setProject('location.getCity.fail', {data: this.$settings.defaultCity});
+        storage.set('aaa_Layout.getCity.fail',1)
+        this.$xdLog.setProject('Layout.getCity.fail', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...this.$settings.defaultCity
+        });
         cb({data: this.$settings.defaultCity})
       }
     },
 
-    handleLocationDone(info) {
-      this.$xdLog.setProject('location.done', info);
-      this.locationStatus = true;
+    setDefaultCityData(defaultCity, local){
+      if(!defaultCity.isDefault){
+        storage.set(this.currentLocationCity, defaultCity, .5);
+      }
+      //用户首次定位成功设置系统自动给用户选中一个城市
+      if (!storage.get(this.useSelectCity)) {
+        this.setCityInfo(defaultCity)
+      }
+    },
+
+    timeoutLocation(location){
+      this.timeoutLocationTime = setTimeout(()=>{
+        this.setDefaultCityData(this.$settings.defaultCity);
+        this.$xdLog.setProject('Layout.getCity.timeout.5s', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...this.$settings.defaultCity,
+          ...location
+        });
+        this.locationStatus = true;
+        this.timeoutLocationStatus = true;
+      }, 3000)
+    },
+
+    handleLocationDone(location) {
+      this.$xdLog.setProject('Layout.getCity.start', {
+        time: new Date().getTime(),
+        timeString: new Date().toLocaleString(),
+        statue:this.locationStatus,
+        ...location
+      });
+
+      //从缓存定位到的城市
+      if(storage.get(this.currentLocationCity)) {
+        this.locationStatus = true;
+        return;
+      }
+
+      //通过接口获取定位城市信息
+      this.$xdLog.setProject('Layout.getCity.start.send', {
+        time: new Date().getTime(),
+        timeString: new Date().toLocaleString(),
+      });
+
+      this.getCityInfoByLocation(location, (res)=>{
+        if (this.timeoutLocationStatus) return;
+        this.setDefaultCityData(res.data);
+        this.$xdLog.setProject('Layout.location.done', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+        });
+        if(this.timeoutLocationTime) {
+          clearTimeout(this.timeoutLocationTime);
+          this.timeoutLocationTime = null;
+          this.timeoutLocationStatus = false;
+        }
+
+        this.locationStatus = true;
+      });
+
+      this.timeoutLocation(location);
     },
   }
 }

package/src/mixins/pageEditx.js

@@ -4,6 +4,7 @@ import {
   getContainerPropsValue,
   baseCloneDeep,
 } from "@/utils/xd.base";
+import {JfbEvent} from "@/utils/xd.event";
 
 
 export default {
@@ -15,77 +16,83 @@ export default {
   },
 
   created(){
-    //注册预览模式删除插件事件
-    XdBus.addEvent('onDelPackage', (data) => {
-      this.deleteComponent(data);
-    });
+    // #ifdef H5
+    if (this.$configProject.viewType === 'preview') {
+      //注册预览模式删除插件事件
+      XdBus.addEvent('onDelPackage', (data) => {
+        this.deleteComponent(data);
+      });
+
 
-    //注册预览模式新增插件事件
-    this.regAddComponent();
+      //注册预览模式新增插件事件
+      this.regAddComponent();
 
-    //注册预览模式编辑插件面板事件
-    this.editComponent();
+      //注册预览模式编辑插件面板事件
+      this.editComponent();
 
-    //注册预览模式移动插件面板事件
-    this.regMoveComponent()
+      //注册预览模式移动插件面板事件
+      this.regMoveComponent()
+    }
+    // #endif
   },
 
   methods: {
+    // #ifdef H5
     //==移动插件相关=================================
-    regMoveComponent() {
+    /**
+     * @description 绑定监听插件移动事件
+     */
+    regMoveComponent(){
       XdBus.addEvent('onMoveComponents', ({container, type}) => {
         let temp = baseCloneDeep(this.containers);
-
         //先计算当前移动的插件在那个组中
         let fixed = this.getFixedValue(container);
         let containers = temp[fixed];
-
         //数组为0或者为1个长度不处理
-        if (containers.length <= 1) {
+        if(containers.length <= 1){
           alert('当前区域只有一个组件，无需排序操作');
           return;
         }
         let index = this.getItemToContainerIndex(containers, container.containerId);
-
         //向上并且已经是第一个
-        if (type === 'up' && index === 0) {
+        if (type === 'up' && index === 0){
           alert('已经是第一个，无需排序操作');
           return;
         }
-
         //向下并且已经是最后一个
-        if (type === 'down' && index === (containers.length - 1)) {
+        if (type === 'down' && index === (containers.length - 1)){
           alert('已经是最后个，无需排序操作');
           return;
         }
-
         let item = baseCloneDeep(containers[index]);
-        let newIndex = type === 'up' ? (index - 1) : (index + 1);
-        containers.splice(index, 1);
+        let newIndex = type === 'up' ? (index - 1): (index + 1);
+        containers.splice(index,1);
         containers.splice(newIndex, 0, item);
         temp[fixed] = containers;
-        let newContainers = baseCloneDeep([].concat(temp.tops, temp.bodys, temp.bottoms));
+        let newContainers = baseCloneDeep([].concat(temp.tops, temp.bodys, temp.bottoms,temp.footers));
+        this.containers = baseCloneDeep(temp);
 
-        this.containers = baseCloneDeep.cloneDeep(temp);
         let indexObj = {};
         newContainers.map((it, i) => {
           indexObj[it['container_id']] = i;
-        });
+        })
         XdBus.send('onMoveComponentsIndex', indexObj);
       });
     },
-    getItemToContainerIndex(container, containerId) {
+
+    getItemToContainerIndex(container, containerId){
       let index = null;
-      container.map((item, idx) => {
-        if (containerId === item['container_id']) index = idx
+      container.map((item,idx) =>{
+        if(containerId === item['container_id']) index = idx
       })
       return index;
     },
-    getFixedValue(value) {
+
+    getFixedValue(value){
       let fixed = 'bodys';
       let attr = value['container']['component']['attrs'];
-      attr.map(item => {
-        if (item['key'] === 'fixed') {
+      attr.map(item=>{
+        if(item['key'] ==='fixed') {
           if (item['value'] === 'top') fixed = 'tops';
           if (item['value'] === 'bottom') fixed = 'bottoms';
           if (item['value'] === 'footer') fixed = 'footers';
@@ -101,13 +108,24 @@ export default {
      * @description  删除插件
      */
     deleteComponent(data) {
-      let temp = this.$xdUniHelper.cloneDeep(this.containers);
+      let temp = baseCloneDeep(this.containers);
       temp['refreshKey'] = this.$xdUniHelper.randomChar(20);
-      this.refs = this.refs.filter(item => {
+      let fixed = 'body';
+      let height = 0;
+      data['container']['component']['attrs'].map(it => {
+        if (it['key'] === 'fixed') {
+          fixed = it['value'];
+        }
+        if (it['key'] === 'height') {
+          height = it['value'];
+        }
+      });
+
+      //重置refs
+      this.refs = this.refs.filter(item=>{
         return item !== data.containerId
       });
 
-      let {fixed, height} = this.getFixedKey(data, false);
       switch (fixed) {
         case 'top':
           temp.tops = temp.tops.filter(item => {
@@ -133,34 +151,31 @@ export default {
           });
       }
       this.containers = temp;
-
       this.$nextTick(() => {
         setTimeout(() => {
           this.setIframeHeigth(false);
           XdBus.send('onDelViewUpdateBoard', {});
           this.dataListRefreshKey = this.$xdUniHelper.randomChar(20);
-        }, this.time)
+        }, 100)
       })
     },
 
-    /**
-     * @description 接受点击加入插件操作
-     */
-    regAddComponent() {
-      XdBus.addEvent('onAddComponent', (containers) => {
-        let temp = this.$xdUniHelper.cloneDeep(this.containers);
-        temp['refreshKey'] = this.$xdUniHelper.randomChar(20);
-        let {fixed, height}  = this.getFixedKey(containers);
-        this.switchFixed(fixed, height, containers,temp);
-        this.containers = temp;
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.setIframeHeigth();
-            XdBus.message('onBoardSelect', {containerId: item['container_id']});
-            this.dataListRefreshKey = this.$xdUniHelper.randomChar(20);
-          }, this.time)
-        })
-      })
+    reInitData(list,container){
+      let res = {
+        status: false
+      };
+      res.data = list.map(item => {
+        if (container['container_id'] === item['container_id']){
+          //有隐藏与显示操作并且显示操作需要刷新页面
+          if(container.hidden !== item.hidden){
+            container['refreshKey'] = this.$xdUniHelper.randomChar(20);
+            res.status = true;
+          }
+          return this.$xdUniHelper.cloneDeep(container);
+        }
+        return item;
+      });
+      return res;
     },
 
     /**
@@ -168,49 +183,59 @@ export default {
      */
     editComponent() {
       XdBus.addEvent('onEditComponent', ({container, isHeight}) => {
-        let temp = this.$xdUniHelper.cloneDeep(this.containers);
-        temp['refreshKey'] = this.$xdUniHelper.randomChar(20);
-        let {fixed, height} = this.getFixedKey(container, false);
+        //有隐藏与显示操作并且显示操作需要刷新页面
+        let hasHiddenDoStatus = false;
+        let temp = baseCloneDeep(this.containers);
+        let fixed = 'body';
+        let height = 0;
+        container['component']['attrs'].map(it => {
+          if (it['key'] === 'fixed') {
+            fixed = it['value'];
+          }
+          if (it['key'] === 'height') {
+            height = it['value'];
+          }
+        });
         switch (fixed) {
           case 'top':
-            temp.tops = temp.tops.map(item => {
-              if (container['container_id'] === item['container_id']) return container;
-              return item;
-            });
+            let tops = this.reInitData(temp.tops, container);
+            temp.tops = tops.data;
+            if(tops.status) hasHiddenDoStatus = true;
+
             if (isHeight) {
               if (container.hidden) temp.topHeight -= height;
               else temp.topHeight += height;
             }
             break;
           case 'bottom':
-            temp.bottoms = temp.bottoms.map(item => {
-              if (container['container_id'] === item['container_id']) return container;
-              return item;
-            });
+            let bottoms = this.reInitData(temp.bottoms, container);
+            temp.bottoms = bottoms.data;
+            if(bottoms.status) hasHiddenDoStatus = true;
+
             if (isHeight) {
               if (container.hidden) temp.bottomHeight -= height;
               else temp.bottomHeight += height;
             }
+
             break;
           case 'footer':
-            temp.footers = temp.footers.map(item => {
-              if (container['container_id'] === item['container_id']) return container;
-              return item;
-            });
-            if (isHeight) {
+            let footers = this.reInitData(temp.footers, container);
+            temp.footers = footers.data;
+            if(footers.status) hasHiddenDoStatus = true;
+
+            if(isHeight) {
               if (container.hidden) temp.footerHeight -= height;
               else temp.footerHeight += height;
             }
             break;
           default:
-            temp.bodys = temp.bodys.map(item => {
-              if (container['container_id'] === item['container_id']) return container;
-              return item;
-            });
+            let bodys = this.reInitData(temp.bodys, container);
+            temp.bodys = bodys.data;
+            if(bodys.status) hasHiddenDoStatus = true;
         }
 
         //编辑模式更新高度需要设置ref
-        if (isHeight) {
+        if(isHeight) {
           if (container.hidden) {
             this.refs = this.refs.filter(ref => {
               return ref !== container['container_id']
@@ -220,31 +245,102 @@ export default {
           }
         }
         this.containers = temp;
-
         this.$nextTick(() => {
           setTimeout(() => {
+            if(!hasHiddenDoStatus) {
+              XdBus.message('onBoardSelect', {containerId: container['container_id']});
+            }
+
+            //由隐藏组件到显示组件时，需要触发操作组件的onJfbLoad事件
+            else {
+              if(!container.hidden) {
+                let ref = this.$refs[container.container_id];
+                if(ref instanceof Array) ref = ref[0];
+                if(typeof ref.onJfbLoad === 'function'){
+                  ref.onJfbLoad(this.options)
+                }
+              }
+            }
+
             this.setIframeHeigth(false);
-            XdBus.message('onBoardSelect', {containerId: container['container_id']});
             this.dataListRefreshKey = this.$xdUniHelper.randomChar(20);
-          }, this.time)
+          }, 50)
+        })
+      })
+    },
+
+    /**
+     * @description 接受点击加入插件操作
+     */
+    regAddComponent() {
+      XdBus.addEvent('onAddComponent', (item) => {
+        let temp = baseCloneDeep(this.containers);
+        temp['refreshKey'] = this.$xdUniHelper.randomChar(20);
+        let fixed = 'body';
+        let height = 0;
+        item['component']['attrs'] = AttrToTargetValues(item['component']['attrs']);
+        item['component']['attrs'].map(it => {
+          if (it['key'] === 'fixed') {
+            fixed = it['value'];
+          }
+          if (it['key'] === 'height') {
+            height = it['value'];
+          }
+        });
+        switch (fixed) {
+          case 'top':
+            temp.tops.push(item);
+            if (!item.hidden) temp.topHeight += height;
+            break;
+          case 'bottom':
+            temp.bottoms.push(item);
+            if (!item.hidden) temp.bottomHeight += height;
+            break;
+          case 'footer':
+            temp.footers.push(item);
+            if (!item.hidden) temp.footerHeight += height;
+            break;
+          default:
+            temp.bodys.push(item);
+        }
+        this.containers = temp;
+        this.refs.push(item['container_id']);
+        this.$nextTick(() => {
+
+          setTimeout(() => {
+            this.setIframeHeigth();
+            XdBus.message('onBoardSelect', {containerId: item['container_id']});
+            this.dataListRefreshKey = this.$xdUniHelper.randomChar(20);
+
+            //现在组件时候需要触发load事件
+            new JfbEvent('onJfbLoad', {
+              vm: this,
+              data: this.options,
+            });
+          }, 50)
         })
       })
     },
+
+
     //==操作插件相关=================================
 
     /**
-     * @description 刷新父级Iframe高度
-     * @param type
+     *  @description 设置容器高度高度问题
      */
     setIframeHeigth(type = true) {
-      let xdLayoutEl = this.$refs[this.layoutId].$el;
-      let height = parseInt(xdLayoutEl.style.height || window.getComputedStyle(xdLayoutEl).height);
-      if (height !== this.indexHeight) {
-        window['XdBus'].send('setIframeHeight', height);
-        this.indexHeight = height;
+      let xdLayoutEl = this.$refs[this.layoutRef];
+      if(xdLayoutEl) {
+        let height = parseInt(xdLayoutEl.$el.style.height || window.getComputedStyle(xdLayoutEl.$el).height);
+        if (height !== this.indexHeight) {
+          window['XdBus'].send('setIframeHeight', height);
+          this.indexHeight = height;
+        }
       }
     },
 
+    // #endif
+
   }
 }