gxd-uni-library-editx 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdLayout/XdLayout.vue

@@ -274,7 +274,7 @@
         observer: null,
         
         //底部是否插槽模式
-        isFooterSolt: false,
+        isFooterSolt: true,
 
       }
     },
@@ -326,6 +326,8 @@
       this.uiErrorLogs = this.errorLogs;
       this.uiLogs = this.logs;
       this.isLogs = this.$settings.isLogs;
+      
+      this.isFooterSolt = this.$settings['isFooterUseSlot'] || true;
   
       //判断是否是打包环境
       if (process.env.VUE_APP_CUSTOM_ENV) {

package/src/components/XdUnit/XdUnit.vue

@@ -53,6 +53,7 @@
   import {
     getParentsStyle,
   } from '@/utils/xd.base';
+  import {mapState} from 'vuex';
 
   export default {
     name: "XdUnit",
@@ -118,6 +119,9 @@
       }
 
     },
+    computed: {
+      ...mapState(['webUnitIcon'])
+    },
     data() {
       return {
         uiColor: '#c00', //金额显示颜色
@@ -160,8 +164,8 @@
 
       //项目配置中获取
       let projectIcon;
-      if (getApp().globalData.$xd && getApp().globalData.$xd.project['unit_icon']) {
-        brandIncon = getApp().globalData.$xd.project['unit_icon'];
+      if (this.webUnitIcon) {
+        projectIcon = this.webUnitIcon;
       }
       
       

package/src/install.js

@@ -102,9 +102,10 @@ const install = (Vue, options = {}) => {
   Vue.mixin({
     data() {
       return {
-        $mainColor: '',
-        $btnColor: '',
-        $subBtnColor: '',
+        /**editx去掉逻辑**/
+        // $mainColor: '',
+        // $btnColor: '',
+        // $subBtnColor: '',
         $pxNum: null, //px to rpx  (1px * $pxNum)rpx
         $rpxNum: null, //rpx to px (1rpx * $rpxNum)px
         $portrait: null,
@@ -137,15 +138,16 @@ const install = (Vue, options = {}) => {
       this.$isIpadCC = 1;
       // #endif
 
-      if (this.webSetting) {
-        this.$mainColor = this.webSetting['mainColor'] || options['mainColor'];
-        this.$btnColor = this.webSetting['btnColor'] || options['btnColor'];
-        this.$subBtnColor = this.webSetting['subBtnColor'] || options['subBtnColor'];
-      } else {
-        this.$mainColor = options['mainColor'] ? options['mainColor'] : '';
-        this.$btnColor = options['btnColor'] ? options['btnColor'] : '';
-        this.$subBtnColor = options['subBtnColor'] ? options['subBtnColor'] : '';
-      }
+      /**editx去掉逻辑**/
+      // if (this.webSetting) {
+      //   this.$mainColor = this.webSetting['mainColor'] || options['mainColor'];
+      //   this.$btnColor = this.webSetting['btnColor'] || options['btnColor'];
+      //   this.$subBtnColor = this.webSetting['subBtnColor'] || options['subBtnColor'];
+      // } else {
+      //   this.$mainColor = options['mainColor'] ? options['mainColor'] : '';
+      //   this.$btnColor = options['btnColor'] ? options['btnColor'] : '';
+      //   this.$subBtnColor = options['subBtnColor'] ? options['subBtnColor'] : '';
+      // }
 
       //横竖屏
       this.$portrait = 1.4;
@@ -155,9 +157,10 @@ const install = (Vue, options = {}) => {
     watch: {
       webSetting(value) {
         if (value !== null) {
-          if (value['mainColor']) this.$mainColor = value['mainColor'];
-          if (value['btnColor']) this.$btnColor = value['btnColor'];
-          if (value['subBtnColor']) this.$subBtnColor = value['subBtnColor'];
+          /**editx去掉逻辑**/
+          // if (value['mainColor']) this.$mainColor = value['mainColor'];
+          // if (value['btnColor']) this.$btnColor = value['btnColor'];
+          // if (value['subBtnColor']) this.$subBtnColor = value['subBtnColor'];
           this.$webSetting = value;
         }
       }

package/src/utils/xd.base.js

@@ -340,6 +340,7 @@ export function parseContainers (containers) {
     containers = [containers];
   }
   const handle = (str) => {
+    if(str === '') return {};
     if(baseCheckVarType(str) === 'object') return str;
     try {
       return JSON.parse(str)

package/src/utils/xd.frame.js

@@ -75,7 +75,15 @@ class xdFrame {
    * @param fnName {String} 方法名字
    */
   getParentApi(fnName) {
-    return this.getParent()['$boardApi'][fnName];
+    if (window.parent['$boardApi']) {
+      return this.getParent()['$boardApi'][fnName];
+    } else {
+      return () => {
+        return new Promise((resolve) => {
+          resolve([]);
+        })
+      }
+    }
   }
 
   /**
@@ -83,7 +91,11 @@ class xdFrame {
    * @param attr {String} 属性名字
    */
   getParentData(attr) {
-    return this.getParent()['$boardData'][attr];
+    console.log('getParentData',)
+    if (window.parent['$boardData']) {
+      return this.getParent()['$boardData'][attr];
+    } else return [];
+
   }
 }
 

package/src/utils/xdh5log.js

@@ -269,7 +269,7 @@ class Logs {
    * @description vue全局报错
    */
   vueErrorHandler(){
-    Vue.config.errorHandler = (error, vm) => {
+    let  handle = (error, vm)=>{
       let messageStr = this.checkMessage(error);
       if (messageStr !== false) {
         this.push(
@@ -278,7 +278,13 @@ class Logs {
           'global'
         )
       }
+    }
+
+    Vue.config.errorHandler = handle;
+
 
+    Vue.config.errorCaptured = (error, vm) => {
+      console.error(error)
     };
   }