jufubao-base 1.0.19 → 1.0.21

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -54,6 +54,26 @@
         if (bgcolor) this.bgcolor = bgcolor;
         if (height) this.height = height;
       },
+      onJfbLoad(options) {
+    
+        //#ifdef H5
+        //参考地址： https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#0
+        jfbRootExec('getH5WxAuthorize', {
+          vm: this,
+          data: {
+            jsApiList: [], //可以不传，不传走系统默认
+            url: window.location.href //可以不传
+          },
+        })
+          .then(res => {
+            console.log('success', res)
+          })
+          .catch(error => {
+            console.error(error)
+          })
+    
+        // #endif
+      },
     }
   }
 

package/src/components/JfbBaseBlock/JfbBaseBlockMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCard/JfbBaseCardMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardBind/JfbBaseCardBindMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardDetail/JfbBaseCardDetailMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardInfo/JfbBaseCardInfoMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardMy/JfbBaseCardMyMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardShift/JfbBaseCardShiftMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据
@@ -169,7 +207,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件